Merge pull request #474 from jikan-me/bump_dependencies1

⬆️ Upgraded some of the dependencies

Dockerfile

@@ -1,7 +1,7 @@
-FROM docker.io/spiralscout/roadrunner:2.12.2 as roadrunner
+FROM docker.io/spiralscout/roadrunner:2.12.3 as roadrunner
-FROM docker.io/composer:2.5.1 as composer
+FROM docker.io/composer:2.6.6 as composer
-FROM docker.io/mlocati/php-extension-installer:2.1.58 as php-ext-installer
+FROM docker.io/mlocati/php-extension-installer:2.1.77 as php-ext-installer
-FROM php:8.1.16-bullseye
+FROM php:8.1.27-bullseye
 COPY --from=composer /usr/bin/composer /usr/bin/composer
 COPY --from=php-ext-installer /usr/bin/install-php-extensions /usr/local/bin/
 ENV COMPOSER_HOME="/tmp/composer"

app/Dto/Concerns/PreparesData.php

@@ -9,7 +9,7 @@ use Spatie\LaravelData\Support\DataProperty;
 /**
  * A trait for preparing the incoming data before passing it through the data pipeline.
  * All preparation logic lives here.
- * https://spatie.be/docs/laravel-data/v2/advanced-usage/pipeline
+ * https://spatie.be/docs/laravel-data/v3/advanced-usage/pipeline
  */
 trait PreparesData
 {

app/Support/helpers.php

@@ -68,3 +68,49 @@ if (!function_exists('text_match_buckets')) {
         return app()->make("jikan-config")->textMatchBuckets();
     }
 }
+
+if (!function_exists('app_path')) {
+    /**
+     * Get the path to the application folder.
+     *
+     * @param  string  $path
+     * @return string
+     */
+    function app_path(?string $path = ""): string {
+        if ($path == "") {
+            return base_path('app');
+        }
+        return base_path('app/' . $path);
+    }
+}
+
+if (! function_exists('cache')) {
+    /**
+     * Get / set the specified cache value.
+     *
+     * If an array is passed, we'll assume you want to put to the cache.
+     *
+     * @param  mixed  ...$arguments  key|key,default|data,expiration|null
+     * @return mixed|\Illuminate\Cache\CacheManager
+     *
+     * @throws \InvalidArgumentException
+     */
+    function cache(...$arguments)
+    {
+        if (empty($arguments)) {
+            return app('cache');
+        }
+
+        if (is_string($arguments[0])) {
+            return app('cache')->get(...$arguments);
+        }
+
+        if (! is_array($arguments[0])) {
+            throw new InvalidArgumentException(
+                'When setting a value in the cache, you must pass an array of key / value pairs.'
+            );
+        }
+
+        return app('cache')->put(key($arguments[0]), reset($arguments[0]), $arguments[1] ?? null);
+    }
+}

composer.json

@@ -34,10 +34,10 @@
         "predis/predis": "^1.1",
         "pushrbx/lumen-roadrunner": "5.9.1",
         "sentry/sentry-laravel": "^2.8",
-        "spatie/laravel-data": "^2.2",
+        "spatie/laravel-data": "^3.11",
         "spatie/laravel-enum": "^3.0",
         "symfony/yaml": "^4.1",
-        "typesense/laravel-scout-typesense-driver": "^5.0",
+        "typesense/laravel-scout-typesense-driver": "^5.2",
         "vlucas/phpdotenv": "^5",
         "zircote/swagger-php": "3.*"
     },

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": "bd75cf3fe6348185584fa3cbde3754e7",
+    "content-hash": "a963961efeb3c49ac016b73e2cc815b8",
     "packages": [
         {
             "name": "amphp/amp",
@@ -556,6 +556,138 @@
             ],
             "time": "2021-10-09T14:11:46+00:00"
         },
+        {
+            "name": "amphp/parallel",
+            "version": "v1.4.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/amphp/parallel.git",
+                "reference": "3aac213ba7858566fd83d38ccb85b91b2d652cb0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/amphp/parallel/zipball/3aac213ba7858566fd83d38ccb85b91b2d652cb0",
+                "reference": "3aac213ba7858566fd83d38ccb85b91b2d652cb0",
+                "shasum": ""
+            },
+            "require": {
+                "amphp/amp": "^2",
+                "amphp/byte-stream": "^1.6.1",
+                "amphp/parser": "^1",
+                "amphp/process": "^1",
+                "amphp/serialization": "^1",
+                "amphp/sync": "^1.0.1",
+                "php": ">=7.1"
+            },
+            "require-dev": {
+                "amphp/php-cs-fixer-config": "dev-master",
+                "amphp/phpunit-util": "^1.1",
+                "phpunit/phpunit": "^8 || ^7"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "lib/Context/functions.php",
+                    "lib/Sync/functions.php",
+                    "lib/Worker/functions.php"
+                ],
+                "psr-4": {
+                    "Amp\\Parallel\\": "lib"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Aaron Piotrowski",
+                    "email": "aaron@trowski.com"
+                },
+                {
+                    "name": "Stephen Coakley",
+                    "email": "me@stephencoakley.com"
+                }
+            ],
+            "description": "Parallel processing component for Amp.",
+            "homepage": "https://github.com/amphp/parallel",
+            "keywords": [
+                "async",
+                "asynchronous",
+                "concurrent",
+                "multi-processing",
+                "multi-threading"
+            ],
+            "support": {
+                "issues": "https://github.com/amphp/parallel/issues",
+                "source": "https://github.com/amphp/parallel/tree/v1.4.3"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/amphp",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-03-23T08:04:23+00:00"
+        },
+        {
+            "name": "amphp/parallel-functions",
+            "version": "v1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/amphp/parallel-functions.git",
+                "reference": "04e92fcacfc921a56dfe12c23b3265e62593a7cb"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/amphp/parallel-functions/zipball/04e92fcacfc921a56dfe12c23b3265e62593a7cb",
+                "reference": "04e92fcacfc921a56dfe12c23b3265e62593a7cb",
+                "shasum": ""
+            },
+            "require": {
+                "amphp/amp": "^2.0.3",
+                "amphp/parallel": "^1.4",
+                "amphp/serialization": "^1.0",
+                "laravel/serializable-closure": "^1.0",
+                "php": ">=7.4"
+            },
+            "require-dev": {
+                "amphp/php-cs-fixer-config": "v2.x-dev",
+                "amphp/phpunit-util": "^2.0",
+                "phpunit/phpunit": "^9.5.11"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "src/functions.php"
+                ],
+                "psr-4": {
+                    "Amp\\ParallelFunctions\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Niklas Keller",
+                    "email": "me@kelunik.com"
+                }
+            ],
+            "description": "Parallel processing made simple.",
+            "support": {
+                "issues": "https://github.com/amphp/parallel-functions/issues",
+                "source": "https://github.com/amphp/parallel-functions/tree/v1.1.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/amphp",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-02-03T19:32:41+00:00"
+        },
         {
             "name": "amphp/parser",
             "version": "v1.1.0",
@@ -8115,34 +8247,37 @@
         },
         {
             "name": "spatie/laravel-data",
-            "version": "2.2.3",
+            "version": "3.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/laravel-data.git",
-                "reference": "cbc712e5fac04173b49662eff777500f850c8a64"
+                "reference": "e9cb66136974b6a6e290d6d2e2d484bac1727537"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/laravel-data/zipball/cbc712e5fac04173b49662eff777500f850c8a64",
+                "url": "https://api.github.com/repos/spatie/laravel-data/zipball/e9cb66136974b6a6e290d6d2e2d484bac1727537",
-                "reference": "cbc712e5fac04173b49662eff777500f850c8a64",
+                "reference": "e9cb66136974b6a6e290d6d2e2d484bac1727537",
                 "shasum": ""
             },
             "require": {
-                "illuminate/contracts": "^8.83|^9.30|^10.0",
+                "illuminate/contracts": "^9.30|^10.0",
                 "php": "^8.1",
                 "phpdocumentor/type-resolver": "^1.5",
-                "spatie/laravel-package-tools": "^1.9.0"
+                "spatie/laravel-package-tools": "^1.9.0",
+                "spatie/php-structure-discoverer": "^2.0"
             },
             "require-dev": {
                 "fakerphp/faker": "^1.14",
                 "friendsofphp/php-cs-fixer": "^3.0",
                 "inertiajs/inertia-laravel": "^0.6.3",
+                "mockery/mockery": "^1.6",
                 "nesbot/carbon": "^2.63",
                 "nette/php-generator": "^3.5",
-                "nunomaduro/larastan": "^2.0|^1.0.3",
+                "nunomaduro/larastan": "^2.0",
-                "orchestra/testbench": "^6.24|^7.6|^8.0",
+                "orchestra/testbench": "^7.6|^8.0",
                 "pestphp/pest": "^1.22",
                 "pestphp/pest-plugin-laravel": "^1.3",
+                "phpbench/phpbench": "^1.2",
                 "phpstan/extension-installer": "^1.1",
                 "phpunit/phpunit": "^9.3",
                 "spatie/invade": "^1.0",
@@ -8185,7 +8320,7 @@
             ],
             "support": {
                 "issues": "https://github.com/spatie/laravel-data/issues",
-                "source": "https://github.com/spatie/laravel-data/tree/2.2.3"
+                "source": "https://github.com/spatie/laravel-data/tree/3.11.0"
             },
             "funding": [
                 {
@@ -8193,7 +8328,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-01-24T08:23:58+00:00"
+            "time": "2023-12-21T12:31:34+00:00"
         },
         {
             "name": "spatie/laravel-enum",
@@ -8347,6 +8482,87 @@
             ],
             "time": "2023-01-27T15:33:45+00:00"
         },
+        {
+            "name": "spatie/php-structure-discoverer",
+            "version": "2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/spatie/php-structure-discoverer.git",
+                "reference": "3e532f0952d37bb10cddd544800eb659499cda3d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/spatie/php-structure-discoverer/zipball/3e532f0952d37bb10cddd544800eb659499cda3d",
+                "reference": "3e532f0952d37bb10cddd544800eb659499cda3d",
+                "shasum": ""
+            },
+            "require": {
+                "amphp/amp": "^2.6.2",
+                "amphp/parallel": "^1.4.1",
+                "amphp/parallel-functions": "^1.1",
+                "illuminate/collections": "^9.30|^10.0",
+                "php": "^8.1",
+                "spatie/laravel-package-tools": "^1.4.3",
+                "symfony/finder": "^6.0|^7.0"
+            },
+            "require-dev": {
+                "illuminate/console": "^9.30|^10.0",
+                "laravel/pint": "^1.0",
+                "nunomaduro/collision": "^6.0",
+                "nunomaduro/larastan": "^2.0.1",
+                "orchestra/testbench": "^7.0|^8.0",
+                "pestphp/pest": "^1.21",
+                "pestphp/pest-plugin-laravel": "^1.1",
+                "phpstan/extension-installer": "^1.1",
+                "phpstan/phpstan-deprecation-rules": "^1.0",
+                "phpstan/phpstan-phpunit": "^1.0",
+                "phpunit/phpunit": "^9.5",
+                "spatie/laravel-ray": "^1.26"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "Spatie\\StructureDiscoverer\\StructureDiscovererServiceProvider"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Spatie\\StructureDiscoverer\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Ruben Van Assche",
+                    "email": "ruben@spatie.be",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Automatically discover structures within your PHP application",
+            "homepage": "https://github.com/spatie/php-structure-discoverer",
+            "keywords": [
+                "discover",
+                "laravel",
+                "php",
+                "php-structure-discoverer"
+            ],
+            "support": {
+                "issues": "https://github.com/spatie/php-structure-discoverer/issues",
+                "source": "https://github.com/spatie/php-structure-discoverer/tree/2.0.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/LaravelAutoDiscoverer",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-12-21T12:04:07+00:00"
+        },
         {
             "name": "spiral/goridge",
             "version": "v3.2.0",
@@ -11101,16 +11317,16 @@
         },
         {
             "name": "typesense/laravel-scout-typesense-driver",
-            "version": "v5.2.5",
+            "version": "v5.2.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/typesense/laravel-scout-typesense-driver.git",
-                "reference": "026187e037a91c1532ecd1d209ae03c7e8733a40"
+                "reference": "b8fdc9874eb5bc5d70d76ec15bc44efce576a9d1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/typesense/laravel-scout-typesense-driver/zipball/026187e037a91c1532ecd1d209ae03c7e8733a40",
+                "url": "https://api.github.com/repos/typesense/laravel-scout-typesense-driver/zipball/b8fdc9874eb5bc5d70d76ec15bc44efce576a9d1",
-                "reference": "026187e037a91c1532ecd1d209ae03c7e8733a40",
+                "reference": "b8fdc9874eb5bc5d70d76ec15bc44efce576a9d1",
                 "shasum": ""
             },
             "require": {
@@ -11120,9 +11336,9 @@
                 "illuminate/pagination": "^7.0|^8.0|^9.0|^10.0",
                 "illuminate/queue": "^7.0|^8.0|^9.0|^10.0",
                 "illuminate/support": "^7.0|^8.0|^9.0|^10.0",
-                "laravel/scout": "^8.0|^9.0",
+                "laravel/scout": "^8.0|^9.0|^10.0",
                 "php": "^8.0",
-                "typesense/typesense-php": "^4.0"
+                "typesense/typesense-php": "^4.2"
             },
             "require-dev": {
                 "mockery/mockery": "^1.3",
@@ -11176,7 +11392,7 @@
             ],
             "support": {
                 "issues": "https://github.com/typesense/laravel-scout-typesense-driver/issues",
-                "source": "https://github.com/typesense/laravel-scout-typesense-driver/tree/v5.2.5"
+                "source": "https://github.com/typesense/laravel-scout-typesense-driver/tree/v5.2.8"
             },
             "funding": [
                 {
@@ -11184,7 +11400,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-05-18T07:06:25+00:00"
+            "time": "2023-09-01T10:02:16+00:00"
         },
         {
             "name": "typesense/typesense-php",
@@ -13397,5 +13613,5 @@
         "ext-mongodb": "*"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.6.0"
 }

config/data.php

@@ -66,4 +66,23 @@ return [
      * which will only enable the caster locally.
      */
     'var_dumper_caster_mode' => 'development',
+
+    /**
+     * It is possible to skip the PHP reflection analysis of data objects
+     * when running in production. This will speed up the package. You
+     * can configure where data objects are stored and which cache
+     * store should be used.
+     */
+    'structure_caching' => [
+        'directories' => [app_path('Dto')],
+        'cache' => [
+            'store' => env('CACHE_DRIVER', 'file'),
+            'prefix' => 'laravel-data',
+        ],
+        'reflection_discovery' => [
+            'enabled' => false,
+            'base_path' => base_path(),
+            'root_namespace' => null,
+        ],
+    ],
 ];