Add PHP 8.0 and 8.1 testing to bitbucket pipeline. Adjust version for PHPUnit in composer (9.5 > ^9.5).

Author: dave83649

bitbucket-pipelines.yml

@@ -1,10 +1,31 @@
-image: php:7.4
-
 pipelines:
   default:
     - parallel:
         - step:
-            name: Test
+            name: PHP 7.4
+            image: php:7.4
+            script:
+              - apt-get update && apt-get install -qy git curl libzip-dev zip
+              - docker-php-ext-install zip
+              - curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+              - composer install --ignore-platform-reqs
+              - ./vendor/bin/phpunit tests
+            caches:
+              - composer
+        - step:
+            name: PHP 8.0
+            image: php:8.0
+            script:
+              - apt-get update && apt-get install -qy git curl libzip-dev zip
+              - docker-php-ext-install zip
+              - curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+              - composer install --ignore-platform-reqs
+              - ./vendor/bin/phpunit tests
+            caches:
+              - composer
+        - step:
+            name: PHP 8.1
+            image: php:8.1
             script:
               - apt-get update && apt-get install -qy git curl libzip-dev zip
               - docker-php-ext-install zip

composer.json

@@ -3,7 +3,7 @@
     "description": "The firewall engine of Patchstack.",
     "type": "library",
     "require": {
-        "php": ">=5.4",
+        "php": ">=5.6",
         "opis/closure": "^3.6",
         "laravel/serializable-closure": "^1.1"
     },
@@ -20,6 +20,6 @@
         }
     ],
     "require-dev": {
-        "phpunit/phpunit": "9.5"
+        "phpunit/phpunit": "^9.5"
     }
 }

composer.lock

@@ -94,12 +94,13 @@ class_alias('\Laravel\SerializableClosure\SerializableClosure', 'SerializeClosur
             return in_array($_SERVER['REMOTE_ADDR'], $datasets['ps_ips']);
         };
         $wrapper = new SerializeClosure($function);
+        $serialized = base64_encode(serialize($wrapper));
         $rule = (object) [
             'id' => 1,
             'title' => 'Determine if IP is in blacklist',
             'rule_closure' => (object) [
-                'opis' => base64_encode(serialize($wrapper)),
-                'laravel' => base64_encode(serialize($wrapper))
+                'opis' => $serialized,
+                'laravel' => $serialized
             ],
             'cat' => 'TEST',
             'type' => 'BLOCK'
@@ -116,12 +117,13 @@ class_alias('\Laravel\SerializableClosure\SerializableClosure', 'SerializeClosur
             return preg_match($datasets['ps_sqli'], $_GET['id']) === 1;
         };
         $wrapper = new SerializeClosure($function);
+        $serialized = base64_encode(serialize($wrapper));
         $rule = (object) [
             'id' => 1,
             'title' => 'Determine if union all select regex is a hit in the id GET parameter',
             'rule_closure' => (object) [
-                'opis' => base64_encode(serialize($wrapper)),
-                'laravel' => base64_encode(serialize($wrapper))
+                'opis' => $serialized,
+                'laravel' => $serialized
             ],
             'cat' => 'TEST',
             'type' => 'BLOCK'

tests/FirewallDatasetTest.php

@@ -27,7 +27,6 @@ protected function setUp(): void
     {
         $this->rules = json_decode(file_get_contents(dirname(__FILE__) . '/data/Rules.json'));
         $this->whitelist = json_decode(file_get_contents(dirname(__FILE__) . '/data/Whitelist.json'));
-
         $this->processor = new Processor(
             new Extension(),
             $this->rules,