Merge branch '2.6' into 2.7

nicolas-grekas · nicolas-grekas · commit 38b9a88968b7 · 2015-07-24T10:19:55.000+02:00
* 2.6:
  [2.6] Static Code Analysis for Components
  [Security/Http] Fix test relying on a private property
diff --git a/src/Symfony/Component/HttpKernel/Client.php b/src/Symfony/Component/HttpKernel/Client.php
@@ -101,7 +101,7 @@ protected function getScript($request)
 
         $r = new \ReflectionClass('\\Symfony\\Component\\ClassLoader\\ClassLoader');
         $requirePath = str_replace("'", "\\'", $r->getFileName());
-        $symfonyPath = str_replace("'", "\\'", realpath(__DIR__.'/../../..'));
+        $symfonyPath = str_replace("'", "\\'", dirname(dirname(dirname(__DIR__))));
         $errorReporting = error_reporting();
 
         $code = <<<EOF
diff --git a/src/Symfony/Component/Intl/Resources/bin/update-data.php b/src/Symfony/Component/Intl/Resources/bin/update-data.php
@@ -178,8 +178,7 @@
 $compiler = new GenrbCompiler($genrb, $genrbEnv);
 $config = new GeneratorConfig($sourceDir.'/data', $icuVersionInDownload);
 
-// Don't wrap "/data" in realpath(), in case the directory does not exist
-$baseDir = realpath(__DIR__.'/..').'/data';
+$baseDir = dirname(__DIR__).'/data';
 
 //$txtDir = $baseDir.'/txt';
 $jsonDir = $baseDir;
diff --git a/src/Symfony/Component/Security/Http/Tests/Firewall/AnonymousAuthenticationListenerTest.php b/src/Symfony/Component/Security/Http/Tests/Firewall/AnonymousAuthenticationListenerTest.php
@@ -54,10 +54,9 @@ public function testHandleWithTokenStorageHavingNoToken()
         $authenticationManager
             ->expects($this->once())
             ->method('authenticate')
-            ->with(self::logicalAnd(
-                       $this->isInstanceOf('Symfony\Component\Security\Core\Authentication\Token\AnonymousToken'),
-                       $this->attributeEqualTo('key', 'TheKey')
-            ))
+            ->with($this->callback(function ($token) {
+                return 'TheKey' === $token->getKey();
+            }))
             ->will($this->returnValue($anonymousToken))
         ;
 
