Merge branch 'main' into update/scssphp

# Conflicts:
#	composer.json
#	composer.lock

Author: tronsha

.github/workflows/php.yml

@@ -2,43 +2,40 @@ name: PHP Composer
 
 on:
   push:
-    branches: [ master ]
+    branches: [master]
   pull_request:
-    branches: [ master ]
+    branches: [master]
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-
-    - name: Validate composer.json and composer.lock
-      run: composer validate
-
-    - name: Cache Composer packages
-      id: composer-cache
-      uses: actions/cache@v2
-      with:
-        path: vendor
-        key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
-        restore-keys: |
-          ${{ runner.os }}-php-
-
-    - name: Composer update
-      run: composer update
-
-    - name: Install dependencies
-      if: steps.composer-cache.outputs.cache-hit != 'true'
-      run: composer install --prefer-dist --no-progress --no-suggest
-
-    - name: Run PHPUnit
-      run: phpunit
-
-    - name: Run PHPStan
-      uses: docker://oskarstark/phpstan-ga
-      env:
-        REQUIRE_DEV: true
-      with:
-        args: analyse src/ --level=6
+      - uses: actions/checkout@v2
+
+      - name: Setup PHP 8.0
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.0
+
+      - name: Validate composer.json and composer.lock
+        run: composer validate
+
+      - name: Cache Composer packages
+        id: composer-cache
+        uses: actions/cache@v2
+        with:
+          path: vendor
+          key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-php-
+
+      - name: Install dependencies
+        if: steps.composer-cache.outputs.cache-hit != 'true'
+        run: composer install --prefer-dist --no-progress --no-suggest
+
+      - name: Run PHPUnit
+        run: composer run phpunit
+
+      - name: Run PHPStan
+        run: composer run phpstan

.gitignore

@@ -10,3 +10,4 @@
 .php_cs.cache
 
 node_modules
+.phpunit.result.cache

composer.json

@@ -1,48 +1,47 @@
 {
-    "name": "paneon/php-vue-to-twig",
-    "description": "",
-    "type": "library",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Alexander Pape",
-            "email": "[email protected]"
-        }
-    ],
-    "require": {
-        "php": "^7.3|^8.0",
-        "ext-dom": "*",
-        "ext-libxml": "*",
-        "scssphp/scssphp": "1.9",
-        "squizlabs/php_codesniffer": "^3.3",
-        "ramsey/uuid": "^3.8"
-    },
-    "autoload": {
-        "psr-4": {
-            "Paneon\\VueToTwig\\": "src"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "Paneon\\VueToTwig\\": "src",
-            "Paneon\\VueToTwig\\Tests\\": "tests"
-        },
-        "files": [
-            "vendor/autoload.php"
-        ]
-
-    },
-    "require-dev": {
-        "ext-simplexml": "*",
-        "phpunit/phpunit": "^9",
-        "monolog/monolog": "^1.24",
-        "phpstan/phpstan": "^0.12",
-        "friendsofphp/php-cs-fixer": "^2.16"
-    },
-    "scripts": {
-        "cs:fix": "phpcbf --standard=phpcs.xml",
-        "cs:check": "phpcs --standard=phpcs.xml --colors -ps",
-        "phpstan": "@php vendor/bin/phpstan analyse src --level 6",
-        "phpunit": "@php vendor/phpunit/phpunit/phpunit"
+  "name": "paneon/php-vue-to-twig",
+  "description": "",
+  "type": "library",
+  "license": "MIT",
+  "authors": [
+    {
+      "name": "Alexander Pape",
+      "email": "[email protected]"
+    }
+  ],
+  "require": {
+    "php": "^7.3|^8.0",
+    "ext-dom": "*",
+    "ext-libxml": "*",
+    "scssphp/scssphp": "1.9",
+    "squizlabs/php_codesniffer": "^3.3",
+    "ramsey/uuid": "^3.8"
+  },
+  "autoload": {
+    "psr-4": {
+      "Paneon\\VueToTwig\\": "src"
     }
+  },
+  "autoload-dev": {
+    "psr-4": {
+      "Paneon\\VueToTwig\\": "src",
+      "Paneon\\VueToTwig\\Tests\\": "tests"
+    },
+    "files": [
+      "vendor/autoload.php"
+    ]
+  },
+  "require-dev": {
+    "ext-simplexml": "*",
+    "phpunit/phpunit": "^9",
+    "monolog/monolog": "^1.24",
+    "phpstan/phpstan": "^0.12",
+    "friendsofphp/php-cs-fixer": "^2.16"
+  },
+  "scripts": {
+    "cs:fix": "phpcbf --standard=phpcs.xml",
+    "cs:check": "phpcs --standard=phpcs.xml --colors -ps",
+    "phpstan": "@php vendor/bin/phpstan analyse src --level 6",
+    "phpunit": "@php vendor/phpunit/phpunit/phpunit"
+  }
 }