Merge pull request #169 from magento-commerce/MCLOUD-13145

Add support for PHP 8.4 to ece-tools

Author: andriyShevtsov

codeception.dist.yml

@@ -9,7 +9,6 @@ settings:
 extensions:
   enabled:
     - Codeception\Extension\RunFailed
-    - Codeception\Extension\FailedInfo
 params:
   - vendor/magento/magento-cloud-docker/tests/functional/configuration.dist.yml
   - env

composer.json

@@ -5,6 +5,10 @@
   "version": "2002.1.19",
   "license": "OSL-3.0",
   "repositories": {
+    "mcd": {
+      "type": "vcs",
+      "url": "https://github.com/magento-commerce/magento-cloud-docker.git"
+    },
     "repo.magento.com": {
       "type": "composer",
       "url": "https://repo.magento.com/"
@@ -16,17 +20,17 @@
     "ext-json": "*",
     "ext-sockets": "*",
     "colinmollenhour/credis": "^1.6.0 || ^1.13",
-    "composer/composer": "^1.9 || ^2.0 || !=2.2.16",
+    "composer/composer": "^1.9 || ^2.8 || !=2.2.16",
     "composer/semver": "@stable",
     "graylog2/gelf-php": "^2.0.1",
     "guzzlehttp/guzzle": "^7.3 || ^7.5",
-    "illuminate/config": "^5.5||^8.77",
+    "illuminate/config": "^10.0 || ^11.0",
     "magento/magento-cloud-components": "^1.0.8",
-    "magento/magento-cloud-docker": "^1.0.0",
+    "magento/magento-cloud-docker": "dev-MCLOUD-13147 as 1.3.99",
     "magento/magento-cloud-patches": "^1.0.20",
     "magento/quality-patches": "^1.1.0",
     "monolog/monolog": "^2.3 || ^2.7 || ^3.6",
-    "nesbot/carbon": "^1.0 || ^2.0",
+    "nesbot/carbon": "^1.0 || ^2.0 || ^3.8",
     "psr/container": "^1.0",
     "psr/log": "^1.0 || ^2.0 || ^3.0",
     "symfony/config": "^4.4 || ^5.1 || ^5.4 || ^6.4",
@@ -45,9 +49,9 @@
     "consolidation/robo": "^3.0",
     "php-mock/php-mock-phpunit": "^2.0",
     "phpmd/phpmd": "@stable",
-    "phpstan/phpstan": "~1.2.0",
-    "phpunit/php-code-coverage": "^9.2",
-    "phpunit/phpunit": "^9.5",
+    "phpstan/phpstan": "1.2.0 || ^2.0",
+    "phpunit/php-code-coverage": "^10.0",
+    "phpunit/phpunit": "^10.0",
     "squizlabs/php_codesniffer": "^3.0",
     "funkjedi/composer-include-files": "^1.0"
   },

src/App/Container.php

@@ -21,7 +21,7 @@
 /**
  * @inheritdoc
  * @codeCoverageIgnore
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings("PHPMD.CouplingBetweenObjects")
  */
 class Container implements ContainerInterface
 {

src/App/ErrorHandler.php

@@ -31,7 +31,6 @@ class ErrorHandler
         E_USER_ERROR => 'User Error',
         E_USER_WARNING => 'User Warning',
         E_USER_NOTICE => 'User Notice',
-        E_STRICT => 'Strict Notice',
         E_RECOVERABLE_ERROR => 'Recoverable Error',
         E_DEPRECATED => 'Deprecated Functionality',
         E_USER_DEPRECATED => 'User Deprecated Functionality',

src/App/GenericException.php

@@ -12,14 +12,14 @@
 /**
  * Base exception for general purposes.
  *
- * @SuppressWarnings(PHPMD.NumberOfChildren)
+ * @SuppressWarnings("PHPMD.NumberOfChildren")
  */
 class GenericException extends \Exception
 {
     /**
      * @inheritDoc
      */
-    public function __construct(string $message, int $code = 0, Throwable $previous = null)
+    public function __construct(string $message, int $code = 0, Throwable | null $previous = null)
     {
         parent::__construct($message, $code, $previous);
     }

src/App/Logger/Formatter/JsonErrorFormatter.php

@@ -53,6 +53,7 @@ public function __construct(
     public function format(\Monolog\LogRecord|array $record): string
     {
         // Monolog version 3 or higher.
+        /** @phpstan-ignore-next-line */
         if (\Monolog\Logger::API == 3) {
             try {
                 /** @phpstan-ignore-next-line */

src/App/Logger/HandlerFactory.php

@@ -23,7 +23,7 @@
 /**
  * The handler factory.
  *
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings("PHPMD.CouplingBetweenObjects")
  */
 class HandlerFactory
 {
@@ -73,7 +73,7 @@ public function __construct(
      * @return AbstractProcessingHandler
      * @throws LoggerException
      *
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings("PHPMD.CyclomaticComplexity")
      */
     public function create(string $handler): AbstractProcessingHandler
     {
@@ -172,6 +172,7 @@ private function normalizeLevel(string $level): int
         /** @phpstan-ignore-next-line */
         $normalizedLevel = Logger::toMonologLevel($level);
 
+        /** @phpstan-ignore-next-line */
         if (\Monolog\Logger::API == 3) {
             /** @phpstan-ignore-next-line */
             $normalizedLevel =  $normalizedLevel->value;

src/App/Logger/Processor/SanitizeProcessor.php

@@ -33,7 +33,7 @@ public function __construct(Sanitizer $sanitizer)
     public function __invoke(\Monolog\LogRecord|array $record)
     {
         // Monolog version 3 or higher.
-        if (\Monolog\Logger::API == 3) {
+        if (\Monolog\Logger::API == 3) { // @phpstan-ignore-line
             $message = $this->sanitizer->sanitize($record->message); // @phpstan-ignore-line
             // Create new LogRecord from existing and update the message,
             // since message is read only

src/Application.php

@@ -15,7 +15,7 @@
 /**
  * @inheritdoc
  *
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings("PHPMD.CouplingBetweenObjects")
  */
 class Application extends \Symfony\Component\Console\Application
 {

src/Command/ConfigShow/Renderer.php

@@ -114,7 +114,7 @@ protected function renderTable(OutputInterface $output, string $title, array $he
         $table = new Table($output);
         $table->setHeaders($header)
             ->setRows($rows);
-        if (method_exists($table, 'setColumnWidth')) {
+        if (method_exists($table, 'setColumnWidth')) { // @phpstan-ignore-line
             $table->setColumnWidth(0, 40);
             $table->setColumnWidth(1, 60);
         }