Merge branch '2.4' into 2.5

fabpot · fabpot · commit 48eb52088e74 · 2014-09-22T11:14:18.000+02:00
* 2.4:
  fixed CS
  [Process] fixed some volatile tests
  [HttpKernel] fixed a volatile test
  [HttpFoundation] fixed some volatile tests
  [Tests] PHPUnit Optimizations
  Use getPathname() instead of string casting to get BinaryFileReponse file path

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/full.php
	src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/SessionController.php
	src/Symfony/Component/ClassLoader/Tests/ApcUniversalClassLoaderTest.php
	src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php
	src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php
	src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
	src/Symfony/Component/HttpKernel/Tests/DataCollector/LoggerDataCollectorTest.php
	src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php
	src/Symfony/Component/HttpKernel/Tests/Debug/TraceableEventDispatcherTest.php
	src/Symfony/Component/Process/Tests/AbstractProcessTest.php
	src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
	src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php
	src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php
	src/Symfony/Component/Security/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php
	src/Symfony/Component/Security/Http/Tests/Firewall/SwitchUserListenerTest.php
	src/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php
	src/Symfony/Component/Translation/Tests/Dumper/IcuResFileDumperTest.php
	src/Symfony/Component/Validator/Constraints/ChoiceValidator.php
	src/Symfony/Component/Validator/Constraints/CollectionValidator.php
	src/Symfony/Component/Validator/Tests/Constraints/AbstractConstraintValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/IsbnValidatorTest.php
	src/Symfony/Component/Validator/Tests/ValidationVisitorTest.php
	src/Symfony/Component/Yaml/Parser.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/Debug/TraceableEventDispatcher.php b/Debug/TraceableEventDispatcher.php
@@ -65,7 +65,8 @@ protected function preDispatch($eventName, Event $event)
                 // which must be caught.
                 try {
                     $this->stopwatch->openSection($token);
-                } catch (\LogicException $e) {}
+                } catch (\LogicException $e) {
+                }
                 break;
         }
     }
@@ -89,7 +90,8 @@ protected function postDispatch($eventName, 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/RequestDataCollectorTest.php b/Tests/DataCollector/RequestDataCollectorTest.php
@@ -68,7 +68,7 @@ public function testControllerInspection()
                     'class' => 'Symfony\Component\HttpKernel\Tests\DataCollector\RequestDataCollectorTest',
                     'method' => 'testControllerInspection',
                     'file' => __FILE__,
-                    'line' => $r1->getStartLine()
+                    'line' => $r1->getStartLine(),
                 ),
             ),
 
@@ -96,7 +96,7 @@ function () { return 'foo'; },
                     'class' => 'Symfony\Component\HttpKernel\Tests\DataCollector\RequestDataCollectorTest',
                     'method' => 'staticControllerMethod',
                     'file' => __FILE__,
-                    'line' => $r2->getStartLine()
+                    'line' => $r2->getStartLine(),
                 ),
             ),
 
@@ -107,7 +107,7 @@ function () { return 'foo'; },
                     'class' => 'Symfony\Component\HttpKernel\Tests\DataCollector\RequestDataCollectorTest',
                     'method' => 'staticControllerMethod',
                     'file' => __FILE__,
-                    'line' => $r2->getStartLine()
+                    'line' => $r2->getStartLine(),
                 ),
             ),
 
@@ -118,7 +118,7 @@ function () { return 'foo'; },
                     'class' => 'Symfony\Component\HttpKernel\Tests\DataCollector\RequestDataCollectorTest',
                     'method' => 'magicMethod',
                     'file' => 'n/a',
-                    'line' => 'n/a'
+                    'line' => 'n/a',
                 ),
             ),
 
@@ -129,7 +129,7 @@ function () { return 'foo'; },
                     'class' => 'Symfony\Component\HttpKernel\Tests\DataCollector\RequestDataCollectorTest',
                     'method' => 'magicMethod',
                     'file' => 'n/a',
-                    'line' => 'n/a'
+                    'line' => 'n/a',
                 ),
             ),
         );
@@ -202,5 +202,4 @@ public static function __callStatic($method, $args)
     {
         throw new \LogicException('Unexpected method call');
     }
-
 }
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
@@ -77,23 +77,23 @@ public function getDsns()
             array('mongodb://localhost/symfony_tests/profiler_data', array(
                 'mongodb://localhost/symfony_tests',
                 'symfony_tests',
-                'profiler_data'
+                'profiler_data',
             )),
             array('mongodb://user:password@localhost/symfony_tests/profiler_data', array(
                 'mongodb://user:password@localhost/symfony_tests',
                 'symfony_tests',
-                'profiler_data'
+                'profiler_data',
             )),
             array('mongodb://user:password@localhost/admin/symfony_tests/profiler_data', array(
                 'mongodb://user:password@localhost/admin',
                 'symfony_tests',
-                'profiler_data'
+                'profiler_data',
             )),
             array('mongodb://user:password@localhost:27009,localhost:27010/?replicaSet=rs-name&authSource=admin/symfony_tests/profiler_data', array(
                 'mongodb://user:password@localhost:27009,localhost:27010/?replicaSet=rs-name&authSource=admin',
                 'symfony_tests',
-                'profiler_data'
-            ))
+                'profiler_data',
+            )),
         );
     }
 

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,8 @@ protected function preDispatch($eventName, Event $event)`
`65`	`65`	`// which must be caught.`
`66`	`66`	`try {`
`67`	`67`	`$this->stopwatch->openSection($token);`
`68`		`- } catch (\LogicException $e) {}`
	`68`	`+ } catch (\LogicException $e) {`
	`69`	`+ }`
`69`	`70`	`break;`
`70`	`71`	`}`
`71`	`72`	`}`
`@@ -89,7 +90,8 @@ protected function postDispatch($eventName, Event $event)`
`89`	`90`	`$token = $event->getResponse()->headers->get('X-Debug-Token');`
`90`	`91`	`try {`
`91`	`92`	`$this->stopwatch->stopSection($token);`
`92`		`- } catch (\LogicException $e) {}`
	`93`	`+ } catch (\LogicException $e) {`
	`94`	`+ }`
`93`	`95`	`break;`
`94`	`96`	`}`
`95`	`97`	`}`
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`	`}`