Raise minimum PHP requirements to ^8.0 and yiisoft/aliasess to ^2.0 +…

… Fix psalm errors (#172)

.editorconfig

@@ -12,3 +12,6 @@ trim_trailing_whitespace = true
 
 [*.md]
 trim_trailing_whitespace = false
+
+[*.yml]
+indent_size = 2

.github/workflows/build.yml

@@ -21,7 +21,6 @@ jobs:
           - windows-latest
 
         php:
-          - "7.4"
           - "8.0"
 
     steps:
@@ -51,15 +50,12 @@ jobs:
           key: php${{ matrix.php }}-composer-${{ hashFiles('**/composer.json') }}
           restore-keys: |
             php${{ matrix.php }}-composer-
+      - name: Update composer
+        run: composer self-update
 
-      - name: Install dependencies with composer php 7.4
-        if: matrix.php == '7.4'
+      - name: Install dependencies with composer
         run: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
 
-      - name: Install dependencies with composer php 8.0
-        if: matrix.php == '8.0'
-        run: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader --ignore-platform-reqs --ansi
-
       - name: Run tests with codeception
         run: |
           php -S 127.0.0.1:8080 -t public > ./runtime/yii.log 2>&1 &

.github/workflows/static.yml

@@ -16,11 +16,11 @@ jobs:
           - ubuntu-latest
 
         php:
-          - "7.4"
+          - "8.0"
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v2
 
       - name: Install PHP
         uses: shivammathur/setup-php@v2

.scrutinizer.yml

@@ -1,41 +1,41 @@
 checks:
-    php: true
+  php: true
 
 filter:
-    paths:
-        - "src/*"
-    excluded_paths:
-        - "src/ApplicationRunner.php"
-        - "src/Installer.php"
+  paths:
+    - "src/*"
+  excluded_paths:
+    - "src/ApplicationRunner.php"
+    - "src/Installer.php"
 
 build:
-    nodes:
-        analysis:
-            environment:
-                php: 7.4.12
-
-            tests:
-                override:
-                    - php-scrutinizer-run
-
-        tests-and-coverage:
-            environment:
-                php: 7.4.12
-
-            dependencies:
-                override:
-                    - composer self-update
-                    - composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
-
-            tests:
-                override:
-                    -
-                        command: |
-                            php -S 127.0.0.1:8080 -t public public/index-test.php > ./runtime/yii.log 2>&1 &
-                            vendor/bin/codecept run --coverage-xml
-                        on_node: 1
-                        coverage:
-                            file: runtime/tests/_output/coverage.xml
-                            format: php-clover
-
-
+  nodes:
+    analysis:
+      environment:
+        php: 8.0.6
+
+      tests:
+        override:
+          - php-scrutinizer-run
+
+    tests-and-coverage:
+      environment:
+        php:
+          version: 8.0.6
+          ini:
+            xdebug.mode: coverage
+
+      dependencies:
+        override:
+          - composer self-update
+          - composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
+
+      tests:
+        override:
+          - command: |
+              php -S 127.0.0.1:8080 -t public public/index-test.php > ./runtime/yii.log 2>&1 &
+              vendor/bin/codecept run --coverage-xml
+            on_node: 1
+            coverage:
+              file: runtime/tests/_output/coverage.xml
+              format: php-clover

README.md

@@ -24,11 +24,11 @@ Yii application template for Yii 3 is best for rapidly creating projects.
 
 ## Requirements
 
-The minimum requirement by this project template that your Web server supports PHP 7.4.0.
+The minimum requirement by this project template that your Web server supports PHP 8.0.
 
 ## Installation
 
-You'll need at least PHP 7.4.
+You'll need at least PHP 8.0.
 
 If you do not have [Composer](http://getcomposer.org/), you may install it by following the instructions
 at [getcomposer.org](http://getcomposer.org/doc/00-intro.md).

composer.json

@@ -17,13 +17,13 @@
         ]
     },
     "require": {
-        "php": "^7.4|^8.0",
+        "php": "^8.0",
         "httpsoft/http-message": "^1.0.5",
         "psr/container": "^1.0",
         "psr/http-message": "^1.0",
         "psr/http-server-handler": "^1.0",
         "symfony/console": "^5.3",
-        "yiisoft/aliases": "^1.1|^2.0",
+        "yiisoft/aliases": "^2.0",
         "yiisoft/assets": "^1.0",
         "yiisoft/cache": "^1.0",
         "yiisoft/cache-file": "^1.0",

psalm.xml

@@ -8,9 +8,6 @@
 >
     <projectFiles>
         <directory name="src" />
-        <ignoreFiles>
-            <directory name="vendor" />
-        </ignoreFiles>
     </projectFiles>
 </psalm>
 

src/ApplicationRunner.php

@@ -59,6 +59,7 @@ public function run(): void
         // Register error handler with real container-configured dependencies.
         $this->registerErrorHandler($container->get(ErrorHandler::class), $errorHandler);
 
+        /** @var Container */
         $container = $container->get(ContainerInterface::class);
 
         if ($this->debug) {

src/Installer.php

@@ -4,7 +4,6 @@
 
 namespace App;
 
-use Composer\Script\Event;
 use FilesystemIterator as FSIterator;
 use RecursiveDirectoryIterator as DirIterator;
 use RecursiveIteratorIterator as RIterator;
@@ -14,7 +13,7 @@ final class Installer
     /**
      * @psalm-suppress UndefinedClass
      */
-    public static function postUpdate(Event $event = null): void
+    public static function postUpdate(): void
     {
         self::chmodRecursive('runtime', 0777);
         self::chmodRecursive('public/assets', 0777);
@@ -24,6 +23,7 @@ private static function chmodRecursive(string $path, int $mode): void
     {
         chmod($path, $mode);
 
+        /** @psalm-var iterable<array-key, string> $iterator */
         $iterator = new RIterator(
             new DirIterator($path, FSIterator::SKIP_DOTS | FSIterator::CURRENT_AS_PATHNAME),
             RIterator::SELF_FIRST