Merge pull request #338 from bowphp/refactor/code-base

Refactoring queue and add more testing

Author: papac

.github/workflows/tests.yml

@@ -67,4 +67,4 @@ jobs:
         run: if [ ! -d /tmp/bowphp_testing ]; then mkdir -p /tmp/bowphp_testing; fi;
 
       - name: Run test suite
-        run: sudo composer run-script test
+        run: sudo composer run-script test || sudo composer run-script testdox

CHANGELOG.md

@@ -24,7 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## 5.1.2 - 2023-09-17
 
-Fix `db_seed` helper
+Fix `app_db_seed` helper
 
 Ref
 
@@ -60,16 +60,15 @@ Reference #248
 
 ## 5.0.8 - 2023-05-24
 
-Release 5.0.8
-
+Release **5.0.8**
 Fixes test case errors
 
 Reference #243
 From #242
 
 ## 5.0.7 - 2023-05-24
 
-Release 5.0.7
+Release **5.0.7**
 
 - Fixes the database relationship
 - Fixes the HTTP client
@@ -81,7 +80,7 @@ Fixes #240
 
 ## 5.0.6 - 2023-05-22
 
-Release 5.0.6
+Release **5.0.6**
 
 - Fixes get last insert id for pgsql
 - Add data validation custom message parser
@@ -95,7 +94,7 @@ References
 
 ## 5.0.5 - 2023-05-20
 
-Release 5.0.5
+Release **5.0.5**
 
 - Fix migration status table definition
 - Fix enum creation for pgsql
@@ -104,7 +103,7 @@ Reference #232
 
 ## 5.0.4 - 2023-05-19
 
-Release 5.0.4
+Release **5.0.4**
 
 - Fixes HTTP Client
 - Add variable binding to the env loader
@@ -124,7 +123,7 @@ Add many fixes
 
 ## 5.0.2 - 2023-05-16
 
-Release for 5.0.2
+Release **5.0.2**
 
 - Fix action dependency injector
 - Add the base error handler

composer.json

@@ -68,6 +68,7 @@
     "scripts": {
         "phpcbf": "phpcbf --standard=psr12 --severity=4 --tab-width=4 src tests",
         "phpcs": "phpcs --standard=psr12 --severity=4 --tab-width=4 src",
-        "test": "phpunit --configuration phpunit.dist.xml"
+        "test": "phpunit --configuration phpunit.dist.xml",
+        "testdox": "phpunit --configuration phpunit.dist.xml --testdox"
     }
 }

docker-compose.yml

@@ -127,3 +127,39 @@ services:
             interval: 10s
             timeout: 5s
             retries: 5
+    rabbitmq:
+        container_name: bowphp_rabbitmq
+        image: rabbitmq:3.11-management
+        restart: unless-stopped
+        ports:
+            - "5672:5672"
+            - "15672:15672"
+        environment:
+            RABBITMQ_DEFAULT_USER: guest
+            RABBITMQ_DEFAULT_PASS: guest
+        networks:
+            - bowphp_network
+        healthcheck:
+            test: ["CMD", "rabbitmq-diagnostics", "ping"]
+            interval: 10s
+            timeout: 5s
+            retries: 5
+    minio:
+        container_name: bowphp_minio
+        image: minio/minio
+        restart: unless-stopped
+        ports:
+            - "9000:9000"
+            - "9001:9001"
+        environment:
+            MINIO_ROOT_USER: minioadmin
+            MINIO_ROOT_PASSWORD: minioadmin
+        command: server /data --console-address ":9001"
+        networks:
+            - bowphp_network
+        healthcheck:
+            test: ["CMD", "mc", "alias", "set", "local", "http://localhost:9000", "minioadmin", "minioadmin"]
+            interval: 10s
+            timeout: 5s
+            retries: 5
+    

src/Cache/Adapters/FilesystemAdapter.php

@@ -73,10 +73,8 @@ private function makeHashFilename(string $key, bool $make_group_directory = fals
 
         $group = Str::slice($hash, 0, 2);
 
-        if ($make_group_directory) {
-            if (!is_dir($this->directory . '/' . $group)) {
-                @mkdir($this->directory . '/' . $group);
-            }
+        if ($make_group_directory && !is_dir($this->directory . '/' . $group)) {
+            @mkdir($this->directory . '/' . $group);
         }
 
         return $this->directory . '/' . $group . '/' . $hash;
@@ -153,22 +151,15 @@ public function get(string $key, mixed $default = null): mixed
     {
         if (!$this->has($key)) {
             $this->with_meta = false;
-
-            if (is_callable($default)) {
-                return $default();
-            }
-
-            return $default;
+            return is_callable($default) ? $default() : $default;
         }
 
         $cache = unserialize(file_get_contents($this->makeHashFilename($key)));
 
         $expire_at = $cache['__bow_meta']['expire_at'];
 
-        if ($expire_at != '+') {
-            if (time() > $expire_at) {
-                return null;
-            }
+        if ($expire_at != '+' && time() > $expire_at) {
+            return null;
         }
 
         if (!$this->with_meta) {

src/Cache/Cache.php

@@ -9,7 +9,6 @@
 use Bow\Cache\Adapters\DatabaseAdapter;
 use Bow\Cache\Adapters\FilesystemAdapter;
 use Bow\Cache\Adapters\RedisAdapter;
-use ErrorException;
 use InvalidArgumentException;
 
 class Cache
@@ -86,12 +85,12 @@ public static function store(string $store): CacheAdapterInterface
      * Get the cache instance
      *
      * @return CacheAdapterInterface
-     * @throws ErrorException
+     * @throws CacheException
      */
     public static function getInstance(): CacheAdapterInterface
     {
         if (is_null(static::$instance)) {
-            throw new ErrorException("Unable to get cache instance before configuration");
+            throw new CacheException("Unable to get cache instance before configuration");
         }
 
         return static::$instance;
@@ -122,7 +121,7 @@ public static function addAdapters(array $adapters): void
     public static function __callStatic(string $name, array $arguments)
     {
         if (is_null(static::$instance)) {
-            throw new ErrorException(
+            throw new CacheException(
                 "Unable to get cache instance before configuration"
             );
         }

src/Cache/CacheException.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Bow\Cache;
+
+class CacheException extends \Exception
+{
+}

src/Console/Command.php

@@ -20,7 +20,7 @@
 use Bow\Console\Command\Generator\GenerateServiceCommand;
 use Bow\Console\Command\Generator\GenerateSessionCommand;
 use Bow\Console\Command\Generator\GenerateAppEventCommand;
-use Bow\Console\Command\Generator\GenerateProducerCommand;
+use Bow\Console\Command\Generator\GenerateWorkerCommand;
 use Bow\Console\Command\Generator\GenerateExceptionCommand;
 use Bow\Console\Command\Generator\GenerateMessagingCommand;
 use Bow\Console\Command\Generator\GenerateMigrationCommand;
@@ -57,7 +57,7 @@ class Command extends AbstractCommand
         "add:validation" => GenerateValidationCommand::class,
         "add:event" => GenerateAppEventCommand::class,
         "add:listener" => GenerateEventListenerCommand::class,
-        "add:producer" => GenerateProducerCommand::class,
+        "add:producer" => GenerateWorkerCommand::class,
         "add:command" => GenerateConsoleCommand::class,
         "add:message" => GenerateMessagingCommand::class,
         "run:console" => ReplCommand::class,

src/Console/Command/Generator/GenerateJobCommand.php

@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Bow\Console\Command\Generator;
+
+use Bow\Console\AbstractCommand;
+use Bow\Console\Color;
+use Bow\Console\Generator;
+
+class GenerateJobCommand extends AbstractCommand
+{
+    /**
+     * Add job
+     *
+     * @param  string $job
+     * @return void
+     */
+    public function run(string $job): void
+    {
+        $generator = new Generator(
+            $this->setting->getJobDirectory(),
+            $job
+        );
+
+        if ($generator->fileExists()) {
+            echo Color::red("The job already exists");
+            exit(1);
+        }
+
+        $generator->write('job', [
+            'baseNamespace' => $this->namespaces['job'] ?? 'App\\Jobs'
+        ]);
+
+        echo Color::green("The job has been well created.");
+        exit(0);
+    }
+}