Merge branch '5.x' into papac-patch-1

bowphp · Sep 23, 2023 · 3e93bc7 · 3e93bc7
2 parents 116fe5b + 34f1b09
commit 3e93bc7
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 30 deletions.
diff --git a/.env.example.json b/.env.example.json
@@ -32,9 +32,9 @@
     "SESSION_SECURE": false,
     "SESSION_HTTPONLY": true,
 
-    "S3_KEY": "",
-    "S3_SECRET": "",
-    "S3_REGION": "us-east-1",
+    "AWS_KEY": "",
+    "AWS_SECRET": "",
+    "AWS_REGION": "us-east-1",
     "S3_BUCKET": "buckets",
 
     "FTP_HOSTNAME": "localhost",

diff --git a/.github/workflows/pull-requests.yml b/.github/workflows/pull-requests.yml
@@ -4,9 +4,6 @@ on:
   pull_request_target:
     types: [opened]
 
-permissions:
-  pull-requests: write
-
 jobs:
   uneditable:
     uses: bowphp/.github/.github/workflows/pull-requests.yml@main
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -2,9 +2,6 @@ name: Tests
 
 on: [ push, pull_request ]
 
-permissions:
-  contents: read
-
 jobs:
   run:
     runs-on: ${{ matrix.operating-system }}

diff --git a/app/Exceptions/ErrorHandle.php b/app/Exceptions/ErrorHandle.php
@@ -14,22 +14,22 @@ class ErrorHandle extends BaseErrorHandler
      * handle the error
      *
      * @param Exception $exception
-     * @return mixed
      */
-    public function handle($exception): mixed
+    public function handle($exception)
     {
         if (request()->isAjax()) {
             return $this->json($exception);
         }
 
-        if ($exception instanceof ModelNotFoundException || $exception instanceof HttpException) {
+        if (
+            $exception instanceof ModelNotFoundException 
+            || $exception instanceof HttpException
+        ) {
             $code = $exception->getStatusCode();
-            $source = $this->render('errors.' . $code, [
+            return $this->render('errors.' . $code, [
                 'code' => 404,
                 'exception' => $exception
             ]);
-
-            return $source;
         }
 
         if ($exception instanceof HttpResponseException) {

diff --git a/config/cache.php b/config/cache.php
@@ -1,29 +1,27 @@
 <?php
 
 return [
+    // Define the default store
     "default" => "file",
 
     "stores" => [
+        // The filesystem connection
         "file" => [
             "driver" => "file",
             "path" => __DIR__ . '/../var/cache'
         ],
 
+        // The database connection
         "database" => [
             "driver" => "database",
             "connection" => app_env('DB_DEFAULT', 'mysql'),
             "table" => "caches",
         ],
 
+        // The redis connection
         "redis" => [
             'driver' => 'redis',
-            'host' => app_env('REDIS_HOSTNAME', '127.0.0.1'),
-            'port' => app_env('REDIS_PORT', 6379),
-            'timeout' => 2.5,
-            'ssl' => false,
-            'username' => app_env('REDIS_USERNAME'),
-            'password' => app_env('REDIS_PASSWORD'),
-            'database' => app_env('REDIS_CACHE_DB', '1'),
+            'database' => app_env('REDIS_CACHE_DB', 5),
             "prefix" => "__app__",
         ]
     ]

diff --git a/config/database.php b/config/database.php
@@ -14,7 +14,7 @@
     /**
      * The migration memory table
      */
-    'migration' => 'bow_migration_status',
+    'migration' => 'migrations',
 
     /**
      * The database on which the default application will connect.
@@ -66,6 +66,20 @@
             'charset'  => app_env('DB_CHARSET', 'utf8'),
             'prefix' => app_env('DB_PREFIX', ''),
             'foreign_key_constraints' => app_env('DB_FOREIGN_KEYS', true),
-        ]
+        ],
+    ],
+
+    /**
+     * Connexion redis
+     */
+    "redis" => [
+        'driver' => 'redis',
+        'host' => app_env('REDIS_HOSTNAME', '127.0.0.1'),
+        'port' => app_env('REDIS_PORT', 6379),
+        'timeout' => 2.5,
+        'ssl' => false,
+        'username' => app_env('REDIS_USERNAME'),
+        'password' => app_env('REDIS_PASSWORD'),
+        'database' => app_env('REDIS_CACHE_DB', '1'),
     ]
 ];
diff --git a/config/worker.php → config/queue.php b/config/worker.php → config/queue.php
@@ -30,9 +30,20 @@
          * The sqs connexion
          */
         "sqs" => [
-            "hostname" => "127.0.0.0",
-            "port" => 11300,
-            "timeout" => 10,
+            "url" => app_env("SQS_URL"),
+            'region' => app_env('AWS_REGION'),
+            'version' => 'latest',
+            'credentials' => [
+                'key'    => app_env('AWS_KEY'),
+                'secret' => app_env('AWS_SECRET'),
+            ],
+        ],
+
+        /**
+         * The database connexion
+         */
+        "database" => [
+            "table" => "queues",
         ]
     ]
 ];
diff --git a/config/storage.php b/config/storage.php
@@ -44,11 +44,11 @@
         's3' => [
             'driver' => 's3',
             'bucket' => app_env('S3_BUCKET', 'settlements'),
-            'region' => app_env('S3_REGION'),
+            'region' => app_env('AWS_REGION'),
             'version' => 'latest',
             'credentials' => [
-                'key'    => app_env('S3_KEY'),
-                'secret' => app_env('S3_SECRET'),
+                'key'    => app_env('AWS_KEY'),
+                'secret' => app_env('AWS_SECRET'),
             ],
         ]
     ],