PHP 8.4 support (#454)

* Fix test suite * phpcbf * Revert "phpcbf" This reverts commit b4b739d. * phpcbf * revert ci.yml * remove old code * PHP 8.4 support
rcrowe · Feb 12, 2025 · b1e0d2b · b1e0d2b
1 parent 20a3e79
commit b1e0d2b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,11 +11,13 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [ '8.1', '8.2', '8.3']
+        php: [ '8.1', '8.2', '8.3', '8.4']
         laravel: [ '9', '10', '11' ]
         exclude:
           - laravel: 11
             php: 8.1
+          - laravel: 9
+            php: 8.4
 
     name: PHP ${{ matrix.php }}; Laravel ${{ matrix.laravel }}
 

diff --git a/src/Bridge.php b/src/Bridge.php
@@ -36,7 +36,7 @@ class Bridge extends Environment
     /**
      * {@inheritdoc}
      */
-    public function __construct(LoaderInterface $loader, $options = [], Container $app = null)
+    public function __construct(LoaderInterface $loader, $options = [], ?Container $app = null)
     {
         // Twig 2.0 doesn't support `true` anymore
         if (isset($options['autoescape']) && $options['autoescape'] === true) {

diff --git a/tests/Extension/Laravel/Legacy/FacadesTest.php b/tests/Extension/Laravel/Legacy/FacadesTest.php
@@ -118,7 +118,7 @@ public function testGetFunction()
         $this->assertInstanceOf(TwigFunction::class, $facade->getFunction('foo_bar'));
     }
 
-    protected function getFacade(Environment $twig = null)
+    protected function getFacade(?Environment $twig = null)
     {
         $app = $this->getApplication();