Merge pull request #9 from webfactory/test-symfony-5

Extend matrix to test with Symfony 5.x and Twig 3.x

Author: mpdude

.github/workflows/dependencies.yml

@@ -0,0 +1,32 @@
+name: Dependencies
+
+permissions:
+    contents: read
+
+on:
+    push:
+        branches:
+            - master
+    pull_request:
+
+env:
+    PHP_VERSION: 7.2
+
+jobs:
+    composer-require-checker:
+        name: Check missing composer requirements
+        runs-on: ubuntu-20.04
+        steps:
+            -   uses: shivammathur/setup-php@v2
+                with:
+                  php-version: ${{ env.PHP_VERSION }}
+                  tools: composer:v2
+            -   uses: actions/checkout@v2
+            -   uses: actions/cache@v2
+                with:
+                    path: vendor
+                    key: composer-${{ runner.os }}-${{ env.PHP_VERSION }}-${{ matrix.symfony-locked-version }}-${{ matrix.dependency-version }}-${{ hashFiles('composer.json') }}
+                    restore-keys: |
+                        composer-${{ runner.os }}-${{ env.PHP_VERSION }}-${{ matrix.symfony-locked-version }}-${{ matrix.dependency-version }}-
+            -   run: composer install --no-interaction --no-scripts --no-progress --prefer-dist
+            -   uses: docker://webfactory/composer-require-checker:3.2.0

.github/workflows/tests.yml

@@ -13,12 +13,13 @@ env:
 jobs:
     PHPUnit:
 
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-18.04
         strategy:
             fail-fast: false
             matrix:
                 include:
                     - { symfony-locked-version: none, dependency-version: prefer-lowest }
+                    - { symfony-locked-version: none, dependency-version: prefer-stable }
                     - { symfony-locked-version: 3.4.*, dependency-version: prefer-stable }
                     - { symfony-locked-version: 4.4.*, dependency-version: prefer-stable }
         name: PHPUnit (Symfony Version Lock ${{ matrix.symfony-locked-version }}, ${{ matrix.dependency-version }})
@@ -31,13 +32,13 @@ jobs:
             -   uses: actions/cache@v2
                 with:
                     path: vendor
-                    key: composer-${{ runner.os }}-${{ env.PHP_VERSION }}-${{ matrix.symfony-locked-version }}-${{ matrix.dependency-version }}-${{ hashFiles('composer.json', 'composer.lock') }}
+                    key: composer-${{ runner.os }}-${{ env.PHP_VERSION }}-${{ matrix.symfony-locked-version }}-${{ matrix.dependency-version }}-${{ hashFiles('composer.json') }}
                     restore-keys: |
                         composer-${{ runner.os }}-${{ env.PHP_VERSION }}-${{ matrix.symfony-locked-version }}-${{ matrix.dependency-version }}-
-                        composer-${{ runner.os }}-${{ env.PHP_VERSION }}-
-                        composer-${{ runner.os }}-
             -   run: VERSION=${{ matrix.symfony-locked-version }} .github/workflows/lock-symfony-version.sh
                 if: matrix.symfony-locked-version != 'none'
             -   run: composer update --${{ matrix.dependency-version }} --no-interaction --no-scripts --no-progress --prefer-dist
             -   run: composer show
             -   run: vendor/bin/phpunit
+            -   uses: lhotari/action-upterm@v1
+                if: failure()

.gitignore

@@ -3,4 +3,4 @@ vendor/
 phpunit.xml
 .phpunit.result.cache
 .php_cs.cache
-Tests/Fixtures/cache/
+tests/Fixtures/cache/

Tests/Fixtures/cache/.keepme

@@ -5,29 +5,40 @@
 
     "require": {
         "php": ">=7.2",
+        "ext-json": "*",
+        "ext-mbstring": "*",
         "psr/log": "^1.0.2",
-        "symfony/dependency-injection": "^3.4.11|^4.0",
-        "symfony/http-kernel": "^3.4.11|^4.0",
-        "symfony/twig-bundle": "^3.4.11|^4.0",
+        "symfony/config": "^3.4.11|^4.0|^5.0",
+        "symfony/dependency-injection": "^3.4.11|^4.0|^5.0",
+        "symfony/http-foundation": "^3.4.11|^4.0|^5.0",
+        "symfony/http-kernel": "^3.4.11|^4.0|^5.0",
         "thunderer/shortcode": "^0.6.5|^0.7",
-        "twig/twig": "^1.34|^2.0"
+        "twig/twig": "^1.34|^2.0|^3.0"
     },
 
     "require-dev": {
-        "phpunit/phpunit": "^7.0|^8.0",
-        "symfony/expression-language": "^3.4.11|^4.0",
-        "symfony/framework-bundle": "^3.4.11|^4.0",
+        "phpunit/phpunit": "^7.0|^8.0|^9.0",
+        "symfony/expression-language": "^3.4.11|^4.0|^5.0",
+        "symfony/framework-bundle": "^3.4.11|^4.0|^5.0",
         "symfony/phpunit-bridge": "*",
-        "symfony/templating": "^3.4.11|^4.0",
-        "symfony/yaml": "^3.4.11|^4.0"
+        "symfony/routing": "^3.4.11|^4.0|^5.0",
+        "symfony/templating": "^3.4.11|^4.0|^5.0",
+        "symfony/twig-bundle": "^3.4.11|^4.0|^5.0",
+        "symfony/yaml": "^3.4.11|^4.0|^5.0"
     },
 
     "autoload": {
         "psr-4": {
-            "Webfactory\\ShortcodeBundle\\": ""
+            "Webfactory\\ShortcodeBundle\\": "src"
         }
     },
 
+    "autoload-dev": {
+        "psr-4": {
+            "Webfactory\\ShortcodeBundle\\Tests\\": "tests"
+        }
+    },
+
     "config": {
         "sort-packages": true
     }