Merge branch '2.5'

fabpot · fabpot · commit 1fe17e33861a · 2014-10-26T08:46:28.000+01:00
* 2.5:
  Remove aligned '=&gt;' and '='
  Break infinite loop while resolving aliases
  [Security][listener] change priority of switchuser
  Improved the phpdoc for security token classes
  bumped Symfony version to 2.5.7
  updated VERSION for 2.5.6
  updated CHANGELOG for 2.5.6
  bumped Symfony version to 2.3.22
  updated VERSION for 2.3.21
  update CONTRIBUTORS for 2.3.21
  updated CHANGELOG for 2.3.21

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
	src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php
	src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php
	src/Symfony/Component/Debug/ErrorHandler.php
	src/Symfony/Component/Debug/ExceptionHandler.php
	src/Symfony/Component/Form/Extension/Core/Type/BaseType.php
	src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
	src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php
	src/Symfony/Component/Form/Extension/Core/Type/DateType.php
	src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
	src/Symfony/Component/Form/Extension/Validator/Type/FormTypeValidatorExtension.php
	src/Symfony/Component/HttpFoundation/Request.php
	src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php
	src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/Security/Core/SecurityContextInterface.php
	src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationFailureHandler.php
	src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationSuccessHandler.php
	src/Symfony/Component/Security/Http/Firewall/AnonymousAuthenticationListener.php
	src/Symfony/Component/Serializer/Serializer.php
	src/Symfony/Component/Validator/Constraints/File.php
diff --git a/DataCollector/ConfigDataCollector.php b/DataCollector/ConfigDataCollector.php
@@ -55,22 +55,22 @@ public function setKernel(KernelInterface $kernel = null)
     public function collect(Request $request, Response $response, \Exception $exception = null)
     {
         $this->data = array(
-            'app_name'             => $this->name,
-            'app_version'          => $this->version,
-            'token'                => $response->headers->get('X-Debug-Token'),
-            'symfony_version'      => Kernel::VERSION,
-            'name'                 => isset($this->kernel) ? $this->kernel->getName() : 'n/a',
-            'env'                  => isset($this->kernel) ? $this->kernel->getEnvironment() : 'n/a',
-            'debug'                => isset($this->kernel) ? $this->kernel->isDebug() : 'n/a',
-            'php_version'          => PHP_VERSION,
-            'xdebug_enabled'       => extension_loaded('xdebug'),
-            'eaccel_enabled'       => extension_loaded('eaccelerator') && ini_get('eaccelerator.enable'),
-            'apc_enabled'          => extension_loaded('apc') && ini_get('apc.enabled'),
-            'xcache_enabled'       => extension_loaded('xcache') && ini_get('xcache.cacher'),
-            'wincache_enabled'     => extension_loaded('wincache') && ini_get('wincache.ocenabled'),
+            'app_name' => $this->name,
+            'app_version' => $this->version,
+            'token' => $response->headers->get('X-Debug-Token'),
+            'symfony_version' => Kernel::VERSION,
+            'name' => isset($this->kernel) ? $this->kernel->getName() : 'n/a',
+            'env' => isset($this->kernel) ? $this->kernel->getEnvironment() : 'n/a',
+            'debug' => isset($this->kernel) ? $this->kernel->isDebug() : 'n/a',
+            'php_version' => PHP_VERSION,
+            'xdebug_enabled' => extension_loaded('xdebug'),
+            'eaccel_enabled' => extension_loaded('eaccelerator') && ini_get('eaccelerator.enable'),
+            'apc_enabled' => extension_loaded('apc') && ini_get('apc.enabled'),
+            'xcache_enabled' => extension_loaded('xcache') && ini_get('xcache.cacher'),
+            'wincache_enabled' => extension_loaded('wincache') && ini_get('wincache.ocenabled'),
             'zend_opcache_enabled' => extension_loaded('Zend OPcache') && ini_get('opcache.enable'),
-            'bundles'              => array(),
-            'sapi_name'            => php_sapi_name(),
+            'bundles' => array(),
+            'sapi_name' => php_sapi_name(),
         );
 
         if (isset($this->kernel)) {
diff --git a/DataCollector/EventDataCollector.php b/DataCollector/EventDataCollector.php
@@ -36,7 +36,7 @@ public function __construct(EventDispatcherInterface $dispatcher = null)
     public function collect(Request $request, Response $response, \Exception $exception = null)
     {
         $this->data = array(
-            'called_listeners'     => array(),
+            'called_listeners' => array(),
             'not_called_listeners' => array(),
         );
     }
diff --git a/DataCollector/MemoryDataCollector.php b/DataCollector/MemoryDataCollector.php
@@ -24,7 +24,7 @@ class MemoryDataCollector extends DataCollector implements LateDataCollectorInte
     public function __construct()
     {
         $this->data = array(
-            'memory'       => 0,
+            'memory' => 0,
             'memory_limit' => $this->convertToBytes(ini_get('memory_limit')),
         );
     }
diff --git a/DataCollector/RequestDataCollector.php b/DataCollector/RequestDataCollector.php
@@ -89,24 +89,24 @@ public function collect(Request $request, Response $response, \Exception $except
         $statusCode = $response->getStatusCode();
 
         $this->data = array(
-            'format'             => $request->getRequestFormat(),
-            'content'            => $content,
-            'content_type'       => $response->headers->get('Content-Type') ? $response->headers->get('Content-Type') : 'text/html',
-            'status_text'        => isset(Response::$statusTexts[$statusCode]) ? Response::$statusTexts[$statusCode] : '',
-            'status_code'        => $statusCode,
-            'request_query'      => $request->query->all(),
-            'request_request'    => $request->request->all(),
-            'request_headers'    => $request->headers->all(),
-            'request_server'     => $request->server->all(),
-            'request_cookies'    => $request->cookies->all(),
+            'format' => $request->getRequestFormat(),
+            'content' => $content,
+            'content_type' => $response->headers->get('Content-Type') ? $response->headers->get('Content-Type') : 'text/html',
+            'status_text' => isset(Response::$statusTexts[$statusCode]) ? Response::$statusTexts[$statusCode] : '',
+            'status_code' => $statusCode,
+            'request_query' => $request->query->all(),
+            'request_request' => $request->request->all(),
+            'request_headers' => $request->headers->all(),
+            'request_server' => $request->server->all(),
+            'request_cookies' => $request->cookies->all(),
             'request_attributes' => $attributes,
-            'response_headers'   => $responseHeaders,
-            'session_metadata'   => $sessionMetadata,
+            'response_headers' => $responseHeaders,
+            'session_metadata' => $sessionMetadata,
             'session_attributes' => $sessionAttributes,
-            'flashes'            => $flashes,
-            'path_info'          => $request->getPathInfo(),
-            'controller'         => 'n/a',
-            'locale'             => $request->getLocale(),
+            'flashes' => $flashes,
+            'path_info' => $request->getPathInfo(),
+            'controller' => 'n/a',
+            'locale' => $request->getLocale(),
         );
 
         if (isset($this->data['request_headers']['php-auth-pw'])) {
@@ -123,29 +123,29 @@ public function collect(Request $request, Response $response, \Exception $except
                 try {
                     $r = new \ReflectionMethod($controller[0], $controller[1]);
                     $this->data['controller'] = array(
-                        'class'  => is_object($controller[0]) ? get_class($controller[0]) : $controller[0],
+                        'class' => is_object($controller[0]) ? get_class($controller[0]) : $controller[0],
                         'method' => $controller[1],
-                        'file'   => $r->getFilename(),
-                        'line'   => $r->getStartLine(),
+                        'file' => $r->getFilename(),
+                        'line' => $r->getStartLine(),
                     );
                 } catch (\ReflectionException $re) {
                     if (is_callable($controller)) {
                         // using __call or  __callStatic
                         $this->data['controller'] = array(
-                            'class'  => is_object($controller[0]) ? get_class($controller[0]) : $controller[0],
+                            'class' => is_object($controller[0]) ? get_class($controller[0]) : $controller[0],
                             'method' => $controller[1],
-                            'file'   => 'n/a',
-                            'line'   => 'n/a',
+                            'file' => 'n/a',
+                            'line' => 'n/a',
                         );
                     }
                 }
             } elseif ($controller instanceof \Closure) {
                 $r = new \ReflectionFunction($controller);
                 $this->data['controller'] = array(
-                    'class'  => $r->getName(),
+                    'class' => $r->getName(),
                     'method' => null,
-                    'file'   => $r->getFilename(),
-                    'line'   => $r->getStartLine(),
+                    'file' => $r->getFilename(),
+                    'line' => $r->getStartLine(),
                 );
             } else {
                 $this->data['controller'] = (string) $controller ?: 'n/a';
diff --git a/DataCollector/RouterDataCollector.php b/DataCollector/RouterDataCollector.php
@@ -31,8 +31,8 @@ public function __construct()
 
         $this->data = array(
             'redirect' => false,
-            'url'      => null,
-            'route'    => null,
+            'url' => null,
+            'route' => null,
         );
     }
 
diff --git a/DataCollector/TimeDataCollector.php b/DataCollector/TimeDataCollector.php
@@ -45,7 +45,7 @@ public function collect(Request $request, Response $response, \Exception $except
         $this->data = array(
             'token'      => $response->headers->get('X-Debug-Token'),
             'start_time' => $startTime * 1000,
-            'events'     => array(),
+            'events' => array(),
         );
     }
 
diff --git a/HttpCache/HttpCache.php b/HttpCache/HttpCache.php
@@ -87,13 +87,13 @@ public function __construct(HttpKernelInterface $kernel, StoreInterface $store,
         register_shutdown_function(array($this->store, 'cleanup'));
 
         $this->options = array_merge(array(
-            'debug'                  => false,
-            'default_ttl'            => 0,
-            'private_headers'        => array('Authorization', 'Cookie'),
-            'allow_reload'           => false,
-            'allow_revalidate'       => false,
+            'debug' => false,
+            'default_ttl' => 0,
+            'private_headers' => array('Authorization', 'Cookie'),
+            'allow_reload' => false,
+            'allow_revalidate' => false,
             'stale_while_revalidate' => 2,
-            'stale_if_error'         => 60,
+            'stale_if_error' => 60,
         ), $options);
     }
 
diff --git a/Kernel.php b/Kernel.php
@@ -59,12 +59,12 @@ abstract class Kernel implements KernelInterface, TerminableInterface
     protected $startTime;
     protected $loadClassCache;
 
-    const VERSION         = '2.6.0-DEV';
-    const VERSION_ID      = '20600';
-    const MAJOR_VERSION   = '2';
-    const MINOR_VERSION   = '6';
+    const VERSION = '2.6.0-DEV';
+    const VERSION_ID = '20600';
+    const MAJOR_VERSION = '2';
+    const MINOR_VERSION = '6';
     const RELEASE_VERSION = '0';
-    const EXTRA_VERSION   = 'DEV';
+    const EXTRA_VERSION = 'DEV';
 
     /**
      * Constructor.
@@ -586,14 +586,14 @@ protected function getKernelParameters()
 
         return array_merge(
             array(
-                'kernel.root_dir'        => $this->rootDir,
-                'kernel.environment'     => $this->environment,
-                'kernel.debug'           => $this->debug,
-                'kernel.name'            => $this->name,
-                'kernel.cache_dir'       => $this->getCacheDir(),
-                'kernel.logs_dir'        => $this->getLogDir(),
-                'kernel.bundles'         => $bundles,
-                'kernel.charset'         => $this->getCharset(),
+                'kernel.root_dir' => $this->rootDir,
+                'kernel.environment' => $this->environment,
+                'kernel.debug' => $this->debug,
+                'kernel.name' => $this->name,
+                'kernel.cache_dir' => $this->getCacheDir(),
+                'kernel.logs_dir' => $this->getLogDir(),
+                'kernel.bundles' => $bundles,
+                'kernel.charset' => $this->getCharset(),
                 'kernel.container_class' => $this->getContainerClass(),
             ),
             $this->getEnvParameters()
diff --git a/Profiler/BaseMemcacheProfilerStorage.php b/Profiler/BaseMemcacheProfilerStorage.php
@@ -77,12 +77,12 @@ public function find($ip, $url, $limit, $method, $start = null, $end = null)
                 continue;
             }
 
-            $result[$itemToken]  = array(
-                'token'  => $itemToken,
-                'ip'     => $itemIp,
+            $result[$itemToken] = array(
+                'token' => $itemToken,
+                'ip' => $itemIp,
                 'method' => $itemMethod,
-                'url'    => $itemUrl,
-                'time'   => $itemTime,
+                'url' => $itemUrl,
+                'time' => $itemTime,
                 'parent' => $itemParent,
             );
             --$limit;
@@ -152,14 +152,14 @@ public function read($token)
     public function write(Profile $profile)
     {
         $data = array(
-            'token'    => $profile->getToken(),
-            'parent'   => $profile->getParentToken(),
+            'token' => $profile->getToken(),
+            'parent' => $profile->getParentToken(),
             'children' => array_map(function ($p) { return $p->getToken(); }, $profile->getChildren()),
-            'data'     => $profile->getCollectors(),
-            'ip'       => $profile->getIp(),
-            'method'   => $profile->getMethod(),
-            'url'      => $profile->getUrl(),
-            'time'     => $profile->getTime(),
+            'data' => $profile->getCollectors(),
+            'ip' => $profile->getIp(),
+            'method' => $profile->getMethod(),
+            'url' => $profile->getUrl(),
+            'time' => $profile->getTime(),
         );
 
         $profileIndexed = false !== $this->getValue($this->getItemName($profile->getToken()));
diff --git a/Profiler/FileProfilerStorage.php b/Profiler/FileProfilerStorage.php
@@ -78,11 +78,11 @@ public function find($ip, $url, $limit, $method, $start = null, $end = null)
             }
 
             $result[$csvToken] = array(
-                'token'  => $csvToken,
-                'ip'     => $csvIp,
+                'token' => $csvToken,
+                'ip' => $csvIp,
                 'method' => $csvMethod,
-                'url'    => $csvUrl,
-                'time'   => $csvTime,
+                'url' => $csvUrl,
+                'time' => $csvTime,
                 'parent' => $csvParent,
             );
         }
@@ -140,14 +140,14 @@ public function write(Profile $profile)
 
         // Store profile
         $data = array(
-            'token'    => $profile->getToken(),
-            'parent'   => $profile->getParentToken(),
+            'token' => $profile->getToken(),
+            'parent' => $profile->getParentToken(),
             'children' => array_map(function ($p) { return $p->getToken(); }, $profile->getChildren()),
-            'data'     => $profile->getCollectors(),
-            'ip'       => $profile->getIp(),
-            'method'   => $profile->getMethod(),
-            'url'      => $profile->getUrl(),
-            'time'     => $profile->getTime(),
+            'data' => $profile->getCollectors(),
+            'ip' => $profile->getIp(),
+            'method' => $profile->getMethod(),
+            'url' => $profile->getUrl(),
+            'time' => $profile->getTime(),
         );
 
         if (false === file_put_contents($file, serialize($data))) {
diff --git a/Profiler/PdoProfilerStorage.php b/Profiler/PdoProfilerStorage.php
@@ -86,13 +86,13 @@ public function write(Profile $profile)
     {
         $db = $this->initDb();
         $args = array(
-            ':token'      => $profile->getToken(),
-            ':parent'     => $profile->getParentToken(),
-            ':data'       => base64_encode(serialize($profile->getCollectors())),
-            ':ip'         => $profile->getIp(),
-            ':method'     => $profile->getMethod(),
-            ':url'        => $profile->getUrl(),
-            ':time'       => $profile->getTime(),
+            ':token' => $profile->getToken(),
+            ':parent' => $profile->getParentToken(),
+            ':data' => base64_encode(serialize($profile->getCollectors())),
+            ':ip' => $profile->getIp(),
+            ':method' => $profile->getMethod(),
+            ':url' => $profile->getUrl(),
+            ':time' => $profile->getTime(),
             ':created_at' => time(),
         );
 
diff --git a/Profiler/RedisProfilerStorage.php b/Profiler/RedisProfilerStorage.php
@@ -88,11 +88,11 @@ public function find($ip, $url, $limit, $method, $start = null, $end = null)
             }
 
             $result[] = array(
-                'token'  => $itemToken,
-                'ip'     => $itemIp,
+                'token' => $itemToken,
+                'ip' => $itemIp,
                 'method' => $itemMethod,
-                'url'    => $itemUrl,
-                'time'   => $itemTime,
+                'url' => $itemUrl,
+                'time' => $itemTime,
                 'parent' => $itemParent,
             );
             --$limit;
@@ -158,14 +158,14 @@ public function read($token)
     public function write(Profile $profile)
     {
         $data = array(
-            'token'    => $profile->getToken(),
-            'parent'   => $profile->getParentToken(),
+            'token' => $profile->getToken(),
+            'parent' => $profile->getParentToken(),
             'children' => array_map(function ($p) { return $p->getToken(); }, $profile->getChildren()),
-            'data'     => $profile->getCollectors(),
-            'ip'       => $profile->getIp(),
-            'method'   => $profile->getMethod(),
-            'url'      => $profile->getUrl(),
-            'time'     => $profile->getTime(),
+            'data' => $profile->getCollectors(),
+            'ip' => $profile->getIp(),
+            'method' => $profile->getMethod(),
+            'url' => $profile->getUrl(),
+            'time' => $profile->getTime(),
         );
 
         $profileIndexed = false !== $this->getValue($this->getItemName($profile->getToken()));
diff --git a/Tests/EventListener/TestSessionListenerTest.php b/Tests/EventListener/TestSessionListenerTest.php
@@ -39,7 +39,7 @@ class TestSessionListenerTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $this->listener = $this->getMockForAbstractClass('Symfony\Component\HttpKernel\EventListener\TestSessionListener');
-        $this->session  = $this->getSession();
+        $this->session = $this->getSession();
     }
 
     public function testShouldSaveMasterRequestSession()
diff --git a/Tests/HttpCache/HttpCacheTest.php b/Tests/HttpCache/HttpCacheTest.php
diff --git a/Tests/HttpCache/TestMultipleHttpKernel.php b/Tests/HttpCache/TestMultipleHttpKernel.php
diff --git a/Tests/Profiler/AbstractProfilerStorageTest.php b/Tests/Profiler/AbstractProfilerStorageTest.php

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public function __construct(EventDispatcherInterface $dispatcher = null)`
`36`	`36`	`public function collect(Request $request, Response $response, \Exception $exception = null)`
`37`	`37`	`{`
`38`	`38`	`$this->data = array(`
`39`		`- 'called_listeners' => array(),`
	`39`	`+ 'called_listeners' => array(),`
`40`	`40`	`'not_called_listeners' => array(),`
`41`	`41`	`);`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class MemoryDataCollector extends DataCollector implements LateDataCollectorInte`
`24`	`24`	`public function __construct()`
`25`	`25`	`{`
`26`	`26`	`$this->data = array(`
`27`		`- 'memory' => 0,`
	`27`	`+ 'memory' => 0,`
`28`	`28`	`'memory_limit' => $this->convertToBytes(ini_get('memory_limit')),`
`29`	`29`	`);`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,8 @@ public function __construct()`
`31`	`31`
`32`	`32`	`$this->data = array(`
`33`	`33`	`'redirect' => false,`
`34`		`- 'url' => null,`
`35`		`- 'route' => null,`
	`34`	`+ 'url' => null,`
	`35`	`+ 'route' => null,`
`36`	`36`	`);`
`37`	`37`	`}`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public function collect(Request $request, Response $response, \Exception $except`
`45`	`45`	`$this->data = array(`
`46`	`46`	`'token' => $response->headers->get('X-Debug-Token'),`
`47`	`47`	`'start_time' => $startTime * 1000,`
`48`		`- 'events' => array(),`
	`48`	`+ 'events' => array(),`
`49`	`49`	`);`
`50`	`50`	`}`
`51`	`51`