Merge pull request #16 from matomo-org/githubaction

Migrate travis tests to GitHub action

.github/workflows/phpunit.yml

@@ -0,0 +1,26 @@
+name: PHPUnit
+
+on:
+  pull_request:
+  push:
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    name: PHPUnit
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        php-version: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-version }}
+      - name: Composer install
+        run: composer install
+      - name: PHPUnit / PHP ${{ matrix.php-version }}
+        run: ./vendor/bin/phpunit

composer.json

@@ -13,9 +13,9 @@
         }
     },
     "require": {
-        "php": ">=5.4"
+        "php": ">=7.2"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8.36"
+        "phpunit/phpunit": "^8 || ^9 || ^10 || ^11"
     }
 }

phpunit.xml

@@ -3,14 +3,9 @@
     phpunit -c phpunit.xml
 -->
 <phpunit backupGlobals="false"
-         backupStaticAttributes="false"
          colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false"
          bootstrap="./vendor/autoload.php">
 
     <testsuites>

tests/IPTest.php

@@ -17,7 +17,7 @@
  */
 class IPTest extends TestCase
 {
-    public function ipData()
+    public static function ipData()
     {
         return array(
             // IPv4
@@ -35,7 +35,7 @@ public function ipData()
         );
     }
 
-    public function emptyNullIpData()
+    public static function emptyNullIpData()
     {
         return array(
             array('', "\x00\x00\x00\x00", '0.0.0.0'),
@@ -134,7 +134,7 @@ public function testGetHostnameFailure()
         $this->assertNull($ip->getHostname());
     }
 
-    public function getIpsInRangeData()
+    public static function getIpsInRangeData()
     {
         return array(
             array('192.168.1.10', array(
@@ -221,7 +221,7 @@ public function getIpsInRangeData()
         );
     }
 
-    public function getEmptyIpRangeData()
+    public static function getEmptyIpRangeData()
     {
         return array(
             array(''),

tests/IPUtilsTest.php

@@ -16,7 +16,7 @@
  */
 class IPUtilsTest extends TestCase
 {
-    public function getIPSanitizationData()
+    public static function getIPSanitizationData()
     {
         return array( // input, output
             // single IPv4 address
@@ -66,7 +66,7 @@ public function testSanitizeIp($ip, $expected)
         $this->assertEquals($expected, IPUtils::sanitizeIp($ip));
     }
 
-    public function getIPRangeSanitizationData()
+    public static function getIPRangeSanitizationData()
     {
         return array(
             array('', null),
@@ -136,7 +136,7 @@ public function testSanitizeIpRange($ip, $expected)
         $this->assertSame($expected, IPUtils::sanitizeIpRange($ip));
     }
 
-    public function getIPData()
+    public static function getIPData()
     {
         return array(
             // IPv4
@@ -162,7 +162,7 @@ public function testStringToBinaryIP($string, $binary)
         $this->assertEquals($binary, IPUtils::stringToBinaryIP($string));
     }
 
-    public function getInvalidIPData()
+    public static function getInvalidIPData()
     {
         return array(
             // not a series of dotted numbers
@@ -194,7 +194,7 @@ public function testStringToBinaryInvalidIP($stringIp)
         $this->assertEquals("\x00\x00\x00\x00", IPUtils::stringToBinaryIP($stringIp));
     }
 
-    public function getBinaryIPData()
+    public static function getBinaryIPData()
     {
         // a valid network address is either 4 or 16 bytes; those lines are intentionally left blank ;)
         return array(
@@ -236,7 +236,7 @@ public function testBinaryToStringInvalidIP($binary)
         $this->assertEquals('0.0.0.0', IPUtils::binaryToStringIP($binary), bin2hex($binary));
     }
 
-    public function getBoundsForIPRangeTest()
+    public static function getBoundsForIPRangeTest()
     {
         return array(
 

tests/IPv4Test.php

@@ -16,7 +16,7 @@
  */
 class IPv4Test extends TestCase
 {
-    public function getIPv4Data()
+    public static function getIPv4Data()
     {
         return array(
             array(null, '0.0.0.0'),
@@ -34,10 +34,10 @@ public function testToIPv4String($stringIp, $expected)
 
         $this->assertInstanceOf('Matomo\Network\IPv4', $ip);
 
-        $this->assertEquals($expected, $ip->toIPv4String(), $stringIp);
+        $this->assertEquals($expected, $ip->toIPv4String());
     }
 
-    public function getAddressesToAnonymize()
+    public static function getAddressesToAnonymize()
     {
         return array(
             // ip, array( expected0, expected1, expected2, expected3, expected4 ),

tests/IPv6Test.php

@@ -17,7 +17,7 @@
  */
 class IPv6Test extends TestCase
 {
-    public function getIPv6Data()
+    public static function getIPv6Data()
     {
         return array(
             array('::ffff:192.168.0.1', '192.168.0.1'),
@@ -37,7 +37,7 @@ public function testToIPv4String($stringIp, $expected)
         $this->assertEquals($expected, $ip->toIPv4String(), $stringIp);
     }
 
-    public function getMappedIPv4Data()
+    public static function getMappedIPv4Data()
     {
         return array(
             array(IP::fromStringIP('::ffff:192.168.0.1'), true),
@@ -63,7 +63,7 @@ public function testIsMappedIPv4(IPv6 $ip, $isMapped)
         $this->assertEquals($isMapped, $ip->isMappedIPv4(), $ip);
     }
 
-    public function getAddressesToAnonymize()
+    public static function getAddressesToAnonymize()
     {
         return array(
             array('2001:db8:0:8d3:0:8a2e:70:7344', array(
@@ -100,7 +100,7 @@ public function testAnonymize($ipString, $expected)
     }
 
 
-    public function getIPv4AddressesToAnonymize()
+    public static function getIPv4AddressesToAnonymize()
     {
         return array(
             // ip, array( expected0, expected1, expected2, expected3, expected4 ),