From 5d7b1fdbb8e5699a113d5194af471637bcb59ad8 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Wed, 21 Jul 2021 07:57:41 +0200 Subject: [PATCH] wip #4216 @0.5 --- app/Console/Commands/WorkshopMigration.php | 4 + app/Models/FluidbookTheme.php | 2 +- composer.json | 3 +- composer.lock | 128 ++++++++++----------- 4 files changed, 70 insertions(+), 67 deletions(-) diff --git a/app/Console/Commands/WorkshopMigration.php b/app/Console/Commands/WorkshopMigration.php index c7540ccb3..c998ebf2f 100644 --- a/app/Console/Commands/WorkshopMigration.php +++ b/app/Console/Commands/WorkshopMigration.php @@ -103,7 +103,11 @@ class WorkshopMigration extends CubistCommand if (in_array($k, $ignore)) { continue; } + $f = $c->getField($k); + if (null === $f) { + continue; + } if ($f instanceof Files) { $c->_handleWS2File($f, $data, $oldRoot); } else { diff --git a/app/Models/FluidbookTheme.php b/app/Models/FluidbookTheme.php index 5bf45a6e7..7c505551e 100644 --- a/app/Models/FluidbookTheme.php +++ b/app/Models/FluidbookTheme.php @@ -764,7 +764,7 @@ class FluidbookTheme extends CubistMagicAbstractModel if (self::$updateWS2ViewOnChange) { $this->updateWS2Table(); } - dispatch(new GenerateThemePreview($this)); + dispatch(new GenerateThemePreview($this))->onQueue('theme'); } public function postDelete() diff --git a/composer.json b/composer.json index 3c4487941..b7017e46f 100644 --- a/composer.json +++ b/composer.json @@ -23,12 +23,13 @@ "ext-simplexml": "*", "ext-tidy": "*", "ext-zip": "*", + "ahmadshah/lucy": "dev-master", "cubedesigners/userdatabase": "dev-master", "cubist/cms-back": "dev-master", "league/csv": "^9.7", "php-ffmpeg/php-ffmpeg": "^0.18.0", "phpoffice/phpspreadsheet": "^1.18", - "ahmadshah/lucy": "dev-master" + "predis/predis": "^1.1" }, "require-dev": { "facade/ignition": "^2.3", diff --git a/composer.lock b/composer.lock index 4bcda18fa..03bb62d97 100644 --- a/composer.lock +++ b/composer.lock @@ -1318,13 +1318,13 @@ "source": { "type": "git", "url": "git://git.cubedesigners.com/cubist_cms-back.git", - "reference": "029cadc78ec1a9c6f4bcd4390d299ba502c2cf8a" + "reference": "af677aa6a382ae1782fb1e0d382b5ab87f3b8a0d" }, "dist": { "type": "tar", - "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-master-af18ff.tar", - "reference": "029cadc78ec1a9c6f4bcd4390d299ba502c2cf8a", - "shasum": "05f8473e813e2a172c36938886da69748a696b47" + "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-master-070acc.tar", + "reference": "af677aa6a382ae1782fb1e0d382b5ab87f3b8a0d", + "shasum": "aeb240df1f5053f5a9603735150f5002555c6944" }, "require": { "backpack/backupmanager": "^2.0", @@ -1399,7 +1399,7 @@ } ], "description": "Cubist Backpack extension", - "time": "2021-07-06T16:38:33+00:00" + "time": "2021-07-20T10:10:01+00:00" }, { "name": "cubist/cms-front", @@ -1876,24 +1876,23 @@ }, { "name": "doctrine/cache", - "version": "1.11.3", + "version": "1.12.1", "source": { "type": "git", "url": "https://github.com/doctrine/cache.git", - "reference": "3bb5588cec00a0268829cc4a518490df6741af9d" + "reference": "4cf401d14df219fa6f38b671f5493449151c9ad8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/cache/zipball/3bb5588cec00a0268829cc4a518490df6741af9d", - "reference": "3bb5588cec00a0268829cc4a518490df6741af9d", + "url": "https://api.github.com/repos/doctrine/cache/zipball/4cf401d14df219fa6f38b671f5493449151c9ad8", + "reference": "4cf401d14df219fa6f38b671f5493449151c9ad8", "shasum": "" }, "require": { "php": "~7.1 || ^8.0" }, "conflict": { - "doctrine/common": ">2.2,<2.4", - "psr/cache": ">=3" + "doctrine/common": ">2.2,<2.4" }, "require-dev": { "alcaeus/mongo-php-adapter": "^1.1", @@ -1902,8 +1901,9 @@ "mongodb/mongodb": "^1.1", "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0", "predis/predis": "~1.0", - "psr/cache": "^1.0 || ^2.0", - "symfony/cache": "^4.4 || ^5.2" + "psr/cache": "^1.0 || ^2.0 || ^3.0", + "symfony/cache": "^4.4 || ^5.2 || ^6.0@dev", + "symfony/var-exporter": "^4.4 || ^5.2 || ^6.0@dev" }, "suggest": { "alcaeus/mongo-php-adapter": "Required to use legacy MongoDB driver" @@ -1955,7 +1955,7 @@ ], "support": { "issues": "https://github.com/doctrine/cache/issues", - "source": "https://github.com/doctrine/cache/tree/1.11.3" + "source": "https://github.com/doctrine/cache/tree/1.12.1" }, "funding": [ { @@ -1971,7 +1971,7 @@ "type": "tidelift" } ], - "time": "2021-05-25T09:01:55+00:00" + "time": "2021-07-17T14:39:21+00:00" }, { "name": "doctrine/dbal", @@ -3369,7 +3369,7 @@ }, { "name": "intervention/image", - "version": "dev-master", + "version": "2.6.0", "source": { "type": "git", "url": "https://github.com/Intervention/image.git", @@ -3395,7 +3395,6 @@ "ext-imagick": "to use Imagick based image processing.", "intervention/imagecache": "Caching extension for the Intervention Image library" }, - "default-branch": true, "type": "library", "extra": { "branch-alias": { @@ -3438,7 +3437,7 @@ ], "support": { "issues": "https://github.com/Intervention/image/issues", - "source": "https://github.com/Intervention/image/tree/master" + "source": "https://github.com/Intervention/image/tree/2.6.0" }, "funding": [ { @@ -3807,16 +3806,16 @@ }, { "name": "league/commonmark", - "version": "1.6.5", + "version": "1.6.6", "source": { "type": "git", "url": "https://github.com/thephpleague/commonmark.git", - "reference": "44ffd8d3c4a9133e4bd0548622b09c55af39db5f" + "reference": "c4228d11e30d7493c6836d20872f9582d8ba6dcf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/44ffd8d3c4a9133e4bd0548622b09c55af39db5f", - "reference": "44ffd8d3c4a9133e4bd0548622b09c55af39db5f", + "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/c4228d11e30d7493c6836d20872f9582d8ba6dcf", + "reference": "c4228d11e30d7493c6836d20872f9582d8ba6dcf", "shasum": "" }, "require": { @@ -3904,7 +3903,7 @@ "type": "tidelift" } ], - "time": "2021-06-26T11:57:13+00:00" + "time": "2021-07-17T17:13:23+00:00" }, { "name": "league/csv", @@ -4689,16 +4688,16 @@ }, { "name": "monolog/monolog", - "version": "2.3.0", + "version": "2.3.1", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "df991fd88693ab703aa403413d83e15f688dae33" + "reference": "9738e495f288eec0b187e310b7cdbbb285777dbe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/df991fd88693ab703aa403413d83e15f688dae33", - "reference": "df991fd88693ab703aa403413d83e15f688dae33", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/9738e495f288eec0b187e310b7cdbbb285777dbe", + "reference": "9738e495f288eec0b187e310b7cdbbb285777dbe", "shasum": "" }, "require": { @@ -4769,7 +4768,7 @@ ], "support": { "issues": "https://github.com/Seldaek/monolog/issues", - "source": "https://github.com/Seldaek/monolog/tree/2.3.0" + "source": "https://github.com/Seldaek/monolog/tree/2.3.1" }, "funding": [ { @@ -4781,7 +4780,7 @@ "type": "tidelift" } ], - "time": "2021-07-05T11:34:13+00:00" + "time": "2021-07-14T11:56:39+00:00" }, { "name": "myclabs/php-enum", @@ -6353,16 +6352,16 @@ }, { "name": "spatie/laravel-backup", - "version": "6.16.0", + "version": "6.16.1", "source": { "type": "git", "url": "https://github.com/spatie/laravel-backup.git", - "reference": "6b2229a07d92c2bb146ad9c5223fc32e9d74830c" + "reference": "11a3fdb6938566ba75f3dd9ab790319d5e90b0fc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-backup/zipball/6b2229a07d92c2bb146ad9c5223fc32e9d74830c", - "reference": "6b2229a07d92c2bb146ad9c5223fc32e9d74830c", + "url": "https://api.github.com/repos/spatie/laravel-backup/zipball/11a3fdb6938566ba75f3dd9ab790319d5e90b0fc", + "reference": "11a3fdb6938566ba75f3dd9ab790319d5e90b0fc", "shasum": "" }, "require": { @@ -6427,7 +6426,7 @@ ], "support": { "issues": "https://github.com/spatie/laravel-backup/issues", - "source": "https://github.com/spatie/laravel-backup/tree/6.16.0" + "source": "https://github.com/spatie/laravel-backup/tree/6.16.1" }, "funding": [ { @@ -6439,7 +6438,7 @@ "type": "other" } ], - "time": "2021-04-15T09:31:32+00:00" + "time": "2021-07-10T14:54:21+00:00" }, { "name": "spatie/laravel-googletagmanager", @@ -10413,16 +10412,16 @@ }, { "name": "facade/ignition", - "version": "2.10.2", + "version": "2.11.2", "source": { "type": "git", "url": "https://github.com/facade/ignition.git", - "reference": "43688227bbf27c43bc1ad83af224f135b6ef0ff4" + "reference": "7c4e7a7da184cd00c7ce6eacc590200bb9672de7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/facade/ignition/zipball/43688227bbf27c43bc1ad83af224f135b6ef0ff4", - "reference": "43688227bbf27c43bc1ad83af224f135b6ef0ff4", + "url": "https://api.github.com/repos/facade/ignition/zipball/7c4e7a7da184cd00c7ce6eacc590200bb9672de7", + "reference": "7c4e7a7da184cd00c7ce6eacc590200bb9672de7", "shasum": "" }, "require": { @@ -10430,7 +10429,6 @@ "ext-mbstring": "*", "facade/flare-client-php": "^1.6", "facade/ignition-contracts": "^1.0.2", - "filp/whoops": "^2.4", "illuminate/support": "^7.0|^8.0", "monolog/monolog": "^2.0", "php": "^7.2.5|^8.0", @@ -10486,7 +10484,7 @@ "issues": "https://github.com/facade/ignition/issues", "source": "https://github.com/facade/ignition" }, - "time": "2021-06-11T06:57:25+00:00" + "time": "2021-07-20T14:01:22+00:00" }, { "name": "facade/ignition-contracts", @@ -10543,16 +10541,16 @@ }, { "name": "filp/whoops", - "version": "2.13.0", + "version": "2.14.0", "source": { "type": "git", "url": "https://github.com/filp/whoops.git", - "reference": "2edbc73a4687d9085c8f20f398eebade844e8424" + "reference": "fdf92f03e150ed84d5967a833ae93abffac0315b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filp/whoops/zipball/2edbc73a4687d9085c8f20f398eebade844e8424", - "reference": "2edbc73a4687d9085c8f20f398eebade844e8424", + "url": "https://api.github.com/repos/filp/whoops/zipball/fdf92f03e150ed84d5967a833ae93abffac0315b", + "reference": "fdf92f03e150ed84d5967a833ae93abffac0315b", "shasum": "" }, "require": { @@ -10602,7 +10600,7 @@ ], "support": { "issues": "https://github.com/filp/whoops/issues", - "source": "https://github.com/filp/whoops/tree/2.13.0" + "source": "https://github.com/filp/whoops/tree/2.14.0" }, "funding": [ { @@ -10610,7 +10608,7 @@ "type": "github" } ], - "time": "2021-06-04T12:00:00+00:00" + "time": "2021-07-13T12:00:00+00:00" }, { "name": "fzaninotto/faker", @@ -11132,16 +11130,16 @@ }, { "name": "phar-io/manifest", - "version": "2.0.1", + "version": "2.0.3", "source": { "type": "git", "url": "https://github.com/phar-io/manifest.git", - "reference": "85265efd3af7ba3ca4b2a2c34dbfc5788dd29133" + "reference": "97803eca37d319dfa7826cc2437fc020857acb53" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phar-io/manifest/zipball/85265efd3af7ba3ca4b2a2c34dbfc5788dd29133", - "reference": "85265efd3af7ba3ca4b2a2c34dbfc5788dd29133", + "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53", + "reference": "97803eca37d319dfa7826cc2437fc020857acb53", "shasum": "" }, "require": { @@ -11186,9 +11184,9 @@ "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", "support": { "issues": "https://github.com/phar-io/manifest/issues", - "source": "https://github.com/phar-io/manifest/tree/master" + "source": "https://github.com/phar-io/manifest/tree/2.0.3" }, - "time": "2020-06-27T14:33:11+00:00" + "time": "2021-07-20T11:28:43+00:00" }, { "name": "phar-io/version", @@ -11541,16 +11539,16 @@ }, { "name": "phpunit/php-file-iterator", - "version": "2.0.3", + "version": "2.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "4b49fb70f067272b659ef0174ff9ca40fdaa6357" + "reference": "28af674ff175d0768a5a978e6de83f697d4a7f05" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/4b49fb70f067272b659ef0174ff9ca40fdaa6357", - "reference": "4b49fb70f067272b659ef0174ff9ca40fdaa6357", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/28af674ff175d0768a5a978e6de83f697d4a7f05", + "reference": "28af674ff175d0768a5a978e6de83f697d4a7f05", "shasum": "" }, "require": { @@ -11589,7 +11587,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues", - "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/2.0.3" + "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/2.0.4" }, "funding": [ { @@ -11597,7 +11595,7 @@ "type": "github" } ], - "time": "2020-11-30T08:25:21+00:00" + "time": "2021-07-19T06:46:01+00:00" }, { "name": "phpunit/php-text-template", @@ -11765,16 +11763,16 @@ }, { "name": "phpunit/phpunit", - "version": "8.5.17", + "version": "8.5.18", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "79067856d85421c56d413bd238d4e2cd6b0e54da" + "reference": "bd5fc77c869e8dd65040dacbad170f074c13796c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/79067856d85421c56d413bd238d4e2cd6b0e54da", - "reference": "79067856d85421c56d413bd238d4e2cd6b0e54da", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/bd5fc77c869e8dd65040dacbad170f074c13796c", + "reference": "bd5fc77c869e8dd65040dacbad170f074c13796c", "shasum": "" }, "require": { @@ -11846,7 +11844,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/8.5.17" + "source": "https://github.com/sebastianbergmann/phpunit/tree/8.5.18" }, "funding": [ { @@ -11858,7 +11856,7 @@ "type": "github" } ], - "time": "2021-06-23T05:12:43+00:00" + "time": "2021-07-19T06:13:17+00:00" }, { "name": "psy/psysh", -- 2.39.5