Merge pull request #59 from researchgate/php-8-support

Add PHP 8.0 compatibility, fix iterating JSArray

.github/workflows/tests.yml

@@ -10,7 +10,7 @@ jobs:
   tests:
     strategy:
       matrix:
-        php-versions: ['7.3', '7.4']
+        php-versions: ['7.3', '7.4', '8.0', '8.1']
 
     runs-on: ubuntu-latest
 

.gitignore

@@ -0,0 +1,3 @@
+/.phpunit.cache
+/composer.lock
+/vendor

composer.json

@@ -14,7 +14,7 @@
         "php": ">=5.3.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4"
+        "phpunit/phpunit": "^9.5.21"
     },
     "autoload": {
         "psr-0": {

phpunit.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
+         cacheResultFile=".phpunit.cache/test-results"
+         executionOrder="depends,defects"
+         beStrictAboutCoversAnnotation="true"
+         beStrictAboutOutputDuringTests="true"
+         beStrictAboutTodoAnnotatedTests="true"
+         convertDeprecationsToExceptions="true"
+         failOnRisky="true"
+         failOnWarning="true"
+         verbose="true">
+    <testsuites>
+        <testsuite name="default">
+            <directory>tests</directory>
+        </testsuite>
+    </testsuites>
+
+    <coverage cacheDirectory=".phpunit.cache/code-coverage"
+              processUncoveredFiles="true">
+        <include>
+            <directory suffix=".php">src</directory>
+        </include>
+    </coverage>
+</phpunit>

src/vierbergenlars/LibJs/JSArray.php

@@ -194,7 +194,7 @@ public function rewind()
 
     public function valid()
     {
-        return each($this->array)!== false;
+        return key($this->array) !== null;
     }
 
     public function valueOf()

tests/JSArrayTest.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace vierbergenlars\SemVer\Tests;
+
+use PHPUnit\Framework\TestCase;
+use vierbergenlars\LibJs\JSArray;
+use vierbergenlars\LibJs\JString;
+
+/**
+ * @copyright ResearchGate GmbH
+ */
+class JSArrayTest extends TestCase
+{
+
+    public function testIterableJSArray()
+    {
+        $jsArray = new JSArray(array('1.0.0', '2.0.0'));
+        $versions = array();
+        foreach ($jsArray as $version) {
+            $versions[] = $version;
+        }
+
+        $this->assertEquals(array(new JString('1.0.0'), new JString('2.0.0')), $versions);
+    }
+}

tests/RegressionTest.php

@@ -2,9 +2,10 @@
 
 namespace vierbergenlars\SemVer\Tests;
 
+use PHPUnit\Framework\TestCase;
 use vierbergenlars\SemVer;
 
-class RegressionTest extends \PHPUnit_Framework_TestCase
+class RegressionTest extends TestCase
 {
     public function testBug23()
     {

tests/SemVerTest.php

@@ -2,9 +2,10 @@
 
 namespace vierbergenlars\SemVer\Tests\Internal;
 
+use PHPUnit\Framework\TestCase;
 use vierbergenlars\SemVer\Internal as SemVer;
 
-class SemVerTest extends \PHPUnit_Framework_TestCase
+class SemVerTest extends TestCase
 {
     public function testComparison()
     {

tests/VersionTest.php

@@ -2,9 +2,10 @@
 
 namespace vierbergenlars\SemVer\Tests;
 
+use PHPUnit\Framework\TestCase;
 use vierbergenlars\SemVer;
 
-class VersionTest extends \PHPUnit_Framework_TestCase
+class VersionTest extends TestCase
 {
     public function testKeepSimpleversion()
     {
@@ -238,19 +239,19 @@ public function testNotSatisfiedBy()
 
     /**
      * @dataProvider invalidSemanticVersionProvider
-     * @expectedException \vierbergenlars\SemVer\SemVerException
      */
     public function testInvalidExpressionString($version)
     {
+        $this->expectException(SemVer\SemVerException::class);
         new SemVer\expression($version);
     }
 
     /**
      * @dataProvider invalidSemanticVersionProvider
-     * @expectedException \vierbergenlars\SemVer\SemVerException
      */
     public function testInvalidVersionString($version)
     {
+        $this->expectException(SemVer\SemVerException::class);
         new SemVer\version($version);
     }