Replace deprecated withConsecutive method in PHP tests - All tests passing

CHANGELOG.md

@@ -7,7 +7,7 @@
 # Unreleased
 ## [28.x.x]
 ### Changed
-
+- Replace deprecated PHPUnit `withConsecutive` method to prepare for PHPUnit 10 upgrade
 
 ### Fixed
 

tests/Unit/Command/ExploreGeneratorTest.php

@@ -140,9 +140,18 @@ public function testFailingFeed()
             ->with('votes')
             ->willReturn(100);
 
+        $expectedCalls = [
+            ['<error>Failed to fetch feed info:</error>', 0],
+            ['Failure', 0]
+        ];
+        $callIndex = 0;
+
         $this->consoleOutput->expects($this->exactly(2))
             ->method('writeln')
-            ->withConsecutive(['<error>Failed to fetch feed info:</error>'], ['Failure']);
+            ->willReturnCallback(function (...$args) use (&$expectedCalls, &$callIndex) {
+                $this->assertEquals($expectedCalls[$callIndex], $args);
+                $callIndex++;
+            });
 
         $result = $this->command->run($this->consoleInput, $this->consoleOutput);
         $this->assertSame(1, $result);

tests/Unit/Command/ShowFeedTest.php

@@ -75,12 +75,18 @@ public function testValid()
                            ->with('feed', true, 'user', 'user')
                            ->willReturn([['feed'], [['items']]]);
 
+        $expectedCalls = [
+            ["Feed: [\n    \"feed\"\n]", 0],  // writeln includes verbosity level
+            ["Items: [\n    [\n        \"items\"\n    ]\n]", 0]
+        ];
+        $callIndex = 0;
+
         $this->consoleOutput->expects($this->exactly(2))
                             ->method('writeln')
-                            ->withConsecutive(
-                                ["Feed: [\n    \"feed\"\n]"],
-                                ["Items: [\n    [\n        \"items\"\n    ]\n]"]
-                            );
+                            ->willReturnCallback(function (...$args) use (&$expectedCalls, &$callIndex) {
+                                $this->assertEquals($expectedCalls[$callIndex], $args);
+                                $callIndex++;
+                            });
 
         $result = $this->command->run($this->consoleInput, $this->consoleOutput);
         $this->assertSame(0, $result);
@@ -109,12 +115,18 @@ public function testInValid()
                            ->with('feed', true, 'user', 'user')
                            ->will($this->throwException(new ServiceNotFoundException('test')));
 
+        $expectedCalls = [
+            ['<error>Failed to fetch feed info:</error>', 0],  // writeln includes verbosity level
+            ['test', 0]
+        ];
+        $callIndex = 0;
+
         $this->consoleOutput->expects($this->exactly(2))
                             ->method('writeln')
-                            ->withConsecutive(
-                                ['<error>Failed to fetch feed info:</error>'],
-                                ['test']
-                            );
+                            ->willReturnCallback(function (...$args) use (&$expectedCalls, &$callIndex) {
+                                $this->assertEquals($expectedCalls[$callIndex], $args);
+                                $callIndex++;
+                            });
 
         $result = $this->command->run($this->consoleInput, $this->consoleOutput);
         $this->assertSame(1, $result);

tests/Unit/Controller/ExportControllerTest.php

@@ -141,10 +141,20 @@ public function testGetAllArticles()
             ->method('findAllForUser')
             ->with('user')
             ->will($this->returnValue($feeds));
+
+        $expectedCalls = [
+            ['user', ['unread' => false, 'starred' => true]],
+            ['user', ['unread' => true]]
+        ];
+        $returns = [$articles, []];
+        $callIndex = 0;
+
         $this->itemService->expects($this->exactly(2))
             ->method('findAllForUser')
-            ->withConsecutive(['user', ['unread' => false, 'starred' => true]], ['user', ['unread' => true]])
-            ->willReturnOnConsecutiveCalls($articles, []);
+            ->willReturnCallback(function (...$args) use (&$expectedCalls, &$returns, &$callIndex) {
+                $this->assertEquals($expectedCalls[$callIndex], $args);
+                return $returns[$callIndex++];
+            });
 
 
         $return = $this->controller->articles();

tests/Unit/Controller/FeedControllerTest.php

@@ -199,13 +199,19 @@ public function testIndexHighestItemIdExists()
      */
     private function activeInitMocks($id, $type): void
     {
+        $expectedCalls = [
+            [$this->uid, $this->appName, 'lastViewedFeedId', ''],
+            [$this->uid, $this->appName, 'lastViewedFeedType', '']
+        ];
+        $returns = [$id, $type];
+        $callIndex = 0;
+
         $this->settings->expects($this->exactly(2))
             ->method('getUserValue')
-            ->withConsecutive(
-                [$this->uid, $this->appName, 'lastViewedFeedId'],
-                [$this->uid, $this->appName, 'lastViewedFeedType']
-            )
-            ->willReturnOnConsecutiveCalls($id, $type);
+            ->willReturnCallback(function (...$args) use (&$expectedCalls, &$returns, &$callIndex) {
+                $this->assertEquals($expectedCalls[$callIndex], $args);
+                return $returns[$callIndex++];
+            });
     }