allow php 7.1

Author: janedbal

composer.json

@@ -8,11 +8,11 @@
         "nette/utils": ">=2.4.0"
     },
     "require-dev": {
-        "editorconfig-checker/editorconfig-checker": "^10.2",
+        "editorconfig-checker/editorconfig-checker": "^8.0",
         "phpstan/phpstan": "^0.12.94",
         "phpstan/phpstan-phpunit": "^0.12.22",
         "phpstan/phpstan-strict-rules": "^0.12.10",
-        "phpunit/phpunit": "^9.5",
+        "phpunit/phpunit": "^7.5",
         "slevomat/coding-standard": "^7.0"
     },
     "config": {
@@ -29,6 +29,6 @@
         }
     },
     "scripts": {
-        "check": "ec && phpcs && phpstan analyse -vvv && phpunit -vvv tests"
+        "check": "editorconfig-checker src/* tests/* *.dist && phpcs && phpstan analyse -vvv && phpunit -vvv tests"
     }
 }

phpcs.xml.dist

@@ -245,7 +245,9 @@
     </rule>
 
     <rule ref="SlevomatCodingStandard.Arrays.TrailingArrayComma"/>
-    <rule ref="SlevomatCodingStandard.Classes.ModernClassNameReference" />
+    <rule ref="SlevomatCodingStandard.Classes.ModernClassNameReference">
+        <exclude name="SlevomatCodingStandard.Classes.ModernClassNameReference.ClassNameReferencedViaFunctionCall"/> <!-- after bumping to PHP8 -->
+    </rule>
     <rule ref="SlevomatCodingStandard.Classes.ClassConstantVisibility" />
     <rule ref="SlevomatCodingStandard.Classes.ClassStructure">
         <properties>

phpstan.neon.dist

@@ -2,6 +2,8 @@ includes:
     - phar://phpstan.phar/conf/config.levelmax.neon
     - phar://phpstan.phar/conf/bleedingEdge.neon
     - ./vendor/phpstan/phpstan-strict-rules/rules.neon
+    - ./vendor/phpstan/phpstan-phpunit/extension.neon
+    - ./vendor/phpstan/phpstan-phpunit/rules.neon
 
 parameters:
     paths:

tests/Doctrine/MySql/UseIndexSqlWalkerTest.php

@@ -24,7 +24,7 @@ public function testWalker(string $dql, callable $configureQueryCallback, ?strin
     {
         if ($expectedError !== null) {
             $this->expectException(LogicException::class);
-            $this->expectExceptionMessageMatches($expectedError);
+            $this->expectExceptionMessageRegExp($expectedError);
         }
 
         $entityManagerMock = $this->createEntityManagerMock();
@@ -105,7 +105,7 @@ static function (Query $query): void {
             static function (Query $query): void {
                 $query->setHint(
                     UseIndexSqlWalker::class,
-                    [IndexHint::use('IDX_FOO', Account::TABLE_NAME, 'a')],
+                    [IndexHint::use('IDX_FOO', Account::TABLE_NAME, 'a')]
                 );
             },
             'SELECT u0_.id AS id_0, u0_.account_id AS account_id_1'
@@ -121,7 +121,7 @@ static function (Query $query): void {
                     [
                         IndexHint::use('IDX_FOO', Account::TABLE_NAME, 'a'),
                         IndexHint::ignore('IDX_BAR', Account::TABLE_NAME, 'a'),
-                    ],
+                    ]
                 );
             },
             'SELECT u0_.id AS id_0, u0_.account_id AS account_id_1'
@@ -137,7 +137,7 @@ static function (Query $query): void {
                     [
                         IndexHint::use('IDX_FOO', Account::TABLE_NAME, 'a'),
                         IndexHint::use('IDX_BAR', Account::TABLE_NAME, 'a'),
-                    ],
+                    ]
                 );
             },
             'SELECT u0_.id AS id_0, u0_.account_id AS account_id_1'
@@ -155,7 +155,7 @@ static function (Query $query): void {
                         IndexHint::use('IDX_FOO', Account::TABLE_NAME, 'a'),
                         IndexHint::use('IDX_BAR', Account::TABLE_NAME, 'ma'),
                         IndexHint::use('IDX_BAZ', Account::TABLE_NAME, 'ma'),
-                    ],
+                    ]
                 );
             },
             'SELECT u0_.id AS id_0, u0_.account_id AS account_id_1'
@@ -193,7 +193,7 @@ static function (Query $query): void {
                     UseIndexSqlWalker::class,
                     [
                         IndexHint::use('IDX_FOO', 'unknown_table'),
-                    ],
+                    ]
                 );
             },
             null,
@@ -207,7 +207,7 @@ static function (Query $query): void {
                     UseIndexSqlWalker::class,
                     [
                         IndexHint::use('IDX_FOO', User::TABLE_NAME, 'unknown_alias'),
-                    ],
+                    ]
                 );
             },
             null,
@@ -219,7 +219,7 @@ static function (Query $query): void {
             static function (Query $query): void {
                 $query->setHint(
                     UseIndexSqlWalker::class,
-                    IndexHint::use('IDX_FOO', User::TABLE_NAME),
+                    IndexHint::use('IDX_FOO', User::TABLE_NAME)
                 );
             },
             null,
@@ -233,7 +233,7 @@ static function (Query $query): void {
                     UseIndexSqlWalker::class,
                     [
                         new stdClass(),
-                    ],
+                    ]
                 );
             },
             null,
@@ -245,7 +245,7 @@ static function (Query $query): void {
             static function (Query $query): void {
                 $query->setHint(
                     UseIndexSqlWalker::class,
-                    [IndexHint::use('IDX_FOO', Account::TABLE_NAME)],
+                    [IndexHint::use('IDX_FOO', Account::TABLE_NAME)]
                 );
             },
             null,