Drop support for old php and phpunit versions (#148)

.docker/Dockerfile

@@ -1,4 +1,5 @@
-FROM php:7.4-cli-alpine3.14
+ARG BASE_IMAGE=php:7.4-cli-alpine3.14
+FROM ${BASE_IMAGE}
 
 RUN php -r "readfile('http://getcomposer.org/installer');" | php -- --install-dir=/usr/bin/ --filename=composer
 RUN apk add --no-cache python3 \

.github/workflows/ci.yml

@@ -8,22 +8,19 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: [5.5, 5.6, 7.0, 7.1, 7.2, 7.3, 7.4]
+        php: [7.1, 7.4, 8.0]
         dependencies:
           - "lowest"
           - "highest"
+        include:
+          - { php: 8.1, dependencies: "highest" }
     steps:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-      - name: Remove dev dependecies for older php versions
-        if: ${{ matrix.php < 7.1 }}
-        run: |
-          composer remove --dev phpstan/phpstan --ignore-platform-reqs --no-update
-          composer remove --dev psalm/phar --ignore-platform-reqs --no-update
       - name: Install dependencies
         uses: ramsey/composer-install@v1
         with:
@@ -37,24 +34,18 @@ jobs:
     strategy:
       matrix:
         include:
+          - { phpunit: 9, php: 8.1 }
           - { phpunit: 9, php: 8.0 }
           - { phpunit: 8, php: 7.4 }
           - { phpunit: 7, php: 7.3 }
-          - { phpunit: 6, php: 7.2 }
-          - { phpunit: 5, php: 7.1 }
-          - { phpunit: 4, php: 5.6 }
+          - { phpunit: 6, php: 7.1 }
     steps:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-      - name: Remove dev dependecies for older php versions
-        if: ${{ matrix.php < 7.1 }}
-        run: |
-          composer remove --dev phpstan/phpstan --ignore-platform-reqs --no-update
-          composer remove --dev psalm/phar --ignore-platform-reqs --no-update
       - name: Install dependencies
         uses: ramsey/composer-install@v1
       - name: Download phpunit phar

ChangeLog.md

@@ -5,8 +5,11 @@ The project follows [semantic versioning](http://semver.org/). `BC` stands for a
 ## Unreleased
 ### Added
 * `Eris\Generators` contains all the generator constructors as static methods.
+* Support for PHP 8.1
 ### Changed
 * The generator constructors implemented as simple function now call the static methods of `Eris\Generators`. They will be deprecated.
+### Removed
+* Support for PHP < 7.1
 
 ## 0.12.1
 ### Changed

Makefile

@@ -0,0 +1,7 @@
+.PHONY: run-php-7.4
+run-php-7.4:
+	docker-compose run php-7.4 sh
+
+.PHONY: run-php-8.1
+run-php-8.1:
+	docker-compose run php-8.1 sh

README.md

@@ -35,7 +35,7 @@ This test tries to verify that natural numbers from 0 to 1000 are all smaller th
 <?php
 use Eris\Generator;
 
-class ReadmeTest extends \PHPUnit_Framework_TestCase
+class ReadmeTest extends \PHPUnit\Framework\TestCase
 {
     use \Eris\TestTrait;
 

composer.json

@@ -17,10 +17,10 @@
     ],
     "license": "MIT",
     "require": {
-        "php": ">=5.5"
+        "php": ">=7.1"
     },
     "require-dev": {
-        "phpunit/phpunit": ">=4.1 <8",
+        "phpunit/phpunit": ">=7",
         "sebastian/comparator": ">=1.2.4",
         "friendsofphp/php-cs-fixer": "^2.0",
         "icomefromthenet/reverse-regex": "v0.0.6.3",

docker-compose.yml

@@ -5,9 +5,20 @@ version: "3.8"
 
 # Add a docker-compose.override.yml if you need to change one of the following (it won't be tracked)
 services:
-  php:
+  php-7.4:
     build:
       context: .docker
+      args:
+        BASE_IMAGE: php:7.4-cli-alpine3.14
+    volumes:
+      - .:/usr/src/eris
+    user: 1000:1000
+    working_dir: /usr/src/eris
+  php-8.1:
+    build:
+      context: .docker
+      args:
+        BASE_IMAGE: php:8.1-cli-alpine3.14
     volumes:
       - .:/usr/src/eris
     user: 1000:1000

examples/AlwaysFailsTest.php

@@ -3,7 +3,7 @@
 use Eris\Generators;
 use Eris\TestTrait;
 
-class AlwaysFailsTest extends \PHPUnit_Framework_TestCase
+class AlwaysFailsTest extends \PHPUnit\Framework\TestCase
 {
     use TestTrait;
 

examples/AssociativeArrayTest.php

@@ -2,7 +2,7 @@
 
 use Eris\Generators;
 
-class AssociativeArrayTest extends PHPUnit_Framework_TestCase
+class AssociativeArrayTest extends \PHPUnit\Framework\TestCase
 {
     use Eris\TestTrait;
 
@@ -15,11 +15,11 @@ public function testAssociativeArraysGeneratedOnStandardKeys()
             ])
         )
             ->then(function ($array) {
-                $this->assertEquals(2, count($array));
+                $this->assertCount(2, $array);
                 $letter = $array['letter'];
-                $this->assertInternalType('string', $letter);
+                \Eris\PHPUnitDeprecationHelper::assertIsString($letter);
                 $cipher = $array['cipher'];
-                $this->assertInternalType('integer', $cipher);
+                \Eris\PHPUnitDeprecationHelper::assertIsInt($cipher);
             });
     }
 }

examples/BindTest.php

@@ -2,7 +2,7 @@
 
 use Eris\Generators;
 
-class BindTest extends PHPUnit_Framework_TestCase
+class BindTest extends \PHPUnit\Framework\TestCase
 {
     use Eris\TestTrait;
 

examples/BooleanTest.php

@@ -3,7 +3,7 @@
 use Eris\Generators;
 use Eris\TestTrait;
 
-class BooleanTest extends PHPUnit_Framework_TestCase
+class BooleanTest extends \PHPUnit\Framework\TestCase
 {
     use TestTrait;
 

examples/CharacterTest.php

@@ -3,7 +3,7 @@
 use Eris\Antecedents;
 use Eris\Generators;
 
-class CharacterTest extends PHPUnit_Framework_TestCase
+class CharacterTest extends \PHPUnit\Framework\TestCase
 {
     use Eris\TestTrait;
 

examples/ChooseTest.php

@@ -3,7 +3,7 @@
 use Eris\Generators;
 use Eris\TestTrait;
 
-class ChooseTest extends PHPUnit_Framework_TestCase
+class ChooseTest extends \PHPUnit\Framework\TestCase
 {
     use TestTrait;
 

examples/CollectTest.php

@@ -4,7 +4,7 @@
 use Eris\Listeners;
 use Eris\TestTrait;
 
-class CollectTest extends PHPUnit_Framework_TestCase
+class CollectTest extends \PHPUnit\Framework\TestCase
 {
     use TestTrait;
 

examples/ConstantTest.php

@@ -2,7 +2,7 @@
 
 use Eris\Generators;
 
-class ConstantTest extends \PHPUnit_Framework_TestCase
+class ConstantTest extends \PHPUnit\Framework\TestCase
 {
     use Eris\TestTrait;
 

examples/DateTest.php

@@ -2,7 +2,7 @@
 
 use Eris\Generators;
 
-class DateTest extends PHPUnit_Framework_TestCase
+class DateTest extends \PHPUnit\Framework\TestCase
 {
     use Eris\TestTrait;
 

examples/DifferentElementsTest.php

@@ -32,7 +32,7 @@ public static function C()
     }
 }
 
-class DifferentElementsTest extends \PHPUnit_Framework_TestCase
+class DifferentElementsTest extends \PHPUnit\Framework\TestCase
 {
     use TestTrait;
 

examples/DisableShrinkingTest.php

@@ -3,7 +3,7 @@
 use Eris\Generators;
 use Eris\TestTrait;
 
-class DisableShrinkingTest extends \PHPUnit_Framework_TestCase
+class DisableShrinkingTest extends \PHPUnit\Framework\TestCase
 {
     use TestTrait;
 

examples/ElementsTest.php

@@ -2,7 +2,7 @@
 
 use Eris\Generators;
 
-class ElementsTest extends \PHPUnit_Framework_TestCase
+class ElementsTest extends \PHPUnit\Framework\TestCase
 {
     use Eris\TestTrait;
 

examples/ErrorTest.php

@@ -2,7 +2,7 @@
 
 use Eris\Generators;
 
-class ErrorTest extends \PHPUnit_Framework_TestCase
+class ErrorTest extends \PHPUnit\Framework\TestCase
 {
     use Eris\TestTrait;
 

examples/FloatTest.php

@@ -2,7 +2,7 @@
 
 use Eris\Generators;
 
-class FloatTest extends \PHPUnit_Framework_TestCase
+class FloatTest extends \PHPUnit\Framework\TestCase
 {
     use Eris\TestTrait;
 

examples/FrequencyTest.php

@@ -2,7 +2,7 @@
 
 use Eris\Generators;
 
-class FrequencyTest extends \PHPUnit_Framework_TestCase
+class FrequencyTest extends \PHPUnit\Framework\TestCase
 {
     use Eris\TestTrait;
 

examples/GeneratorSamplesTest.php

@@ -3,7 +3,7 @@
 use Eris\Generators;
 use Eris\TestTrait;
 
-class GeneratorSamplesTest extends PHPUnit_Framework_TestCase
+class GeneratorSamplesTest extends \PHPUnit\Framework\TestCase
 {
     use TestTrait;
 
@@ -36,7 +36,7 @@ private function generateSample($description, $generator)
         echo PHP_EOL;
         echo $description . " with size 10";
         $sample = $this->sample($generator);
-        $this->assertInternalType('array', $sample->collected());
+        \Eris\PHPUnitDeprecationHelper::assertIsArray($sample->collected());
         $this->prettyPrint($sample->collected());
     }
 

examples/IntegerTest.php

@@ -3,7 +3,7 @@
 use Eris\Generators;
 use Eris\TestTrait;
 
-class IntegerTest extends PHPUnit_Framework_TestCase
+class IntegerTest extends \PHPUnit\Framework\TestCase
 {
     use TestTrait;
 

examples/LimitToTest.php

@@ -3,7 +3,7 @@
 use Eris\Generators;
 use Eris\TestTrait;
 
-class LimitToTest extends PHPUnit_Framework_TestCase
+class LimitToTest extends \PHPUnit\Framework\TestCase
 {
     use TestTrait;
 
@@ -16,7 +16,7 @@ public function testNumberOfIterationsCanBeConfigured()
             Generators::int()
         )
             ->then(function ($value) {
-                $this->assertInternalType('integer', $value);
+                \Eris\PHPUnitDeprecationHelper::assertIsInt($value);
             });
     }
 

examples/LogFileTest.php

@@ -4,23 +4,23 @@
 use Eris\Listeners;
 use Eris\TestTrait;
 
-class LogFileTest extends PHPUnit_Framework_TestCase
+class LogFileTest extends \PHPUnit\Framework\TestCase
 {
     use TestTrait;
 
-    public function testWritingIterationsOnALogFile()
+    public function testWritingIterationsOnALogFile(): void
     {
         $this
             ->forAll(
                 Generators::int()
             )
             ->hook(Listeners::log(sys_get_temp_dir().'/eris-log-file-test.log'))
             ->then(function ($number) {
-                $this->assertInternalType('integer', $number);
+                \Eris\PHPUnitDeprecationHelper::assertIsInt($number);
             });
     }
 
-    public function testLogOfFailuresAndShrinking()
+    public function testLogOfFailuresAndShrinking(): void
     {
         $this
             ->forAll(

examples/MapTest.php

@@ -2,7 +2,7 @@
 
 use Eris\Generators;
 
-class MapTest extends PHPUnit_Framework_TestCase
+class MapTest extends \PHPUnit\Framework\TestCase
 {
     use Eris\TestTrait;
 

examples/MinimumEvaluationsTest.php

@@ -2,7 +2,7 @@
 
 use Eris\Generators;
 
-class MinimumEvaluationsTest extends PHPUnit_Framework_TestCase
+class MinimumEvaluationsTest extends \PHPUnit\Framework\TestCase
 {
     use Eris\TestTrait;
 

examples/NamesTest.php

@@ -3,7 +3,7 @@
 use Eris\Generator;
 use Eris\Generators;
 
-class NamesTest extends PHPUnit_Framework_TestCase
+class NamesTest extends \PHPUnit\Framework\TestCase
 {
     use Eris\TestTrait;
 
@@ -12,7 +12,7 @@ public function testGeneratingNames()
         $this->forAll(
             Generators::names()
         )->then(function ($name) {
-            $this->assertInternalType('string', $name);
+            \Eris\PHPUnitDeprecationHelper::assertIsString($name);
             var_dump($name);
         });
     }
@@ -21,7 +21,7 @@ public function testSamplingShrinkingOfNames()
     {
         $generator = Generator\NamesGenerator::defaultDataSet();
         $sample = $this->sampleShrink($generator);
-        $this->assertInternalType('array', $sample->collected());
+        \Eris\PHPUnitDeprecationHelper::assertIsArray($sample->collected());
         var_dump($sample->collected());
     }
 }