Merge pull request #88 from laravel-shift/l11-compatibility

Laravel 11.x Compatibility

.github/workflows/php.yml

@@ -2,17 +2,22 @@ name: Tests
 
 on:
   push:
-    branches: [ main ]
+    branches:
+      - main
   pull_request:
-    branches: [ main ]
+    branches:
+      - main
 
 jobs:
   build:
     runs-on: ubuntu-latest
+
     strategy:
       matrix:
-        php-versions: [8.1]
+        php-versions: [8.1, '8.2']
+
     name: PHP ${{ matrix.php-versions }} Test
+
     services:
       redis:
         image: redis
@@ -24,32 +29,41 @@ jobs:
         ports:
           - 11211:11211
         options: --health-cmd "timeout 5 bash -c 'cat < /dev/null > /dev/udp/127.0.0.1/11211'" --health-interval 10s --health-timeout 5s --health-retries 5
+
     steps:
-    - uses: actions/checkout@v2
-    - name: Setup PHP
-      uses: shivammathur/setup-php@v2
-      with:
-        php-version: ${{ matrix.php-versions }}
-        extensions: memcached
-        coverage: pcov
-    - 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: dump autoload
-      run: composer dump-autoload
-    - name: Run test suite
-      run: vendor/bin/phpunit
-    - name: Run cs
-      run: composer run-script phpcs
-    - name: Run analyse
-      run: composer run-script analyse
+      - uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-versions }}
+          extensions: memcached
+          coverage: pcov
+
+      - 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: dump autoload
+        run: composer dump-autoload
+
+      - name: Run test suite
+        run: vendor/bin/phpunit
+
+      - name: Run cs
+        run: composer run-script phpcs
+
+      - name: Run analyse
+        run: composer run-script analyse

composer.json

@@ -1,80 +1,80 @@
 {
-  "name": "ytake/laravel-smarty",
-  "description": "Smarty template engine for Laravel and Lumen",
-  "keywords": [
-    "laravel",
-    "smarty",
-    "template",
-    "view",
-    "cache",
-    "lumen"
-  ],
-  "authors": [
-    {
-      "name": "Yuuki Takezawa",
-      "email": "[email protected]"
-    }
-  ],
-  "license": "MIT",
-  "require": {
-    "php": "^8.1",
-    "illuminate/support": "^10.0",
-    "illuminate/view": "^10.0",
-    "illuminate/config": "^10.0",
-    "illuminate/console": "^10.0",
-    "illuminate/events": "^10.0",
-    "smarty/smarty": "^4.3"
-  },
-  "require-dev": {
-    "predis/predis": "^2.1",
-    "symfony/framework-bundle": "^6.0",
-    "symfony/console": "^6.0",
-    "phpunit/phpunit": "^9.5.10",
-    "phpmd/phpmd": "^2.13",
-    "squizlabs/php_codesniffer": "^3.7",
-    "friendsofphp/php-cs-fixer": "^3.14",
-    "slevomat/coding-standard": "^8.8",
-    "sebastian/phpcpd": "*",
-    "phploc/phploc": "*",
-    "pdepend/pdepend": "^2.12",
-    "phpstan/phpstan": "^1.9"
-  },
-  "suggest": {
-    "ext-memcached": "memcached Template Cache Driver",
-    "predis/predis": "Redis Template Cache Driver"
-  },
-  "autoload": {
-    "psr-4": {
-      "Ytake\\LaravelSmarty\\": "src/"
-    }
-  },
-  "autoload-dev": {
-    "psr-4": {
-      "Tests\\": "tests/"
-    }
-  },
-  "scripts": {
-    "quality-assurance": [
-      "php ./vendor/bin/phpunit",
-      "php ./vendor/bin/phpcpd src/"
+    "name": "ytake/laravel-smarty",
+    "description": "Smarty template engine for Laravel and Lumen",
+    "keywords": [
+        "laravel",
+        "smarty",
+        "template",
+        "view",
+        "cache",
+        "lumen"
     ],
-    "pdepend": "php ./vendor/bin/pdepend  --summary-xml=tests/build/summary.xml --jdepend-chart=tests/quality-assurance/jdepend.svg --overview-pyramid=tests/quality-assurance/pyramid.svg src/",
-    "loc": "php ./vendor/bin/phploc src/ --log-xml=tests/quality-assurance/phploc.xml",
-    "phpcs": "./vendor/bin/phpcs src/ --report-full --report-source --colors",
-    "analyse": "./vendor/bin/phpstan analyse -c phpstan.neon"
-  },
-  "extra": {
-    "laravel": {
-      "providers": [
-        "Ytake\\LaravelSmarty\\SmartyServiceProvider",
-        "Ytake\\LaravelSmarty\\SmartyConsoleServiceProvider"
-      ]
-    }
-  },
-  "minimum-stability": "stable",
-  "config": {
-    "allow-plugins": {
-      "dealerdirect/phpcodesniffer-composer-installer": true
+    "authors": [
+        {
+            "name": "Yuuki Takezawa",
+            "email": "[email protected]"
+        }
+    ],
+    "license": "MIT",
+    "require": {
+        "php": "^8.1",
+        "illuminate/support": "^10.0|^11.0",
+        "illuminate/view": "^10.0|^11.0",
+        "illuminate/config": "^10.0|^11.0",
+        "illuminate/console": "^10.0|^11.0",
+        "illuminate/events": "^10.0|^11.0",
+        "smarty/smarty": "^4.3"
+    },
+    "require-dev": {
+        "predis/predis": "^2.1",
+        "symfony/framework-bundle": "^6.0|^7.0",
+        "symfony/console": "^6.0|^7.0",
+        "phpunit/phpunit": "^9.5.10|^10.5",
+        "phpmd/phpmd": "^2.13",
+        "squizlabs/php_codesniffer": "^3.7",
+        "friendsofphp/php-cs-fixer": "^3.14",
+        "slevomat/coding-standard": "^8.8",
+        "sebastian/phpcpd": "*",
+        "phploc/phploc": "*",
+        "pdepend/pdepend": "^2.12",
+        "phpstan/phpstan": "^1.9"
+    },
+    "suggest": {
+        "ext-memcached": "memcached Template Cache Driver",
+        "predis/predis": "Redis Template Cache Driver"
+    },
+    "autoload": {
+        "psr-4": {
+            "Ytake\\LaravelSmarty\\": "src/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Tests\\": "tests/"
+        }
+    },
+    "scripts": {
+        "quality-assurance": [
+            "php ./vendor/bin/phpunit",
+            "php ./vendor/bin/phpcpd src/"
+        ],
+        "pdepend": "php ./vendor/bin/pdepend  --summary-xml=tests/build/summary.xml --jdepend-chart=tests/quality-assurance/jdepend.svg --overview-pyramid=tests/quality-assurance/pyramid.svg src/",
+        "loc": "php ./vendor/bin/phploc src/ --log-xml=tests/quality-assurance/phploc.xml",
+        "phpcs": "./vendor/bin/phpcs src/ --report-full --report-source --colors",
+        "analyse": "./vendor/bin/phpstan analyse -c phpstan.neon"
+    },
+    "extra": {
+        "laravel": {
+            "providers": [
+                "Ytake\\LaravelSmarty\\SmartyServiceProvider",
+                "Ytake\\LaravelSmarty\\SmartyConsoleServiceProvider"
+            ]
+        }
+    },
+    "minimum-stability": "stable",
+    "config": {
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
     }
-  }
 }