updated PHPStan and codeception

Author: petrparolek

.github/workflows/main.yaml

@@ -138,7 +138,7 @@ jobs:
 
     strategy:
       matrix:
-        php-version: [ "7.1", "7.2", "7.3", "7.4", "8.0" ]
+        php-version: [ "7.2", "7.3", "7.4", "8.0" ]
         operating-system: [ "ubuntu-latest" ]
         composer-args: [ "" ]
         include:

Makefile

@@ -12,7 +12,7 @@ csf:
 	vendor/bin/codefixer src tests
 
 phpstan:
-	vendor/bin/phpstan analyse -l max -c phpstan.neon src
+	vendor/bin/phpstan analyse -l 8 -c phpstan.neon src
 
 tests:
 	vendor/bin/codecept run

composer.json

@@ -15,18 +15,18 @@
   },
   "require-dev": {
     "codeception/codeception": "^4.1.20",
-    "codeception/module-asserts": "^1.3.1",
-    "codeception/module-phpbrowser": "^1.0.2",
+    "codeception/module-asserts": "^1.3.1|^2.0",
+    "codeception/module-phpbrowser": "^1.0.2|^2.0",
     "latte/latte": "^2.7",
-    "nette/application": "~3.1.0",
+    "nette/application": "~3.1.4",
     "nette/di": "^3.0",
     "nette/tester": "^2.3.2",
     "ninjify/nunjuck": "^0.3",
     "ninjify/qa": "^0.12",
-    "phpstan/phpstan": "^0.12",
-    "phpstan/phpstan-deprecation-rules": "^0.12",
-    "phpstan/phpstan-nette": "^0.12",
-    "phpstan/phpstan-strict-rules": "^0.12",
+    "phpstan/phpstan": "^1.0",
+    "phpstan/phpstan-deprecation-rules": "^1.0",
+    "phpstan/phpstan-nette": "^1.0",
+    "phpstan/phpstan-strict-rules": "^1.0",
     "webchemistry/testing-helpers": "^3.0.0"
   },
   "prefer-stable": true,

src/Wizard.php

@@ -122,6 +122,7 @@ public function getStepCounter(): StepCounter
 	{
 		$counter = 1;
 		if ($this->stepCounter === null) {
+			/** @phpstan-ignore-next-line $counter */
 			for ($counter = 1; $counter < 1000; $counter++) {
 				if (!method_exists($this, 'createStep' . $counter) && !$this->getComponent('step' . $counter, false)) {
 					$counter--;

tests/_support/_generated/UnitTesterActions.php

@@ -1,4 +1,4 @@
-<?php  //[STAMP] 7e6c6e8dff53d5c6d3b146271eb7b854
+<?php  //[STAMP] 1c0e31bd853b62bc2c914e187b574323
 namespace _generated;
 
 // This class was automatically generated by build task
@@ -13,41 +13,6 @@ trait UnitTesterActions
     abstract protected function getScenario();
 
 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Handles and checks exception called inside callback function.
-     * Either exception class name or exception instance should be provided.
-     *
-     * ```php
-     * <?php
-     * $I->expectException(MyException::class, function() {
-     *     $this->doSomethingBad();
-     * });
-     *
-     * $I->expectException(new MyException(), function() {
-     *     $this->doSomethingBad();
-     * });
-     * ```
-     * If you want to check message or exception code, you can pass them with exception instance:
-     * ```php
-     * <?php
-     * // will check that exception MyException is thrown with "Don't do bad things" message
-     * $I->expectException(new MyException("Don't do bad things"), function() {
-     *     $this->doSomethingBad();
-     * });
-     * ```
-     *
-     * @deprecated Use expectThrowable() instead
-     * @param \Exception|string $exception
-     * @param callable $callback
-     * @see \Codeception\Module\Asserts::expectException()
-     */
-    public function expectException($exception, $callback) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('expectException', func_get_args()));
-    }
-
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -73,12 +38,11 @@ public function expectException($exception, $callback) {
      * });
      * ```
      *
-     * @param \Throwable|string $throwable
-     * @param callable $callback
+     * @param Throwable|string $throwable
      * @see \Codeception\Module\Asserts::expectThrowable()
      */
-    public function expectThrowable($throwable, $callback) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('expectThrowable', func_get_args()));
+    public function expectThrowable($throwable, callable $callback): void {
+        $this->getScenario()->runStep(new \Codeception\Step\Action('expectThrowable', func_get_args()));
     }