Merge branch '2.6' into 2.7

nicolas-grekas · nicolas-grekas · commit dbc38d17bd1c · 2015-01-03T16:46:01.000+01:00
* 2.6:
  [2.3] Remove useless tests skips
  [ClassLoader] removes deprecated classes from documentation.
  [ClassLoader] added missing deprecation notice.
  [HttpFoundation] Fix an issue caused by php's Bug #66606.
  [Yaml] Update README.md
  Don't add Accept-Range header on unsafe HTTP requests
  simplify hasScheme method
  adapted merge to 2.5
  adapted previous commit for 2.3
  [Security] Don't send remember cookie for sub request
  [Security] fixed wrong phpdoc
  [HttpKernel] Fix UriSigner::check when _hash is not at the end of the uri
  [2.3] Cleanup deprecations

Conflicts:
	src/Symfony/Bridge/Twig/composer.json
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Bundle/TwigBundle/composer.json
	src/Symfony/Component/ClassLoader/UniversalClassLoader.php
	src/Symfony/Component/Debug/composer.json
	src/Symfony/Component/Form/ButtonBuilder.php
	src/Symfony/Component/HttpKernel/Exception/FatalErrorException.php
	src/Symfony/Component/HttpKernel/Exception/FlattenException.php
	src/Symfony/Component/HttpKernel/composer.json
	src/Symfony/Component/Security/composer.json
	src/Symfony/Component/Validator/composer.json
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,7 +23,7 @@ CHANGELOG
 
  * [BC BREAK] renamed `Symfony\Component\HttpKernel\EventListener\DeprecationLoggerListener` to `Symfony\Component\HttpKernel\EventListener\ErrorsLoggerListener` and changed its constructor
  * deprecated `Symfony\Component\HttpKernel\Debug\ErrorHandler`, `Symfony\Component\HttpKernel\Debug\ExceptionHandler`,
-   `Symfony\Component\HttpKernel\Exception\FatalErrorException`, and `Symfony\Component\HttpKernel\Exception\FlattenException`
+   `Symfony\Component\HttpKernel\Exception\FatalErrorException` and `Symfony\Component\HttpKernel\Exception\FlattenException`
  * deprecated `Symfony\Component\HttpKernel\Kernel::init()``
  * added the possibility to specify an id an extra attributes to hinclude tags
  * added the collect of data if a controller is a Closure in the Request collector
diff --git a/DataCollector/ExceptionDataCollector.php b/DataCollector/ExceptionDataCollector.php
@@ -11,9 +11,9 @@
 
 namespace Symfony\Component\HttpKernel\DataCollector;
 
+use Symfony\Component\Debug\Exception\FlattenException;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Exception\FlattenException;
 
 /**
  * ExceptionDataCollector.
diff --git a/EventListener/ExceptionListener.php b/EventListener/ExceptionListener.php
@@ -12,12 +12,12 @@
 namespace Symfony\Component\HttpKernel\EventListener;
 
 use Psr\Log\LoggerInterface;
+use Symfony\Component\Debug\Exception\FlattenException;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Log\DebugLoggerInterface;
 use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
-use Symfony\Component\HttpKernel\Exception\FlattenException;
 use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
diff --git a/Exception/FatalErrorException.php b/Exception/FatalErrorException.php
@@ -13,15 +13,11 @@
 
 trigger_error('Symfony\Component\HttpKernel\Exception\FatalErrorException is deprecated since version 2.3 and will be removed in 3.0. Use the same class from the Debug component instead.', E_USER_DEPRECATED);
 
-use Symfony\Component\Debug\Exception\FatalErrorException as DebugFatalErrorException;
-
 /**
  * Fatal Error Exception.
  *
  * @author Konstanton Myakshin <koc-dp@yandex.ru>
  *
  * @deprecated Deprecated in 2.3, to be removed in 3.0. Use the same class from the Debug component instead.
  */
-class FatalErrorException extends DebugFatalErrorException
-{
-}
+class_exists('Symfony\Component\Debug\Exception\FatalErrorException');
diff --git a/Exception/FlattenException.php b/Exception/FlattenException.php
@@ -13,8 +13,6 @@
 
 trigger_error('Symfony\Component\HttpKernel\Exception\FlattenException is deprecated since version 2.3 and will be removed in 3.0. Use the same class from the Debug component instead.', E_USER_DEPRECATED);
 
-use Symfony\Component\Debug\Exception\FlattenException as DebugFlattenException;
-
 /**
  * FlattenException wraps a PHP Exception to be able to serialize it.
  *
@@ -24,6 +22,4 @@
  *
  * @deprecated Deprecated in 2.3, to be removed in 3.0. Use the same class from the Debug component instead.
  */
-class FlattenException extends DebugFlattenException
-{
-}
+class_exists('Symfony\Component\Debug\Exception\FlattenException');
diff --git a/Tests/DataCollector/ExceptionDataCollectorTest.php b/Tests/DataCollector/ExceptionDataCollectorTest.php
@@ -11,8 +11,8 @@
 
 namespace Symfony\Component\HttpKernel\Tests\DataCollector;
 
+use Symfony\Component\Debug\Exception\FlattenException;
 use Symfony\Component\HttpKernel\DataCollector\ExceptionDataCollector;
-use Symfony\Component\HttpKernel\Exception\FlattenException;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
diff --git a/Tests/DataCollector/LoggerDataCollectorTest.php b/Tests/DataCollector/LoggerDataCollectorTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\HttpKernel\Tests\DataCollector;
 
+use Symfony\Component\Debug\ErrorHandler;
 use Symfony\Component\HttpKernel\DataCollector\LoggerDataCollector;
 
 class LoggerDataCollectorTest extends \PHPUnit_Framework_TestCase
diff --git a/Tests/EventListener/LocaleListenerTest.php b/Tests/EventListener/LocaleListenerTest.php
@@ -67,10 +67,6 @@ public function testLocaleSetForRoutingContext()
 
     public function testRouterResetWithParentRequestOnKernelFinishRequest()
     {
-        if (!class_exists('Symfony\Component\Routing\Router')) {
-            $this->markTestSkipped('The "Routing" component is not available');
-        }
-
         // the request context is updated
         $context = $this->getMock('Symfony\Component\Routing\RequestContext');
         $context->expects($this->once())->method('setParameter')->with('_locale', 'es');
diff --git a/Tests/KernelTest.php b/Tests/KernelTest.php
@@ -194,11 +194,6 @@ public function testHandleBootsTheKernel()
 
     public function testStripComments()
     {
-        if (!function_exists('token_get_all')) {
-            $this->markTestSkipped('The function token_get_all() is not available.');
-
-            return;
-        }
         $source = <<<'EOF'
 <?php
 
diff --git a/Tests/Profiler/ProfilerTest.php b/Tests/Profiler/ProfilerTest.php
@@ -60,10 +60,6 @@ public function testFindWorksWithInvalidDates()
 
     protected function setUp()
     {
-        if (!class_exists('Symfony\Component\HttpFoundation\Request')) {
-            $this->markTestSkipped('The "HttpFoundation" component is not available');
-        }
-
         if (!class_exists('SQLite3') && (!class_exists('PDO') || !in_array('sqlite', \PDO::getAvailableDrivers()))) {
             $this->markTestSkipped('This test requires SQLite support in your environment');
         }
diff --git a/Tests/UriSignerTest.php b/Tests/UriSignerTest.php
@@ -33,5 +33,7 @@ public function testCheck()
 
         $this->assertTrue($signer->check($signer->sign('http://example.com/foo')));
         $this->assertTrue($signer->check($signer->sign('http://example.com/foo?foo=bar')));
+
+        $this->assertTrue($signer->sign('http://example.com/foo?foo=bar&bar=foo') === $signer->sign('http://example.com/foo?bar=foo&foo=bar'));
     }
 }
diff --git a/UriSigner.php b/UriSigner.php
@@ -42,6 +42,15 @@ public function __construct($secret)
      */
     public function sign($uri)
     {
+        $url = parse_url($uri);
+        if (isset($url['query'])) {
+            parse_str($url['query'], $params);
+        } else {
+            $params = array();
+        }
+
+        $uri = $this->buildUrl($url, $params);
+
         return $uri.(false === (strpos($uri, '?')) ? '?' : '&').'_hash='.$this->computeHash($uri);
     }
 
@@ -58,15 +67,43 @@ public function sign($uri)
      */
     public function check($uri)
     {
-        if (!preg_match('/^(.*)(?:\?|&)_hash=(.+?)$/', $uri, $matches)) {
+        $url = parse_url($uri);
+        if (isset($url['query'])) {
+            parse_str($url['query'], $params);
+        } else {
+            $params = array();
+        }
+
+        if (empty($params['_hash'])) {
             return false;
         }
 
-        return $this->computeHash($matches[1]) === $matches[2];
+        $hash = urlencode($params['_hash']);
+        unset($params['_hash']);
+
+        return $this->computeHash($this->buildUrl($url, $params)) === $hash;
     }
 
     private function computeHash($uri)
     {
         return urlencode(base64_encode(hash_hmac('sha256', $uri, $this->secret, true)));
     }
+
+    private function buildUrl(array $url, array $params = array())
+    {
+        ksort($params);
+        $url['query'] = http_build_query($params);
+
+        $scheme   = isset($url['scheme']) ? $url['scheme'].'://' : '';
+        $host     = isset($url['host']) ? $url['host'] : '';
+        $port     = isset($url['port']) ? ':'.$url['port'] : '';
+        $user     = isset($url['user']) ? $url['user'] : '';
+        $pass     = isset($url['pass']) ? ':'.$url['pass']  : '';
+        $pass     = ($user || $pass) ? "$pass@" : '';
+        $path     = isset($url['path']) ? $url['path'] : '';
+        $query    = isset($url['query']) && $url['query'] ? '?'.$url['query'] : '';
+        $fragment = isset($url['fragment']) ? '#'.$url['fragment'] : '';
+
+        return $scheme.$user.$pass.$host.$port.$path.$query.$fragment;
+    }
 }
diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
         "php": ">=5.3.3",
         "symfony/event-dispatcher": "~2.5.9|~2.6,>=2.6.2|~3.0.0",
         "symfony/http-foundation": "~2.5,>=2.5.4|~3.0.0",
-        "symfony/debug": "~2.6|~3.0.0",
+        "symfony/debug": "~2.6,>=2.6.2|~3.0.0",
         "psr/log": "~1.0"
     },
     "require-dev": {

Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,6 @@`
`13`	`13`
`14`	`14`	`trigger_error('Symfony\Component\HttpKernel\Exception\FlattenException is deprecated since version 2.3 and will be removed in 3.0. Use the same class from the Debug component instead.', E_USER_DEPRECATED);`
`15`	`15`
`16`		`-use Symfony\Component\Debug\Exception\FlattenException as DebugFlattenException;`
`17`		`-`
`18`	`16`	`/**`
`19`	`17`	`* FlattenException wraps a PHP Exception to be able to serialize it.`
`20`	`18`	`*`
`@@ -24,6 +22,4 @@`
`24`	`22`	`*`
`25`	`23`	`* @deprecated Deprecated in 2.3, to be removed in 3.0. Use the same class from the Debug component instead.`
`26`	`24`	`*/`
`27`		`-class FlattenException extends DebugFlattenException`
`28`		`-{`
`29`		`-}`
	`25`	`+class_exists('Symfony\Component\Debug\Exception\FlattenException');`
Original file line number	Diff line number	Diff line change
`@@ -60,10 +60,6 @@ public function testFindWorksWithInvalidDates()`
`60`	`60`
`61`	`61`	`protected function setUp()`
`62`	`62`	`{`
`63`		`- if (!class_exists('Symfony\Component\HttpFoundation\Request')) {`
`64`		`- $this->markTestSkipped('The "HttpFoundation" component is not available');`
`65`		`- }`
`66`		`-`
`67`	`63`	`if (!class_exists('SQLite3') && (!class_exists('PDO') \|\| !in_array('sqlite', \PDO::getAvailableDrivers()))) {`
`68`	`64`	`$this->markTestSkipped('This test requires SQLite support in your environment');`
`69`	`65`	`}`