fix deprecations

Author: skie

composer.json

@@ -35,9 +35,10 @@
         "firebase/php-jwt": "^5.0"
     },
     "require-dev": {
+        "brianium/paratest": "^6.3",
         "cakephp/cakephp-codesniffer": "^4.0",
         "league/flysystem-vfs": "^1.0",
-        "phpunit/phpunit": "^8.0",
+        "phpunit/phpunit": "^9.4",
         "vlucas/phpdotenv": "^3.3"
     },
     "autoload": {

psalm.xml

@@ -42,7 +42,6 @@
 
         <MoreSpecificReturnType errorLevel="info" />
         <LessSpecificReturnStatement errorLevel="info" />
-        <TypeCoercion errorLevel="info" />
 
         <PossiblyInvalidArrayAccess errorLevel="info" />
         <PossiblyInvalidArrayOffset errorLevel="info" />

tests/TestCase/Auth/Authenticate/SocialAuthenticateTest.php

@@ -136,20 +136,19 @@ public function testHeaderHappy()
             ->setMethods(['getHeader'])
             ->getMock();
 
-        $request->expects($this->at(0))
-            ->method('getHeader')
-            ->with('provider')
-            ->will($this->returnValue(['Facebook']));
-
-        $request->expects($this->at(1))
-            ->method('getHeader')
-            ->with('token')
-            ->will($this->returnValue(['token-1234']));
-
-        $request->expects($this->at(2))
-            ->method('getHeader')
-            ->with('token_secret')
-            ->will($this->returnValue(['token-secret']));
+        $request->expects($this->exactly(3))
+                 ->method('getHeader')
+                 ->withConsecutive(
+                     ['provider'],
+                     ['token'],
+                     ['token_secret'],
+                 )
+                 ->willReturnOnConsecutiveCalls(
+                    $this->returnValue(['Facebook']),
+                    $this->returnValue(['token-1234']),
+                    $this->returnValue(['token-secret']),
+                 );
+
         $this->social->setConfig('type', 'header');
         $result = $this->social->authenticate($request, new Response());
         $this->assertEquals('user-1', $result['username']);
@@ -165,20 +164,19 @@ public function testAuthenticateHeaderFail()
         $request = $this->getMockBuilder(\Cake\Http\ServerRequest::class)
             ->setMethods(['getHeader'])
             ->getMock();
-        $request->expects($this->at(0))
-            ->method('getHeader')
-            ->with('provider')
-            ->will($this->returnValue(['wrong']));
-
-        $request->expects($this->at(1))
-            ->method('getHeader')
-            ->with('token')
-            ->will($this->returnValue(['wrong']));
-
-        $request->expects($this->at(2))
-            ->method('getHeader')
-            ->with('token_secret')
-            ->will($this->returnValue(['wrong']));
+        $request->expects($this->exactly(3))
+                 ->method('getHeader')
+                 ->withConsecutive(
+                     [$this->equalTo('provider')],
+                     [$this->equalTo('token')],
+                     [$this->equalTo('token_secret')],
+                 )
+                 ->willReturnOnConsecutiveCalls(
+                    $this->returnValue(['wrong']),
+                    $this->returnValue(['wrong']),
+                    $this->returnValue(['wrong']),
+                 );
+
         $this->social->setConfig('type', 'header');
         $result = $this->social->authenticate($request, new Response());
         $this->assertFalse($result);