Drop 7.3 and run 8.1 and 8.2 in the pipeline (#1023)

dantleech · web-flow · commit d6d0b5654e6e · 2023-03-07T00:27:49.000Z
* Bump min php version to 7.4

* Fix JSON tests

* Removing dynamic properties

* Fix test case

* Fixed badly named abstract test case

* Fix dynamic propeerty

* Drop 7.3 in github actions

* Aply CS fixer

* Drupl phpunit 8.5

* Update CL
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -20,7 +20,7 @@ jobs:
         strategy:
             matrix:
                 php-version:
-                    - '7.3'
+                    - '7.4'
 
         steps:
             -
@@ -34,7 +34,6 @@ jobs:
                     coverage: "none"
                     php-version: "${{ matrix.php-version }}"
                     tools: composer:v2
-
             -
                 name: "Validate composer.json"
                 run: "composer validate --strict --no-check-lock"
@@ -50,7 +49,7 @@ jobs:
         strategy:
             matrix:
                 php-version:
-                    - '7.3'
+                    - '7.4'
 
         steps:
             -
@@ -87,7 +86,7 @@ jobs:
         strategy:
             matrix:
                 php-version:
-                    - '7.3'
+                    - '7.4'
 
         steps:
             -
@@ -126,26 +125,21 @@ jobs:
         strategy:
             matrix:
                 php-version:
-                    - '7.3'
                     - '7.4'
                     - '8.0'
+                    - '8.1'
+                    - '8.2'
                 dependency:
                     - 'lowest'
                     - 'highest'
                 with-examples: ['yes']
                 allow-failures: [false]
                 include:
-                    - php-version: '7.3'
+                    - php-version: '7.4'
                       dependency: 'lowest'
                       with-examples: 'no'
                       allow-failures: false
                       coverage: xdebug
-                    - php-version: '8.1'
-                      dependency: 'highest'
-                      with-examples: 'no'
-                      allow-failures: true
-                      coverage: xdebug
-                      skip_xdebug_tests: "true"
 
         steps:
             - name: "Checkout code"
diff --git a/.github/workflows/release-phar.yml b/.github/workflows/release-phar.yml
@@ -15,10 +15,10 @@ jobs:
         with:
             fetch-depth: 0
 
-      - name: Set PHP 7.3
+      - name: Set PHP 7.4
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '7.3'
+          php-version: '7.4'
 
       -
         name: "Composer install"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,10 @@ Bug fixes:
 
 - Fix PHP 8.2 deprecation warning #1022
 
+Improvements:
+
+- Drop support for 7.3 and support for 8.1 and 8.2 in the pipeline.
+
 1.2.8
 -----
 
diff --git a/composer.json b/composer.json
@@ -11,7 +11,7 @@
     "minimum-stability": "stable",
     "prefer-stable": true,
     "require": {
-        "php": "^7.3 || ^8.0",
+        "php": "^7.4 || ^8.0",
         "ext-dom": "*",
         "ext-json": "*",
         "ext-pcre": "*",
@@ -38,7 +38,7 @@
         "phpstan/phpstan-phpunit": "^1.0",
         "jangregor/phpstan-prophecy": "^1.0",
         "phpstan/extension-installer": "^1.1",
-        "phpunit/phpunit": "^8.5.8 || ^9.0",
+        "phpunit/phpunit": "^9.0",
         "symfony/error-handler": "^5.2 || ^6.0",
         "symfony/var-dumper": "^4.0 || ^5.0 || ^6.0"
     },
diff --git a/lib/Benchmark/Metadata/Annotations/AbstractArrayAnnotation.php b/lib/Benchmark/Metadata/Annotations/AbstractArrayAnnotation.php
@@ -14,6 +14,7 @@
 
 /**
  * @Attributes({
+ *
  *    @Attribute("extend", required = true, type="boolean"),
  * })
  */
diff --git a/lib/Benchmark/Metadata/Annotations/AbstractMethodsAnnotation.php b/lib/Benchmark/Metadata/Annotations/AbstractMethodsAnnotation.php
@@ -14,7 +14,9 @@
 
 /**
  * @Taget({"METHOD", "CLASS"})
+ *
  * @Attributes({
+ *
  *    @Attribute("value", required = true,  type = "array"),
  * })
  */
diff --git a/lib/Benchmark/Metadata/Annotations/Assert.php b/lib/Benchmark/Metadata/Annotations/Assert.php
@@ -16,7 +16,9 @@
  * @Annotation
  *
  * @Taget({"METHOD", "CLASS"})
+ *
  * @Attributes({
+ *
  *    @Attribute("value", required = true, type="string")
  * })
  */
diff --git a/lib/Benchmark/Metadata/Annotations/BeforeClassMethods.php b/lib/Benchmark/Metadata/Annotations/BeforeClassMethods.php
@@ -16,7 +16,9 @@
  * @Annotation
  *
  * @Taget({"CLASS"})
+ *
  * @Attributes({
+ *
  *    @Attribute("value", required = true,  type = "array"),
  * })
  */
diff --git a/lib/Benchmark/Metadata/Annotations/Groups.php b/lib/Benchmark/Metadata/Annotations/Groups.php
@@ -16,7 +16,9 @@
  * @Annotation
  *
  * @Taget({"METHOD", "CLASS"})
+ *
  * @Attributes({
+ *
  *    @Attribute("value", required = true, type="array"),
  * })
  */
diff --git a/lib/Benchmark/Metadata/Annotations/Iterations.php b/lib/Benchmark/Metadata/Annotations/Iterations.php
@@ -16,7 +16,9 @@
  * @Annotation
  *
  * @Taget({"METHOD", "CLASS"})
+ *
  * @Attributes({
+ *
  *    @Attribute("value", required = true, type="mixed")
  * })
  */
diff --git a/lib/Benchmark/Metadata/Annotations/OutputMode.php b/lib/Benchmark/Metadata/Annotations/OutputMode.php
@@ -16,7 +16,9 @@
  * @Annotation
  *
  * @Taget({"METHOD", "CLASS"})
+ *
  * @Attributes({
+ *
  *    @Attribute("value", required = true, type="string")
  * })
  */
diff --git a/lib/Benchmark/Metadata/Annotations/OutputTimeUnit.php b/lib/Benchmark/Metadata/Annotations/OutputTimeUnit.php
@@ -16,7 +16,9 @@
  * @Annotation
  *
  * @Taget({"METHOD", "CLASS"})
+ *
  * @Attributes({
+ *
  *    @Attribute("value", required = true, type="string"),
  *    @Attribute("precision", required = false, type="integer")
  * })
diff --git a/lib/Benchmark/Metadata/Annotations/ParamProviders.php b/lib/Benchmark/Metadata/Annotations/ParamProviders.php
@@ -16,7 +16,9 @@
  * @Annotation
  *
  * @Taget({"METHOD", "CLASS"})
+ *
  * @Attributes({
+ *
  *    @Attribute("value", required = true, type="array"),
  * })
  */
diff --git a/lib/Benchmark/Metadata/Annotations/RetryThreshold.php b/lib/Benchmark/Metadata/Annotations/RetryThreshold.php
@@ -16,7 +16,9 @@
  * @Annotation
  *
  * @Taget({"METHOD", "CLASS"})
+ *
  * @Attributes({
+ *
  *    @Attribute("value", required = true, type="float")
  * })
  */
diff --git a/lib/Benchmark/Metadata/Annotations/Revs.php b/lib/Benchmark/Metadata/Annotations/Revs.php
@@ -16,7 +16,9 @@
  * @Annotation
  *
  * @Taget({"METHOD", "CLASS"})
+ *
  * @Attributes({
+ *
  *    @Attribute("value", required = true, type="mixed"),
  * })
  */
diff --git a/lib/Benchmark/Metadata/Annotations/Sleep.php b/lib/Benchmark/Metadata/Annotations/Sleep.php
@@ -16,7 +16,9 @@
  * @Annotation
  *
  * @Taget({"METHOD", "CLASS"})
+ *
  * @Attributes({
+ *
  *    @Attribute("value", required = true, type="integer")
  * })
  */
diff --git a/lib/Benchmark/Metadata/Annotations/Timeout.php b/lib/Benchmark/Metadata/Annotations/Timeout.php
@@ -16,7 +16,9 @@
  * @Annotation
  *
  * @Taget({"METHOD", "CLASS"})
+ *
  * @Attributes({
+ *
  *    @Attribute("value", required = true, type="float")
  * })
  */
diff --git a/lib/Benchmark/Metadata/Annotations/Warmup.php b/lib/Benchmark/Metadata/Annotations/Warmup.php
@@ -16,7 +16,9 @@
  * @Annotation
  *
  * @Taget({"METHOD", "CLASS"})
+ *
  * @Attributes({
+ *
  *    @Attribute("value", required = true, type="mixed")
  * })
  */
diff --git a/lib/Json/JsonDecoder.php b/lib/Json/JsonDecoder.php
@@ -44,6 +44,10 @@ public function __construct()
     public function decode(string $jsonString): array
     {
         $jsonString = $this->normalize($jsonString);
+
+        if (!$jsonString) {
+            return [];
+        }
         $this->parser->parse($jsonString);
 
         return json_decode($jsonString, true);
@@ -65,7 +69,7 @@ private function normalize($jsonString): string
         $inRight = $inQuote = $inFakeQuote = false;
         $fakeQuoteStart = null;
 
-        if ($chars[0] !== '{') {
+        if (isset($chars[0]) && $chars[0] !== '{') {
             array_unshift($chars, '{');
             $chars[] = '}';
         }
diff --git a/tests/Benchmark/Console/Command/RunCommandBench.php b/tests/Benchmark/Console/Command/RunCommandBench.php
@@ -12,7 +12,9 @@
 
 /**
  * @BeforeMethods("setUp")
+ *
  * @Revs(1)
+ *
  * @Iterations(10)
  */
 class RunCommandBench extends IntegrationBenchCase
diff --git a/tests/Benchmark/Report/Generator/ComponentGeneratorBench.php b/tests/Benchmark/Report/Generator/ComponentGeneratorBench.php
@@ -125,7 +125,9 @@ public function provideNumberOfIterations(): Generator
 
     /**
      * @BeforeMethods({"prepare"})
+     *
      * @ParamProviders({"provideConfigs", "provideNumberOfIterations"})
+     *
      * @Revs(2)
      */
     public function benchGenerate(): void
diff --git a/tests/System/benchmarks/set1/BenchmarkBench.php b/tests/System/benchmarks/set1/BenchmarkBench.php
@@ -19,7 +19,9 @@ public function benchRandom(): void
 
     /**
      * @Iterations(1)
+     *
      * @Revs(1000)
+     *
      * @Groups({"do_nothing"})
      */
     public function benchDoNothing(): void
@@ -28,7 +30,9 @@ public function benchDoNothing(): void
 
     /**
      * @ParamProviders({"provideParamsOne", "provideParamsTwo"})
+     *
      * @Groups({"parameterized"})
+     *
      * @Iterations(1)
      */
     public function benchParameterized($params): void
diff --git a/tests/System/benchmarks/set1/IsolatedParametersBench.php b/tests/System/benchmarks/set1/IsolatedParametersBench.php
@@ -14,7 +14,9 @@ class IsolatedParameterBench
 {
     /**
      * @Groups({"process"})
+     *
      * @Iterations(1)
+     *
      * @ParamProviders({"provideParams"})
      */
     public function benchIterationIsolation(): void
diff --git a/tests/System/benchmarks/set1/ParameterProviderCallableBench.php b/tests/System/benchmarks/set1/ParameterProviderCallableBench.php
@@ -23,7 +23,9 @@ class ParameterProviderCallableBench
 {
     /**
      * @Groups({"process"})
+     *
      * @Iterations(1)
+     *
      * @ParamProviders({"param_provider"})
      */
     public function benchParamProviderCallable($params): void
diff --git a/tests/Unit/Benchmark/Metadata/MetadataFactoryTest.php b/tests/Unit/Benchmark/Metadata/MetadataFactoryTest.php
@@ -73,7 +73,7 @@ protected function setUp(): void
         );
 
         $this->hierarchy = $this->prophesize(ReflectionHierarchy::class);
-        $this->hierarchy->reveal()->class = 'Class';
+        $this->hierarchy->reveal();
         $this->reflection = $this->prophesize(ReflectionClass::class);
         $this->metadata = $this->prophesize(BenchmarkMetadata::class);
         $this->subjectMetadata = $this->prophesize(SubjectMetadata::class);
diff --git a/tests/Unit/Benchmark/SamplerManagerTest.php b/tests/Unit/Benchmark/SamplerManagerTest.php
@@ -45,6 +45,7 @@ public function testRegisterTwice(): void
      * It should measure the mean time taken to execute a callable.
      *
      * @\PhpBench\Benchmark\Metadata\Annotations\Subject()
+     *
      * @\PhpBench\Benchmark\Metadata\Annotations\Iterations(100)
      */
     public function testCallable(): void
diff --git a/tests/Unit/Benchmark/findertest/FooCaseBench.php b/tests/Unit/Benchmark/findertest/FooCaseBench.php
@@ -56,8 +56,10 @@ public function beforeSelectSql(BenchIteration $iteration): void
 
     /**
      * @BeforeMethod({"setupSelectSql"})
+     *
      * @ParamProvider({"provideNodes"})
      * @ParamProvider({"provideColumns"})
+     *
      * @Iterations(3)
      */
     public function benchSelectSql(BenchIteration $iteration): void
@@ -66,8 +68,10 @@ public function benchSelectSql(BenchIteration $iteration): void
 
     /**
      * @BeforeMethod({"setupSelectSql)
+     *
      * @ParamProvider({"provideNodes)
      * @ParamProvider({"provideColumns"})
+     *
      * @Iterations(3)
      */
     public function benchTraverseSomething(BenchIteration $iteration): void
diff --git a/tests/Unit/Console/Command/LogCommandTest.php b/tests/Unit/Console/Command/LogCommandTest.php
@@ -22,6 +22,7 @@
 use PhpBench\Tests\TestCase;
 use PhpBench\Util\TimeUnit;
 use Prophecy\Argument;
+use Prophecy\Prophecy\ObjectProphecy;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Helper\QuestionHelper;
 use Symfony\Component\Console\Input\ArrayInput;
@@ -35,6 +36,26 @@ class LogCommandTest extends TestCase
     private $output;
     private $history;
 
+    /**
+     * @var ObjectProphecy<TimeUnit>
+     */
+    private $timeUnit;
+
+    /**
+     * @var ObjectProphecy<TimeUnitHandler>
+     */
+    private $timeUnitHandler;
+
+    /**
+     * @var ObjectProphecy<CharacterReader>
+     */
+    private $characterReader;
+
+    /**
+     * @var Application
+     */
+    private $application;
+
     protected function setUp(): void
     {
         if (!class_exists(QuestionHelper::class)) {
diff --git a/tests/Unit/Environment/SupplierTest.php b/tests/Unit/Environment/SupplierTest.php
diff --git a/tests/Unit/Model/IterationTest.php b/tests/Unit/Model/IterationTest.php
diff --git a/tests/Unit/Model/ResultCollectionTest.php b/tests/Unit/Model/ResultCollectionTest.php
diff --git a/tests/Unit/Progress/Logger/HistogramLoggerTest.php b/tests/Unit/Progress/Logger/HistogramLoggerTest.php
diff --git a/tests/Unit/Progress/Logger/PhpBenchLoggerTestCase.php b/tests/Unit/Progress/Logger/PhpBenchLoggerTestCase.php
diff --git a/tests/Unit/Progress/Logger/PlainLoggerTest.php b/tests/Unit/Progress/Logger/PlainLoggerTest.php
diff --git a/tests/Unit/Progress/Logger/VerboseLoggerTest.php b/tests/Unit/Progress/Logger/VerboseLoggerTest.php
diff --git a/tests/Unit/Progress/LoggerRegistryTest.php b/tests/Unit/Progress/LoggerRegistryTest.php
diff --git a/tests/Unit/Reflection/reflector/ClassWithClassKeywords.php b/tests/Unit/Reflection/reflector/ClassWithClassKeywords.php
diff --git a/tests/Unit/Reflection/reflector/ExampleClass2.php b/tests/Unit/Reflection/reflector/ExampleClass2.php
diff --git a/tests/Unit/Report/Generator/CompositeGeneratorTest.php b/tests/Unit/Report/Generator/CompositeGeneratorTest.php
diff --git a/tests/Unit/Serializer/XmlEncoderTest.php b/tests/Unit/Serializer/XmlEncoderTest.php
diff --git a/tests/Unit/Serializer/XmlTestCase.php b/tests/Unit/Serializer/XmlTestCase.php
diff --git a/tests/Unit/Storage/Driver/Xml/XmlDriverTest.php b/tests/Unit/Storage/Driver/Xml/XmlDriverTest.php
