Merge branch '2.3' into 2.4

fabpot · fabpot · commit aac1dff59ef2 · 2014-09-22T10:51:05.000+02:00
* 2.3:
  fixed CS
  [Process] fixed some volatile tests
  [HttpKernel] fixed a volatile test
  [HttpFoundation] fixed some volatile tests
  Use getPathname() instead of string casting to get BinaryFileReponse file path

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php
	src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
	src/Symfony/Bundle/FrameworkBundle/EventListener/SessionListener.php
	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
	src/Symfony/Component/ClassLoader/Tests/ApcUniversalClassLoaderTest.php
	src/Symfony/Component/Config/Definition/ReferenceDumper.php
	src/Symfony/Component/Config/Tests/Definition/Dumper/YamlReferenceDumperTest.php
	src/Symfony/Component/Console/Application.php
	src/Symfony/Component/Console/Tests/ApplicationTest.php
	src/Symfony/Component/Filesystem/Exception/IOException.php
	src/Symfony/Component/Form/Extension/Templating/TemplatingExtension.php
	src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php
	src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
	src/Symfony/Component/HttpKernel/Tests/Bundle/BundleTest.php
	src/Symfony/Component/HttpKernel/Tests/Fragment/RoutableFragmentRendererTest.php
	src/Symfony/Component/HttpKernel/Tests/Profiler/Mock/RedisMock.php
	src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php
	src/Symfony/Component/PropertyAccess/PropertyAccessor.php
	src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorCollectionTest.php
	src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
	src/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php
	src/Symfony/Component/Routing/Tests/Annotation/RouteTest.php
	src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTest.php
	src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
	src/Symfony/Component/Validator/Constraints/CollectionValidator.php
	src/Symfony/Component/Validator/Tests/ExecutionContextTest.php
diff --git a/DataCollector/ConfigDataCollector.php b/DataCollector/ConfigDataCollector.php
@@ -70,7 +70,7 @@ public function collect(Request $request, Response $response, \Exception $except
             '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()
+            'sapi_name'            => php_sapi_name(),
         );
 
         if (isset($this->kernel)) {
diff --git a/DataCollector/LoggerDataCollector.php b/DataCollector/LoggerDataCollector.php
@@ -49,7 +49,7 @@ public function lateCollect()
             $this->data = array(
                 'error_count'       => $this->logger->countErrors(),
                 'logs'              => $this->sanitizeLogs($this->logger->getLogs()),
-                'deprecation_count' => $this->computeDeprecationCount()
+                'deprecation_count' => $this->computeDeprecationCount(),
             );
         }
     }
diff --git a/Debug/TraceableEventDispatcher.php b/Debug/TraceableEventDispatcher.php
@@ -268,7 +268,7 @@ private function getListenerInfo($listener, $eventId, $eventName)
         if ($listener instanceof \Closure) {
             $info += array(
                 'type' => 'Closure',
-                'pretty' => 'closure'
+                'pretty' => 'closure',
             );
         } elseif (is_string($listener)) {
             try {
@@ -346,7 +346,8 @@ private function preDispatch($eventName, $eventId, Event $event)
                 // which must be caught.
                 try {
                     $this->stopwatch->openSection($token);
-                } catch (\LogicException $e) {}
+                } catch (\LogicException $e) {
+                }
                 break;
         }
     }
@@ -367,7 +368,8 @@ private function postDispatch($eventName, $eventId, Event $event)
                 $token = $event->getResponse()->headers->get('X-Debug-Token');
                 try {
                     $this->stopwatch->stopSection($token);
-                } catch (\LogicException $e) {}
+                } catch (\LogicException $e) {
+                }
                 break;
         }
 
diff --git a/EventListener/FragmentListener.php b/EventListener/FragmentListener.php
@@ -16,7 +16,6 @@
 use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 use Symfony\Component\HttpKernel\UriSigner;
-use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 /**
diff --git a/EventListener/SessionListener.php b/EventListener/SessionListener.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\HttpKernel\EventListener;
 
-use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
diff --git a/EventListener/TestSessionListener.php b/EventListener/TestSessionListener.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\HttpKernel\EventListener;
 
 use Symfony\Component\HttpFoundation\Cookie;
-use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
diff --git a/HttpCache/HttpCache.php b/HttpCache/HttpCache.php
@@ -152,7 +152,6 @@ public function getKernel()
         return $this->kernel;
     }
 
-
     /**
      * Gets the Esi instance
      *
diff --git a/Kernel.php b/Kernel.php
@@ -517,7 +517,6 @@ protected function initializeBundles()
                 array_pop($bundleMap);
             }
         }
-
     }
 
     /**
diff --git a/Profiler/BaseMemcacheProfilerStorage.php b/Profiler/BaseMemcacheProfilerStorage.php
@@ -53,12 +53,11 @@ public function find($ip, $url, $limit, $method, $start = null, $end = null)
         $result = array();
 
         foreach ($profileList as $item) {
-
             if ($limit === 0) {
                 break;
             }
 
-            if ($item=='') {
+            if ($item == '') {
                 continue;
             }
 
@@ -166,7 +165,6 @@ public function write(Profile $profile)
         $profileIndexed = false !== $this->getValue($this->getItemName($profile->getToken()));
 
         if ($this->setValue($this->getItemName($profile->getToken()), $data, $this->lifetime)) {
-
             if (!$profileIndexed) {
                 // Add to index
                 $indexName = $this->getIndexName();
@@ -304,5 +302,4 @@ private function isItemNameValid($name)
 
         return true;
     }
-
 }
diff --git a/Profiler/MemcacheProfilerStorage.php b/Profiler/MemcacheProfilerStorage.php
@@ -91,7 +91,6 @@ protected function appendValue($key, $value, $expiration = 0)
         $memcache = $this->getMemcache();
 
         if (method_exists($memcache, 'append')) {
-
             // Memcache v3.0
             if (!$result = $memcache->append($key, $value, false, $expiration)) {
                 return $memcache->set($key, $value, false, $expiration);
diff --git a/Profiler/MongoDbProfilerStorage.php b/Profiler/MongoDbProfilerStorage.php
@@ -82,7 +82,7 @@ public function write(Profile $profile)
             'ip' => $profile->getIp(),
             'method' => $profile->getMethod(),
             'url' => $profile->getUrl(),
-            'time' => $profile->getTime()
+            'time' => $profile->getTime(),
         );
 
         $result = $this->getMongo()->update(array('_id' => $profile->getToken()), array_filter($record, function ($v) { return !empty($v); }), array('upsert' => true));
diff --git a/Profiler/RedisProfilerStorage.php b/Profiler/RedisProfilerStorage.php
@@ -171,7 +171,6 @@ public function write(Profile $profile)
         $profileIndexed = false !== $this->getValue($this->getItemName($profile->getToken()));
 
         if ($this->setValue($this->getItemName($profile->getToken()), $data, $this->lifetime, self::REDIS_SERIALIZER_PHP)) {
-
             if (!$profileIndexed) {
                 // Add to index
                 $indexName = $this->getIndexName();
diff --git a/Tests/ClientTest.php b/Tests/ClientTest.php
@@ -60,7 +60,7 @@ public function testFilterResponseConvertsCookies()
 
         $expected = array(
             'foo=bar; expires=Sun, 15 Feb 2009 20:00:00 GMT; domain=http://example.com; path=/foo; secure; httponly',
-            'foo1=bar1; expires=Sun, 15 Feb 2009 20:00:00 GMT; domain=http://example.com; path=/foo; secure; httponly'
+            'foo1=bar1; expires=Sun, 15 Feb 2009 20:00:00 GMT; domain=http://example.com; path=/foo; secure; httponly',
         );
 
         $response = new Response();
diff --git a/Tests/DataCollector/ExceptionDataCollectorTest.php b/Tests/DataCollector/ExceptionDataCollectorTest.php
@@ -36,5 +36,4 @@ public function testCollect()
         $this->assertSame('exception',$c->getName());
         $this->assertSame($trace,$c->getTrace());
     }
-
 }
diff --git a/Tests/DataCollector/LoggerDataCollectorTest.php b/Tests/DataCollector/LoggerDataCollectorTest.php
@@ -41,28 +41,28 @@ public function getCollectTestData()
                 1,
                 array(array('message' => 'foo', 'context' => array())),
                 null,
-                0
+                0,
             ),
             array(
                 1,
                 array(array('message' => 'foo', 'context' => array('foo' => fopen(__FILE__, 'r')))),
                 array(array('message' => 'foo', 'context' => array('foo' => 'Resource(stream)'))),
-                0
+                0,
             ),
             array(
                 1,
                 array(array('message' => 'foo', 'context' => array('foo' => new \stdClass()))),
                 array(array('message' => 'foo', 'context' => array('foo' => 'Object(stdClass)'))),
-                0
+                0,
             ),
             array(
                 1,
                 array(
                     array('message' => 'foo', 'context' => array('type' => ErrorHandler::TYPE_DEPRECATION)),
-                    array('message' => 'foo2', 'context' => array('type' => ErrorHandler::TYPE_DEPRECATION))
+                    array('message' => 'foo2', 'context' => array('type' => ErrorHandler::TYPE_DEPRECATION)),
                 ),
                 null,
-                2
+                2,
             ),
         );
     }
diff --git a/Tests/DataCollector/RequestDataCollectorTest.php b/Tests/DataCollector/RequestDataCollectorTest.php
@@ -69,7 +69,7 @@ public function testControllerInspection(Request $request, Response $response)
                     'class' => 'Symfony\Component\HttpKernel\Tests\DataCollector\RequestDataCollectorTest',
                     'method' => 'testControllerInspection',
                     'file' => __FILE__,
-                    'line' => $r1->getStartLine()
+                    'line' => $r1->getStartLine(),
                 ),
             ),
 
@@ -97,7 +97,7 @@ function () { return 'foo'; },
                     'class' => 'Symfony\Component\HttpKernel\Tests\DataCollector\RequestDataCollectorTest',
                     'method' => 'staticControllerMethod',
                     'file' => __FILE__,
-                    'line' => $r2->getStartLine()
+                    'line' => $r2->getStartLine(),
                 ),
             ),
 
@@ -108,7 +108,7 @@ function () { return 'foo'; },
                     'class' => 'Symfony\Component\HttpKernel\Tests\DataCollector\RequestDataCollectorTest',
                     'method' => 'staticControllerMethod',
                     'file' => __FILE__,
-                    'line' => $r2->getStartLine()
+                    'line' => $r2->getStartLine(),
                 ),
             ),
 
@@ -119,7 +119,7 @@ function () { return 'foo'; },
                     'class' => 'Symfony\Component\HttpKernel\Tests\DataCollector\RequestDataCollectorTest',
                     'method' => 'magicMethod',
                     'file' => 'n/a',
-                    'line' => 'n/a'
+                    'line' => 'n/a',
                 ),
             ),
 
@@ -130,7 +130,7 @@ function () { return 'foo'; },
                     'class' => 'Symfony\Component\HttpKernel\Tests\DataCollector\RequestDataCollectorTest',
                     'method' => 'magicMethod',
                     'file' => 'n/a',
-                    'line' => 'n/a'
+                    'line' => 'n/a',
                 ),
             ),
         );
@@ -163,7 +163,7 @@ public function provider()
         $response->headers->setCookie(new Cookie('bazz','foo','2000-12-12'));
 
         return array(
-            array($request, $response)
+            array($request, $response),
         );
     }
 
@@ -201,5 +201,4 @@ public static function __callStatic($method, $args)
     {
         throw new \LogicException('Unexpected method call');
     }
-
 }
diff --git a/Tests/Debug/TraceableEventDispatcherTest.php b/Tests/Debug/TraceableEventDispatcherTest.php
@@ -27,7 +27,7 @@ public function testAddRemoveListener()
         $dispatcher = new EventDispatcher();
         $tdispatcher = new TraceableEventDispatcher($dispatcher, new Stopwatch());
 
-        $tdispatcher->addListener('foo', $listener = function () { ; });
+        $tdispatcher->addListener('foo', $listener = function () {; });
         $listeners = $dispatcher->getListeners('foo');
         $this->assertCount(1, $listeners);
         $this->assertSame($listener, $listeners[0]);
@@ -41,7 +41,7 @@ public function testGetListeners()
         $dispatcher = new EventDispatcher();
         $tdispatcher = new TraceableEventDispatcher($dispatcher, new Stopwatch());
 
-        $tdispatcher->addListener('foo', $listener = function () { ; });
+        $tdispatcher->addListener('foo', $listener = function () {; });
         $this->assertSame($dispatcher->getListeners('foo'), $tdispatcher->getListeners('foo'));
     }
 
@@ -53,7 +53,7 @@ public function testHasListeners()
         $this->assertFalse($dispatcher->hasListeners('foo'));
         $this->assertFalse($tdispatcher->hasListeners('foo'));
 
-        $tdispatcher->addListener('foo', $listener = function () { ; });
+        $tdispatcher->addListener('foo', $listener = function () {; });
         $this->assertTrue($dispatcher->hasListeners('foo'));
         $this->assertTrue($tdispatcher->hasListeners('foo'));
     }
@@ -78,7 +78,7 @@ public function testGetCalledListeners()
     {
         $dispatcher = new EventDispatcher();
         $tdispatcher = new TraceableEventDispatcher($dispatcher, new Stopwatch());
-        $tdispatcher->addListener('foo', $listener = function () { ; });
+        $tdispatcher->addListener('foo', $listener = function () {; });
 
         $this->assertEquals(array(), $tdispatcher->getCalledListeners());
         $this->assertEquals(array('foo.closure' => array('event' => 'foo', 'type' => 'Closure', 'pretty' => 'closure')), $tdispatcher->getNotCalledListeners());
@@ -95,8 +95,8 @@ public function testLogger()
 
         $dispatcher = new EventDispatcher();
         $tdispatcher = new TraceableEventDispatcher($dispatcher, new Stopwatch(), $logger);
-        $tdispatcher->addListener('foo', $listener1 = function () { ; });
-        $tdispatcher->addListener('foo', $listener2 = function () { ; });
+        $tdispatcher->addListener('foo', $listener1 = function () {; });
+        $tdispatcher->addListener('foo', $listener2 = function () {; });
 
         $logger->expects($this->at(0))->method('debug')->with("Notified event \"foo\" to listener \"closure\".");
         $logger->expects($this->at(1))->method('debug')->with("Notified event \"foo\" to listener \"closure\".");
@@ -111,7 +111,7 @@ public function testLoggerWithStoppedEvent()
         $dispatcher = new EventDispatcher();
         $tdispatcher = new TraceableEventDispatcher($dispatcher, new Stopwatch(), $logger);
         $tdispatcher->addListener('foo', $listener1 = function (Event $event) { $event->stopPropagation(); });
-        $tdispatcher->addListener('foo', $listener2 = function () { ; });
+        $tdispatcher->addListener('foo', $listener2 = function () {; });
 
         $logger->expects($this->at(0))->method('debug')->with("Notified event \"foo\" to listener \"closure\".");
         $logger->expects($this->at(1))->method('debug')->with("Listener \"closure\" stopped propagation of the event \"foo\".");
diff --git a/Tests/DependencyInjection/RegisterListenersPassTest.php b/Tests/DependencyInjection/RegisterListenersPassTest.php
@@ -136,5 +136,7 @@ public function testAbstractEventListener()
 
 class SubscriberService implements \Symfony\Component\EventDispatcher\EventSubscriberInterface
 {
-    public static function getSubscribedEvents() {}
+    public static function getSubscribedEvents()
+    {
+    }
 }
diff --git a/Tests/EventListener/ExceptionListenerTest.php b/Tests/EventListener/ExceptionListenerTest.php
@@ -97,7 +97,7 @@ public function provider()
         $event2 = new GetResponseForExceptionEvent(new TestKernelThatThrowsException(), $request, 'foo', $exception);
 
         return array(
-            array($event, $event2)
+            array($event, $event2),
         );
     }
 
diff --git a/Tests/EventListener/ResponseListenerTest.php b/Tests/EventListener/ResponseListenerTest.php
@@ -32,7 +32,6 @@ protected function setUp()
         $this->dispatcher->addListener(KernelEvents::RESPONSE, array($listener, 'onKernelResponse'));
 
         $this->kernel = $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface');
-
     }
 
     protected function tearDown()
diff --git a/Tests/Fixtures/ExtensionPresentBundle/Command/BarCommand.php b/Tests/Fixtures/ExtensionPresentBundle/Command/BarCommand.php
@@ -13,6 +13,5 @@ class BarCommand extends Command
 {
     public function __construct($example, $name = 'bar')
     {
-
     }
 }
diff --git a/Tests/Fixtures/ExtensionPresentBundle/Command/FooCommand.php b/Tests/Fixtures/ExtensionPresentBundle/Command/FooCommand.php
@@ -19,5 +19,4 @@ protected function configure()
     {
         $this->setName('foo');
     }
-
 }
diff --git a/Tests/Fixtures/KernelForOverrideName.php b/Tests/Fixtures/KernelForOverrideName.php
@@ -20,11 +20,9 @@ class KernelForOverrideName extends Kernel
 
     public function registerBundles()
     {
-
     }
 
     public function registerContainerConfiguration(LoaderInterface $loader)
     {
-
     }
 }
diff --git a/Tests/HttpCache/HttpCacheTest.php b/Tests/HttpCache/HttpCacheTest.php
@@ -595,7 +595,7 @@ public function testAssignsDefaultTtlWhenResponseHasNoFreshnessInformationAndAft
         $this->assertTraceContains('miss');
         $this->assertTraceContains('store');
         $this->assertEquals('Hello World', $this->response->getContent());
-        $this->assertRegExp('/s-maxage=2/', $this->response->headers->get('Cache-Control'));
+        $this->assertRegExp('/s-maxage=(?:2|3)/', $this->response->headers->get('Cache-Control'));
 
         $this->request('GET', '/');
         $this->assertHttpKernelIsNotCalled();
diff --git a/Tests/KernelTest.php b/Tests/KernelTest.php
@@ -424,7 +424,7 @@ public function testLocateResourceReturnsAllMatches()
 
         $this->assertEquals(array(
             __DIR__.'/Fixtures/Bundle2Bundle/foo.txt',
-            __DIR__.'/Fixtures/Bundle1Bundle/foo.txt'),
+            __DIR__.'/Fixtures/Bundle1Bundle/foo.txt',),
             $kernel->locateResource('@Bundle1Bundle/foo.txt', null, false));
     }
 
@@ -436,7 +436,7 @@ public function testLocateResourceReturnsAllMatchesBis()
             ->method('getBundle')
             ->will($this->returnValue(array(
                 $this->getBundle(__DIR__.'/Fixtures/Bundle1Bundle'),
-                $this->getBundle(__DIR__.'/Foobar')
+                $this->getBundle(__DIR__.'/Foobar'),
             )))
         ;
 
@@ -487,7 +487,7 @@ public function testLocateResourceReturnsTheDirOneForResourcesAndBundleOnes()
 
         $this->assertEquals(array(
             __DIR__.'/Fixtures/Resources/Bundle1Bundle/foo.txt',
-            __DIR__.'/Fixtures/Bundle1Bundle/Resources/foo.txt'),
+            __DIR__.'/Fixtures/Bundle1Bundle/Resources/foo.txt',),
             $kernel->locateResource('@Bundle1Bundle/Resources/foo.txt', __DIR__.'/Fixtures/Resources', false)
         );
     }
diff --git a/Tests/Profiler/MongoDbProfilerStorageTest.php b/Tests/Profiler/MongoDbProfilerStorageTest.php

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public function lateCollect()`
`49`	`49`	`$this->data = array(`
`50`	`50`	`'error_count' => $this->logger->countErrors(),`
`51`	`51`	`'logs' => $this->sanitizeLogs($this->logger->getLogs()),`
`52`		`- 'deprecation_count' => $this->computeDeprecationCount()`
	`52`	`+ 'deprecation_count' => $this->computeDeprecationCount(),`
`53`	`53`	`);`
`54`	`54`	`}`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,6 @@ public function getKernel()`
`152`	`152`	`return $this->kernel;`
`153`	`153`	`}`
`154`	`154`
`155`		`-`
`156`	`155`	`/**`
`157`	`156`	`* Gets the Esi instance`
`158`	`157`	`*`
Original file line number	Diff line number	Diff line change
`@@ -517,7 +517,6 @@ protected function initializeBundles()`
`517`	`517`	`array_pop($bundleMap);`
`518`	`518`	`}`
`519`	`519`	`}`
`520`		`-`
`521`	`520`	`}`
`522`	`521`
`523`	`522`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -53,12 +53,11 @@ public function find($ip, $url, $limit, $method, $start = null, $end = null)`
`53`	`53`	`$result = array();`
`54`	`54`
`55`	`55`	`foreach ($profileList as $item) {`
`56`		`-`
`57`	`56`	`if ($limit === 0) {`
`58`	`57`	`break;`
`59`	`58`	`}`
`60`	`59`
`61`		`- if ($item=='') {`
	`60`	`+ if ($item == '') {`
`62`	`61`	`continue;`
`63`	`62`	`}`
`64`	`63`
`@@ -166,7 +165,6 @@ public function write(Profile $profile)`
`166`	`165`	`$profileIndexed = false !== $this->getValue($this->getItemName($profile->getToken()));`
`167`	`166`
`168`	`167`	`if ($this->setValue($this->getItemName($profile->getToken()), $data, $this->lifetime)) {`
`169`		`-`
`170`	`168`	`if (!$profileIndexed) {`
`171`	`169`	`// Add to index`
`172`	`170`	`$indexName = $this->getIndexName();`
`@@ -304,5 +302,4 @@ private function isItemNameValid($name)`
`304`	`302`
`305`	`303`	`return true;`
`306`	`304`	`}`
`307`		`-`
`308`	`305`	`}`