Merge pull request #10 from dinhquochan/develop

Add: support laravel 9.x and drop laravel 6.x, 7.x

.github/workflows/tests.yml

@@ -8,8 +8,8 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [7.3, 7.4, 8.0]
-        laravel: [6.*, 7.*, 8.*]
+        php: [7.3, 7.4, 8.0, 8.1]
+        laravel: [8.*, 9.*]
         dependency-version: [prefer-lowest, prefer-stable]
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - S${{ matrix.stability }}
@@ -35,4 +35,3 @@ jobs:
 
       - name: Execute tests
         run: vendor/bin/phpunit --verbose
-

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 All notable changes to `laravel-twig` will be documented in this file
 
+## 2.0.0 - 2022-01-18
+
+- Support Laravel 9.x
+- Remove Support Laravel 6.x, 7.x
+
 ## 1.4.0 - 2021-02-18
 
 - Add PHP 8.0 support

composer.json

@@ -13,13 +13,13 @@
     ],
     "require": {
         "php": "^7.3|^8.0",
-        "illuminate/console": "^6.20|^7.30|^8.28",
-        "illuminate/support": "^6.20|^7.30|^8.28",
-        "illuminate/view": "^6.20|^7.30|^8.28",
+        "illuminate/console": "^8.28|^9.0",
+        "illuminate/support": "^8.28|^9.0",
+        "illuminate/view": "^8.28|^9.0",
         "twig/twig": "~3.0"
     },
     "require-dev": {
-        "laravel/framework": "^6.20|^7.30|^8.28",
+        "laravel/framework": "^7.30|^8.28",
         "mockery/mockery": "^1.3.1",
         "phpunit/phpunit": "^8.4|^9.0"
     },

src/TwigEngine.php

@@ -6,7 +6,7 @@
 
 class TwigEngine implements Engine
 {
-    /*** @var \DinhQuocHan\Twig\TwigEnvironment */
+    /*** @var \DinhQuocHan\Twig\ */
     protected $environment;
 
     public function __construct(TwigEnvironment $environment)