Update for php 8

exussum12 · Jul 17, 2024 · 936ac59 · 936ac59
1 parent d049031
commit 936ac59
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 45 deletions.
diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "exussum12/trip-advisor",
     "description": "PHP implementation of review API",
     "require-dev": {
-        "phpunit/phpunit": "^5.7"
+        "phpunit/phpunit": "^9.0"
     },
     "license": "MIT",
     "authors": [

diff --git a/phpunit.xml b/phpunit.xml
@@ -1,31 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/5.7/phpunit.xsd"
-         bootstrap="tests/autoload.php"
-         backupGlobals="false"
-         beStrictAboutCoversAnnotation="true"
-         beStrictAboutOutputDuringTests="true"
-         beStrictAboutTestsThatDoNotTestAnything="true"
-         beStrictAboutTodoAnnotatedTests="true"
-         verbose="true">
-    <testsuite>
-        <directory suffix="Test.php">tests</directory>
-    </testsuite>
-
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">src</directory>
-            <exclude>
-                <directory suffix=".php">src/Clients</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-    <logging>
-        <log
-            type="coverage-html"
-            target="report"
-            lowUpperBound="35"
-            highLowerBound="70"/>
-        <log type="coverage-clover" target="report/coverage.xml"/>
-    </logging>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" bootstrap="tests/autoload.php" backupGlobals="false" beStrictAboutCoversAnnotation="true" beStrictAboutOutputDuringTests="true" beStrictAboutTestsThatDoNotTestAnything="true" beStrictAboutTodoAnnotatedTests="true" convertDeprecationsToExceptions="true" verbose="true">
+  <coverage processUncoveredFiles="true">
+    <include>
+      <directory suffix=".php">src</directory>
+    </include>
+    <exclude>
+      <directory suffix=".php">src/Clients</directory>
+    </exclude>
+    <report>
+      <clover outputFile="report/coverage.xml"/>
+      <html outputDirectory="report" lowUpperBound="35" highLowerBound="70"/>
+    </report>
+  </coverage>
+  <testsuite name="tests">
+    <directory suffix="Test.php">tests</directory>
+  </testsuite>
+  <logging/>
 </phpunit>
diff --git a/src/ResultSet.php b/src/ResultSet.php
@@ -21,22 +21,22 @@ public function __construct(Reviews $reviews, array $startingArray)
         $this->reviews = $reviews;
     }
 
-    public function current()
+    public function current(): mixed
     {
         return $this->array[$this->current];
     }
 
-    public function next()
+    public function next(): void
     {
         $this->current++;
     }
 
-    public function key()
+    public function key(): mixed
     {
         return $this->current;
     }
 
-    public function valid()
+    public function valid(): bool
     {
         if (isset($this->array[$this->current])) {
             return true;
@@ -55,17 +55,17 @@ public function valid()
         return false;
     }
 
-    public function rewind()
+    public function rewind(): void
     {
         $this->current = 0;
     }
 
-    public function getArray()
+    public function getArray(): array
     {
         return $this->array;
     }
 
-    public function count()
+    public function count():int
     {
         return count($this->array);
     }

diff --git a/src/Reviews.php b/src/Reviews.php
@@ -88,7 +88,7 @@ public function limit($limit)
         return $this;
     }
 
-    public function get($time = null)
+    public function get($time = '')
     {
         $url = parse_url(static::URL);
         $args = http_build_query($this->urlArgs);

diff --git a/tests/ResultSetTest.php b/tests/ResultSetTest.php
@@ -9,18 +9,14 @@
 
 class ResultSetTest extends TestCase
 {
-    public function setUp()
-    {
-        parent::setUp();
-    }
 
     public function testInitialLoad()
     {
         $review = $this->createMock(Reviews::class);
 
-        $resultSet = new ResultSetTest($review, []);
+        $resultSet = new ResultSet($review, []);
 
-        $this->assertInstanceOf(ResultSetTest::class, $resultSet);
+        $this->assertInstanceOf(ResultSet::class, $resultSet);
     }
 
     public function testCountable()

diff --git a/tests/ReviewsTest.php b/tests/ReviewsTest.php
@@ -15,7 +15,7 @@ class ReviewsTest extends TestCase
     /** @var  Reviews */
     protected $reviews;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->client = $this->getMockBuilder(Client::class)->getMock();