[internal] CI for php 8.2 and 8.3

mpoiriert · Jan 16, 2024 · d7b6e14 · d7b6e14
1 parent f800d23
commit d7b6e14
Show file tree

Hide file tree

Showing 9 changed files with 112 additions and 119 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -39,7 +39,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.1']
+        php-versions: ['8.1', '8.2', '8.3']
     steps:
       - name: Checkout
         uses: actions/checkout@v2

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -3,6 +3,7 @@
 $finder = (new \PhpCsFixer\Finder)
     ->in(__DIR__)
     ->exclude('var')
+    ->exclude('bin')
     ->exclude('packages/fixer/Tests/fixtures/ClassPrivateStaticCallFixerTest')
     ->exclude('packages/fixer/Tests/fixtures/ClassStaticCallFixerTest')
 ;

diff --git a/composer.json b/composer.json
@@ -74,7 +74,7 @@
         "monolog/monolog": "^2.4.0",
         "nelmio/cors-bundle": "^2.0",
         "pdeans/http": "^1.1",
-        "pelago/emogrifier": "^6.0",
+        "pelago/emogrifier": "^7.0",
         "scheb/2fa-bundle": "^6.0",
         "endroid/qr-code": "^4.8",
         "scheb/2fa-totp": "^6.0",

diff --git a/composer.lock b/composer.lock
diff --git a/packages/console/EventListener/CommandFlowListener.php b/packages/console/EventListener/CommandFlowListener.php
@@ -41,7 +41,7 @@ public static function getSubscribedEvents(): array
                 ['loadIdFromInput', -10],
                 ['generateFromDatabase', -10],
             ],
-            Event\ConsoleCommandEvent::class => [
+            ConsoleCommandEvent::class => [
                 ['configureOptions', 1],
                 ['logCommandStart', 0],
             ],
@@ -58,7 +58,7 @@ public function __construct(
     ) {
     }
 
-    public function configureOptions(Event\ConsoleCommandEvent $event): void
+    public function configureOptions(ConsoleCommandEvent $event): void
     {
         $definition = $event->getCommand()->getDefinition();
 
@@ -163,7 +163,7 @@ public function generateFromDatabase(LoadExecutionIdEvent $event): void
         $event->setExecutionId($executionId);
     }
 
-    public function logCommandStart(Event\ConsoleCommandEvent $event): void
+    public function logCommandStart(ConsoleCommandEvent $event): void
     {
         if ($event->getInput()->getOption(self::OPTION_IGNORE)) {
             return;

diff --git a/packages/console/Tests/EventListener/CommandFlowListenerTest.php b/packages/console/Tests/EventListener/CommandFlowListenerTest.php
@@ -89,7 +89,7 @@ public function testGetSubscribedEvents(): void
                     ['loadIdFromInput', -10],
                     ['generateFromDatabase', -10],
                 ],
-                Event\ConsoleCommandEvent::class => [
+                ConsoleCommandEvent::class => [
                     ['configureOptions', 1],
                     ['logCommandStart', 0],
                 ],
@@ -521,7 +521,7 @@ public function testLogCommandStartNoExecutionId(): void
             ->method('dispatch')
             ->willReturnArgument(0);
 
-        $event = new Event\ConsoleCommandEvent(
+        $event = new ConsoleCommandEvent(
             $command = $this->createMock(Command::class),
             $this->createMock(InputInterface::class),
             $this->createMock(OutputInterface::class)
@@ -549,7 +549,7 @@ public function testLogCommandStart(Execution $execution): void
             )
             ->willReturnArgument(0);
 
-        $event = new Event\ConsoleCommandEvent(
+        $event = new ConsoleCommandEvent(
             $command = $this->createMock(Command::class),
             $this->createMock(InputInterface::class),
             $this->createMock(OutputInterface::class)
@@ -837,14 +837,14 @@ private function createOptionExecutionIdInput(string $id): InputInterface
         return $input;
     }
 
-    private function createCommandEvent(): Event\ConsoleCommandEvent
+    private function createCommandEvent(): ConsoleCommandEvent
     {
         $command = new PurgeExecutionCommand(
             self::$entityManager->getConnection(),
             new NullLogger()
         );
 
-        return new Event\ConsoleCommandEvent(
+        return new ConsoleCommandEvent(
             $command,
             $this->createMock(InputInterface::class),
             $this->createMock(OutputInterface::class)

diff --git a/packages/framework-extra-bundle/composer.json b/packages/framework-extra-bundle/composer.json
@@ -38,7 +38,7 @@
         "draw/validator": "^0.11",
         "draw/workflow": "^0.11",
         "monolog/monolog": "^2.4.0",
-        "pelago/emogrifier": "^6.0",
+        "pelago/emogrifier": "^7.0",
         "phpunit/phpunit": "^9.0 || ^10.0",
         "psr/log": "@stable",
         "symfony/event-dispatcher": "^6.4.0",

diff --git a/packages/mailer/Tests/EventListener/EmailCssInlinerListenerTest.php b/packages/mailer/Tests/EventListener/EmailCssInlinerListenerTest.php
@@ -94,13 +94,7 @@ public function testInlineEmailCss(): void
             ->expects(static::once())
             ->method('html')
             ->with('<!DOCTYPE html>
-<html lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title></title>
-</head>
-<body><div class="body" style="background: maroon;"></div></body>
-</html>
+<html lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"><title></title></head><body><div class="body" style="background: maroon;"></div></body></html>
 ');
 
         $this->object->inlineEmailCss($event);

diff --git a/packages/mailer/composer.json b/packages/mailer/composer.json
@@ -17,7 +17,7 @@
     },
     "require-dev": {
         "draw/tester": "^0.11",
-        "pelago/emogrifier": "^6.0",
+        "pelago/emogrifier": "^7.0",
         "phpunit/phpunit": "^9.0 || ^10.0"
     },
     "minimum-stability": "dev",