wip #6501 @0.5

diff --git a/app/Console/Commands/FluidbookDocumentSetRegion.php b/app/Console/Commands/FluidbookDocumentSetRegion.php
index 3db1b18ed5e868c4b1cd00c2a245874333bc6dd9..f4f2a47fa7cc3648ee4dd4755f65e055e0f42253 100644 (file)
--- a/app/Console/Commands/FluidbookDocumentSetRegion.php
+++ b/app/Console/Commands/FluidbookDocumentSetRegion.php
@@ -2,6 +2,7 @@
 
 namespace App\Console\Commands;
 
+use App\Fluidbook\Region;
 use App\Models\FluidbookPublication;
 use Cubist\Backpack\Console\Commands\CubistCommand;
 use Illuminate\Support\Facades\DB;
@@ -17,7 +18,7 @@ class FluidbookDocumentSetRegion extends CubistCommand
     public function handle()
     {
         $regions = [];
-        $default = 'UE';
+        $default = Region::EUROPE;
         foreach (FluidbookPublication::withoutGlobalScopes()->whereNot('region', $default)->get() as $fluidbook) {
             /** @var $fluidbook FluidbookPublication */
             $r = $fluidbook->region;

diff --git a/app/Fluidbook/Farm.php b/app/Fluidbook/Farm.php
index 933890ff00018cfd1db3e219efaad00115ee258f..a02957805a73cc81f216b107d9f2b6080a64a947 100644 (file)
--- a/app/Fluidbook/Farm.php
+++ b/app/Fluidbook/Farm.php
@@ -18,22 +18,22 @@ class Farm
 
     //protected static $_forceServer = 'alphaville';
 
-    protected static $_region = 'UE';
+    protected static $_region = Region::EUROPE;
 
     protected static $_farmServers = [
-        ['name' => 'alphaville', 'host' => 'fluidbook-processfarm', 'port' => 9000, 'weight' => 12, 'region' => 'UE'],
-        ['name' => 'brazil', 'host' => 'brazil.cubedesigners.com', 'weight' => 6, 'region' => 'UE'],
-        ['name' => 'clockwork', 'host' => 'clockwork.cubedesigners.com', 'weight' => 2, 'region' => 'UE'],
-        ['name' => 'dracula', 'host' => 'dracula.cubedesigners.com', 'weight' => 6, 'region' => 'UE'],
-        ['name' => 'dobermann', 'host' => 'dobermann.cubedesigners.com', 'weight' => 6, 'region' => 'UE'],
-        ['name' => 'elephantman', 'host' => 'paris.cubedesigners.com', 'weight' => 2, 'region' => 'UE'],
-        ['name' => 'fastandfurious', 'host' => 'fastandfurious.cubedesigners.com', 'weight' => 2, 'region' => 'UE'],
-        ['name' => 'godzilla', 'host' => 'godzilla.cubedesigners.com', 'weight' => 3, 'region' => 'UE'],
-        ['name' => 'her', 'host' => 'her2.cubedesigners.com', 'weight' => 4, 'region' => 'UE'],
-        ['name' => 'isleofdogs', 'host' => 'paris.cubedesigners.com', 'port' => 9458, 'weight' => 2, 'region' => 'UE'],
-        ['name' => 'jumanji', 'host' => 'paris.cubedesigners.com', 'port' => 9459, 'weight' => 2, 'region' => 'UE'],
-        ['name' => 'kingkong', 'host' => 'kingkong.cubedesigners.com', 'weight' => 6, 'region' => 'US'],
-        //['name' => 'nakedgun', 'host' => 'nakedgun.cubedesigners.com', 'weight' => 4, 'region' => 'UE'],
+        ['name' => 'alphaville', 'host' => 'fluidbook-processfarm', 'port' => 9000, 'weight' => 12, 'region' => Region::EUROPE],
+        ['name' => 'brazil', 'host' => 'brazil.cubedesigners.com', 'weight' => 6, 'region' => Region::EUROPE],
+        ['name' => 'clockwork', 'host' => 'clockwork.cubedesigners.com', 'weight' => 2, 'region' => Region::EUROPE],
+        ['name' => 'dracula', 'host' => 'dracula.cubedesigners.com', 'weight' => 6, 'region' => Region::EUROPE],
+        ['name' => 'dobermann', 'host' => 'dobermann.cubedesigners.com', 'weight' => 6, 'region' => Region::EUROPE],
+        ['name' => 'elephantman', 'host' => 'paris.cubedesigners.com', 'weight' => 2, 'region' => Region::EUROPE],
+        ['name' => 'fastandfurious', 'host' => 'fastandfurious.cubedesigners.com', 'weight' => 2, 'region' => Region::EUROPE],
+        ['name' => 'godzilla', 'host' => 'godzilla.cubedesigners.com', 'weight' => 3, 'region' => Region::EUROPE],
+        ['name' => 'her', 'host' => 'her2.cubedesigners.com', 'weight' => 4, 'region' => Region::EUROPE],
+        ['name' => 'isleofdogs', 'host' => 'paris.cubedesigners.com', 'port' => 9458, 'weight' => 2, 'region' => Region::EUROPE],
+        ['name' => 'jumanji', 'host' => 'paris.cubedesigners.com', 'port' => 9459, 'weight' => 2, 'region' => Region::EUROPE],
+        ['name' => 'kingkong', 'host' => 'kingkong.cubedesigners.com', 'weight' => 6, 'region' => Region::USA],
+        //['name' => 'nakedgun', 'host' => 'nakedgun.cubedesigners.com', 'weight' => 4, 'region' => Region::EUROPE],
     ];
 
     /**

diff --git a/app/Fluidbook/Region.php b/app/Fluidbook/Region.php
new file mode 100644 (file)
index 0000000..ed57c6c
--- /dev/null
+++ b/app/Fluidbook/Region.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Fluidbook;
+
+class Region
+{
+
+    const EUROPE = 'UE';
+    const USA = 'US';
+
+    public static function getAllRegionsCodes()
+    {
+        return array_keys(static::getAllRegions());
+    }
+
+    public static function getAllRegions()
+    {
+        return [static::EUROPE => __('Union Européenne'), static::USA => __('USA')];
+    }
+}

diff --git a/app/Models/FluidbookDocument.php b/app/Models/FluidbookDocument.php
index abbb5ea4a9f30420cf94fdbc8bae4f46657b9ef7..b0210df5e6390b384ecd25e63bb0bec6cc196be1 100644 (file)
--- a/app/Models/FluidbookDocument.php
+++ b/app/Models/FluidbookDocument.php
@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use App\Fluidbook\Farm;
+use App\Fluidbook\Region;
 use App\Jobs\FluidbookDocumentFileProcess;
 use App\Jobs\FluidbookDocumentUpload;
 use App\Models\Base\ToolboxModel;
@@ -12,6 +13,7 @@ use Cubist\Backpack\Magic\Fields\Text;
 use Cubist\Backpack\Magic\Fields\Textarea;
 use Cubist\PDF\CommandLine\FWSTK;
 use Cubist\PDF\PDFTools;
+use Cubist\Util\CommandLine\Rsync;
 use Cubist\Util\Files\Files;
 use Cubist\Util\Gzip;
 use Cubist\Util\Math;
@@ -44,7 +46,7 @@ class FluidbookDocument extends ToolboxModel
     public function setFields()
     {
         parent::setFields();
-        $this->addField('region', SelectFromArray::class, __('Région d\'hébergement des données'), ['options' => ['UE' => __('Union européenne'), 'US' => 'USA'], 'default' => 'UE', 'allows_null' => false, 'databaseDefault' => 'UE']);
+        $this->addField('region', SelectFromArray::class, __('Région d\'hébergement des données'), ['options' => Region::getAllRegions(), 'default' => Region::EUROPE, 'allows_null' => false, 'databaseDefault' => Region::EUROPE]);
         $this->addField('file', Text::class);
         $this->addField('pages', Integer::class);
         $this->addOwnerField();
@@ -216,7 +218,7 @@ class FluidbookDocument extends ToolboxModel
         }
 
         $base = 'fluidbookpublication/docs/' . $this->id . '/' . $path;
-        $res = Files::mkdir($this->getRegion() == 'UE' ? protected_path($base) : us_protected_path($base));
+        $res = Files::mkdir($this->getRegion() == Region::EUROPE ? protected_path($base) : us_protected_path($base));
 
         if ($fname) {
             $res .= $fname;
@@ -226,7 +228,24 @@ class FluidbookDocument extends ToolboxModel
 
     public function getRegion()
     {
-        return $this->region ?? 'UE';
+        return $this->region ?? Region::EUROPE;
+    }
+
+    public function moveRegion($newRegion)
+    {
+        $regions = Region::getAllRegionsCodes();
+        foreach ($regions as $region) {
+            if ($region === $newRegion) {
+                continue;
+            }
+            $from = $this->protected_path('fluidbookpublication/docs/' . $this->id, $region);
+            $to = $this->protected_path('fluidbookpublication/docs/' . $this->id, $newRegion);
+            $rsync = new Rsync($from, $to, false);
+            $rsync->setMove(true);
+            $rsync->execute();
+        }
+        $this->region = $newRegion;
+        $this->save();
     }
 
     public function hasFile($page, $format = 'jpg', $resolution = 150, $quality = 85, $withText = true, $withGraphics = true, $version = 'html', $forceCheck = false)

diff --git a/app/Models/FluidbookPublication.php b/app/Models/FluidbookPublication.php
index d15b0552b00111feb67a25b531e54cd2cc0fc1c2..c820675ca0623e2509d3ee102e91a628bd4334f3 100644 (file)
--- a/app/Models/FluidbookPublication.php
+++ b/app/Models/FluidbookPublication.php
@@ -14,6 +14,7 @@ use App\Fields\User;
 use App\Fluidbook\Farm;
 use App\Fluidbook\Link\Link;
 use App\Fluidbook\Link\LinksData;
+use App\Fluidbook\Region;
 use App\Http\Controllers\Admin\Operations\ChangeownerOperation;
 use App\Http\Controllers\Admin\Operations\ChangestatusOperation;
 use App\Http\Controllers\Admin\Operations\FluidbookPublication\AuditOperation;
@@ -50,6 +51,7 @@ use Cubist\Backpack\Magic\Fields\Integer;
 use Cubist\Backpack\Magic\Fields\ReadOnlyValue;
 use Cubist\Excel\ExcelToArray;
 use Cubist\Util\ArrayUtil;
+use Cubist\Util\CommandLine\Rsync;
 use Cubist\Util\Files\Files;
 use Cubist\Util\Graphics\Image;
 use Cubist\Util\Json;
@@ -180,7 +182,7 @@ class FluidbookPublication extends ToolboxStatusModel
 
         $this->addOwnerField();
 
-        $this->addField('region', ReadOnlyValue::class, __('Région d\'hébergement des données'), ['non_default_tracking' => false, 'options' => ['UE' => __('Union européenne'), 'US' => 'USA'], 'default' => 'UE', 'allows_null' => false, 'databaseDefault' => 'UE']);
+        $this->addField('region', ReadOnlyValue::class, __('Région d\'hébergement des données'), ['non_default_tracking' => false, 'options' => Region::getAllRegions(), 'default' => Region::EUROPE, 'allows_null' => false, 'databaseDefault' => Region::EUROPE]);
         $this->addField('status', FluidbookStatus::class, __('Status'), [
                 'column' => true,
                 'filter' => true,
@@ -535,9 +537,10 @@ class FluidbookPublication extends ToolboxStatusModel
         return (float)$this->getDocumentSize($page)[1];
     }
 
-    public function protected_path($path)
+    public function protected_path($path, $forceRegion = null)
     {
-        if ($this->region === 'UE') {
+        $r = $forceRegion ?? $this->region;
+        if ($r === Region::EUROPE) {
             return protected_path($path);
         } else {
             return us_protected_path($path);
@@ -811,6 +814,31 @@ class FluidbookPublication extends ToolboxStatusModel
     }
 
 
+    public function moveRegion($newRegion)
+    {
+        foreach (FluidbookDocument::withoutGlobalScopes()->whereIn('id', $this->getDocumentsId())->get() as $doc) {
+            $doc->moveRegion($newRegion);
+        }
+
+        $regions = Region::getAllRegionsCodes();
+
+        $dirs = ['final', 'pdf', 'index', 'working'];
+        foreach ($dirs as $dir) {
+            foreach ($regions as $region) {
+                if ($region === $newRegion) {
+                    continue;
+                }
+                $from = $this->protected_path('fluidbookpublication/' . $dir . '/' . $this->id, $region);
+                $to = $this->protected_path('fluidbookpublication/' . $dir . '/' . $this->id, $newRegion);
+                $rsync = new Rsync($from, $to, false);
+                $rsync->setMove(true);
+                $rsync->execute();
+            }
+        }
+        $this->region = $newRegion;
+        $this->save();
+    }
+
     protected function _replicateMedia($newId)
     {
         static::copyAssets($this->id, $newId, 'link');
@@ -818,8 +846,8 @@ class FluidbookPublication extends ToolboxStatusModel
 
     public static function copyAssets($fromId, $toId, $mode = 'link')
     {
-        $from = Files::mkdir(protected_path('fluidbookpublication/working/' . $fromId));
-        $to = Files::mkdir(protected_path('fluidbookpublication/working/' . $toId));
+        $from = Files::mkdir(self::getProtectedPath($fromId, 'fluidbookpublication/working/' . $fromId));
+        $to = Files::mkdir(self::getProtectedPath($toId, 'fluidbookpublication/working/' . $toId));
         if ($mode === 'link') {
             $cmd = "cp -Rnps $from* $to";
         } else if ($mode === 'link_overwrite') {

diff --git a/composer.lock b/composer.lock
index dbadf4810dcb6f620179c5939666a3c349b54cf0..06d44ff433f66f782b37755b76102406c7e18c4b 100644 (file)
--- a/composer.lock
+++ b/composer.lock
@@ -2175,13 +2175,13 @@
             "source": {
                 "type": "git",
                 "url": "git://git.cubedesigners.com/cubist_util.git",
-                "reference": "cae7516c3a082886d62a5ffbc8b54bba2bb84298"
+                "reference": "6bf2e76444fcf1e4071f927cbcba7ae289f5420e"
             },
             "dist": {
                 "type": "tar",
-                "url": "https://composer.cubedesigners.com/dist/cubist/util/cubist-util-dev-master-edcce4.tar",
-                "reference": "cae7516c3a082886d62a5ffbc8b54bba2bb84298",
-                "shasum": "3670d5cd17c3b87e9860f69db06d3d8baa7ea7df"
+                "url": "https://composer.cubedesigners.com/dist/cubist/util/cubist-util-dev-master-15d837.tar",
+                "reference": "6bf2e76444fcf1e4071f927cbcba7ae289f5420e",
+                "shasum": "b9d1e26f3942c7428943d69e761243f03169d2cd"
             },
             "require": {
                 "cubist/net": "dev-master",
@@ -2215,7 +2215,7 @@
                 }
             ],
             "description": "Utilities class",
-            "time": "2023-10-04T14:55:43+00:00"
+            "time": "2023-11-22T12:16:47+00:00"
         },
         {
             "name": "cviebrock/eloquent-sluggable",
@@ -2706,16 +2706,16 @@
         },
         {
             "name": "doctrine/dbal",
-            "version": "3.7.1",
+            "version": "3.7.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/dbal.git",
-                "reference": "5b7bd66c9ff58c04c5474ab85edce442f8081cb2"
+                "reference": "0ac3c270590e54910715e9a1a044cc368df282b2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/dbal/zipball/5b7bd66c9ff58c04c5474ab85edce442f8081cb2",
-                "reference": "5b7bd66c9ff58c04c5474ab85edce442f8081cb2",
+                "url": "https://api.github.com/repos/doctrine/dbal/zipball/0ac3c270590e54910715e9a1a044cc368df282b2",
+                "reference": "0ac3c270590e54910715e9a1a044cc368df282b2",
                 "shasum": ""
             },
             "require": {
@@ -2731,7 +2731,7 @@
                 "doctrine/coding-standard": "12.0.0",
                 "fig/log-test": "^1",
                 "jetbrains/phpstorm-stubs": "2023.1",
-                "phpstan/phpstan": "1.10.35",
+                "phpstan/phpstan": "1.10.42",
                 "phpstan/phpstan-strict-rules": "^1.5",
                 "phpunit/phpunit": "9.6.13",
                 "psalm/plugin-phpunit": "0.18.4",
@@ -2799,7 +2799,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/dbal/issues",
-                "source": "https://github.com/doctrine/dbal/tree/3.7.1"
+                "source": "https://github.com/doctrine/dbal/tree/3.7.2"
             },
             "funding": [
                 {
@@ -2815,7 +2815,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-10-06T05:06:20+00:00"
+            "time": "2023-11-19T08:06:58+00:00"
         },
         {
             "name": "doctrine/deprecations",
@@ -3770,20 +3770,20 @@
         },
         {
             "name": "ezyang/htmlpurifier",
-            "version": "v4.16.0",
+            "version": "v4.17.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ezyang/htmlpurifier.git",
-                "reference": "523407fb06eb9e5f3d59889b3978d5bfe94299c8"
+                "reference": "bbc513d79acf6691fa9cf10f192c90dd2957f18c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/523407fb06eb9e5f3d59889b3978d5bfe94299c8",
-                "reference": "523407fb06eb9e5f3d59889b3978d5bfe94299c8",
+                "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/bbc513d79acf6691fa9cf10f192c90dd2957f18c",
+                "reference": "bbc513d79acf6691fa9cf10f192c90dd2957f18c",
                 "shasum": ""
             },
             "require": {
-                "php": "~5.6.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0"
+                "php": "~5.6.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0"
             },
             "require-dev": {
                 "cerdic/css-tidy": "^1.7 || ^2.0",
@@ -3825,9 +3825,9 @@
             ],
             "support": {
                 "issues": "https://github.com/ezyang/htmlpurifier/issues",
-                "source": "https://github.com/ezyang/htmlpurifier/tree/v4.16.0"
+                "source": "https://github.com/ezyang/htmlpurifier/tree/v4.17.0"
             },
-            "time": "2022-09-18T07:06:19+00:00"
+            "time": "2023-11-17T15:01:25+00:00"
         },
         {
             "name": "fluidbook/tools",
@@ -3835,13 +3835,13 @@
             "source": {
                 "type": "git",
                 "url": "git://git.cubedesigners.com/fluidbook_tools.git",
-                "reference": "ac6a50b6a6440814a5f23e490d2e35eff4216a90"
+                "reference": "dd9b5b32ddc1a14afce0aed09a39be2723dc8502"
             },
             "dist": {
                 "type": "tar",
-                "url": "https://composer.cubedesigners.com/dist/fluidbook/tools/fluidbook-tools-dev-master-1245dd.tar",
-                "reference": "ac6a50b6a6440814a5f23e490d2e35eff4216a90",
-                "shasum": "34f51f7771a2642bd02f19dc9772f48448a7f108"
+                "url": "https://composer.cubedesigners.com/dist/fluidbook/tools/fluidbook-tools-dev-master-cf70ef.tar",
+                "reference": "dd9b5b32ddc1a14afce0aed09a39be2723dc8502",
+                "shasum": "1a3c8493f78e9d5bcad767e5cfb7c6877fec005e"
             },
             "require": {
                 "barryvdh/laravel-debugbar": "*",
@@ -3877,7 +3877,7 @@
                 }
             ],
             "description": "Fluidbook Tools",
-            "time": "2023-11-17T07:25:02+00:00"
+            "time": "2023-11-17T09:43:44+00:00"
         },
         {
             "name": "fruitcake/php-cors",
@@ -4633,7 +4633,7 @@
         },
         {
             "name": "jane-php/json-schema-runtime",
-            "version": "v7.5.4",
+            "version": "v7.5.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/janephp/json-schema-runtime.git",
@@ -4689,13 +4689,13 @@
             ],
             "description": "Jane runtime Library",
             "support": {
-                "source": "https://github.com/janephp/json-schema-runtime/tree/v7.5.4"
+                "source": "https://github.com/janephp/json-schema-runtime/tree/v7.5.5"
             },
             "time": "2023-09-08T13:25:01+00:00"
         },
         {
             "name": "jane-php/open-api-runtime",
-            "version": "v7.5.4",
+            "version": "v7.5.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/janephp/open-api-runtime.git",
@@ -4752,7 +4752,7 @@
             ],
             "description": "Jane OpenAPI Runtime Library, dependencies and utility class for a library generated by jane/openapi",
             "support": {
-                "source": "https://github.com/janephp/open-api-runtime/tree/v7.5.4"
+                "source": "https://github.com/janephp/open-api-runtime/tree/v7.5.5"
             },
             "time": "2021-12-16T13:26:58+00:00"
         },
@@ -5113,16 +5113,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v10.32.1",
+            "version": "v10.33.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "b30e44f20d244f7ba125283e14a8bbac167f4e5b"
+                "reference": "4536872e3e5b6be51b1f655dafd12c9a4fa0cfe8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/b30e44f20d244f7ba125283e14a8bbac167f4e5b",
-                "reference": "b30e44f20d244f7ba125283e14a8bbac167f4e5b",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/4536872e3e5b6be51b1f655dafd12c9a4fa0cfe8",
+                "reference": "4536872e3e5b6be51b1f655dafd12c9a4fa0cfe8",
                 "shasum": ""
             },
             "require": {
@@ -5311,7 +5311,7 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2023-11-14T22:57:08+00:00"
+            "time": "2023-11-21T14:49:31+00:00"
         },
         {
             "name": "laravel/prompts",
@@ -5764,16 +5764,16 @@
         },
         {
             "name": "league/flysystem",
-            "version": "3.19.0",
+            "version": "3.21.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem.git",
-                "reference": "1b2aa10f2326e0351399b8ce68e287d8e9209a83"
+                "reference": "a326d8a2d007e4ca327a57470846e34363789258"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/1b2aa10f2326e0351399b8ce68e287d8e9209a83",
-                "reference": "1b2aa10f2326e0351399b8ce68e287d8e9209a83",
+                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/a326d8a2d007e4ca327a57470846e34363789258",
+                "reference": "a326d8a2d007e4ca327a57470846e34363789258",
                 "shasum": ""
             },
             "require": {
@@ -5838,7 +5838,7 @@
             ],
             "support": {
                 "issues": "https://github.com/thephpleague/flysystem/issues",
-                "source": "https://github.com/thephpleague/flysystem/tree/3.19.0"
+                "source": "https://github.com/thephpleague/flysystem/tree/3.21.0"
             },
             "funding": [
                 {
@@ -5850,20 +5850,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-11-07T09:04:28+00:00"
+            "time": "2023-11-18T13:59:15+00:00"
         },
         {
             "name": "league/flysystem-local",
-            "version": "3.19.0",
+            "version": "3.21.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem-local.git",
-                "reference": "8d868217f9eeb4e9a7320db5ccad825e9a7a4076"
+                "reference": "470eb1c09eaabd49ebd908ae06f23983ba3ecfe7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/8d868217f9eeb4e9a7320db5ccad825e9a7a4076",
-                "reference": "8d868217f9eeb4e9a7320db5ccad825e9a7a4076",
+                "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/470eb1c09eaabd49ebd908ae06f23983ba3ecfe7",
+                "reference": "470eb1c09eaabd49ebd908ae06f23983ba3ecfe7",
                 "shasum": ""
             },
             "require": {
@@ -5898,7 +5898,7 @@
             ],
             "support": {
                 "issues": "https://github.com/thephpleague/flysystem-local/issues",
-                "source": "https://github.com/thephpleague/flysystem-local/tree/3.19.0"
+                "source": "https://github.com/thephpleague/flysystem-local/tree/3.21.0"
             },
             "funding": [
                 {
@@ -5910,7 +5910,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-11-06T20:35:28+00:00"
+            "time": "2023-11-18T13:41:42+00:00"
         },
         {
             "name": "league/glide",
@@ -9412,16 +9412,16 @@
         },
         {
             "name": "spatie/laravel-backup",
-            "version": "8.4.0",
+            "version": "8.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/laravel-backup.git",
-                "reference": "64f4b816c61f802e9f4c831a589c9d2e21573ddd"
+                "reference": "b79f790cc856e67cce012abf34bf1c9035085dc1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/laravel-backup/zipball/64f4b816c61f802e9f4c831a589c9d2e21573ddd",
-                "reference": "64f4b816c61f802e9f4c831a589c9d2e21573ddd",
+                "url": "https://api.github.com/repos/spatie/laravel-backup/zipball/b79f790cc856e67cce012abf34bf1c9035085dc1",
+                "reference": "b79f790cc856e67cce012abf34bf1c9035085dc1",
                 "shasum": ""
             },
             "require": {
@@ -9495,7 +9495,7 @@
             ],
             "support": {
                 "issues": "https://github.com/spatie/laravel-backup/issues",
-                "source": "https://github.com/spatie/laravel-backup/tree/8.4.0"
+                "source": "https://github.com/spatie/laravel-backup/tree/8.4.1"
             },
             "funding": [
                 {
@@ -9507,7 +9507,7 @@
                     "type": "other"
                 }
             ],
-            "time": "2023-10-17T15:51:49+00:00"
+            "time": "2023-11-20T08:21:45+00:00"
         },
         {
             "name": "spatie/laravel-googletagmanager",
@@ -15408,16 +15408,16 @@
         },
         {
             "name": "phpstan/phpdoc-parser",
-            "version": "1.24.2",
+            "version": "1.24.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpdoc-parser.git",
-                "reference": "bcad8d995980440892759db0c32acae7c8e79442"
+                "reference": "12f01d214f1c73b9c91fdb3b1c415e4c70652083"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/bcad8d995980440892759db0c32acae7c8e79442",
-                "reference": "bcad8d995980440892759db0c32acae7c8e79442",
+                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/12f01d214f1c73b9c91fdb3b1c415e4c70652083",
+                "reference": "12f01d214f1c73b9c91fdb3b1c415e4c70652083",
                 "shasum": ""
             },
             "require": {
@@ -15449,9 +15449,9 @@
             "description": "PHPDoc parser with support for nullable, intersection and generic types",
             "support": {
                 "issues": "https://github.com/phpstan/phpdoc-parser/issues",
-                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.24.2"
+                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.24.3"
             },
-            "time": "2023-09-26T12:28:12+00:00"
+            "time": "2023-11-18T20:15:32+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -17228,16 +17228,16 @@
         },
         {
             "name": "theseer/tokenizer",
-            "version": "1.2.1",
+            "version": "1.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/theseer/tokenizer.git",
-                "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e"
+                "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e",
-                "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e",
+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b2ad5003ca10d4ee50a12da31de12a5774ba6b96",
+                "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96",
                 "shasum": ""
             },
             "require": {
@@ -17266,7 +17266,7 @@
             "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
             "support": {
                 "issues": "https://github.com/theseer/tokenizer/issues",
-                "source": "https://github.com/theseer/tokenizer/tree/1.2.1"
+                "source": "https://github.com/theseer/tokenizer/tree/1.2.2"
             },
             "funding": [
                 {
@@ -17274,7 +17274,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-07-28T10:34:58+00:00"
+            "time": "2023-11-20T00:12:19+00:00"
         }
     ],
     "aliases": [],
@@ -17306,5 +17306,5 @@
         "ext-zlib": "*"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.1.0"
+    "plugin-api-version": "2.6.0"
 }