Merge pull request #76 from ostark/craft5

Craft5
ostark · Apr 18, 2024 · 7d93e6a · 7d93e6a
2 parents 90e5ddd + ccb5988
commit 7d93e6a
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 11,308 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,6 +12,7 @@ composer.lock
 /node_modules/*
 /build/*
 /yarn-error.log
+/tests/_craft/storage/*
 
 # MISC FILES
 .cache

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file.
 
+## [3.2.0] - 2024-04-18
+
+- Craft 5 compatibility
+
 ## [3.1.1] - 2023-01-04
 
 - composer housekeeping, thanks @markhuot

diff --git a/composer.json b/composer.json
@@ -22,7 +22,7 @@
   ],
   "require": {
     "php": "^8.0",
-    "craftcms/cms": "^4.0.0",
+    "craftcms/cms": "^4.0|^5.0",
     "symfony/process": "^5.0|^6.0"
   },
   "autoload": {

diff --git a/src/QueueCommand.php b/src/QueueCommand.php
@@ -45,6 +45,7 @@ public function getPreparedCommand(callable $wrapper = null): string
             throw new PhpExecutableNotFound('Unable to find php executable.');
         }
 
+        $php = str_replace(' ', '\ ', $php);
         $path = realpath(CRAFT_BASE_PATH);
         $script = $path . DIRECTORY_SEPARATOR . $this->scriptName;
         $commandLine = implode(" ", [$php, $script, $this->scriptArgs]);

diff --git a/src/TestUtility/Utility.php b/src/TestUtility/Utility.php
@@ -64,7 +64,7 @@ public static function setup(Plugin $plugin): void
         // Register the Utility
         Event::on(
             Utilities::class,
-            Utilities::EVENT_REGISTER_UTILITY_TYPES, function (RegisterComponentTypesEvent $event): void {
+            Utilities::EVENT_REGISTER_UTILITIES, function (RegisterComponentTypesEvent $event): void {
             $event->types[] = Utility::class;
         });
 

diff --git a/tests/BackgroundProcessRunTest.php b/tests/BackgroundProcessRunTest.php
@@ -35,6 +35,7 @@ public function test_start_default_dummy_script_success(): void
         // give it some time to write the test file
         usleep(150000);
 
+
         $this->assertEquals(0, $process->getExitCode());
         $this->assertTrue($process->isSuccessful());
         $this->assertEquals(\Symfony\Component\Process\Process::STATUS_TERMINATED, $process->getStatus());

diff --git a/tests/RateLimiterTest.php b/tests/RateLimiterTest.php
@@ -10,7 +10,7 @@
  */
 class RateLimiterTest extends TestCase
 {
-    public $plugin;
+    public \ostark\AsyncQueue\Plugin $plugin;
 
     public function setUp(): void
     {

diff --git a/tests/_craft/storage/logs/console-2024-04-18.log b/tests/_craft/storage/logs/console-2024-04-18.log
@@ -0,0 +1,4 @@
+2024-04-18 08:49:46 [console.INFO] [yii\db\Connection::open] Opening DB connection: mysql:host=;dbname=;port=3306 {"memory":8712496} 
+2024-04-18 08:49:46 [console.INFO] [yii\db\Connection::open] Opening DB connection: mysql:host=;dbname=;port=3306 {"memory":9824936} 
+2024-04-18 08:50:06 [console.INFO] [yii\db\Connection::open] Opening DB connection: mysql:host=;dbname=;port=3306 {"memory":8712488} 
+2024-04-18 08:50:06 [console.INFO] [yii\db\Connection::open] Opening DB connection: mysql:host=;dbname=;port=3306 {"memory":8712488} 
diff --git a/tests/_craft/storage/logs/console.log b/tests/_craft/storage/logs/console.log
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -29,6 +29,7 @@
 $configService->appDefaultsDir = dirname(__DIR__) . DIRECTORY_SEPARATOR . 'src' . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'defaults';
 $generalConfig = $configService->getConfigFromFile('general');
 
+/** @var array{class: class-string, array<string, mixed>} $config */
 $config = \craft\helpers\ArrayHelper::merge(
     [
         'vendorPath' => CRAFT_VENDOR_PATH,