Merge branch '2.3' into 2.7

fabpot · fabpot · commit 9dc9fb706a1a · 2016-01-27T06:09:39.000+01:00
* 2.3:
  Static code analysis
  Update AnnotationDirectoryLoader.php
  [FrameworkBundle] Fix template location for PHP templates
  [FrameworkBundle] Add path verification to the template parsing test cases
diff --git a/Tests/RememberMe/TokenBasedRememberMeServicesTest.php b/Tests/RememberMe/TokenBasedRememberMeServicesTest.php
@@ -172,9 +172,8 @@ public function testLoginFail()
     {
         $service = $this->getService(null, array('name' => 'foo', 'path' => '/foo', 'domain' => 'foodomain.foo'));
         $request = new Request();
-        $response = new Response();
 
-        $service->loginFail($request, $response);
+        $service->loginFail($request);
 
         $cookie = $request->attributes->get(RememberMeServicesInterface::COOKIE_ATTR_NAME);
         $this->assertTrue($cookie->isCleared());

Original file line number	Diff line number	Diff line change
`@@ -172,9 +172,8 @@ public function testLoginFail()`
`172`	`172`	`{`
`173`	`173`	`$service = $this->getService(null, array('name' => 'foo', 'path' => '/foo', 'domain' => 'foodomain.foo'));`
`174`	`174`	`$request = new Request();`
`175`		`- $response = new Response();`
`176`	`175`
`177`		`- $service->loginFail($request, $response);`
	`176`	`+ $service->loginFail($request);`
`178`	`177`
`179`	`178`	`$cookie = $request->attributes->get(RememberMeServicesInterface::COOKIE_ATTR_NAME);`
`180`	`179`	`$this->assertTrue($cookie->isCleared());`