Added PHP 8 support.

Dropped PHP 7.2 support because coverage not supported by PHPUnit 8.
Provider · Dec 16, 2020 · 62549df · 62549df
1 parent 6942058
commit 62549df
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 19 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -14,8 +14,8 @@ jobs:
       max-parallel: 1
       matrix:
         php:
-          - 7.2
-          - 7.4
+          - 8.0
+          - 7.3
         dependencies:
           - hi
           - lo
@@ -27,6 +27,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
+          coverage: xdebug
 
       - name: Validate composer.json
         run: composer validate

diff --git a/composer.json b/composer.json
@@ -8,7 +8,7 @@
     }
   ],
   "require": {
-    "php": "^7.2",
+    "php": "^7.3|^8",
     "ext-json": "*",
     "amphp/parallel": "^1.1",
     "connectors/http": "^4",
@@ -20,9 +20,9 @@
   },
   "require-dev": {
     "amphp/phpunit-util": "^1.2",
-    "athari/yalinqo": "^2.4.2",
-    "mockery/mockery": "^1.3",
-    "phpunit/phpunit": "^7.5"
+    "mockery/mockery": "^1.3.3",
+    "nikic/iter": "^2.1",
+    "phpunit/phpunit": "^9.5"
   },
   "autoload": {
     "psr-4": {

diff --git a/src/Resource/ScrapeUserReviews.php b/src/Resource/ScrapeUserReviews.php
@@ -36,7 +36,7 @@ public function fetch(ImportConnector $connector): \Iterator
         // Force Crawler creation.
         $pages->current();
         $count = $crawler->filter('.review_stat')->first()->filter('.giantNumber')->text();
-        $avatar = preg_replace('[_medium(?=\.jpg$)]', null, $crawler->filter('.playerAvatar > img')->attr('src'));
+        $avatar = preg_replace('[_medium(?=\.jpg$)]', '', $crawler->filter('.playerAvatar > img')->attr('src'));
 
         return new UsersReviewsRecords($pages, +$count, $avatar, $this);
     }

diff --git a/src/Scrape/AppDetailsParser.php b/src/Scrape/AppDetailsParser.php
@@ -312,7 +312,7 @@ private static function trimNodeText(Crawler $crawler): string
      */
     private static function filterNumbers(string $input): int
     {
-        return +preg_replace('[\D]', null, $input);
+        return +preg_replace('[\D]', '', $input);
     }
 
     /**

diff --git a/test/Functional/Curator/CuratorListsTest.php b/test/Functional/Curator/CuratorListsTest.php
@@ -129,7 +129,10 @@ public function testReorderCuratorList(): void
 
             // Fetch first app from list.
             $list = self::fetchList($listId);
-            $firstApp = from($list['apps'])->orderBy('$v["sort_order"]')->first();
+            usort($list['apps'], static function (array $a, array $b) {
+                return $a['sort_order'] <=> $b['sort_order'];
+            });
+            $firstApp = reset($list['apps']);
 
             self::assertSame(
                 $appId1,
@@ -144,7 +147,10 @@ public function testReorderCuratorList(): void
 
             // Fetch first app from list.
             $list = self::fetchList($listId);
-            $firstApp = from($list['apps'])->orderBy('$v["sort_order"]')->first();
+            usort($list['apps'], static function (array $a, array $b) {
+                return $a['sort_order'] <=> $b['sort_order'];
+            });
+            $firstApp = reset($list['apps']);
 
             self::assertSame(
                 $appId2,
@@ -188,7 +194,9 @@ private static function fetchList(string $listId): array
 
         $lists = wait(self::iteratorToArray($listIterator));
 
-        $list = from($lists)->firstOrDefault(null, "\$v['listid'] === '$listId'");
+        $list = \iter\search(static function (array $list) use ($listId) {
+            return $list['listid'] === $listId;
+        }, $lists);
         self::assertNotNull($list, 'Find specified curator list in curator list collection.');
 
         return $list;

diff --git a/test/Functional/Curator/CuratorTestCase.php b/test/Functional/Curator/CuratorTestCase.php
@@ -23,7 +23,7 @@ abstract class CuratorTestCase extends TestCase
      */
     protected static $session;
 
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         self::$porter = FixtureFactory::createPorter();
         self::$session = wait(FixtureFactory::createSession(self::$porter));

diff --git a/test/Functional/ScrapeAppDetailsTest.php b/test/Functional/ScrapeAppDetailsTest.php
@@ -89,9 +89,9 @@ public function testGame(\Closure $import): void
             self::assertIsString($tagName = $tag['name']);
 
             // Tags should not contain any whitespace
-            self::assertNotContains("\r", $tagName);
-            self::assertNotContains("\n", $tagName);
-            self::assertNotContains("\t", $tagName);
+            self::assertStringNotContainsString("\r", $tagName);
+            self::assertStringNotContainsString("\n", $tagName);
+            self::assertStringNotContainsString("\t", $tagName);
 
             // Tags should not start or end with spaces.
             self::assertStringStartsNotWith(' ', $tagName);

diff --git a/test/phpunit.xml b/test/phpunit.xml
@@ -5,9 +5,9 @@
     <testsuite name="default">
         <directory>.</directory>
     </testsuite>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
+    <coverage processUncoveredFiles="true">
+        <include>
             <directory>../src</directory>
-        </whitelist>
-    </filter>
+        </include>
+    </coverage>
 </phpunit>