Make tests compatible with newer phpunit versions

Author: williamdes

Tests/DeviceDetectorTest.php

@@ -247,7 +247,7 @@ public function testParse(array $fixtureData): void
         $this->assertEquals($fixtureData, $uaInfo, $errorMessage);
     }
 
-    public function getFixtures(): array
+    public static function getFixtures(): array
     {
         $fixtures     = [];
         $fixtureFiles = \glob(\realpath(__DIR__) . '/fixtures/*.yml');
@@ -301,7 +301,7 @@ public function testParseClient(array $fixtureData): void
         $this->assertEquals($fixtureData['client'], $uaInfo['client'], $messageError);
     }
 
-    public function getFixturesClient(): array
+    public static function getFixturesClient(): array
     {
         $fixtures     = [];
         $fixtureFiles = \glob(\realpath(__DIR__) . '/Parser/Client/fixtures/*.yml');
@@ -341,7 +341,7 @@ public function testParseDevice(array $fixtureData): void
         $this->assertEquals($fixtureData['device'], $uaInfo['device']);
     }
 
-    public function getFixturesDevice(): array
+    public static function getFixturesDevice(): array
     {
         $fixtures     = [];
         $fixtureFiles = \glob(\realpath(__DIR__) . '/Parser/Device/fixtures/*.yml');
@@ -403,7 +403,7 @@ public function testVersionTruncation(string $useragent, int $truncationType, st
         AbstractParser::setVersionTruncation(AbstractParser::VERSION_TRUNCATION_NONE);
     }
 
-    public function getVersionTruncationFixtures(): array
+    public static function getVersionTruncationFixtures(): array
     {
         return [
             ['Mozilla/5.0 (Linux; Android 4.2.2; ARCHOS 101 PLATINUM Build/JDQ39) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.114 Safari/537.36', AbstractParser::VERSION_TRUNCATION_NONE, '4.2.2', '34.0.1847.114'],
@@ -528,7 +528,7 @@ public function testParseBots(array $fixtureData): void
         );
     }
 
-    public function getBotFixtures(): array
+    public static function getBotFixtures(): array
     {
         $fixturesPath = \realpath(__DIR__ . '/fixtures/bots.yml');
         $fixtures     = \Spyc::YAMLLoad($fixturesPath);
@@ -628,11 +628,15 @@ public function testGetClient(): void
         $this->assertEquals($expected, $dd->getClient());
     }
 
-    public function getTypeMethodFixtures(): array
+    public static function getTypeMethodFixtures(): array
     {
-        $fixturePath = \realpath(__DIR__ . '/Parser/fixtures/type-methods.yml');
+        $fixtureData = \Spyc::YAMLLoad(\realpath(__DIR__ . '/Parser/fixtures/type-methods.yml'));
 
-        return \Spyc::YAMLLoad($fixturePath);
+        $fixtureData = \array_map(static function (array $item): array {
+            return ['ua' => $item['user_agent'], 'checkTypes' => $item['check']];
+        }, $fixtureData);
+
+        return $fixtureData;
     }
 
     /**

Tests/Parser/Client/BrowserTest.php

@@ -49,10 +49,14 @@ public function testParse(string $useragent, array $client, ?array $headers = nu
         self::$browsersTested[] = $client['name'];
     }
 
-    public function getFixtures(): array
+    public static function getFixtures(): array
     {
         $fixtureData = Spyc::YAMLLoad(\realpath(__DIR__) . '/fixtures/browser.yml');
 
+        $fixtureData = \array_map(static function (array $item): array {
+            return ['useragent' => $item['user_agent'], 'client' => $item['client'], 'headers' => $item['headers'] ?? null];
+        }, $fixtureData);
+
         return $fixtureData;
     }
 
@@ -108,7 +112,7 @@ public function testBrowserFamiliesNoDuplicates(): void
     /**
      * @return array
      */
-    public function getFixturesBrowserHints(): array
+    public static function getFixturesBrowserHints(): array
     {
         $method = new \ReflectionMethod(BrowserHints::class, 'getRegexes');
         $method->setAccessible(true);

Tests/Parser/Client/FeedReaderTest.php

@@ -29,10 +29,14 @@ public function testParse(string $useragent, array $client): void
         $this->assertEquals($client, $feedReaderParser->parse(), "UserAgent: {$useragent}");
     }
 
-    public function getFixtures(): array
+    public static function getFixtures(): array
     {
         $fixtureData = Spyc::YAMLLoad(\realpath(__DIR__) . '/fixtures/feed_reader.yml');
 
+        $fixtureData = \array_map(static function (array $item): array {
+            return ['useragent' => $item['user_agent'], 'client' => $item['client']];
+        }, $fixtureData);
+
         return $fixtureData;
     }
 

Tests/Parser/Client/LibraryTest.php

@@ -29,10 +29,14 @@ public function testParse(string $useragent, array $client): void
         $this->assertEquals($client, $libraryParser->parse());
     }
 
-    public function getFixtures(): array
+    public static function getFixtures(): array
     {
         $fixtureData = Spyc::YAMLLoad(\realpath(__DIR__) . '/fixtures/library.yml');
 
+        $fixtureData = \array_map(static function (array $item): array {
+            return ['useragent' => $item['user_agent'], 'client' => $item['client']];
+        }, $fixtureData);
+
         return $fixtureData;
     }
 

Tests/Parser/Client/MediaPlayerTest.php

@@ -29,10 +29,14 @@ public function testParse(string $useragent, array $client): void
         $this->assertEquals($client, $mediaPlayerParser->parse());
     }
 
-    public function getFixtures(): array
+    public static function getFixtures(): array
     {
         $fixtureData = Spyc::YAMLLoad(\realpath(__DIR__) . '/fixtures/mediaplayer.yml');
 
+        $fixtureData = \array_map(static function (array $item): array {
+            return ['useragent' => $item['user_agent'], 'client' => $item['client']];
+        }, $fixtureData);
+
         return $fixtureData;
     }
 

Tests/Parser/Client/MobileAppTest.php

@@ -29,10 +29,14 @@ public function testParse(string $useragent, array $client): void
         $this->assertEquals($client, $mobileAppParser->parse());
     }
 
-    public function getFixtures(): array
+    public static function getFixtures(): array
     {
         $fixtureData = Spyc::YAMLLoad(\realpath(__DIR__) . '/fixtures/mobile_app.yml');
 
+        $fixtureData = \array_map(static function (array $item): array {
+            return ['useragent' => $item['user_agent'], 'client' => $item['client']];
+        }, $fixtureData);
+
         return $fixtureData;
     }
 

Tests/Parser/Client/PIMTest.php

@@ -29,10 +29,14 @@ public function testParse(string $useragent, array $client): void
         $this->assertEquals($client, $PIMParser->parse());
     }
 
-    public function getFixtures(): array
+    public static function getFixtures(): array
     {
         $fixtureData = Spyc::YAMLLoad(\realpath(__DIR__) . '/fixtures/pim.yml');
 
+        $fixtureData = \array_map(static function (array $item): array {
+            return ['useragent' => $item['user_agent'], 'client' => $item['client']];
+        }, $fixtureData);
+
         return $fixtureData;
     }
 

Tests/Parser/Device/CameraTest.php

@@ -31,10 +31,14 @@ public function testParse(string $useragent, array $device): void
         $this->assertEquals($device['model'], $consoleParser->getModel());
     }
 
-    public function getFixtures(): array
+    public static function getFixtures(): array
     {
         $fixtureData = Spyc::YAMLLoad(\realpath(__DIR__) . '/fixtures/camera.yml');
 
+        $fixtureData = \array_map(static function (array $item): array {
+            return ['useragent' => $item['user_agent'], 'device' => $item['device']];
+        }, $fixtureData);
+
         return $fixtureData;
     }
 }

Tests/Parser/Device/CarBrowserTest.php

@@ -31,10 +31,14 @@ public function testParse(string $useragent, array $device): void
         $this->assertEquals($device['model'], $consoleParser->getModel());
     }
 
-    public function getFixtures(): array
+    public static function getFixtures(): array
     {
         $fixtureData = Spyc::YAMLLoad(\realpath(__DIR__) . '/fixtures/car_browser.yml');
 
+        $fixtureData = \array_map(static function (array $item): array {
+            return ['useragent' => $item['user_agent'], 'device' => $item['device']];
+        }, $fixtureData);
+
         return $fixtureData;
     }
 }

Tests/Parser/Device/ConsoleTest.php

@@ -31,10 +31,14 @@ public function testParse(string $useragent, array $device): void
         $this->assertEquals($device['model'], $consoleParser->getModel());
     }
 
-    public function getFixtures(): array
+    public static function getFixtures(): array
     {
         $fixtureData = Spyc::YAMLLoad(\realpath(__DIR__) . '/fixtures/console.yml');
 
+        $fixtureData = \array_map(static function (array $item): array {
+            return ['useragent' => $item['user_agent'], 'device' => $item['device']];
+        }, $fixtureData);
+
         return $fixtureData;
     }
 }