Merge branch '2.2' into 2.3

fabpot · fabpot · commit 33e957188642 · 2013-09-13T14:20:37.000+02:00
* 2.2:
  [FrameworkBundle][Security] Replaced void return type with null for consistency
  fixed CS
  NativeSessionStorage regenerate
  removed unneeded comment
  Use setTimeZone if this method exists.
  Fix FileResource test
  fixed wrong usage of unset()
  [HttpFoundation] Fixed the way path to directory is trimmed.
  [Console] Fixed argument parsing when a single dash is passed.

Conflicts:
	src/Symfony/Component/HttpKernel/Debug/ErrorHandler.php
diff --git 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 @@ public function getSecurity()
     /**
      * Returns the current user.
      *
-     * @return mixed|void
+     * @return mixed
      *
      * @see TokenInterface::getUser()
      */
diff --git 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);
     }
diff --git a/src/Symfony/Component/Console/Input/ArgvInput.php b/src/Symfony/Component/Console/Input/ArgvInput.php
@@ -84,7 +84,7 @@ protected function parse()
                 $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
@@ -306,4 +306,11 @@ public function provideGetParameterOptionValues()
             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');
+    }
 }
diff --git a/src/Symfony/Component/Debug/ErrorHandler.php b/src/Symfony/Component/Debug/ErrorHandler.php
@@ -137,7 +137,7 @@ public function handleFatal()
             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/Form/Extension/Core/Type/DateType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateType.php
@@ -247,7 +247,7 @@ private function formatTimestamps(\IntlDateFormatter $formatter, $regex, array $
         $pattern = $formatter->getPattern();
         $timezone = $formatter->getTimezoneId();
 
-        if (version_compare(\PHP_VERSION, '5.5.0-dev', '>=')) {
+        if ($setTimeZone = method_exists($formatter, 'setTimeZone')) {
             $formatter->setTimeZone('UTC');
         } else {
             $formatter->setTimeZoneId('UTC');
@@ -265,7 +265,7 @@ private function formatTimestamps(\IntlDateFormatter $formatter, $regex, array $
             $formatter->setPattern($pattern);
         }
 
-        if (version_compare(\PHP_VERSION, '5.5.0-dev', '>=')) {
+        if ($setTimeZone) {
             $formatter->setTimeZone($timezone);
         } else {
             $formatter->setTimeZoneId($timezone);
diff --git a/src/Symfony/Component/HttpFoundation/File/File.php b/src/Symfony/Component/HttpFoundation/File/File.php
@@ -137,7 +137,7 @@ protected function getTargetFile($directory, $name = null)
             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);
     }
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
@@ -219,6 +219,8 @@ public function regenerate($destroy = false, $lifetime = null)
             } else {
                 session_start();
             }
+
+            $this->loadSession();
         }
 
         return $ret;
diff --git a/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php b/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php
@@ -136,7 +136,7 @@ public function onKernelResponse(FilterResponseEvent $event)
         if ($master) {
             $this->saveProfiles($profile);
 
-            unset($this->children);
+            $this->children = new \SplObjectStorage();
         }
     }
 
diff --git a/src/Symfony/Component/Security/Core/User/UserInterface.php b/src/Symfony/Component/Security/Core/User/UserInterface.php
@@ -80,8 +80,6 @@ public function getUsername();
      *
      * 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();
 }

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,9 @@ class GlobalVariables`
`26`	`26`	`{`
`27`	`27`	`protected $container;`
`28`	`28`
	`29`	`+ /**`
	`30`	`+ * @param ContainerInterface $container The DI container`
	`31`	`+ */`
`29`	`32`	`public function __construct(ContainerInterface $container)`
`30`	`33`	`{`
`31`	`34`	`$this->container = $container;`
`@@ -46,7 +49,7 @@ public function getSecurity()`
`46`	`49`	`/**`
`47`	`50`	`* Returns the current user.`
`48`	`51`	`*`
`49`		`- * @return mixed\|void`
	`52`	`+ * @return mixed`
`50`	`53`	`*`
`51`	`54`	`* @see TokenInterface::getUser()`
`52`	`55`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class FileResourceTest extends \PHPUnit_Framework_TestCase`
`20`	`20`
`21`	`21`	`protected function setUp()`
`22`	`22`	`{`
`23`		`- $this->file = sys_get_temp_dir().'/tmp.xml';`
	`23`	`+ $this->file = realpath(sys_get_temp_dir()).'/tmp.xml';`
`24`	`24`	`touch($this->file);`
`25`	`25`	`$this->resource = new FileResource($this->file);`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -306,4 +306,11 @@ public function provideGetParameterOptionValues()`
`306`	`306`	`array(array('app/console', 'foo:bar', '--env=dev', '--en=1'), array('--en'), '1'),`
`307`	`307`	`);`
`308`	`308`	`}`
	`309`	`+`
	`310`	`+ public function testParseSingleDashAsArgument()`
	`311`	`+ {`
	`312`	`+ $input = new ArgvInput(array('cli.php', '-'));`
	`313`	`+ $input->bind(new InputDefinition(array(new InputArgument('file'))));`
	`314`	`+ $this->assertEquals(array('file' => '-'), $input->getArguments(), '->parse() parses single dash as an argument');`
	`315`	`+ }`
`309`	`316`	`}`
Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ public function handleFatal()`
`137`	`137`	`return;`
`138`	`138`	`}`
`139`	`139`
`140`		`- unset($this->reservedMemory);`
	`140`	`+ $this->reservedMemory = '';`
`141`	`141`	`$type = $error['type'];`
`142`	`142`	`if (0 === $this->level \|\| !in_array($type, array(E_ERROR, E_CORE_ERROR, E_COMPILE_ERROR, E_PARSE))) {`
`143`	`143`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ protected function getTargetFile($directory, $name = null)`
`137`	`137`	`throw new FileException(sprintf('Unable to write in the "%s" directory', $directory));`
`138`	`138`	`}`
`139`	`139`
`140`		`- $target = trim($directory, '/\\').DIRECTORY_SEPARATOR.(null === $name ? $this->getBasename() : $this->getName($name));`
	`140`	`+ $target = rtrim($directory, '/\\').DIRECTORY_SEPARATOR.(null === $name ? $this->getBasename() : $this->getName($name));`
`141`	`141`
`142`	`142`	`return new File($target, false);`
`143`	`143`	`}`
Original file line number	Diff line number	Diff line change
`@@ -219,6 +219,8 @@ public function regenerate($destroy = false, $lifetime = null)`
`219`	`219`	`} else {`
`220`	`220`	`session_start();`
`221`	`221`	`}`
	`222`	`+`
	`223`	`+ $this->loadSession();`
`222`	`224`	`}`
`223`	`225`
`224`	`226`	`return $ret;`
Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ public function onKernelResponse(FilterResponseEvent $event)`
`136`	`136`	`if ($master) {`
`137`	`137`	`$this->saveProfiles($profile);`
`138`	`138`
`139`		`- unset($this->children);`
	`139`	`+ $this->children = new \SplObjectStorage();`
`140`	`140`	`}`
`141`	`141`	`}`
`142`	`142`
Original file line number	Diff line number	Diff line change
`@@ -80,8 +80,6 @@ public function getUsername();`
`80`	`80`	`*`
`81`	`81`	`* This is important if, at any given point, sensitive information like`
`82`	`82`	`* the plain-text password is stored on this object.`
`83`		`- *`
`84`		`- * @return void`
`85`	`83`	`*/`
`86`	`84`	`public function eraseCredentials();`
`87`	`85`	`}`