From 713e8c26a6fcbb96054397d3ee6a2c3866236003 Mon Sep 17 00:00:00 2001 From: Artur Kotyrba Date: Mon, 25 Apr 2011 15:45:53 +0200 Subject: [PATCH 1/6] [Routing] removed redundant parameter in addRoute method --- .../Component/Routing/Loader/AnnotationClassLoader.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php b/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php index ffeca17ec0..73cff36d13 100644 --- a/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php +++ b/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php @@ -139,17 +139,17 @@ abstract class AnnotationClassLoader implements LoaderInterface foreach ($class->getMethods() as $method) { if ($annots = $this->reader->getMethodAnnotation($method, $this->routesAnnotationClass)) { foreach ($annots->getRoutes() as $annot) { - $this->addRoute($collection, $annot, $globals, $annot, $class, $method); + $this->addRoute($collection, $annot, $globals, $class, $method); } } elseif ($annot = $this->reader->getMethodAnnotation($method, $this->routeAnnotationClass)) { - $this->addRoute($collection, $annot, $globals, $annot, $class, $method); + $this->addRoute($collection, $annot, $globals, $class, $method); } } return $collection; } - protected function addRoute(RouteCollection $collection, $annot, $globals, $annot, \ReflectionClass $class, \ReflectionMethod $method) + protected function addRoute(RouteCollection $collection, $annot, $globals, \ReflectionClass $class, \ReflectionMethod $method) { if (null === $annot->getName()) { $annot->setName($this->getDefaultRouteName($class, $method)); From 533e2d994b7d451e518e0c7c1e6da3a460f37581 Mon Sep 17 00:00:00 2001 From: Artur Kotyrba Date: Mon, 25 Apr 2011 15:47:39 +0200 Subject: [PATCH 2/6] [BrowserKit] fixed typo --- src/Symfony/Component/BrowserKit/CookieJar.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/BrowserKit/CookieJar.php b/src/Symfony/Component/BrowserKit/CookieJar.php index 3ac81f8a6b..a5a7e53d7a 100644 --- a/src/Symfony/Component/BrowserKit/CookieJar.php +++ b/src/Symfony/Component/BrowserKit/CookieJar.php @@ -81,7 +81,7 @@ class CookieJar public function updateFromResponse(Response $response, $uri = null) { foreach ($response->getHeader('Set-Cookie', false) as $cookie) { - $this->set(Cookie::fromString($cookie), $uri); + $this->set(Cookie::fromString($cookie, $uri)); } } From f9f02a90471cc55d73ddeef9c4d4403e90ac26be Mon Sep 17 00:00:00 2001 From: Artur Kotyrba Date: Mon, 25 Apr 2011 15:48:49 +0200 Subject: [PATCH 3/6] [HttpKernel] removed unused argument passed to ClosureLoader constructor --- src/Symfony/Component/HttpKernel/Kernel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php index d996da2f3f..cba2985edc 100644 --- a/src/Symfony/Component/HttpKernel/Kernel.php +++ b/src/Symfony/Component/HttpKernel/Kernel.php @@ -597,7 +597,7 @@ abstract class Kernel implements KernelInterface new YamlFileLoader($container, $locator), new IniFileLoader($container, $locator), new PhpFileLoader($container, $locator), - new ClosureLoader($container, $locator), + new ClosureLoader($container), )); return new DelegatingLoader($resolver); From 05698f66a2ba9f83d1b3223eb12fe2bbe76296b6 Mon Sep 17 00:00:00 2001 From: Artur Kotyrba Date: Mon, 25 Apr 2011 15:51:29 +0200 Subject: [PATCH 4/6] [Templating] removed unused argument passed to setRendered() method --- .../Bundle/FrameworkBundle/Templating/Helper/FormHelper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php index d0eef43c95..dea54c4606 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php +++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php @@ -116,7 +116,7 @@ class FormHelper extends Helper } if ('widget' === $section || 'row' === $section) { - $view->setRendered(true); + $view->setRendered(); } return $this->render($template, array_merge($view->all(), $variables)); From 88e78e6f44636ee98c48ff3453fb3da3b9813ad3 Mon Sep 17 00:00:00 2001 From: Artur Kotyrba Date: Mon, 25 Apr 2011 15:52:15 +0200 Subject: [PATCH 5/6] [Translation] removed unnecessary default parameter value --- src/Symfony/Component/Translation/Translator.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/Translation/Translator.php b/src/Symfony/Component/Translation/Translator.php index 1c22d8aac1..b97df9cb71 100644 --- a/src/Symfony/Component/Translation/Translator.php +++ b/src/Symfony/Component/Translation/Translator.php @@ -37,7 +37,7 @@ class Translator implements TranslatorInterface * * @api */ - public function __construct($locale = null, MessageSelector $selector) + public function __construct($locale, MessageSelector $selector) { $this->locale = $locale; $this->selector = $selector; From d506a55b40f53103f6759e09f645b37472e35139 Mon Sep 17 00:00:00 2001 From: Artur Kotyrba Date: Mon, 25 Apr 2011 22:55:31 +0200 Subject: [PATCH 6/6] [Bridge][Twig] removed unused argument passed to setRendered() method --- src/Symfony/Bridge/Twig/Extension/FormExtension.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Bridge/Twig/Extension/FormExtension.php b/src/Symfony/Bridge/Twig/Extension/FormExtension.php index 7c2f7f5551..0ef00f75d1 100644 --- a/src/Symfony/Bridge/Twig/Extension/FormExtension.php +++ b/src/Symfony/Bridge/Twig/Extension/FormExtension.php @@ -166,7 +166,7 @@ class FormExtension extends \Twig_Extension if (isset($templates[$block])) { if ('widget' === $section || 'row' === $section) { - $view->setRendered(true); + $view->setRendered(); } return $templates[$block]->renderBlock($block, array_merge($view->all(), $variables));