Merge pull request #534 from ergebnis/feature/php70

Enhancement: Add support for PHP 7.0

Author: localheinz

.github/settings.yml

@@ -21,6 +21,8 @@ branches:
           - context: "Refactoring (7.4, locked)"
           - context: "Security Analysis (7.4, locked)"
           - context: "Static Code Analysis (7.4, locked)"
+          - context: "Tests (6.5.0, 7.0, highest)"
+          - context: "Tests (6.5.0, 7.0, lowest)"
           - context: "Tests (6.5.0, 7.1, highest)"
           - context: "Tests (6.5.0, 7.1, lowest)"
           - context: "Tests (6.5.0, 7.2, highest)"

.github/workflows/integrate.yaml

@@ -460,6 +460,7 @@ jobs:
           - "6.5.0"
 
         php-version:
+          - "7.0"
           - "7.1"
           - "7.2"
           - "7.3"
@@ -688,9 +689,13 @@ jobs:
         run: "composer config platform.php --ansi --unset"
 
       - name: "Require phpunit/phpunit:^${{ matrix.phpunit-version }}"
-        if: "matrix.dependencies != 'locked'"
+        if: "matrix.dependencies != 'locked' && matrix.phpunit-version != '6.5.0'"
         run: "composer require phpunit/phpunit:^${{ matrix.phpunit-version }} --ansi --no-interaction --no-progress --update-with-all-dependencies"
 
+      - name: "Require fakerphp/faker:^1.9.2 and phpunit/phpunit:^${{ matrix.phpunit-version }}"
+        if: "matrix.dependencies != 'locked' && matrix.phpunit-version == '6.5.0'"
+        run: "composer require fakerphp/faker:^1.9.2 phpunit/phpunit:^${{ matrix.phpunit-version }} --ansi --no-interaction --no-progress --update-with-all-dependencies"
+
       - name: "Install ${{ matrix.dependencies }} dependencies with composer"
         uses: "ergebnis/.github/actions/composer/[email protected]"
         with:

.php-cs-fixer.php

@@ -26,11 +26,10 @@
 
 $license->save();
 
-$ruleSet = PhpCsFixer\Config\RuleSet\Php71::create()
+$ruleSet = PhpCsFixer\Config\RuleSet\Php70::create()
     ->withHeader($license->header())
     ->withRules(PhpCsFixer\Config\Rules::fromArray([
         'mb_str_functions' => false,
-        'void_return' => false,
     ]));
 
 $config = PhpCsFixer\Config\Factory::fromRuleSet($ruleSet);

CHANGELOG.md

@@ -11,6 +11,7 @@ For a full diff see [`2.13.0...main`][2.13.0...main].
 ### Changed
 
 - Added support for `phpunit/phpunit:^6.5.0` ([#533]), by [@localheinz]
+- Added support for PHP 7.0 ([#534]), by [@localheinz]
 
 ## [`2.13.0`][2.13.0]
 
@@ -318,6 +319,7 @@ For a full diff see [`7afa59c...1.0.0`][7afa59c...1.0.0].
 [#531]: https://github.com/ergebnis/phpunit-slow-test-detector/pull/531
 [#532]: https://github.com/ergebnis/phpunit-slow-test-detector/pull/532
 [#533]: https://github.com/ergebnis/phpunit-slow-test-detector/pull/533
+[#534]: https://github.com/ergebnis/phpunit-slow-test-detector/pull/534
 
 [@HypeMC]: https://github.com/HypeMC
 [@localheinz]: https://github.com/localheinz

composer.json

@@ -24,7 +24,7 @@
     "security": "https://github.com/ergebnis/phpunit-slow-test-detector/blob/main/.github/SECURITY.md"
   },
   "require": {
-    "php": "~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
+    "php": "~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
     "phpunit/phpunit": "^6.5.0 || ^7.5.0 || ^8.5.19 || ^9.0.0 || ^10.0.0 || ^11.0.0"
   },
   "require-dev": {

composer.lock

@@ -12,6 +12,10 @@
     resolveFromConfigFile="true"
     strictBinaryOperands="true"
 >
+    <issueHandlers>
+        <ReservedWord errorLevel="info" />
+    </issueHandlers>
+
     <plugins>
         <pluginClass class="Psalm\PhpUnitPlugin\Plugin" />
     </plugins>

psalm-baseline.xml

@@ -23,5 +23,5 @@
         __DIR__ . '/test/',
     ]);
 
-    $rectorConfig->phpVersion(ValueObject\PhpVersion::PHP_71);
+    $rectorConfig->phpVersion(ValueObject\PhpVersion::PHP_70);
 };

psalm.xml

@@ -20,7 +20,7 @@
  */
 interface Collector
 {
-    public function collect(SlowTest $slowTest): void;
+    public function collect(SlowTest $slowTest);
 
     /**
      * @phpstan-return list<SlowTest>