chore: (bc) Update PHP and PHPUnit minimum version requirements (#164)

* chore: (bc) Update PHP and PHPUnit minimum version requirements

- Use attributes to handle what was previously handled through annotations

---------

Co-authored-by: Ilario Pierbattista <987038+ilario-pierbattista@users.noreply.github.com>

.docker/Dockerfile

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

.github/workflows/ci.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: [7.4, 8.0]
+        php: [8.1]
         dependencies:
           - "lowest"
           - "highest"
@@ -35,10 +35,8 @@ jobs:
     strategy:
       matrix:
         include:
-          - { phpunit: 9, php: 8.2 }
-          - { phpunit: 9, php: 8.1 }
-          - { phpunit: 9, php: 8.0 }
-          - { phpunit: 8, php: 7.4 }
+          - { phpunit: 10, php: 8.2 }
+          - { phpunit: 10, php: 8.1 }
     steps:
       - name: Checkout
         uses: actions/checkout@v2

.github/workflows/static-analysis.yml

@@ -23,7 +23,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 7.4
+          php-version: 8.1
       - name: Install dependencies
         uses: "ramsey/composer-install@v1"
       - run: ${{ matrix.script }}

.gitignore

@@ -1,9 +1,8 @@
 /vendor/
-.php_cs.cache
+.php-cs-fixer.cache
 composer.lock
 docs/_build
 .phpunit.result.cache
 docker-compose.override.yml
 .psalm-cache/
 .idea
-.php-cs-fixer.cache

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The project follows [semantic versioning](http://semver.org/). `BC` stands for a change that impacts `Backward Compatibility`.
 
 ## [Unreleased]
+### Added
+* Support for PHP 8.2
+### Removed
+* Support for PHP < 8.1
+* Support for PHPUnit < 10
+
 ## [0.14.0] - 2023-04-21
 ### Added
 * `ilario-pierbattista/reverse-regex` as substitute peer dependency of `icomefromthenet/reverse-regex`.

Makefile

@@ -1,7 +1,3 @@
-.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

@@ -10,8 +10,8 @@ In property-based testing, several properties that the System Under Test must re
 
 ## Compatibility
 
-- PHP 7.4, 8.0, 8.1, 8.2
-- PHPUnit 8.x, 9.x
+- PHP 8.1, 8.2
+- PHPUnit 10.x
 
 ## Installation
 

composer.json

@@ -17,10 +17,10 @@
     ],
     "license": "MIT",
     "require": {
-        "php": ">=7.4"
+        "php": "^8.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "^8 || ^9",
+        "phpunit/phpunit": "^10.0.4",
         "sebastian/comparator": ">=2.1.3",
         "friendsofphp/php-cs-fixer": "^3.0",
         "ilario-pierbattista/reverse-regex": "^0.3.1",

docker-compose.yml

@@ -5,15 +5,6 @@ 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-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

examples/AssociativeArrayTest.php

@@ -17,9 +17,9 @@ public function testAssociativeArraysGeneratedOnStandardKeys()
             ->then(function ($array) {
                 $this->assertCount(2, $array);
                 $letter = $array['letter'];
-                \Eris\PHPUnitDeprecationHelper::assertIsString($letter);
+                static::assertIsString($letter);
                 $cipher = $array['cipher'];
-                \Eris\PHPUnitDeprecationHelper::assertIsInt($cipher);
+                static::assertIsInt($cipher);
             });
     }
 }

examples/CharacterTest.php

@@ -1,6 +1,7 @@
 <?php
 
 use Eris\Antecedents;
+use Eris\Attributes\ErisRatio;
 use Eris\Generators;
 
 class CharacterTest extends \PHPUnit\Framework\TestCase
@@ -43,9 +44,7 @@ public function testMultiplePrintableCharacters()
             });
     }
 
-    /**
-     * @eris-ratio 10
-     */
+    #[ErisRatio(ratio: 10)]
     public function testMultiplePrintableCharactersFromAnnotation()
     {
         $this

examples/GeneratorSamplesTest.php

@@ -36,7 +36,7 @@ private function generateSample($description, $generator)
         echo PHP_EOL;
         echo $description . " with size 10";
         $sample = $this->sample($generator);
-        \Eris\PHPUnitDeprecationHelper::assertIsArray($sample->collected());
+        static::assertIsArray($sample->collected());
         $this->prettyPrint($sample->collected());
     }
 

examples/LimitToTest.php

@@ -1,22 +1,23 @@
 <?php
 
+use Eris\Attributes\ErisDuration;
+use Eris\Attributes\ErisRatio;
+use Eris\Attributes\ErisRepeat;
 use Eris\Generators;
 use Eris\TestTrait;
 
 class LimitToTest extends \PHPUnit\Framework\TestCase
 {
     use TestTrait;
 
-    /**
-     * @eris-repeat 5
-     */
+    #[ErisRepeat(repeat: 5)]
     public function testNumberOfIterationsCanBeConfigured()
     {
         $this->forAll(
             Generators::int()
         )
             ->then(function ($value) {
-                \Eris\PHPUnitDeprecationHelper::assertIsInt($value);
+                static::assertIsInt($value);
             });
     }
 
@@ -50,10 +51,8 @@ public function testTimeIntervalToRunForCanBeConfiguredAndAVeryLowNumberOfIterat
             });
     }
 
-    /**
-     * @eris-ratio 0
-     * @eris-duration PT2S
-     */
+    #[ErisRatio(ratio: 0)]
+    #[ErisDuration(duration: 'PT2S')]
     public function testTimeIntervalToRunForCanBeConfiguredAndAVeryLowNumberOfIterationsCanBeIgnoredFromAnnotation()
     {
         $this->forAll(

examples/LogFileTest.php

@@ -16,7 +16,7 @@ public function testWritingIterationsOnALogFile(): void
             )
             ->hook(Listeners::log(sys_get_temp_dir().'/eris-log-file-test.log'))
             ->then(function ($number) {
-                \Eris\PHPUnitDeprecationHelper::assertIsInt($number);
+                static::assertIsInt($number);
             });
     }
 

examples/MinimumEvaluationsTest.php

@@ -1,5 +1,6 @@
 <?php
 
+use Eris\Attributes\ErisRatio;
 use Eris\Generators;
 
 class MinimumEvaluationsTest extends \PHPUnit\Framework\TestCase
@@ -35,9 +36,7 @@ public function testPassesBecauseOfTheArtificiallyLowMinimumEvaluationRatio()
             });
     }
 
-    /**
-     * @eris-ratio 1
-     */
+    #[ErisRatio(ratio: 1)]
     public function testPassesBecauseOfTheArtificiallyLowMinimumEvaluationRatioFromAnnotation()
     {
         $this

examples/NamesTest.php

@@ -12,7 +12,7 @@ public function testGeneratingNames()
         $this->forAll(
             Generators::names()
         )->then(function ($name) {
-            \Eris\PHPUnitDeprecationHelper::assertIsString($name);
+            static::assertIsString($name);
             var_dump($name);
         });
     }
@@ -21,7 +21,7 @@ public function testSamplingShrinkingOfNames()
     {
         $generator = Generator\NamesGenerator::defaultDataSet();
         $sample = $this->sampleShrink($generator);
-        \Eris\PHPUnitDeprecationHelper::assertIsArray($sample->collected());
+        static::assertIsArray($sample->collected());
         var_dump($sample->collected());
     }
 }

examples/RandConfigurationTest.php

@@ -1,5 +1,6 @@
 <?php
 
+use Eris\Attributes\ErisMethod;
 use Eris\Generators;
 use Eris\Random;
 use Eris\TestTrait;
@@ -19,9 +20,7 @@ public function testUsingTheDefaultRandFunction()
             ->then($this->isInteger());
     }
 
-    /**
-     * @eris-method rand
-     */
+    #[ErisMethod(method: 'rand')]
     public function testUsingTheDefaultRandFunctionFromAnnotation()
     {
         $this
@@ -42,10 +41,7 @@ public function testUsingTheDefaultMtRandFunction()
             ->then($this->isInteger());
     }
 
-
-    /**
-     * @eris-method mt_rand
-     */
+    #[ErisMethod(method: 'mt_rand')]
     public function testUsingTheDefaultMtRandFunctionFromAnnotation()
     {
         $this
@@ -72,7 +68,7 @@ public function testUsingThePurePhpMtRandFunction()
     private function isInteger()
     {
         return function ($number) {
-            \Eris\PHPUnitDeprecationHelper::assertIsInt($number);
+            static::assertIsInt($number);
         };
     }
 }

examples/SetTest.php

@@ -13,7 +13,7 @@ public function testSetsOfAnotherGeneratorsDomain()
             Generators::set(Generators::nat())
         )
             ->then(function ($set) {
-                \Eris\PHPUnitDeprecationHelper::assertIsArray($set);
+                static::assertIsArray($set);
                 foreach ($set as $element) {
                     $this->assertGreaterThanOrEqual(0, $element);
                 }

examples/ShrinkingTest.php

@@ -14,7 +14,7 @@ public function testShrinkingAString()
         )
             ->then(function ($string) {
                 var_dump($string);
-                \Eris\PHPUnitDeprecationHelper::assertStringNotContainsString('B', $string);
+                static::assertStringNotContainsString('B', $string);
             });
     }
 

examples/ShrinkingTimeLimitTest.php

@@ -1,5 +1,6 @@
 <?php
 
+use Eris\Attributes\ErisShrink;
 use Eris\Generator;
 use Eris\Generators;
 
@@ -34,9 +35,7 @@ public function testLengthPreservation()
             });
     }
 
-    /**
-     * @eris-shrink 2
-     */
+    #[ErisShrink(shrink: 2)]
     public function testLengthPreservationFromAnnotation()
     {
         $this

examples/SubsetTest.php

@@ -16,7 +16,7 @@ public function testSubsetsOfASet()
             ])
         )
             ->then(function ($set) {
-                \Eris\PHPUnitDeprecationHelper::assertIsArray($set);
+                static::assertIsArray($set);
                 foreach ($set as $element) {
                     $this->assertTrue($this->isEven($element), "Element $element is not even, where did it come from?");
                 }

phpunit.xml

@@ -13,7 +13,6 @@
         </testsuite>
         <testsuite name="EndToEnd">
             <file>./test/ExampleEnd2EndTest.php</file>
-            <file>./test/PHPUnitDeprecationHelper.php</file>
         </testsuite>
     </testsuites>
     <php>

src/Attributes/ErisAttribute.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace Eris\Attributes;
+
+interface ErisAttribute
+{
+    /**
+     * @return int|string
+     */
+    public function getValue();
+}

src/Attributes/ErisDuration.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Eris\Attributes;
+
+use Attribute;
+
+#[Attribute(Attribute::TARGET_CLASS|Attribute::TARGET_METHOD)]
+class ErisDuration implements ErisAttribute
+{
+    public function __construct(
+        public string $duration
+    ) {
+    }
+
+
+    public function getValue()
+    {
+        return $this->duration;
+    }
+}

src/Attributes/ErisMethod.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Eris\Attributes;
+
+use Attribute;
+
+#[Attribute(Attribute::TARGET_CLASS|Attribute::TARGET_METHOD)]
+class ErisMethod implements ErisAttribute
+{
+    public function __construct(
+        public string $method
+    ) {
+    }
+
+    public function getValue()
+    {
+        return $this->method;
+    }
+}

src/Attributes/ErisRatio.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Eris\Attributes;
+
+use Attribute;
+
+#[Attribute(Attribute::TARGET_CLASS|Attribute::TARGET_METHOD)]
+class ErisRatio implements ErisAttribute
+{
+    public function __construct(
+        public int $ratio
+    ) {
+    }
+
+    public function getValue()
+    {
+        return $this->ratio;
+    }
+}