Merge pull request #26 from magento-commerce/php8.4_support

Php8.4 support
magento · Jan 6, 2025 · f785d2b · f785d2b
2 parents 526da66 + 8afaf3f
commit f785d2b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -17,6 +17,7 @@ jobs:
           - "8.1"
           - "8.2"
           - "8.3"
+          - "8.4"
         dependencies:
           - "lowest"
           - "highest"

diff --git a/composer.json b/composer.json
@@ -8,12 +8,12 @@
     "AFL-3.0"
   ],
   "require": {
-    "php": "~7.4.0||~8.1.0||~8.2.0||~8.3.0",
-    "composer/composer": "^2.0",
+    "php": "~7.4.0||~8.1.0||~8.2.0||~8.3.0||~8.4.0",
+    "composer/composer": "^2.1.13",
     "symfony/console": "~4.4.0||~5.4.0||~6.4.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "^9 || ^10"
+    "phpunit/phpunit": "^9.5.10 || ^10"
   },
   "autoload": {
     "psr-4": {

diff --git a/src/MagentoComposerApplication.php b/src/MagentoComposerApplication.php
@@ -65,9 +65,9 @@ class MagentoComposerApplication
     public function __construct(
         $pathToComposerHome,
         $pathToComposerJson,
-        Application $consoleApplication = null,
-        ConsoleArrayInputFactory $consoleArrayInputFactory = null,
-        BufferedOutput $consoleOutput = null
+        ?Application $consoleApplication = null,
+        ?ConsoleArrayInputFactory $consoleArrayInputFactory = null,
+        ?BufferedOutput $consoleOutput = null
     ) {
         $this->consoleApplication = $consoleApplication ? $consoleApplication : new Application();
         $this->consoleArrayInputFactory = $consoleArrayInputFactory ? $consoleArrayInputFactory
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,6 +17,7 @@ jobs: @@
               - "8.1"
               - "8.2"
               - "8.3"
+              - "8.4"
             dependencies:
               - "lowest"
               - "highest"
@@ Expand Down @@