preparing for hotfix/critical release patches

2025-12-19 22:27:22 +00:00 · 2023-10-03 23:47:58 +09:00
parent 3453ccffd4
commit 729e347a78
9 changed files with 82 additions and 188 deletions
--- a/api/composer-install-dev.sh
+++ b/api/composer-install-dev.sh
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-if [ -f composer.lock ]; then
-    rm composer.lock
-fi
-
-mv composer.json composer.prod.json && cp composer.dev.json composer.json && composer install && mv composer.prod.json composer.json
--- a/api/composer.dev.json
+++ b/api/composer.dev.json
@@ -1,99 +0,0 @@
-{
-    "name": "laravel/laravel",
-    "type": "project",
-    "description": "The Laravel Framework.",
-    "keywords": ["framework", "laravel"],
-    "license": "MIT",
-    "require": {
-        "php": "^7.3|^8.0",
-        "fleetbase/core-api": "^1.2.8",
-        "fleetbase/fleetops-api": "^1.1.7",
-        "fleetbase/storefront-api": "^1.1.2",
-        "fleetbase/pallet-api": "^0.0.1",
-        "fleetbase/billing-api": "^0.0.2",
-        "fleetbase/flespi-integration": "^0.0.1",
-        "fruitcake/laravel-cors": "^2.0",
-        "guzzlehttp/guzzle": "^7.0.1",
-        "laravel/framework": "^8.75",
-        "laravel/sanctum": "^2.11",
-        "laravel/tinker": "^2.5",
-        "league/flysystem-aws-s3-v3": "^1.0",
-        "maatwebsite/excel": "^3.1",
-        "phpoffice/phpspreadsheet": "^1.28",
-        "predis/predis": "^2.1",
-        "psr/http-factory-implementation": "*"
-    },
-    "require-dev": {
-        "facade/ignition": "^2.5",
-        "fakerphp/faker": "^1.9.1",
-        "kitloong/laravel-migrations-generator": "^6.10",
-        "laravel/sail": "^1.0.1",
-        "mockery/mockery": "^1.4.4",
-        "nunomaduro/collision": "^5.10",
-        "phpunit/phpunit": "^9.5.10"
-    },
-    "repositories": [
-        {
-            "type": "path",
-            "url": "../packages/core-api"
-        },
-        {
-            "type": "path",
-            "url": "../packages/fleetops-api"
-        },
-        {
-            "type": "path",
-            "url": "../packages/storefront-api"
-        },
-        {
-            "type": "path",
-            "url": "../packages/pallet-api"
-        },
-        {
-            "type": "path",
-            "url": "../packages/billing-api"
-        },
-        {
-            "type": "path",
-            "url": "../packages/flespi-integration"
-        }
-    ],
-    "autoload": {
-        "psr-4": {
-            "App\\": "app/",
-            "Database\\Factories\\": "database/factories/",
-            "Database\\Seeders\\": "database/seeders/"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "Tests\\": "tests/"
-        }
-    },
-    "scripts": {
-        "post-autoload-dump": ["Illuminate\\Foundation\\ComposerScripts::postAutoloadDump", "@php artisan package:discover --ansi"],
-        "post-update-cmd": ["@php artisan vendor:publish --tag=laravel-assets --ansi --force"],
-        "post-root-package-install": ["@php -r \"file_exists('.env') || copy('.env.example', '.env');\""],
-        "post-create-project-cmd": ["@php artisan key:generate --ansi"],
-        "clear-logs": ["rm -rf storage/logs/*.log", "composer dump-autoload", "chmod -R 777 storage", "chmod -R 777 bootstrap/cache", "chmod -R 777 resources"],
-        "clean-logs": ["composer run-script clear-logs"],
-        "dock": ["docker exec -it fleetbase_os_application_1 /usr/bin/tmux -u new"],
-        "dock-server": ["docker exec -it fleetbase_os_httpd_1 /bin/sh"],
-        "tunnel": ["ngrok http --region=ap --hostname=fleetbase.ap.ngrok.io 8000"]
-    },
-    "extra": {
-        "laravel": {
-            "dont-discover": []
-        }
-    },
-    "config": {
-        "optimize-autoloader": true,
-        "preferred-install": "dist",
-        "sort-packages": true,
-        "allow-plugins": {
-            "php-http/discovery": true
-        }
-    },
-    "minimum-stability": "dev",
-    "prefer-stable": true
-}
--- a/api/composer.json
+++ b/api/composer.json
@@ -9,8 +9,8 @@
    "license": "MIT",
    "require": {
        "php": "^7.3|^8.0",
-        "fleetbase/core-api": "^1.2.8",
-        "fleetbase/fleetops-api": "^1.1.7",
+        "fleetbase/core-api": "^1.2.9",
+        "fleetbase/fleetops-api": "^1.1.9",
        "fleetbase/storefront-api": "^1.1.2",
        "fruitcake/laravel-cors": "^2.0",
        "guzzlehttp/guzzle": "^7.0.1",
@@ -93,4 +93,4 @@
    },
    "minimum-stability": "dev",
    "prefer-stable": true
-}
+}
--- a/api/composer.lock
+++ b/api/composer.lock
@@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "d7433e415934facf525e3a95920714d5",
+    "content-hash": "805704e196faa29e712ee9bb32b01cb9",
    "packages": [
        {
            "name": "aloha/twilio",
@@ -192,16 +192,16 @@
        },
        {
            "name": "aws/aws-sdk-php",
-            "version": "3.282.0",
+            "version": "3.282.1",
            "source": {
                "type": "git",
                "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "79a3ed5bb573f592823f8b1cffe0dbac3132e6b4"
+                "reference": "59b84106b3870da3a1a862047fc61108dccb37b9"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/79a3ed5bb573f592823f8b1cffe0dbac3132e6b4",
-                "reference": "79a3ed5bb573f592823f8b1cffe0dbac3132e6b4",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/59b84106b3870da3a1a862047fc61108dccb37b9",
+                "reference": "59b84106b3870da3a1a862047fc61108dccb37b9",
                "shasum": ""
            },
            "require": {
@@ -281,9 +281,9 @@
            "support": {
                "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.282.0"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.282.1"
            },
-            "time": "2023-09-28T18:09:20+00:00"
+            "time": "2023-10-02T18:07:55+00:00"
        },
        {
            "name": "aws/aws-sdk-php-laravel",
@@ -2002,16 +2002,16 @@
        },
        {
            "name": "fleetbase/core-api",
-            "version": "1.2.8",
+            "version": "1.2.9",
            "source": {
                "type": "git",
                "url": "https://github.com/fleetbase/core-api.git",
-                "reference": "668246072421d7dbc39f1503c1a3e68263204d0e"
+                "reference": "871dcd3c3aa23bcfcf21699370b546d98b117372"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/fleetbase/core-api/zipball/668246072421d7dbc39f1503c1a3e68263204d0e",
-                "reference": "668246072421d7dbc39f1503c1a3e68263204d0e",
+                "url": "https://api.github.com/repos/fleetbase/core-api/zipball/871dcd3c3aa23bcfcf21699370b546d98b117372",
+                "reference": "871dcd3c3aa23bcfcf21699370b546d98b117372",
                "shasum": ""
            },
            "require": {
@@ -2085,29 +2085,29 @@
            ],
            "support": {
                "issues": "https://github.com/fleetbase/core-api/issues",
-                "source": "https://github.com/fleetbase/core-api/tree/v1.2.8"
+                "source": "https://github.com/fleetbase/core-api/tree/v1.2.9"
            },
-            "time": "2023-09-16T04:48:58+00:00"
+            "time": "2023-10-03T13:59:43+00:00"
        },
        {
            "name": "fleetbase/fleetops-api",
-            "version": "1.1.7",
+            "version": "1.1.9",
            "source": {
                "type": "git",
                "url": "https://github.com/fleetbase/fleetops-api.git",
-                "reference": "ba3f7387e70278f535d888f316ae4dfe8029fe94"
+                "reference": "e7e6f0faa3f3df04bdfa26fcb10d6abdc56f05bc"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/fleetbase/fleetops-api/zipball/ba3f7387e70278f535d888f316ae4dfe8029fe94",
-                "reference": "ba3f7387e70278f535d888f316ae4dfe8029fe94",
+                "url": "https://api.github.com/repos/fleetbase/fleetops-api/zipball/e7e6f0faa3f3df04bdfa26fcb10d6abdc56f05bc",
+                "reference": "e7e6f0faa3f3df04bdfa26fcb10d6abdc56f05bc",
                "shasum": ""
            },
            "require": {
                "barryvdh/laravel-dompdf": "^2.0",
                "brick/geo": "0.7.2",
                "cknow/laravel-money": "^7.1",
-                "fleetbase/core-api": "^1.2.8",
+                "fleetbase/core-api": "^1.2.9",
                "geocoder-php/google-maps-places-provider": "^1.4",
                "giggsey/libphonenumber-for-php": "^8.13",
                "league/geotools": "^1.1.0",
@@ -2162,9 +2162,9 @@
            ],
            "support": {
                "issues": "https://github.com/fleetbase/fleetops-api/issues",
-                "source": "https://github.com/fleetbase/fleetops-api/tree/v1.1.7"
+                "source": "https://github.com/fleetbase/fleetops-api/tree/v1.1.9"
            },
-            "time": "2023-09-28T11:24:57+00:00"
+            "time": "2023-10-03T14:04:58+00:00"
        },
        {
            "name": "fleetbase/storefront-api",
@@ -2910,16 +2910,16 @@
        },
        {
            "name": "google/cloud-core",
-            "version": "v1.52.4",
+            "version": "v1.52.5",
            "source": {
                "type": "git",
                "url": "https://github.com/googleapis/google-cloud-php-core.git",
-                "reference": "21c004745a32c71e03ab62effd7fbee0cf3ae7c6"
+                "reference": "28765cf75bd028ed063b0422b9c85bb9a54c41ca"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/googleapis/google-cloud-php-core/zipball/21c004745a32c71e03ab62effd7fbee0cf3ae7c6",
-                "reference": "21c004745a32c71e03ab62effd7fbee0cf3ae7c6",
+                "url": "https://api.github.com/repos/googleapis/google-cloud-php-core/zipball/28765cf75bd028ed063b0422b9c85bb9a54c41ca",
+                "reference": "28765cf75bd028ed063b0422b9c85bb9a54c41ca",
                "shasum": ""
            },
            "require": {
@@ -2969,22 +2969,22 @@
            ],
            "description": "Google Cloud PHP shared dependency, providing functionality useful to all components.",
            "support": {
-                "source": "https://github.com/googleapis/google-cloud-php-core/tree/v1.52.4"
+                "source": "https://github.com/googleapis/google-cloud-php-core/tree/v1.52.5"
            },
-            "time": "2023-09-15T20:50:36+00:00"
+            "time": "2023-09-30T16:50:41+00:00"
        },
        {
            "name": "google/cloud-storage",
-            "version": "v1.33.2",
+            "version": "v1.33.3",
            "source": {
                "type": "git",
                "url": "https://github.com/googleapis/google-cloud-php-storage.git",
-                "reference": "6148b428737eae9b6590ccd8fec508ab8689d096"
+                "reference": "e22877e96c3f5c4f53b0fb2077834fb6d64d0fca"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/googleapis/google-cloud-php-storage/zipball/6148b428737eae9b6590ccd8fec508ab8689d096",
-                "reference": "6148b428737eae9b6590ccd8fec508ab8689d096",
+                "url": "https://api.github.com/repos/googleapis/google-cloud-php-storage/zipball/e22877e96c3f5c4f53b0fb2077834fb6d64d0fca",
+                "reference": "e22877e96c3f5c4f53b0fb2077834fb6d64d0fca",
                "shasum": ""
            },
            "require": {
@@ -3025,9 +3025,9 @@
            ],
            "description": "Cloud Storage Client for PHP",
            "support": {
-                "source": "https://github.com/googleapis/google-cloud-php-storage/tree/v1.33.2"
+                "source": "https://github.com/googleapis/google-cloud-php-storage/tree/v1.33.3"
            },
-            "time": "2023-09-15T20:50:36+00:00"
+            "time": "2023-09-30T16:50:41+00:00"
        },
        {
            "name": "graham-campbell/manager",
@@ -10034,16 +10034,16 @@
        },
        {
            "name": "symfony/cache",
-            "version": "v5.4.28",
+            "version": "v5.4.29",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/cache.git",
-                "reference": "62b7ae3bccc5b474a30fadc7ef6bbc362007d3f9"
+                "reference": "e29c5a97bc2d81269973c3e1d7ceb9d48b4d5151"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/cache/zipball/62b7ae3bccc5b474a30fadc7ef6bbc362007d3f9",
-                "reference": "62b7ae3bccc5b474a30fadc7ef6bbc362007d3f9",
+                "url": "https://api.github.com/repos/symfony/cache/zipball/e29c5a97bc2d81269973c3e1d7ceb9d48b4d5151",
+                "reference": "e29c5a97bc2d81269973c3e1d7ceb9d48b4d5151",
                "shasum": ""
            },
            "require": {
@@ -10111,7 +10111,7 @@
                "psr6"
            ],
            "support": {
-                "source": "https://github.com/symfony/cache/tree/v5.4.28"
+                "source": "https://github.com/symfony/cache/tree/v5.4.29"
            },
            "funding": [
                {
@@ -10127,7 +10127,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-08-05T08:32:42+00:00"
+            "time": "2023-09-19T13:25:51+00:00"
        },
        {
            "name": "symfony/cache-contracts",
@@ -10442,16 +10442,16 @@
        },
        {
            "name": "symfony/error-handler",
-            "version": "v5.4.26",
+            "version": "v5.4.29",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/error-handler.git",
-                "reference": "b26719213a39c9ba57520cbc5e52bfcc5e8d92f9"
+                "reference": "328c6fcfd2f90b64c16efaf0ea67a311d672f078"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/error-handler/zipball/b26719213a39c9ba57520cbc5e52bfcc5e8d92f9",
-                "reference": "b26719213a39c9ba57520cbc5e52bfcc5e8d92f9",
+                "url": "https://api.github.com/repos/symfony/error-handler/zipball/328c6fcfd2f90b64c16efaf0ea67a311d672f078",
+                "reference": "328c6fcfd2f90b64c16efaf0ea67a311d672f078",
                "shasum": ""
            },
            "require": {
@@ -10493,7 +10493,7 @@
            "description": "Provides tools to manage errors and ease debugging PHP code",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/error-handler/tree/v5.4.26"
+                "source": "https://github.com/symfony/error-handler/tree/v5.4.29"
            },
            "funding": [
                {
@@ -10509,7 +10509,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-07-16T16:48:57+00:00"
+            "time": "2023-09-06T21:54:06+00:00"
        },
        {
            "name": "symfony/event-dispatcher",
@@ -10740,16 +10740,16 @@
        },
        {
            "name": "symfony/http-client",
-            "version": "v5.4.26",
+            "version": "v5.4.29",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/http-client.git",
-                "reference": "19d48ef7f38e5057ed1789a503cd3eccef039bce"
+                "reference": "04784c66cbee613a827363ee1e65db65392893c1"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-client/zipball/19d48ef7f38e5057ed1789a503cd3eccef039bce",
-                "reference": "19d48ef7f38e5057ed1789a503cd3eccef039bce",
+                "url": "https://api.github.com/repos/symfony/http-client/zipball/04784c66cbee613a827363ee1e65db65392893c1",
+                "reference": "04784c66cbee613a827363ee1e65db65392893c1",
                "shasum": ""
            },
            "require": {
@@ -10811,7 +10811,7 @@
                "http"
            ],
            "support": {
-                "source": "https://github.com/symfony/http-client/tree/v5.4.26"
+                "source": "https://github.com/symfony/http-client/tree/v5.4.29"
            },
            "funding": [
                {
@@ -10827,7 +10827,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-07-03T12:14:50+00:00"
+            "time": "2023-09-14T20:49:15+00:00"
        },
        {
            "name": "symfony/http-client-contracts",
@@ -10985,16 +10985,16 @@
        },
        {
            "name": "symfony/http-kernel",
-            "version": "v5.4.28",
+            "version": "v5.4.29",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "127a2322ca1828157901092518b8ea8e4e1109d4"
+                "reference": "f53265fc6bd2a7f3a4ed4e443b76e750348ac3f7"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/127a2322ca1828157901092518b8ea8e4e1109d4",
-                "reference": "127a2322ca1828157901092518b8ea8e4e1109d4",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/f53265fc6bd2a7f3a4ed4e443b76e750348ac3f7",
+                "reference": "f53265fc6bd2a7f3a4ed4e443b76e750348ac3f7",
                "shasum": ""
            },
            "require": {
@@ -11077,7 +11077,7 @@
            "description": "Provides a structured process for converting a Request into a Response",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v5.4.28"
+                "source": "https://github.com/symfony/http-kernel/tree/v5.4.29"
            },
            "funding": [
                {
@@ -11093,7 +11093,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-08-26T13:47:51+00:00"
+            "time": "2023-09-30T06:31:17+00:00"
        },
        {
            "name": "symfony/mime",
@@ -12480,16 +12480,16 @@
        },
        {
            "name": "symfony/serializer",
-            "version": "v5.4.28",
+            "version": "v5.4.29",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/serializer.git",
-                "reference": "701e2b8d48a3a627ffe128b38fbe6c4cf3ddcb3c"
+                "reference": "b893175000155839170d589f3a3593f2ce601829"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/serializer/zipball/701e2b8d48a3a627ffe128b38fbe6c4cf3ddcb3c",
-                "reference": "701e2b8d48a3a627ffe128b38fbe6c4cf3ddcb3c",
+                "url": "https://api.github.com/repos/symfony/serializer/zipball/b893175000155839170d589f3a3593f2ce601829",
+                "reference": "b893175000155839170d589f3a3593f2ce601829",
                "shasum": ""
            },
            "require": {
@@ -12563,7 +12563,7 @@
            "description": "Handles serializing and deserializing data structures, including object graphs, into array structures or other formats like XML and JSON.",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/serializer/tree/v5.4.28"
+                "source": "https://github.com/symfony/serializer/tree/v5.4.29"
            },
            "funding": [
                {
@@ -12579,7 +12579,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-08-24T14:14:18+00:00"
+            "time": "2023-09-20T07:40:46+00:00"
        },
        {
            "name": "symfony/service-contracts",
@@ -12666,16 +12666,16 @@
        },
        {
            "name": "symfony/string",
-            "version": "v5.4.26",
+            "version": "v5.4.29",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/string.git",
-                "reference": "1181fe9270e373537475e826873b5867b863883c"
+                "reference": "e41bdc93def20eaf3bfc1537c4e0a2b0680a152d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/1181fe9270e373537475e826873b5867b863883c",
-                "reference": "1181fe9270e373537475e826873b5867b863883c",
+                "url": "https://api.github.com/repos/symfony/string/zipball/e41bdc93def20eaf3bfc1537c4e0a2b0680a152d",
+                "reference": "e41bdc93def20eaf3bfc1537c4e0a2b0680a152d",
                "shasum": ""
            },
            "require": {
@@ -12732,7 +12732,7 @@
                "utf8"
            ],
            "support": {
-                "source": "https://github.com/symfony/string/tree/v5.4.26"
+                "source": "https://github.com/symfony/string/tree/v5.4.29"
            },
            "funding": [
                {
@@ -12748,7 +12748,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-06-28T12:46:07+00:00"
+            "time": "2023-09-13T11:47:41+00:00"
        },
        {
            "name": "symfony/translation",
@@ -12927,16 +12927,16 @@
        },
        {
            "name": "symfony/var-dumper",
-            "version": "v5.4.28",
+            "version": "v5.4.29",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "684b36ff415e1381d4a943c3ca2502cd2debad73"
+                "reference": "6172e4ae3534d25ee9e07eb487c20be7760fcc65"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/684b36ff415e1381d4a943c3ca2502cd2debad73",
-                "reference": "684b36ff415e1381d4a943c3ca2502cd2debad73",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/6172e4ae3534d25ee9e07eb487c20be7760fcc65",
+                "reference": "6172e4ae3534d25ee9e07eb487c20be7760fcc65",
                "shasum": ""
            },
            "require": {
@@ -12996,7 +12996,7 @@
                "dump"
            ],
            "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v5.4.28"
+                "source": "https://github.com/symfony/var-dumper/tree/v5.4.29"
            },
            "funding": [
                {
@@ -13012,7 +13012,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-08-24T13:38:36+00:00"
+            "time": "2023-09-12T10:09:58+00:00"
        },
        {
            "name": "symfony/var-exporter",
--- a/2
+++ b/2
--- a/packages/core-api
+++ b/packages/core-api
--- a/packages/fleetops-api
+++ b/packages/fleetops-api
--- a/packages/fleetops-engine
+++ b/packages/fleetops-engine
--- a/packages/pallet-api
+++ b/packages/pallet-api