Merge branch '2.7' into 2.8

fabpot · fabpot · commit 77a74df4877a · 2017-10-20T11:30:07.000-07:00
* 2.7:
  [Security] Fixed auth provider authenticate() cannot return void
  declare argument type
  streamed response should return $this
  content can be a resource
diff --git a/src/Symfony/Component/HttpFoundation/AcceptHeader.php b/src/Symfony/Component/HttpFoundation/AcceptHeader.php
@@ -153,7 +153,7 @@ public function first()
     private function sort()
     {
         if (!$this->sorted) {
-            uasort($this->items, function ($a, $b) {
+            uasort($this->items, function (AcceptHeaderItem $a, AcceptHeaderItem $b) {
                 $qA = $a->getQuality();
                 $qB = $b->getQuality();
 
diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
@@ -130,7 +130,7 @@ class Request
     public $headers;
 
     /**
-     * @var string
+     * @var string|resource
      */
     protected $content;
 
diff --git a/src/Symfony/Component/HttpFoundation/StreamedResponse.php b/src/Symfony/Component/HttpFoundation/StreamedResponse.php
@@ -83,12 +83,12 @@ public function setCallback($callback)
     public function sendHeaders()
     {
         if ($this->headersSent) {
-            return;
+            return $this;
         }
 
         $this->headersSent = true;
 
-        parent::sendHeaders();
+        return parent::sendHeaders();
     }
 
     /**
@@ -99,7 +99,7 @@ public function sendHeaders()
     public function sendContent()
     {
         if ($this->streamed) {
-            return;
+            return $this;
         }
 
         $this->streamed = true;
@@ -109,6 +109,8 @@ public function sendContent()
         }
 
         call_user_func($this->callback);
+
+        return $this;
     }
 
     /**
diff --git a/src/Symfony/Component/HttpFoundation/Tests/StreamedResponseTest.php b/src/Symfony/Component/HttpFoundation/Tests/StreamedResponseTest.php
@@ -121,4 +121,15 @@ public function testCreate()
         $this->assertInstanceOf('Symfony\Component\HttpFoundation\StreamedResponse', $response);
         $this->assertEquals(204, $response->getStatusCode());
     }
+
+    public function testReturnThis()
+    {
+        $response = new StreamedResponse(function () {});
+        $this->assertInstanceOf('Symfony\Component\HttpFoundation\StreamedResponse', $response->sendContent());
+        $this->assertInstanceOf('Symfony\Component\HttpFoundation\StreamedResponse', $response->sendContent());
+
+        $response = new StreamedResponse(function () {});
+        $this->assertInstanceOf('Symfony\Component\HttpFoundation\StreamedResponse', $response->sendHeaders());
+        $this->assertInstanceOf('Symfony\Component\HttpFoundation\StreamedResponse', $response->sendHeaders());
+    }
 }
diff --git a/src/Symfony/Component/Security/Core/Authentication/Provider/AnonymousAuthenticationProvider.php b/src/Symfony/Component/Security/Core/Authentication/Provider/AnonymousAuthenticationProvider.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Security\Core\Authentication\Provider;
 
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\Exception\AuthenticationException;
 use Symfony\Component\Security\Core\Exception\BadCredentialsException;
 use Symfony\Component\Security\Core\Authentication\Token\AnonymousToken;
 
@@ -44,7 +45,7 @@ public function __construct($secret)
     public function authenticate(TokenInterface $token)
     {
         if (!$this->supports($token)) {
-            return;
+            throw new AuthenticationException('The token is not supported by this authentication provider.');
         }
 
         if ($this->secret !== $token->getSecret()) {
diff --git a/src/Symfony/Component/Security/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php b/src/Symfony/Component/Security/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php
@@ -13,6 +13,7 @@
 
 use Symfony\Component\Security\Core\User\UserProviderInterface;
 use Symfony\Component\Security\Core\User\UserCheckerInterface;
+use Symfony\Component\Security\Core\Exception\AuthenticationException;
 use Symfony\Component\Security\Core\Exception\BadCredentialsException;
 use Symfony\Component\Security\Core\Authentication\Token\PreAuthenticatedToken;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
@@ -51,7 +52,7 @@ public function __construct(UserProviderInterface $userProvider, UserCheckerInte
     public function authenticate(TokenInterface $token)
     {
         if (!$this->supports($token)) {
-            return;
+            throw new AuthenticationException('The token is not supported by this authentication provider.');
         }
 
         if (!$user = $token->getUser()) {
diff --git a/src/Symfony/Component/Security/Core/Authentication/Provider/RememberMeAuthenticationProvider.php b/src/Symfony/Component/Security/Core/Authentication/Provider/RememberMeAuthenticationProvider.php
@@ -14,6 +14,7 @@
 use Symfony\Component\Security\Core\User\UserCheckerInterface;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Authentication\Token\RememberMeToken;
+use Symfony\Component\Security\Core\Exception\AuthenticationException;
 use Symfony\Component\Security\Core\Exception\BadCredentialsException;
 
 class RememberMeAuthenticationProvider implements AuthenticationProviderInterface
@@ -40,7 +41,7 @@ public function __construct(UserCheckerInterface $userChecker, $secret, $provide
     public function authenticate(TokenInterface $token)
     {
         if (!$this->supports($token)) {
-            return;
+            throw new AuthenticationException('The token is not supported by this authentication provider.');
         }
 
         if ($this->secret !== $token->getSecret()) {
diff --git a/src/Symfony/Component/Security/Core/Authentication/Provider/UserAuthenticationProvider.php b/src/Symfony/Component/Security/Core/Authentication/Provider/UserAuthenticationProvider.php
@@ -56,7 +56,7 @@ public function __construct(UserCheckerInterface $userChecker, $providerKey, $hi
     public function authenticate(TokenInterface $token)
     {
         if (!$this->supports($token)) {
-            return;
+            throw new AuthenticationException('The token is not supported by this authentication provider.');
         }
 
         $username = $token->getUsername();
diff --git a/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/AnonymousAuthenticationProviderTest.php b/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/AnonymousAuthenticationProviderTest.php
@@ -24,11 +24,15 @@ public function testSupports()
         $this->assertFalse($provider->supports($this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock()));
     }
 
+    /**
+     * @expectedException \Symfony\Component\Security\Core\Exception\AuthenticationException
+     * @expectedExceptionMessage The token is not supported by this authentication provider.
+     */
     public function testAuthenticateWhenTokenIsNotSupported()
     {
         $provider = $this->getProvider('foo');
 
-        $this->assertNull($provider->authenticate($this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock()));
+        $provider->authenticate($this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock());
     }
 
     /**
diff --git a/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/PreAuthenticatedAuthenticationProviderTest.php b/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/PreAuthenticatedAuthenticationProviderTest.php
@@ -36,11 +36,15 @@ public function testSupports()
         $this->assertFalse($provider->supports($token));
     }
 
+    /**
+     * @expectedException \Symfony\Component\Security\Core\Exception\AuthenticationException
+     * @expectedExceptionMessage The token is not supported by this authentication provider.
+     */
     public function testAuthenticateWhenTokenIsNotSupported()
     {
         $provider = $this->getProvider();
 
-        $this->assertNull($provider->authenticate($this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock()));
+        $provider->authenticate($this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock());
     }
 
     /**
diff --git a/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/RememberMeAuthenticationProviderTest.php b/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/RememberMeAuthenticationProviderTest.php
@@ -26,12 +26,16 @@ public function testSupports()
         $this->assertFalse($provider->supports($this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock()));
     }
 
+    /**
+     * @expectedException \Symfony\Component\Security\Core\Exception\AuthenticationException
+     * @expectedExceptionMessage The token is not supported by this authentication provider.
+     */
     public function testAuthenticateWhenTokenIsNotSupported()
     {
         $provider = $this->getProvider();
 
         $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
-        $this->assertNull($provider->authenticate($token));
+        $provider->authenticate($token);
     }
 
     /**
diff --git a/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/UserAuthenticationProviderTest.php b/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/UserAuthenticationProviderTest.php
@@ -29,11 +29,15 @@ public function testSupports()
         $this->assertFalse($provider->supports($this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock()));
     }
 
+    /**
+     * @expectedException \Symfony\Component\Security\Core\Exception\AuthenticationException
+     * @expectedExceptionMessage The token is not supported by this authentication provider.
+     */
     public function testAuthenticateWhenTokenIsNotSupported()
     {
         $provider = $this->getProvider();
 
-        $this->assertNull($provider->authenticate($this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock()));
+        $provider->authenticate($this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock());
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ public function first()`
`153`	`153`	`private function sort()`
`154`	`154`	`{`
`155`	`155`	`if (!$this->sorted) {`
`156`		`- uasort($this->items, function ($a, $b) {`
	`156`	`+ uasort($this->items, function (AcceptHeaderItem $a, AcceptHeaderItem $b) {`
`157`	`157`	`$qA = $a->getQuality();`
`158`	`158`	`$qB = $b->getQuality();`
`159`	`159`
Original file line number	Diff line number	Diff line change
`@@ -83,12 +83,12 @@ public function setCallback($callback)`
`83`	`83`	`public function sendHeaders()`
`84`	`84`	`{`
`85`	`85`	`if ($this->headersSent) {`
`86`		`- return;`
	`86`	`+ return $this;`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`$this->headersSent = true;`
`90`	`90`
`91`		`- parent::sendHeaders();`
	`91`	`+ return parent::sendHeaders();`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`/**`
`@@ -99,7 +99,7 @@ public function sendHeaders()`
`99`	`99`	`public function sendContent()`
`100`	`100`	`{`
`101`	`101`	`if ($this->streamed) {`
`102`		`- return;`
	`102`	`+ return $this;`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`$this->streamed = true;`
`@@ -109,6 +109,8 @@ public function sendContent()`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`call_user_func($this->callback);`
	`112`	`+`
	`113`	`+ return $this;`
`112`	`114`	`}`
`113`	`115`
`114`	`116`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`namespace Symfony\Component\Security\Core\Authentication\Provider;`
`13`	`13`
`14`	`14`	`use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;`
	`15`	`+use Symfony\Component\Security\Core\Exception\AuthenticationException;`
`15`	`16`	`use Symfony\Component\Security\Core\Exception\BadCredentialsException;`
`16`	`17`	`use Symfony\Component\Security\Core\Authentication\Token\AnonymousToken;`
`17`	`18`
`@@ -44,7 +45,7 @@ public function __construct($secret)`
`44`	`45`	`public function authenticate(TokenInterface $token)`
`45`	`46`	`{`
`46`	`47`	`if (!$this->supports($token)) {`
`47`		`- return;`
	`48`	`+ throw new AuthenticationException('The token is not supported by this authentication provider.');`
`48`	`49`	`}`
`49`	`50`
`50`	`51`	`if ($this->secret !== $token->getSecret()) {`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`
`14`	`14`	`use Symfony\Component\Security\Core\User\UserProviderInterface;`
`15`	`15`	`use Symfony\Component\Security\Core\User\UserCheckerInterface;`
	`16`	`+use Symfony\Component\Security\Core\Exception\AuthenticationException;`
`16`	`17`	`use Symfony\Component\Security\Core\Exception\BadCredentialsException;`
`17`	`18`	`use Symfony\Component\Security\Core\Authentication\Token\PreAuthenticatedToken;`
`18`	`19`	`use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;`
`@@ -51,7 +52,7 @@ public function __construct(UserProviderInterface $userProvider, UserCheckerInte`
`51`	`52`	`public function authenticate(TokenInterface $token)`
`52`	`53`	`{`
`53`	`54`	`if (!$this->supports($token)) {`
`54`		`- return;`
	`55`	`+ throw new AuthenticationException('The token is not supported by this authentication provider.');`
`55`	`56`	`}`
`56`	`57`
`57`	`58`	`if (!$user = $token->getUser()) {`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`use Symfony\Component\Security\Core\User\UserCheckerInterface;`
`15`	`15`	`use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;`
`16`	`16`	`use Symfony\Component\Security\Core\Authentication\Token\RememberMeToken;`
	`17`	`+use Symfony\Component\Security\Core\Exception\AuthenticationException;`
`17`	`18`	`use Symfony\Component\Security\Core\Exception\BadCredentialsException;`
`18`	`19`
`19`	`20`	`class RememberMeAuthenticationProvider implements AuthenticationProviderInterface`
`@@ -40,7 +41,7 @@ public function __construct(UserCheckerInterface $userChecker, $secret, $provide`
`40`	`41`	`public function authenticate(TokenInterface $token)`
`41`	`42`	`{`
`42`	`43`	`if (!$this->supports($token)) {`
`43`		`- return;`
	`44`	`+ throw new AuthenticationException('The token is not supported by this authentication provider.');`
`44`	`45`	`}`
`45`	`46`
`46`	`47`	`if ($this->secret !== $token->getSecret()) {`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public function __construct(UserCheckerInterface $userChecker, $providerKey, $hi`
`56`	`56`	`public function authenticate(TokenInterface $token)`
`57`	`57`	`{`
`58`	`58`	`if (!$this->supports($token)) {`
`59`		`- return;`
	`59`	`+ throw new AuthenticationException('The token is not supported by this authentication provider.');`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`$username = $token->getUsername();`
Original file line number	Diff line number	Diff line change
`@@ -24,11 +24,15 @@ public function testSupports()`
`24`	`24`	`$this->assertFalse($provider->supports($this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock()));`
`25`	`25`	`}`
`26`	`26`
	`27`	`+ /**`
	`28`	`+ * @expectedException \Symfony\Component\Security\Core\Exception\AuthenticationException`
	`29`	`+ * @expectedExceptionMessage The token is not supported by this authentication provider.`
	`30`	`+ */`
`27`	`31`	`public function testAuthenticateWhenTokenIsNotSupported()`
`28`	`32`	`{`
`29`	`33`	`$provider = $this->getProvider('foo');`
`30`	`34`
`31`		`- $this->assertNull($provider->authenticate($this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock()));`
	`35`	`+ $provider->authenticate($this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock());`
`32`	`36`	`}`
`33`	`37`
`34`	`38`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -36,11 +36,15 @@ public function testSupports()`
`36`	`36`	`$this->assertFalse($provider->supports($token));`
`37`	`37`	`}`
`38`	`38`
	`39`	`+ /**`
	`40`	`+ * @expectedException \Symfony\Component\Security\Core\Exception\AuthenticationException`
	`41`	`+ * @expectedExceptionMessage The token is not supported by this authentication provider.`
	`42`	`+ */`
`39`	`43`	`public function testAuthenticateWhenTokenIsNotSupported()`
`40`	`44`	`{`
`41`	`45`	`$provider = $this->getProvider();`
`42`	`46`
`43`		`- $this->assertNull($provider->authenticate($this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock()));`
	`47`	`+ $provider->authenticate($this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock());`
`44`	`48`	`}`
`45`	`49`
`46`	`50`	`/**`