From ffe863c5439fba49fe078a307397482579990ce6 Mon Sep 17 00:00:00 2001 From: Tobias Schultze Date: Mon, 3 Nov 2014 21:24:10 +0100 Subject: [PATCH 1/9] [Routing] correctly initialize condition as string --- src/Symfony/Component/Routing/Route.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/Routing/Route.php b/src/Symfony/Component/Routing/Route.php index 28966945d6..32b31c9a3b 100644 --- a/src/Symfony/Component/Routing/Route.php +++ b/src/Symfony/Component/Routing/Route.php @@ -64,7 +64,7 @@ class Route implements \Serializable /** * @var string */ - private $condition; + private $condition = ''; /** * Constructor. @@ -84,7 +84,7 @@ class Route implements \Serializable * * @api */ - public function __construct($path, array $defaults = array(), array $requirements = array(), array $options = array(), $host = '', $schemes = array(), $methods = array(), $condition = null) + public function __construct($path, array $defaults = array(), array $requirements = array(), array $options = array(), $host = '', $schemes = array(), $methods = array(), $condition = '') { $this->setPath($path); $this->setDefaults($defaults); From 809cf24675e17b1f1860d2227b0712caf7d6d834 Mon Sep 17 00:00:00 2001 From: Peter Rehm Date: Thu, 6 Nov 2014 13:46:31 +0100 Subject: [PATCH 2/9] Fixed whitespace control for password form widget --- .../Bridge/Twig/Resources/views/Form/form_div_layout.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig index 64e6a4aee1..5e85fb40c7 100644 --- a/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig +++ b/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig @@ -162,7 +162,7 @@ {% block password_widget -%} {% set type = type|default('password') %} - {{ block('form_widget_simple') }} + {{- block('form_widget_simple') -}} {%- endblock password_widget %} {% block hidden_widget -%} From 5321741ab5b045ee4789a7157f0d7f159feae041 Mon Sep 17 00:00:00 2001 From: Yosmany Garcia Date: Sat, 8 Nov 2014 14:35:51 -0500 Subject: [PATCH 3/9] Fixed case for empty folder --- src/Symfony/Component/Filesystem/Filesystem.php | 4 ++++ .../Component/Filesystem/Tests/FilesystemTest.php | 15 +++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php index 7de9507e26..34b82cfd97 100644 --- a/src/Symfony/Component/Filesystem/Filesystem.php +++ b/src/Symfony/Component/Filesystem/Filesystem.php @@ -388,6 +388,10 @@ class Filesystem $iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($originDir, $flags), \RecursiveIteratorIterator::SELF_FIRST); } + if ($this->exists($originDir)) { + $this->mkdir($targetDir); + } + foreach ($iterator as $file) { $target = str_replace($originDir, $targetDir, $file->getPathname()); diff --git a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php index 76988d0e68..e957edfbb1 100644 --- a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php +++ b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php @@ -845,6 +845,21 @@ class FilesystemTest extends \PHPUnit_Framework_TestCase $this->assertFalse($this->filesystem->exists($targetPath.'directory'.DIRECTORY_SEPARATOR.'file1')); } + public function testMirrorCreatesEmptyDirectory() + { + $sourcePath = $this->workspace.DIRECTORY_SEPARATOR.'source'.DIRECTORY_SEPARATOR; + + mkdir($sourcePath); + + $targetPath = $this->workspace.DIRECTORY_SEPARATOR.'target'.DIRECTORY_SEPARATOR; + + $this->filesystem->mirror($sourcePath, $targetPath); + + $this->assertTrue(is_dir($targetPath)); + + $this->filesystem->remove($sourcePath); + } + public function testMirrorCopiesLinks() { $this->markAsSkippedIfSymlinkIsMissing(); From 7816a98204aad2904b2b95b941b656a995abad32 Mon Sep 17 00:00:00 2001 From: Warnar Boekkooi Date: Mon, 3 Nov 2014 19:58:57 +0800 Subject: [PATCH 4/9] [DependencyInjection] inlined factory not referenced --- .../Compiler/AnalyzeServiceReferencesPass.php | 4 + .../Compiler/InlineServiceDefinitionsPass.php | 4 + .../AnalyzeServiceReferencesPassTest.php | 22 ++++++ .../InlineServiceDefinitionsPassTest.php | 78 +++++++++++++++++++ 4 files changed, 108 insertions(+) diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php index 10718533bb..7d62569e66 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php @@ -111,6 +111,10 @@ class AnalyzeServiceReferencesPass implements RepeatablePassInterface $this->processArguments($argument->getArguments()); $this->processArguments($argument->getMethodCalls()); $this->processArguments($argument->getProperties()); + + if ($argument->getFactoryService()) { + $this->processArguments(array(new Reference($argument->getFactoryService()))); + } } } } diff --git a/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php index 5d4f2bf58b..6623e73afc 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php @@ -138,6 +138,10 @@ class InlineServiceDefinitionsPass implements RepeatablePassInterface return false; } + if (count($ids) > 1 && $definition->getFactoryService()) { + return false; + } + return $container->getDefinition(reset($ids))->getScope() === $definition->getScope(); } } diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AnalyzeServiceReferencesPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AnalyzeServiceReferencesPassTest.php index 00322a22d0..e45ac9305a 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AnalyzeServiceReferencesPassTest.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AnalyzeServiceReferencesPassTest.php @@ -79,6 +79,28 @@ class AnalyzeServiceReferencesPassTest extends \PHPUnit_Framework_TestCase $this->assertSame($ref, $refs[0]->getValue()); } + public function testProcessDetectsReferencesFromInlinedFactoryDefinitions() + { + $container = new ContainerBuilder(); + + $container + ->register('a') + ; + + $factory = new Definition(); + $factory->setFactoryService('a'); + + $container + ->register('b') + ->addArgument($factory) + ; + + $graph = $this->process($container); + + $this->assertTrue($graph->hasNode('a')); + $this->assertCount(1, $refs = $graph->getNode('a')->getInEdges()); + } + public function testProcessDoesNotSaveDuplicateReferences() { $container = new ContainerBuilder(); diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/InlineServiceDefinitionsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/InlineServiceDefinitionsPassTest.php index 6458a335d8..fc404467a6 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/InlineServiceDefinitionsPassTest.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/InlineServiceDefinitionsPassTest.php @@ -110,6 +110,84 @@ class InlineServiceDefinitionsPassTest extends \PHPUnit_Framework_TestCase $this->assertSame($a, $inlinedArguments[0]); } + public function testProcessInlinesPrivateFactoryReference() + { + $container = new ContainerBuilder(); + + $container->register('a')->setPublic(false); + $b = $container + ->register('b') + ->setPublic(false) + ->setFactoryService('a') + ; + + $container + ->register('foo') + ->setArguments(array( + $ref = new Reference('b'), + )); + + $this->process($container); + + $inlinedArguments = $container->getDefinition('foo')->getArguments(); + $this->assertSame($b, $inlinedArguments[0]); + } + + public function testProcessDoesNotInlinePrivateFactoryIfReferencedMultipleTimesWithinTheSameDefinition() + { + $container = new ContainerBuilder(); + $container + ->register('a') + ; + $container + ->register('b') + ->setPublic(false) + ->setFactoryService('a') + ; + + $container + ->register('foo') + ->setArguments(array( + $ref1 = new Reference('b'), + $ref2 = new Reference('b'), + )) + ; + $this->process($container); + + $args = $container->getDefinition('foo')->getArguments(); + $this->assertSame($ref1, $args[0]); + $this->assertSame($ref2, $args[1]); + } + + public function testProcessDoesNotInlineReferenceWhenUsedByInlineFactory() + { + $container = new ContainerBuilder(); + $container + ->register('a') + ; + $container + ->register('b') + ->setPublic(false) + ->setFactoryService('a') + ; + + $inlineFactory = new Definition(); + $inlineFactory->setPublic(false); + $inlineFactory->setFactoryService('b'); + + $container + ->register('foo') + ->setArguments(array( + $ref = new Reference('b'), + $inlineFactory, + )) + ; + $this->process($container); + + $args = $container->getDefinition('foo')->getArguments(); + $this->assertSame($ref, $args[0]); + } + public function testProcessInlinesOnlyIfSameScope() { $container = new ContainerBuilder(); From 918b16b16c40a247774f6c5fce9773b1634be5ad Mon Sep 17 00:00:00 2001 From: "Michael H. Arieli" Date: Mon, 10 Nov 2014 18:50:16 -0800 Subject: [PATCH 5/9] [Translations] Added missing Hebrew language trans-unit sources --- .../Resources/translations/validators.he.xlf | 4 +- .../Resources/translations/security.he.xlf | 71 ++++++++++++++++ .../Resources/translations/security.he.xlf | 71 ++++++++++++++++ .../Resources/translations/validators.he.xlf | 80 +++++++++++++++++++ 4 files changed, 224 insertions(+), 2 deletions(-) create mode 100644 src/Symfony/Component/Security/Core/Resources/translations/security.he.xlf create mode 100644 src/Symfony/Component/Security/Resources/translations/security.he.xlf diff --git a/src/Symfony/Component/Form/Resources/translations/validators.he.xlf b/src/Symfony/Component/Form/Resources/translations/validators.he.xlf index 5198738d3f..74a71d05a3 100644 --- a/src/Symfony/Component/Form/Resources/translations/validators.he.xlf +++ b/src/Symfony/Component/Form/Resources/translations/validators.he.xlf @@ -11,8 +11,8 @@ הקובץ שהועלה גדול מדי. נסה להעלות קובץ קטן יותר. - The CSRF token is invalid. - אסימון CSRF אינו חוקי. + The CSRF token is invalid. Please try to resubmit the form. + אסימון CSRF אינו חוקי. אנא נסה לשלוח שוב את הטופס. diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.he.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.he.xlf new file mode 100644 index 0000000000..3640698ce9 --- /dev/null +++ b/src/Symfony/Component/Security/Core/Resources/translations/security.he.xlf @@ -0,0 +1,71 @@ + + + + + + An authentication exception occurred. + An authentication exception occurred. + + + Authentication credentials could not be found. + Authentication credentials could not be found. + + + Authentication request could not be processed due to a system problem. + Authentication request could not be processed due to a system problem. + + + Invalid credentials. + Invalid credentials. + + + Cookie has already been used by someone else. + Cookie has already been used by someone else. + + + Not privileged to request the resource. + Not privileged to request the resource. + + + Invalid CSRF token. + Invalid CSRF token. + + + Digest nonce has expired. + Digest nonce has expired. + + + No authentication provider found to support the authentication token. + No authentication provider found to support the authentication token. + + + No session available, it either timed out or cookies are not enabled. + No session available, it either timed out or cookies are not enabled. + + + No token could be found. + No token could be found. + + + Username could not be found. + Username could not be found. + + + Account has expired. + Account has expired. + + + Credentials have expired. + Credentials have expired. + + + Account is disabled. + Account is disabled. + + + Account is locked. + Account is locked. + + + + diff --git a/src/Symfony/Component/Security/Resources/translations/security.he.xlf b/src/Symfony/Component/Security/Resources/translations/security.he.xlf new file mode 100644 index 0000000000..3640698ce9 --- /dev/null +++ b/src/Symfony/Component/Security/Resources/translations/security.he.xlf @@ -0,0 +1,71 @@ + + + + + + An authentication exception occurred. + An authentication exception occurred. + + + Authentication credentials could not be found. + Authentication credentials could not be found. + + + Authentication request could not be processed due to a system problem. + Authentication request could not be processed due to a system problem. + + + Invalid credentials. + Invalid credentials. + + + Cookie has already been used by someone else. + Cookie has already been used by someone else. + + + Not privileged to request the resource. + Not privileged to request the resource. + + + Invalid CSRF token. + Invalid CSRF token. + + + Digest nonce has expired. + Digest nonce has expired. + + + No authentication provider found to support the authentication token. + No authentication provider found to support the authentication token. + + + No session available, it either timed out or cookies are not enabled. + No session available, it either timed out or cookies are not enabled. + + + No token could be found. + No token could be found. + + + Username could not be found. + Username could not be found. + + + Account has expired. + Account has expired. + + + Credentials have expired. + Credentials have expired. + + + Account is disabled. + Account is disabled. + + + Account is locked. + Account is locked. + + + + diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.he.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.he.xlf index fb8c7c6cc5..3d483ddb93 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.he.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.he.xlf @@ -222,6 +222,86 @@ Unsupported card type or invalid card number. סוג הכרטיס אינו נתמך או לא חוקי. + + This is not a valid International Bank Account Number (IBAN). + This is not a valid International Bank Account Number (IBAN). + + + This value is not a valid ISBN-10. + This value is not a valid ISBN-10. + + + This value is not a valid ISBN-13. + This value is not a valid ISBN-13. + + + This value is neither a valid ISBN-10 nor a valid ISBN-13. + This value is neither a valid ISBN-10 nor a valid ISBN-13. + + + This value is not a valid ISSN. + This value is not a valid ISSN. + + + This value is not a valid currency. + This value is not a valid currency. + + + This value should be equal to {{ compared_value }}. + This value should be equal to {{ compared_value }}. + + + This value should be greater than {{ compared_value }}. + This value should be greater than {{ compared_value }}. + + + This value should be greater than or equal to {{ compared_value }}. + This value should be greater than or equal to {{ compared_value }}. + + + This value should be identical to {{ compared_value_type }} {{ compared_value }}. + This value should be identical to {{ compared_value_type }} {{ compared_value }}. + + + This value should be less than {{ compared_value }}. + This value should be less than {{ compared_value }}. + + + This value should be less than or equal to {{ compared_value }}. + This value should be less than or equal to {{ compared_value }}. + + + This value should not be equal to {{ compared_value }}. + This value should not be equal to {{ compared_value }}. + + + This value should not be identical to {{ compared_value_type }} {{ compared_value }}. + This value should not be identical to {{ compared_value_type }} {{ compared_value }}. + + + The image ratio is too big ({{ ratio }}). Allowed maximum ratio is {{ max_ratio }}. + The image ratio is too big ({{ ratio }}). Allowed maximum ratio is {{ max_ratio }}. + + + The image ratio is too small ({{ ratio }}). Minimum ratio expected is {{ min_ratio }}. + The image ratio is too small ({{ ratio }}). Minimum ratio expected is {{ min_ratio }}. + + + The image is square ({{ width }}x{{ height }}px). Square images are not allowed. + The image is square ({{ width }}x{{ height }}px). Square images are not allowed. + + + The image is landscape oriented ({{ width }}x{{ height }}px). Landscape oriented images are not allowed. + The image is landscape oriented ({{ width }}x{{ height }}px). Landscape oriented images are not allowed. + + + The image is portrait oriented ({{ width }}x{{ height }}px). Portrait oriented images are not allowed. + The image is portrait oriented ({{ width }}x{{ height }}px). Portrait oriented images are not allowed. + + + An empty file is not allowed. + An empty file is not allowed. + From a7c2a9a623dea54ced1b0e7eea4f01dd147b8207 Mon Sep 17 00:00:00 2001 From: Ujjwal Ojha Date: Tue, 11 Nov 2014 08:22:52 +0545 Subject: [PATCH 6/9] fixed typo --- UPGRADE-3.0.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/UPGRADE-3.0.md b/UPGRADE-3.0.md index ed3c6dbb13..077bac29f2 100644 --- a/UPGRADE-3.0.md +++ b/UPGRADE-3.0.md @@ -8,8 +8,8 @@ UPGRADE FROM 2.x to 3.0 * `registerNamespaces()` -> `addPrefixes()` * `registerPrefixes()` -> `addPrefixes()` - * `registerNamespaces()` -> `addPrefix()` - * `registerPrefixes()` -> `addPrefix()` + * `registerNamespace()` -> `addPrefix()` + * `registerPrefix()` -> `addPrefix()` * `getNamespaces()` -> `getPrefixes()` * `getNamespaceFallbacks()` -> `getFallbackDirs()` * `getPrefixFallbacks()` -> `getFallbackDirs()` From f1d043a98a7293e966863214d08275a17281e028 Mon Sep 17 00:00:00 2001 From: James Halsall Date: Mon, 10 Nov 2014 10:45:33 +0000 Subject: [PATCH 7/9] [HttpKernel][2.6] Adding support for invokable controllers in the RequestDataCollector --- .../DataCollector/RequestDataCollector.php | 8 ++++++++ .../DataCollector/RequestDataCollectorTest.php | 17 +++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php index f0df74a365..d257961e15 100644 --- a/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php +++ b/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php @@ -147,6 +147,14 @@ class RequestDataCollector extends DataCollector implements EventSubscriberInter 'file' => $r->getFilename(), 'line' => $r->getStartLine(), ); + } elseif (is_object($controller)) { + $r = new \ReflectionClass($controller); + $this->data['controller'] = array( + 'class' => $r->getName(), + 'method' => null, + 'file' => $r->getFileName(), + 'line' => $r->getStartLine(), + ); } else { $this->data['controller'] = (string) $controller ?: 'n/a'; } diff --git a/src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php b/src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php index e10d96c127..6eeb711d70 100644 --- a/src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php @@ -59,6 +59,7 @@ class RequestDataCollectorTest extends \PHPUnit_Framework_TestCase // make sure we always match the line number $r1 = new \ReflectionMethod($this, 'testControllerInspection'); $r2 = new \ReflectionMethod($this, 'staticControllerMethod'); + $r3 = new \ReflectionClass($this); // test name, callable, expected $controllerTests = array( array( @@ -132,6 +133,17 @@ class RequestDataCollectorTest extends \PHPUnit_Framework_TestCase 'line' => 'n/a', ), ), + + array( + 'Invokable controller', + $this, + array( + 'class' => 'Symfony\Component\HttpKernel\Tests\DataCollector\RequestDataCollectorTest', + 'method' => null, + 'file' => __FILE__, + 'line' => $r3->getStartLine(), + ), + ), ); $c = new RequestDataCollector(); @@ -202,4 +214,9 @@ class RequestDataCollectorTest extends \PHPUnit_Framework_TestCase { throw new \LogicException('Unexpected method call'); } + + public function __invoke() + { + throw new \LogicException('Unexpected method call'); + } } From ace9a2210173fb8da0cee6936ffbd28428465020 Mon Sep 17 00:00:00 2001 From: Daniel Wehner Date: Thu, 23 Oct 2014 14:21:59 +0200 Subject: [PATCH 8/9] Add machine readable events --- .../Component/Console/ConsoleEvents.php | 6 ++++++ src/Symfony/Component/Form/FormEvents.php | 21 +++++++++++++++++++ .../Component/HttpKernel/KernelEvents.php | 12 +++++++++++ .../Security/Http/SecurityEvents.php | 4 ++++ 4 files changed, 43 insertions(+) diff --git a/src/Symfony/Component/Console/ConsoleEvents.php b/src/Symfony/Component/Console/ConsoleEvents.php index 12ede2d5bd..1ed41b7daa 100644 --- a/src/Symfony/Component/Console/ConsoleEvents.php +++ b/src/Symfony/Component/Console/ConsoleEvents.php @@ -26,6 +26,8 @@ final class ConsoleEvents * The event listener method receives a Symfony\Component\Console\Event\ConsoleCommandEvent * instance. * + * @Event + * * @var string */ const COMMAND = 'console.command'; @@ -37,6 +39,8 @@ final class ConsoleEvents * The event listener method receives a Symfony\Component\Console\Event\ConsoleTerminateEvent * instance. * + * @Event + * * @var string */ const TERMINATE = 'console.terminate'; @@ -49,6 +53,8 @@ final class ConsoleEvents * a Symfony\Component\Console\Event\ConsoleExceptionEvent * instance. * + * @Event + * * @var string */ const EXCEPTION = 'console.exception'; diff --git a/src/Symfony/Component/Form/FormEvents.php b/src/Symfony/Component/Form/FormEvents.php index 6c4efc5be1..2bdd585251 100644 --- a/src/Symfony/Component/Form/FormEvents.php +++ b/src/Symfony/Component/Form/FormEvents.php @@ -15,31 +15,52 @@ namespace Symfony\Component\Form; */ final class FormEvents { + /** + * @Event + */ const PRE_SUBMIT = 'form.pre_bind'; + /** + * @Event + */ const SUBMIT = 'form.bind'; + /** + * @Event + */ const POST_SUBMIT = 'form.post_bind'; + /** + * @Event + */ const PRE_SET_DATA = 'form.pre_set_data'; + /** + * @Event + */ const POST_SET_DATA = 'form.post_set_data'; /** * @deprecated Deprecated since version 2.3, to be removed in 3.0. Use * {@link PRE_SUBMIT} instead. + * + * @Event */ const PRE_BIND = 'form.pre_bind'; /** * @deprecated Deprecated since version 2.3, to be removed in 3.0. Use * {@link SUBMIT} instead. + * + * @Event */ const BIND = 'form.bind'; /** * @deprecated Deprecated since version 2.3, to be removed in 3.0. Use * {@link POST_SUBMIT} instead. + * + * @Event */ const POST_BIND = 'form.post_bind'; diff --git a/src/Symfony/Component/HttpKernel/KernelEvents.php b/src/Symfony/Component/HttpKernel/KernelEvents.php index fce48ac3a6..ef2d439c51 100644 --- a/src/Symfony/Component/HttpKernel/KernelEvents.php +++ b/src/Symfony/Component/HttpKernel/KernelEvents.php @@ -29,6 +29,8 @@ final class KernelEvents * receives a Symfony\Component\HttpKernel\Event\GetResponseEvent * instance. * + * @Event + * * @var string * * @api @@ -43,6 +45,8 @@ final class KernelEvents * a Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent * instance. * + * @Event + * * @var string * * @api @@ -58,6 +62,8 @@ final class KernelEvents * Symfony\Component\HttpKernel\Event\GetResponseForControllerResultEvent * instance. * + * @Event + * * @var string * * @api @@ -72,6 +78,8 @@ final class KernelEvents * request. The event listener method receives a * Symfony\Component\HttpKernel\Event\FilterControllerEvent instance. * + * @Event + * * @var string * * @api @@ -86,6 +94,8 @@ final class KernelEvents * replied. The event listener method receives a * Symfony\Component\HttpKernel\Event\FilterResponseEvent instance. * + * @Event + * * @var string * * @api @@ -99,6 +109,8 @@ final class KernelEvents * The event listener method receives a * Symfony\Component\HttpKernel\Event\PostResponseEvent instance. * + * @Event + * * @var string */ const TERMINATE = 'kernel.terminate'; diff --git a/src/Symfony/Component/Security/Http/SecurityEvents.php b/src/Symfony/Component/Security/Http/SecurityEvents.php index 45fae293b3..46c8257f18 100644 --- a/src/Symfony/Component/Security/Http/SecurityEvents.php +++ b/src/Symfony/Component/Security/Http/SecurityEvents.php @@ -20,6 +20,8 @@ final class SecurityEvents * The event listener method receives a * Symfony\Component\Security\Http\Event\InteractiveLoginEvent instance. * + * @Event + * * @var string */ const INTERACTIVE_LOGIN = 'security.interactive_login'; @@ -31,6 +33,8 @@ final class SecurityEvents * The event listener method receives a * Symfony\Component\Security\Http\Event\SwitchUserEvent instance. * + * @Event + * * @var string */ const SWITCH_USER = 'security.switch_user'; From 16c1b6669d671686ea163eb46e383581e1e3b9fc Mon Sep 17 00:00:00 2001 From: "Eric J. Duran" Date: Wed, 12 Nov 2014 15:35:22 -0500 Subject: [PATCH 9/9] Update filesystem readme.md to include exists method --- src/Symfony/Component/Filesystem/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Symfony/Component/Filesystem/README.md b/src/Symfony/Component/Filesystem/README.md index 7d8a4749ed..85b0f1c522 100644 --- a/src/Symfony/Component/Filesystem/README.md +++ b/src/Symfony/Component/Filesystem/README.md @@ -18,6 +18,8 @@ $filesystem->touch($files, $time = null, $atime = null); $filesystem->remove($files); +$filesystem->exists($files); + $filesystem->chmod($files, $mode, $umask = 0000, $recursive = false); $filesystem->chown($files, $user, $recursive = false);