diff --git a/src/Symfony/Bridge/Twig/Extension/FormExtension.php b/src/Symfony/Bridge/Twig/Extension/FormExtension.php index 995d823d16..c4d92eb44f 100644 --- a/src/Symfony/Bridge/Twig/Extension/FormExtension.php +++ b/src/Symfony/Bridge/Twig/Extension/FormExtension.php @@ -212,7 +212,6 @@ class FormExtension extends \Twig_Extension { $mainTemplate = in_array($section, array('widget', 'row')); if ($mainTemplate && $view->isRendered()) { - return ''; } diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/attributes.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/attributes.html.php index 2b3c84d066..c81bd67e70 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/attributes.html.php +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/attributes.html.php @@ -5,4 +5,3 @@ name="escape($full_name) ?>" maxlength="escape($max_length) ?>" pattern="escape($pattern) ?>" $v) { printf('%s="%s" ', $view->escape($k), $view->escape($v)); } ?> - diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_widget.html.php index 77fa483c3f..e07e637b3f 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_widget.html.php +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_widget.html.php @@ -2,4 +2,3 @@ renderBlock('field_rows') ?> rest($form) ?> - diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php index 5fac49f519..24dca9867f 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php +++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php @@ -193,7 +193,6 @@ class FormHelper extends Helper { $mainTemplate = in_array($section, array('row', 'widget')); if ($mainTemplate && $view->isRendered()) { - return ''; } diff --git a/src/Symfony/Component/CssSelector/Node/FunctionNode.php b/src/Symfony/Component/CssSelector/Node/FunctionNode.php index b392b27d07..d645c20aa1 100644 --- a/src/Symfony/Component/CssSelector/Node/FunctionNode.php +++ b/src/Symfony/Component/CssSelector/Node/FunctionNode.php @@ -209,7 +209,6 @@ class FunctionNode implements NodeInterface $xpath->addCondition(sprintf('contains(string(.), %s)', XPathExpr::xpathLiteral($expr))); // FIXME: Currently case insensitive matching doesn't seem to be happening - return $xpath; } @@ -264,7 +263,6 @@ class FunctionNode implements NodeInterface if (false === strpos($s, 'n')) { // Just a b - return array(0, intval((string) $s)); } diff --git a/src/Symfony/Component/Form/Form.php b/src/Symfony/Component/Form/Form.php index 3815386a39..4b36063c71 100644 --- a/src/Symfony/Component/Form/Form.php +++ b/src/Symfony/Component/Form/Form.php @@ -266,7 +266,6 @@ class Form implements \IteratorAggregate, FormInterface public function isRequired() { if (null === $this->parent || $this->parent->isRequired()) { - return $this->required; } @@ -287,7 +286,6 @@ class Form implements \IteratorAggregate, FormInterface public function isReadOnly() { if (null === $this->parent || !$this->parent->isReadOnly()) { - return $this->readOnly; } @@ -661,7 +659,6 @@ class Form implements \IteratorAggregate, FormInterface { foreach ($this->children as $child) { if (!$child->isEmpty()) { - return false; } } @@ -687,7 +684,6 @@ class Form implements \IteratorAggregate, FormInterface if (!$this->readOnly) { foreach ($this->children as $child) { if (!$child->isValid()) { - return false; } } @@ -822,7 +818,6 @@ class Form implements \IteratorAggregate, FormInterface public function get($name) { if (isset($this->children[$name])) { - return $this->children[$name]; } diff --git a/src/Symfony/Component/HttpFoundation/RequestMatcher.php b/src/Symfony/Component/HttpFoundation/RequestMatcher.php index 1c159f6a3d..6bc7d23fce 100644 --- a/src/Symfony/Component/HttpFoundation/RequestMatcher.php +++ b/src/Symfony/Component/HttpFoundation/RequestMatcher.php @@ -237,4 +237,3 @@ class RequestMatcher implements RequestMatcherInterface return true; } } - diff --git a/src/Symfony/Component/HttpFoundation/SessionStorage/PdoSessionStorage.php b/src/Symfony/Component/HttpFoundation/SessionStorage/PdoSessionStorage.php index 8c0bd106ab..0fcaa4c41c 100644 --- a/src/Symfony/Component/HttpFoundation/SessionStorage/PdoSessionStorage.php +++ b/src/Symfony/Component/HttpFoundation/SessionStorage/PdoSessionStorage.php @@ -182,6 +182,7 @@ class PdoSessionStorage extends NativeSessionStorage if (count($sessionRows) == 1) { $session = is_resource($sessionRows[0][0]) ? stream_get_contents($sessionRows[0][0]) : $sessionRows[0][0]; + return base64_decode($session); } diff --git a/src/Symfony/Component/Security/Http/Firewall/ContextListener.php b/src/Symfony/Component/Security/Http/Firewall/ContextListener.php index 6f267cfd92..0bf5cff135 100644 --- a/src/Symfony/Component/Security/Http/Firewall/ContextListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/ContextListener.php @@ -66,6 +66,7 @@ class ContextListener implements ListenerInterface if (null === $session || null === $token = $session->get('_security_'.$this->contextKey)) { $this->context->setToken(null); + return; } diff --git a/tests/Symfony/Tests/Bridge/Doctrine/Logger/DbalLoggerTest.php b/tests/Symfony/Tests/Bridge/Doctrine/Logger/DbalLoggerTest.php index 0359bc7eca..7b6037830a 100644 --- a/tests/Symfony/Tests/Bridge/Doctrine/Logger/DbalLoggerTest.php +++ b/tests/Symfony/Tests/Bridge/Doctrine/Logger/DbalLoggerTest.php @@ -11,7 +11,6 @@ namespace Symfony\Tests\Bridge\Doctrine\Logger; - class DbalLoggerTest extends \PHPUnit_Framework_TestCase { public function testLogNonUtf8() diff --git a/tests/Symfony/Tests/Component/HttpFoundation/RequestMatcherTest.php b/tests/Symfony/Tests/Component/HttpFoundation/RequestMatcherTest.php index db2405c679..43b42441a4 100644 --- a/tests/Symfony/Tests/Component/HttpFoundation/RequestMatcherTest.php +++ b/tests/Symfony/Tests/Component/HttpFoundation/RequestMatcherTest.php @@ -199,4 +199,3 @@ class RequestMatcherTest extends \PHPUnit_Framework_TestCase $this->assertFalse($matcher->matches($request)); } } -