From 42019f6774d5c6a6ea41bdd214e1f7a948af8068 Mon Sep 17 00:00:00 2001 From: Jakub Zalas Date: Thu, 12 Sep 2013 21:51:59 +0100 Subject: [PATCH 1/9] [Console] Fixed argument parsing when a single dash is passed. --- src/Symfony/Component/Console/Input/ArgvInput.php | 2 +- .../Component/Console/Tests/Input/ArgvInputTest.php | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Component/Console/Input/ArgvInput.php b/src/Symfony/Component/Console/Input/ArgvInput.php index 80bf1519bb..9d5be7b017 100644 --- a/src/Symfony/Component/Console/Input/ArgvInput.php +++ b/src/Symfony/Component/Console/Input/ArgvInput.php @@ -84,7 +84,7 @@ class ArgvInput extends Input $parseOptions = false; } elseif ($parseOptions && 0 === strpos($token, '--')) { $this->parseLongOption($token); - } elseif ($parseOptions && '-' === $token[0]) { + } elseif ($parseOptions && '-' === $token[0] && '-' !== $token) { $this->parseShortOption($token); } else { $this->parseArgument($token); diff --git a/src/Symfony/Component/Console/Tests/Input/ArgvInputTest.php b/src/Symfony/Component/Console/Tests/Input/ArgvInputTest.php index cd4dceb661..cac1557a76 100644 --- a/src/Symfony/Component/Console/Tests/Input/ArgvInputTest.php +++ b/src/Symfony/Component/Console/Tests/Input/ArgvInputTest.php @@ -254,4 +254,11 @@ class ArgvInputTest extends \PHPUnit_Framework_TestCase array(array('app/console', 'foo:bar', '--env=dev', '--en=1'), array('--en'), '1'), ); } + + public function testParseSingleDashAsArgument() + { + $input = new ArgvInput(array('cli.php', '-')); + $input->bind(new InputDefinition(array(new InputArgument('file')))); + $this->assertEquals(array('file' => '-'), $input->getArguments(), '->parse() parses single dash as an argument'); + } } From 773e7161bf6bc8e74a6b13200e8ffbad050dcac7 Mon Sep 17 00:00:00 2001 From: Jakub Zalas Date: Thu, 12 Sep 2013 23:34:38 +0100 Subject: [PATCH 2/9] [HttpFoundation] Fixed the way path to directory is trimmed. --- src/Symfony/Component/HttpFoundation/File/File.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/HttpFoundation/File/File.php b/src/Symfony/Component/HttpFoundation/File/File.php index c8967b1bf7..b149ffacf2 100644 --- a/src/Symfony/Component/HttpFoundation/File/File.php +++ b/src/Symfony/Component/HttpFoundation/File/File.php @@ -129,7 +129,7 @@ class File extends \SplFileInfo throw new FileException(sprintf('Unable to write in the "%s" directory', $directory)); } - $target = trim($directory, '/\\').DIRECTORY_SEPARATOR.(null === $name ? $this->getBasename() : $this->getName($name)); + $target = rtrim($directory, '/\\').DIRECTORY_SEPARATOR.(null === $name ? $this->getBasename() : $this->getName($name)); return new File($target, false); } From 4135f6803b8f4b536bd695220fd1a0f87064f110 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 13 Sep 2013 07:05:55 +0200 Subject: [PATCH 3/9] fixed wrong usage of unset() --- src/Symfony/Component/HttpKernel/Debug/ErrorHandler.php | 2 +- .../Component/HttpKernel/EventListener/ProfilerListener.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/HttpKernel/Debug/ErrorHandler.php b/src/Symfony/Component/HttpKernel/Debug/ErrorHandler.php index 07a80772d6..f6b5585c84 100644 --- a/src/Symfony/Component/HttpKernel/Debug/ErrorHandler.php +++ b/src/Symfony/Component/HttpKernel/Debug/ErrorHandler.php @@ -119,7 +119,7 @@ class ErrorHandler return; } - unset($this->reservedMemory); + $this->reservedMemory = ''; $type = $error['type']; if (0 === $this->level || !in_array($type, array(E_ERROR, E_CORE_ERROR, E_COMPILE_ERROR, E_PARSE))) { return; diff --git a/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php b/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php index 43dfaff5c5..30d4011ffe 100644 --- a/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php +++ b/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php @@ -136,7 +136,7 @@ class ProfilerListener implements EventSubscriberInterface if ($master) { $this->saveProfiles($profile); - unset($this->children); + $this->children = new \SplObjectStorage(); } } From 124cb17625322b19683861e9dc7baa6eb01fc721 Mon Sep 17 00:00:00 2001 From: Adrien Brault Date: Thu, 12 Sep 2013 14:49:23 -0700 Subject: [PATCH 4/9] Fix FileResource test I had the following test failing on OS X before: There was 1 failure: 1) Symfony\Component\Config\Tests\Resource\FileResourceTest::testSerializeUnserialize Failed asserting that two strings are identical. --- .../Component/Config/Tests/Resource/FileResourceTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/Config/Tests/Resource/FileResourceTest.php b/src/Symfony/Component/Config/Tests/Resource/FileResourceTest.php index 83c403bbe7..db63fce935 100644 --- a/src/Symfony/Component/Config/Tests/Resource/FileResourceTest.php +++ b/src/Symfony/Component/Config/Tests/Resource/FileResourceTest.php @@ -20,7 +20,7 @@ class FileResourceTest extends \PHPUnit_Framework_TestCase protected function setUp() { - $this->file = sys_get_temp_dir().'/tmp.xml'; + $this->file = realpath(sys_get_temp_dir()).'/tmp.xml'; touch($this->file); $this->resource = new FileResource($this->file); } From 0d6af5cd9004e2926b0fc2f7059f2cfbd589c015 Mon Sep 17 00:00:00 2001 From: dropfen Date: Thu, 12 Sep 2013 23:36:40 +0200 Subject: [PATCH 5/9] Use setTimeZone if this method exists. The php version is not a critical factor to choose the method, but we have to use setTimeZone, if it exists. --- src/Symfony/Component/Form/Extension/Core/Type/DateType.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateType.php index 05b2aaedc1..158f9a91f3 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/DateType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/DateType.php @@ -267,8 +267,10 @@ class DateType extends AbstractType { $pattern = $formatter->getPattern(); $timezone = $formatter->getTimezoneId(); + // Use it, if exists. + $setTimeZone = method_exists($formatter, 'setTimeZone'); - if (version_compare(\PHP_VERSION, '5.5.0-dev', '>=')) { + if ($setTimeZone) { $formatter->setTimeZone('UTC'); } else { $formatter->setTimeZoneId('UTC'); @@ -286,7 +288,7 @@ class DateType extends AbstractType $formatter->setPattern($pattern); } - if (version_compare(\PHP_VERSION, '5.5.0-dev', '>=')) { + if ($setTimeZone) { $formatter->setTimeZone($timezone); } else { $formatter->setTimeZoneId($timezone); From 68c9c866528066b5c44241414404abba39fb0b5b Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 13 Sep 2013 10:54:34 +0200 Subject: [PATCH 6/9] removed unneeded comment --- src/Symfony/Component/Form/Extension/Core/Type/DateType.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateType.php index 158f9a91f3..2ac2f0436e 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/DateType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/DateType.php @@ -267,10 +267,8 @@ class DateType extends AbstractType { $pattern = $formatter->getPattern(); $timezone = $formatter->getTimezoneId(); - // Use it, if exists. - $setTimeZone = method_exists($formatter, 'setTimeZone'); - if ($setTimeZone) { + if ($setTimeZone = method_exists($formatter, 'setTimeZone')) { $formatter->setTimeZone('UTC'); } else { $formatter->setTimeZoneId('UTC'); From 958ec092854496ca47c84eedc1e1944a15231c49 Mon Sep 17 00:00:00 2001 From: lancergr Date: Mon, 9 Sep 2013 20:21:56 +0300 Subject: [PATCH 7/9] NativeSessionStorage regenerate --- .../HttpFoundation/Session/Storage/NativeSessionStorage.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php index e9b7e571f4..b4412f2234 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php @@ -217,6 +217,8 @@ class NativeSessionStorage implements SessionStorageInterface } else { session_start(); } + + $this->loadSession(); } return $ret; From b96c40e57086b2fc24c1f9c29c74c12d11a6ce48 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 13 Sep 2013 12:12:19 +0200 Subject: [PATCH 8/9] fixed CS --- .../HttpFoundation/Session/Storage/NativeSessionStorage.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php index b4412f2234..3443d49383 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php @@ -217,7 +217,7 @@ class NativeSessionStorage implements SessionStorageInterface } else { session_start(); } - + $this->loadSession(); } From e4100ac2fa917ce434647d6a686292ae14b73c2e Mon Sep 17 00:00:00 2001 From: Jakub Zalas Date: Fri, 13 Sep 2013 12:48:12 +0100 Subject: [PATCH 9/9] [FrameworkBundle][Security] Replaced void return type with null for consistency --- .../Bundle/FrameworkBundle/Templating/GlobalVariables.php | 5 ++++- src/Symfony/Component/Security/Core/User/UserInterface.php | 2 -- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/GlobalVariables.php b/src/Symfony/Bundle/FrameworkBundle/Templating/GlobalVariables.php index af3b34ac9b..c223ab9022 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Templating/GlobalVariables.php +++ b/src/Symfony/Bundle/FrameworkBundle/Templating/GlobalVariables.php @@ -26,6 +26,9 @@ class GlobalVariables { protected $container; + /** + * @param ContainerInterface $container The DI container + */ public function __construct(ContainerInterface $container) { $this->container = $container; @@ -46,7 +49,7 @@ class GlobalVariables /** * Returns the current user. * - * @return mixed|void + * @return mixed * * @see TokenInterface::getUser() */ diff --git a/src/Symfony/Component/Security/Core/User/UserInterface.php b/src/Symfony/Component/Security/Core/User/UserInterface.php index f5bbde2fc6..6e9b0f1899 100644 --- a/src/Symfony/Component/Security/Core/User/UserInterface.php +++ b/src/Symfony/Component/Security/Core/User/UserInterface.php @@ -80,8 +80,6 @@ interface UserInterface * * This is important if, at any given point, sensitive information like * the plain-text password is stored on this object. - * - * @return void */ public function eraseCredentials(); }