From: Vincent Vanwaelscappel Date: Wed, 27 Sep 2023 07:04:24 +0000 (+0200) Subject: wip #6300 @0.5 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=53cf46c3f6b6b1cb89f1516c972f5a0eb69aff12;p=fluidbook-toolbox.git wip #6300 @0.5 --- diff --git a/app/Http/Controllers/Admin/Operations/Quiz/PreviewOperation.php b/app/Http/Controllers/Admin/Operations/Quiz/PreviewOperation.php index f59bed7a3..4d42a4fc1 100644 --- a/app/Http/Controllers/Admin/Operations/Quiz/PreviewOperation.php +++ b/app/Http/Controllers/Admin/Operations/Quiz/PreviewOperation.php @@ -31,6 +31,7 @@ trait PreviewOperation })->where('id', '([0-9]+)(-[0-9]+)?') ->where('hash', '[0-9a-f]{32}') ->where('path', '.*') + ->whereNumber('time') ->whereAlpha('version') ->withoutMiddleware([CheckIfAdmin::class]) ->name('quiz_preview_with_time'); diff --git a/app/Models/Quiz.php b/app/Models/Quiz.php index 866f56806..7cc2d4350 100644 --- a/app/Models/Quiz.php +++ b/app/Models/Quiz.php @@ -403,7 +403,7 @@ class Quiz extends ToolboxModel $this->theme = QuizTheme::createFromOldVersionQuiz($this); $this->saveQuietly(); } - return QuizTheme::withoutGlobalScopes()->find($this->theme ?: 3); + return QuizTheme::withoutGlobalScopes()->find($this->theme); } public function onRetrieved(): bool diff --git a/app/Models/QuizTheme.php b/app/Models/QuizTheme.php index 4eb7040ef..175065cd4 100644 --- a/app/Models/QuizTheme.php +++ b/app/Models/QuizTheme.php @@ -13,7 +13,9 @@ use Cubist\Backpack\Magic\Fields\Color; use Cubist\Backpack\Magic\Fields\FormSection; use Cubist\Backpack\Magic\Fields\FormSectionDescription; use Cubist\Backpack\Magic\Fields\FormSeparator; +use Cubist\Backpack\Magic\Fields\Hidden; use Cubist\Backpack\Magic\Fields\SelectFromArray; +use Cubist\Backpack\Magic\Fields\Text; use Cubist\Util\CommandLine\Imagemagick; use Cubist\Util\Files\Files; use Cubist\Util\Graphics\Resizer; @@ -37,6 +39,7 @@ class QuizTheme extends ToolboxModel parent::setFields(); $this->addOwnerField(); + $this->addField('hash', Hidden::class); $this->addField('name', 'Text', __('Nom'), ['column' => true]); //$this->addField('preview', 'NoValue', __('Preview'), ['column_escape' => false, 'column' => true, 'column_type' => 'model_function', 'column_function_name' => 'getPreviewImage', 'column_limit' => -1]); $this->setSettingsFields(); @@ -171,7 +174,23 @@ class QuizTheme extends ToolboxModel */ public static function createFromOldVersionQuiz($quiz) { + $logo = $quiz->getFirstMediaPath($quiz->logo); + $banner = $quiz->getFirstMediaPath($quiz->banner); + + $data = ['mainColor' => (string)$quiz->mainColor, + 'okColor' => (string)$quiz->okColor, + 'nokColor' => (string)$quiz->nokColor, + 'logo' => hash_file('sha256', $logo), + 'banner' => hash_file('sha256', $banner), + ]; + $hash = hash('sha256', print_r($data, true)); + $theme = QuizTheme::withoutGlobalScopes()->where('hash', $hash)->first(); + if (null !== $theme) { + return $theme->id; + } + $theme = new QuizTheme(); + $theme->hash = $hash; $theme->name = $quiz->client . ' - ' . $quiz->title; $theme->mainColor = \Cubist\Util\Graphics\Color::colorToCSS($quiz->mainColor); $theme->neutralColor = \Cubist\Util\Graphics\Color::colorToCSS('#333333'); @@ -181,7 +200,7 @@ class QuizTheme extends ToolboxModel $theme->owner = 5; - $logo = new \SplFileInfo($quiz->getFirstMediaPath($quiz->logo)); + $logo = new \SplFileInfo($logo); $tmp = Files::tempnam() . '.' . $logo->getExtension(); copy($logo, $tmp); $theme->addMediaToField('logo', $tmp); @@ -191,10 +210,11 @@ class QuizTheme extends ToolboxModel $theme->backgroundHorizontalAlign = HorizontalAlign::CENTER; $theme->backgroundVerticalAlign = VerticalAlign::MIDDLE; + $theme->font = 'SourceSans'; $tmp = Files::tempnam() . '.jpg'; $blur = Files::tempnam() . '.jpg'; - $banner = $quiz->getFirstMediaPath($quiz->banner); + $resizer = new Resizer(); $resizer->loadImage($banner); @@ -203,7 +223,7 @@ class QuizTheme extends ToolboxModel Imagemagick::blur($tmp, $blur); $theme->addMediaToField('backgroundImage', $blur); - $resizer = new Resizer($banner); + $resizer = new Resizer(); $resizer->loadImage($banner); $resizer->resize(390, 844, true, true); $resizer->output('jpg', $tmp); diff --git a/composer.lock b/composer.lock index ddf7701ec..927637ab4 100644 --- a/composer.lock +++ b/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": "17a71f00635fcbe7512cc6896ef3b978", + "content-hash": "43c2d924404970eb4cce1df7b451861d", "packages": [ { "name": "archtechx/enums", @@ -492,60 +492,6 @@ }, "time": "2023-02-12T09:09:37+00:00" }, - { - "name": "bacon/bacon-qr-code", - "version": "2.0.8", - "source": { - "type": "git", - "url": "https://github.com/Bacon/BaconQrCode.git", - "reference": "8674e51bb65af933a5ffaf1c308a660387c35c22" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Bacon/BaconQrCode/zipball/8674e51bb65af933a5ffaf1c308a660387c35c22", - "reference": "8674e51bb65af933a5ffaf1c308a660387c35c22", - "shasum": "" - }, - "require": { - "dasprid/enum": "^1.0.3", - "ext-iconv": "*", - "php": "^7.1 || ^8.0" - }, - "require-dev": { - "phly/keep-a-changelog": "^2.1", - "phpunit/phpunit": "^7 | ^8 | ^9", - "spatie/phpunit-snapshot-assertions": "^4.2.9", - "squizlabs/php_codesniffer": "^3.4" - }, - "suggest": { - "ext-imagick": "to generate QR code images" - }, - "type": "library", - "autoload": { - "psr-4": { - "BaconQrCode\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-2-Clause" - ], - "authors": [ - { - "name": "Ben Scholzen 'DASPRiD'", - "email": "mail@dasprids.de", - "homepage": "https://dasprids.de/", - "role": "Developer" - } - ], - "description": "BaconQrCode is a QR code generator for PHP.", - "homepage": "https://github.com/Bacon/BaconQrCode", - "support": { - "issues": "https://github.com/Bacon/BaconQrCode/issues", - "source": "https://github.com/Bacon/BaconQrCode/tree/2.0.8" - }, - "time": "2022-12-07T17:46:57+00:00" - }, { "name": "barryvdh/laravel-debugbar", "version": "v3.9.2", @@ -1010,32 +956,37 @@ }, { "name": "chillerlan/php-qrcode", - "version": "4.3.4", + "version": "dev-main", "source": { "type": "git", "url": "https://github.com/chillerlan/php-qrcode.git", - "reference": "2ca4bf5ae048af1981d1023ee42a0a2a9d51e51d" + "reference": "cf7e82ba7ed5c66e92f89fcaa182ba9868219bb8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/chillerlan/php-qrcode/zipball/2ca4bf5ae048af1981d1023ee42a0a2a9d51e51d", - "reference": "2ca4bf5ae048af1981d1023ee42a0a2a9d51e51d", + "url": "https://api.github.com/repos/chillerlan/php-qrcode/zipball/cf7e82ba7ed5c66e92f89fcaa182ba9868219bb8", + "reference": "cf7e82ba7ed5c66e92f89fcaa182ba9868219bb8", "shasum": "" }, "require": { - "chillerlan/php-settings-container": "^2.1.4", + "chillerlan/php-settings-container": "^2.1.4 || ^3.0", "ext-mbstring": "*", "php": "^7.4 || ^8.0" }, "require-dev": { - "phan/phan": "^5.3", - "phpunit/phpunit": "^9.5", - "setasign/fpdf": "^1.8.2" + "chillerlan/php-authenticator": "^4.0 || ^5.0", + "phan/phan": "^5.4", + "phpmd/phpmd": "^2.13", + "phpunit/phpunit": "^9.6", + "setasign/fpdf": "^1.8.2", + "squizlabs/php_codesniffer": "^3.7" }, "suggest": { "chillerlan/php-authenticator": "Yet another Google authenticator! Also creates URIs for mobile apps.", - "setasign/fpdf": "Required to use the QR FPDF output." + "setasign/fpdf": "Required to use the QR FPDF output.", + "simple-icons/simple-icons": "SVG icons that you can use to embed as logos in the QR Code" }, + "default-branch": true, "type": "library", "autoload": { "psr-4": { @@ -1044,12 +995,21 @@ }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "MIT", + "Apache-2.0" ], "authors": [ { "name": "Kazuhiko Arase", - "homepage": "https://github.com/kazuhikoarase" + "homepage": "https://github.com/kazuhikoarase/qrcode-generator" + }, + { + "name": "ZXing Authors", + "homepage": "https://github.com/zxing/zxing" + }, + { + "name": "Ashot Khanamiryan", + "homepage": "https://github.com/khanamiryan/php-qrcode-detector-decoder" }, { "name": "Smiley", @@ -1061,18 +1021,22 @@ "homepage": "https://github.com/chillerlan/php-qrcode/graphs/contributors" } ], - "description": "A QR code generator. PHP 7.4+", + "description": "A QR code generator and reader with a user friendly API. PHP 7.4+", "homepage": "https://github.com/chillerlan/php-qrcode", "keywords": [ "phpqrcode", "qr", "qr code", + "qr-reader", "qrcode", - "qrcode-generator" + "qrcode-generator", + "qrcode-reader" ], "support": { + "docs": "https://chillerlan.github.io/php-qrcode", "issues": "https://github.com/chillerlan/php-qrcode/issues", - "source": "https://github.com/chillerlan/php-qrcode/tree/4.3.4" + "source": "https://github.com/chillerlan/php-qrcode", + "wiki": "https://github.com/chillerlan/php-qrcode/wiki" }, "funding": [ { @@ -1084,29 +1048,31 @@ "type": "ko_fi" } ], - "time": "2022-07-25T09:12:45+00:00" + "time": "2023-09-19T12:19:07+00:00" }, { "name": "chillerlan/php-settings-container", - "version": "2.1.4", + "version": "3.1.0", "source": { "type": "git", "url": "https://github.com/chillerlan/php-settings-container.git", - "reference": "1beb7df3c14346d4344b0b2e12f6f9a74feabd4a" + "reference": "4d02944424fa1f48abca96353257c93cbac856c1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/chillerlan/php-settings-container/zipball/1beb7df3c14346d4344b0b2e12f6f9a74feabd4a", - "reference": "1beb7df3c14346d4344b0b2e12f6f9a74feabd4a", + "url": "https://api.github.com/repos/chillerlan/php-settings-container/zipball/4d02944424fa1f48abca96353257c93cbac856c1", + "reference": "4d02944424fa1f48abca96353257c93cbac856c1", "shasum": "" }, "require": { "ext-json": "*", - "php": "^7.4 || ^8.0" + "php": "^8.1" }, "require-dev": { - "phan/phan": "^5.3", - "phpunit/phpunit": "^9.5" + "phan/phan": "^5.4", + "phpmd/phpmd": "^2.13", + "phpunit/phpunit": "^10.2", + "squizlabs/php_codesniffer": "^3.7" }, "type": "library", "autoload": { @@ -1125,10 +1091,9 @@ "homepage": "https://github.com/codemasher" } ], - "description": "A container class for immutable settings objects. Not a DI container. PHP 7.4+", + "description": "A container class for immutable settings objects. Not a DI container.", "homepage": "https://github.com/chillerlan/php-settings-container", "keywords": [ - "PHP7", "Settings", "configuration", "container", @@ -1148,7 +1113,7 @@ "type": "ko_fi" } ], - "time": "2022-07-05T22:32:14+00:00" + "time": "2023-07-17T20:46:37+00:00" }, { "name": "chrisjean/php-ico", @@ -1265,21 +1230,21 @@ }, { "name": "cocur/slugify", - "version": "v4.4.0", + "version": "v4.5.1", "source": { "type": "git", "url": "https://github.com/cocur/slugify.git", - "reference": "4c6ed14a087ca061b220ffda640c07644946e2a0" + "reference": "7c6e088228b9f082050876ae8b0cd287b117b840" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cocur/slugify/zipball/4c6ed14a087ca061b220ffda640c07644946e2a0", - "reference": "4c6ed14a087ca061b220ffda640c07644946e2a0", + "url": "https://api.github.com/repos/cocur/slugify/zipball/7c6e088228b9f082050876ae8b0cd287b117b840", + "reference": "7c6e088228b9f082050876ae8b0cd287b117b840", "shasum": "" }, "require": { "ext-mbstring": "*", - "php": "^7.1 || ~8.0.0 || ~8.1.0 || ~8.2.0" + "php": "~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0" }, "conflict": { "symfony/config": "<3.4 || >=4,<4.3", @@ -1333,9 +1298,9 @@ ], "support": { "issues": "https://github.com/cocur/slugify/issues", - "source": "https://github.com/cocur/slugify/tree/v4.4.0" + "source": "https://github.com/cocur/slugify/tree/v4.5.1" }, - "time": "2023-08-05T09:42:11+00:00" + "time": "2023-09-17T07:26:20+00:00" }, { "name": "composer/package-versions-deprecated", @@ -1649,13 +1614,13 @@ "source": { "type": "git", "url": "git://git.cubedesigners.com/cubist_cms-back.git", - "reference": "8b43e1063d420fa27b030c3c2cd9126439e41f9f" + "reference": "947d0dc2f3ff6f53132fd0a6e39bc35decee5cfe" }, "dist": { "type": "tar", - "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-backpack5-3702f9.tar", - "reference": "8b43e1063d420fa27b030c3c2cd9126439e41f9f", - "shasum": "488d6cf28f9d976507e80821423cee95eaab2efc" + "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-backpack5-1ba1bf.tar", + "reference": "947d0dc2f3ff6f53132fd0a6e39bc35decee5cfe", + "shasum": "dc48d45d529b209e16fe60d3d727608be5eebbc0" }, "require": { "backpack/backupmanager": "^v3.0.9", @@ -1734,7 +1699,7 @@ } ], "description": "Cubist Backpack extension", - "time": "2023-09-07T08:05:47+00:00" + "time": "2023-09-18T16:33:50+00:00" }, { "name": "cubist/cms-front", @@ -2070,13 +2035,13 @@ "source": { "type": "git", "url": "git://git.cubedesigners.com/cubist_pdf.git", - "reference": "81f9b5cc6697ec481de852a16252eda0b2117aab" + "reference": "01708681079069ddf30b9aaafbfa5c24a40d8d6a" }, "dist": { "type": "tar", - "url": "https://composer.cubedesigners.com/dist/cubist/pdf/cubist-pdf-dev-master-9efc6e.tar", - "reference": "81f9b5cc6697ec481de852a16252eda0b2117aab", - "shasum": "92ac6b7b0e68294aec6e52c6f3fd40d9085f9d54" + "url": "https://composer.cubedesigners.com/dist/cubist/pdf/cubist-pdf-dev-master-67184e.tar", + "reference": "01708681079069ddf30b9aaafbfa5c24a40d8d6a", + "shasum": "89b2f81898339f751f9888f1065be875a767d8b7" }, "require": { "cubist/util": "dev-master", @@ -2112,7 +2077,7 @@ "cubist", "pdf" ], - "time": "2023-09-08T16:29:40+00:00" + "time": "2023-09-21T09:25:33+00:00" }, { "name": "cubist/scorm", @@ -2120,13 +2085,13 @@ "source": { "type": "git", "url": "git://git.cubedesigners.com/cubist_scorm.git", - "reference": "9d9c448cac2b58cf0a4d04ab4d8400b93371a52d" + "reference": "1ff6427105048123dfa93cca178c0d7aa4363f3c" }, "dist": { "type": "tar", - "url": "https://composer.cubedesigners.com/dist/cubist/scorm/cubist-scorm-dev-master-342aa4.tar", - "reference": "9d9c448cac2b58cf0a4d04ab4d8400b93371a52d", - "shasum": "66984f6c178a8e7e7f86ee43321597f76386b43b" + "url": "https://composer.cubedesigners.com/dist/cubist/scorm/cubist-scorm-dev-master-afa568.tar", + "reference": "1ff6427105048123dfa93cca178c0d7aa4363f3c", + "shasum": "8fbfa91642ab4bf56ad21c2a9750aefb5304cfbd" }, "require": { "ext-mbstring": "*", @@ -2149,7 +2114,7 @@ } ], "description": "cubist_scorm", - "time": "2022-06-28T10:37:24+00:00" + "time": "2023-09-22T15:45:05+00:00" }, { "name": "cubist/util", @@ -2157,13 +2122,13 @@ "source": { "type": "git", "url": "git://git.cubedesigners.com/cubist_util.git", - "reference": "f0424ee65afcec52bf6cd924c92e2415451fa0a6" + "reference": "bb497cd182cb0eea33f2d83d4bdae8a6b62a1e0b" }, "dist": { "type": "tar", - "url": "https://composer.cubedesigners.com/dist/cubist/util/cubist-util-dev-master-32f01f.tar", - "reference": "f0424ee65afcec52bf6cd924c92e2415451fa0a6", - "shasum": "d4d0eb9d3c6eb61cc32147b3a3d5c860573d0b6e" + "url": "https://composer.cubedesigners.com/dist/cubist/util/cubist-util-dev-master-e86967.tar", + "reference": "bb497cd182cb0eea33f2d83d4bdae8a6b62a1e0b", + "shasum": "65bfe13dc8d44df28e15ac99047b7df58a87ccf4" }, "require": { "cubist/net": "dev-master", @@ -2197,7 +2162,7 @@ } ], "description": "Utilities class", - "time": "2023-09-12T10:43:47+00:00" + "time": "2023-09-26T16:42:08+00:00" }, { "name": "cviebrock/eloquent-sluggable", @@ -2349,56 +2314,6 @@ "abandoned": "mailerlite/laravel-elasticsearch", "time": "2023-06-12T20:55:39+00:00" }, - { - "name": "dasprid/enum", - "version": "1.0.5", - "source": { - "type": "git", - "url": "https://github.com/DASPRiD/Enum.git", - "reference": "6faf451159fb8ba4126b925ed2d78acfce0dc016" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/DASPRiD/Enum/zipball/6faf451159fb8ba4126b925ed2d78acfce0dc016", - "reference": "6faf451159fb8ba4126b925ed2d78acfce0dc016", - "shasum": "" - }, - "require": { - "php": ">=7.1 <9.0" - }, - "require-dev": { - "phpunit/phpunit": "^7 | ^8 | ^9", - "squizlabs/php_codesniffer": "*" - }, - "type": "library", - "autoload": { - "psr-4": { - "DASPRiD\\Enum\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-2-Clause" - ], - "authors": [ - { - "name": "Ben Scholzen 'DASPRiD'", - "email": "mail@dasprids.de", - "homepage": "https://dasprids.de/", - "role": "Developer" - } - ], - "description": "PHP 7.1 enum implementation", - "keywords": [ - "enum", - "map" - ], - "support": { - "issues": "https://github.com/DASPRiD/Enum/issues", - "source": "https://github.com/DASPRiD/Enum/tree/1.0.5" - }, - "time": "2023-08-25T16:18:39+00:00" - }, { "name": "dflydev/dot-access-data", "version": "v3.0.2", @@ -2688,16 +2603,16 @@ }, { "name": "doctrine/dbal", - "version": "3.6.6", + "version": "3.7.0", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "63646ffd71d1676d2f747f871be31b7e921c7864" + "reference": "00d03067f07482f025d41ab55e4ba0db5eca2cdf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/63646ffd71d1676d2f747f871be31b7e921c7864", - "reference": "63646ffd71d1676d2f747f871be31b7e921c7864", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/00d03067f07482f025d41ab55e4ba0db5eca2cdf", + "reference": "00d03067f07482f025d41ab55e4ba0db5eca2cdf", "shasum": "" }, "require": { @@ -2713,9 +2628,9 @@ "doctrine/coding-standard": "12.0.0", "fig/log-test": "^1", "jetbrains/phpstorm-stubs": "2023.1", - "phpstan/phpstan": "1.10.29", + "phpstan/phpstan": "1.10.35", "phpstan/phpstan-strict-rules": "^1.5", - "phpunit/phpunit": "9.6.9", + "phpunit/phpunit": "9.6.13", "psalm/plugin-phpunit": "0.18.4", "slevomat/coding-standard": "8.13.1", "squizlabs/php_codesniffer": "3.7.2", @@ -2781,7 +2696,7 @@ ], "support": { "issues": "https://github.com/doctrine/dbal/issues", - "source": "https://github.com/doctrine/dbal/tree/3.6.6" + "source": "https://github.com/doctrine/dbal/tree/3.7.0" }, "funding": [ { @@ -2797,7 +2712,7 @@ "type": "tidelift" } ], - "time": "2023-08-17T05:38:17+00:00" + "time": "2023-09-26T20:56:55+00:00" }, { "name": "doctrine/deprecations", @@ -3813,16 +3728,17 @@ "source": { "type": "git", "url": "git://git.cubedesigners.com/fluidbook_tools.git", - "reference": "0b851276da162cb425cb72b5d5d68ecbb073e6be" + "reference": "a3f8f906fa4c9c179e6fbc89d3178140c21498cd" }, "dist": { "type": "tar", - "url": "https://composer.cubedesigners.com/dist/fluidbook/tools/fluidbook-tools-dev-master-18312e.tar", - "reference": "0b851276da162cb425cb72b5d5d68ecbb073e6be", - "shasum": "66596669cc4742b74f21f47e83f57d5699ddd490" + "url": "https://composer.cubedesigners.com/dist/fluidbook/tools/fluidbook-tools-dev-master-41cd8d.tar", + "reference": "a3f8f906fa4c9c179e6fbc89d3178140c21498cd", + "shasum": "29b1dfe74b938d88d0e1dd936d6af30ddfe76f50" }, "require": { "barryvdh/laravel-debugbar": "*", + "chillerlan/php-qrcode": "dev-main", "cubist/pdf": "dev-master", "cubist/util": "dev-master", "ext-dom": "*", @@ -3832,6 +3748,7 @@ "ext-libxml": "*", "ext-mbstring": "*", "ext-simplexml": "*", + "ext-sodium": "*", "laravel/framework": "~5.8|^6.0|^7.0|^8.0|^9.0|^10.0", "php": ">=8.0", "spatie/laravel-medialibrary": "^9.12.4|^10.7.16" @@ -3853,7 +3770,7 @@ } ], "description": "Fluidbook Tools", - "time": "2023-09-12T14:31:17+00:00" + "time": "2023-09-26T09:00:36+00:00" }, { "name": "fruitcake/php-cors", @@ -5089,16 +5006,16 @@ }, { "name": "laravel/framework", - "version": "v10.22.0", + "version": "v10.25.1", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "9234388a895206d4e1df37342b61adc67e5c5d31" + "reference": "cd0a440f43eaaad247d6f6575d3782c156ec913c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/9234388a895206d4e1df37342b61adc67e5c5d31", - "reference": "9234388a895206d4e1df37342b61adc67e5c5d31", + "url": "https://api.github.com/repos/laravel/framework/zipball/cd0a440f43eaaad247d6f6575d3782c156ec913c", + "reference": "cd0a440f43eaaad247d6f6575d3782c156ec913c", "shasum": "" }, "require": { @@ -5116,7 +5033,7 @@ "ext-tokenizer": "*", "fruitcake/php-cors": "^1.2", "guzzlehttp/uri-template": "^1.0", - "laravel/prompts": "^0.1", + "laravel/prompts": "^0.1.9", "laravel/serializable-closure": "^1.3", "league/commonmark": "^2.2.1", "league/flysystem": "^3.8.0", @@ -5198,7 +5115,7 @@ "league/flysystem-read-only": "^3.3", "league/flysystem-sftp-v3": "^3.0", "mockery/mockery": "^1.5.1", - "orchestra/testbench-core": "^8.4", + "orchestra/testbench-core": "^8.12", "pda/pheanstalk": "^4.0", "phpstan/phpstan": "^1.4.7", "phpunit/phpunit": "^10.0.7", @@ -5285,20 +5202,20 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2023-09-05T13:20:01+00:00" + "time": "2023-09-27T01:29:32+00:00" }, { "name": "laravel/prompts", - "version": "v0.1.6", + "version": "v0.1.9", "source": { "type": "git", "url": "https://github.com/laravel/prompts.git", - "reference": "b514c5620e1b3b61221b0024dc88def26d9654f4" + "reference": "b603410e7af1040aa2d29e0a2cdca570bb63e827" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/prompts/zipball/b514c5620e1b3b61221b0024dc88def26d9654f4", - "reference": "b514c5620e1b3b61221b0024dc88def26d9654f4", + "url": "https://api.github.com/repos/laravel/prompts/zipball/b603410e7af1040aa2d29e0a2cdca570bb63e827", + "reference": "b603410e7af1040aa2d29e0a2cdca570bb63e827", "shasum": "" }, "require": { @@ -5307,6 +5224,10 @@ "php": "^8.1", "symfony/console": "^6.2" }, + "conflict": { + "illuminate/console": ">=10.17.0 <10.25.0", + "laravel/framework": ">=10.17.0 <10.25.0" + }, "require-dev": { "mockery/mockery": "^1.5", "pestphp/pest": "^2.3", @@ -5317,6 +5238,11 @@ "ext-pcntl": "Required for the spinner to be animated." }, "type": "library", + "extra": { + "branch-alias": { + "dev-main": "0.1.x-dev" + } + }, "autoload": { "files": [ "src/helpers.php" @@ -5331,9 +5257,9 @@ ], "support": { "issues": "https://github.com/laravel/prompts/issues", - "source": "https://github.com/laravel/prompts/tree/v0.1.6" + "source": "https://github.com/laravel/prompts/tree/v0.1.9" }, - "time": "2023-08-18T13:32:23+00:00" + "time": "2023-09-26T13:14:20+00:00" }, { "name": "laravel/serializable-closure", @@ -5641,16 +5567,16 @@ }, { "name": "league/csv", - "version": "9.10.0", + "version": "9.11.0", "source": { "type": "git", "url": "https://github.com/thephpleague/csv.git", - "reference": "d24b0d484812313b07ab74b0fe4db9661606df6c" + "reference": "33149c4bea4949aa4fa3d03fb11ed28682168b39" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/csv/zipball/d24b0d484812313b07ab74b0fe4db9661606df6c", - "reference": "d24b0d484812313b07ab74b0fe4db9661606df6c", + "url": "https://api.github.com/repos/thephpleague/csv/zipball/33149c4bea4949aa4fa3d03fb11ed28682168b39", + "reference": "33149c4bea4949aa4fa3d03fb11ed28682168b39", "shasum": "" }, "require": { @@ -5725,7 +5651,7 @@ "type": "github" } ], - "time": "2023-08-04T15:12:48+00:00" + "time": "2023-09-23T10:09:54+00:00" }, { "name": "league/flysystem", @@ -6359,16 +6285,16 @@ }, { "name": "maximebf/debugbar", - "version": "v1.18.2", + "version": "v1.19.0", "source": { "type": "git", "url": "https://github.com/maximebf/php-debugbar.git", - "reference": "17dcf3f6ed112bb85a37cf13538fd8de49f5c274" + "reference": "30f65f18f7ac086255a77a079f8e0dcdd35e828e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/17dcf3f6ed112bb85a37cf13538fd8de49f5c274", - "reference": "17dcf3f6ed112bb85a37cf13538fd8de49f5c274", + "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/30f65f18f7ac086255a77a079f8e0dcdd35e828e", + "reference": "30f65f18f7ac086255a77a079f8e0dcdd35e828e", "shasum": "" }, "require": { @@ -6419,9 +6345,9 @@ ], "support": { "issues": "https://github.com/maximebf/php-debugbar/issues", - "source": "https://github.com/maximebf/php-debugbar/tree/v1.18.2" + "source": "https://github.com/maximebf/php-debugbar/tree/v1.19.0" }, - "time": "2023-02-04T15:27:00+00:00" + "time": "2023-09-19T19:53:10+00:00" }, { "name": "mews/purifier", @@ -6730,16 +6656,16 @@ }, { "name": "nesbot/carbon", - "version": "2.70.0", + "version": "2.71.0", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "d3298b38ea8612e5f77d38d1a99438e42f70341d" + "reference": "98276233188583f2ff845a0f992a235472d9466a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/d3298b38ea8612e5f77d38d1a99438e42f70341d", - "reference": "d3298b38ea8612e5f77d38d1a99438e42f70341d", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/98276233188583f2ff845a0f992a235472d9466a", + "reference": "98276233188583f2ff845a0f992a235472d9466a", "shasum": "" }, "require": { @@ -6832,7 +6758,7 @@ "type": "tidelift" } ], - "time": "2023-09-07T16:43:50+00:00" + "time": "2023-09-25T11:31:05+00:00" }, { "name": "nette/schema", @@ -6898,16 +6824,16 @@ }, { "name": "nette/utils", - "version": "v4.0.1", + "version": "v4.0.2", "source": { "type": "git", "url": "https://github.com/nette/utils.git", - "reference": "9124157137da01b1f5a5a22d6486cb975f26db7e" + "reference": "cead6637226456b35e1175cc53797dd585d85545" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/utils/zipball/9124157137da01b1f5a5a22d6486cb975f26db7e", - "reference": "9124157137da01b1f5a5a22d6486cb975f26db7e", + "url": "https://api.github.com/repos/nette/utils/zipball/cead6637226456b35e1175cc53797dd585d85545", + "reference": "cead6637226456b35e1175cc53797dd585d85545", "shasum": "" }, "require": { @@ -6929,8 +6855,7 @@ "ext-intl": "to use Strings::webalize(), toAscii(), normalize() and compare()", "ext-json": "to use Nette\\Utils\\Json", "ext-mbstring": "to use Strings::lower() etc...", - "ext-tokenizer": "to use Nette\\Utils\\Reflection::getUseStatements()", - "ext-xml": "to use Strings::length() etc. when mbstring is not available" + "ext-tokenizer": "to use Nette\\Utils\\Reflection::getUseStatements()" }, "type": "library", "extra": { @@ -6979,9 +6904,9 @@ ], "support": { "issues": "https://github.com/nette/utils/issues", - "source": "https://github.com/nette/utils/tree/v4.0.1" + "source": "https://github.com/nette/utils/tree/v4.0.2" }, - "time": "2023-07-30T15:42:21+00:00" + "time": "2023-09-19T11:58:07+00:00" }, { "name": "norkunas/youtube-dl-php", @@ -8390,16 +8315,16 @@ }, { "name": "psr/http-client", - "version": "1.0.2", + "version": "1.0.3", "source": { "type": "git", "url": "https://github.com/php-fig/http-client.git", - "reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31" + "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-client/zipball/0955afe48220520692d2d09f7ab7e0f93ffd6a31", - "reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31", + "url": "https://api.github.com/repos/php-fig/http-client/zipball/bb5906edc1c324c9a05aa0873d40117941e5fa90", + "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90", "shasum": "" }, "require": { @@ -8436,9 +8361,9 @@ "psr-18" ], "support": { - "source": "https://github.com/php-fig/http-client/tree/1.0.2" + "source": "https://github.com/php-fig/http-client" }, - "time": "2023-04-10T20:12:12+00:00" + "time": "2023-09-23T14:17:50+00:00" }, { "name": "psr/http-factory", @@ -9120,46 +9045,34 @@ "time": "2022-09-27T16:11:03+00:00" }, { - "name": "simplesoftwareio/simple-qrcode", - "version": "4.2.0", + "name": "ryangjchandler/standalone-blade", + "version": "v0.2.0", "source": { "type": "git", - "url": "https://github.com/SimpleSoftwareIO/simple-qrcode.git", - "reference": "916db7948ca6772d54bb617259c768c9cdc8d537" + "url": "https://github.com/ryangjchandler/standalone-blade.git", + "reference": "a146e1b82461c942aec7486df7a0bf7ad62f8078" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/SimpleSoftwareIO/simple-qrcode/zipball/916db7948ca6772d54bb617259c768c9cdc8d537", - "reference": "916db7948ca6772d54bb617259c768c9cdc8d537", + "url": "https://api.github.com/repos/ryangjchandler/standalone-blade/zipball/a146e1b82461c942aec7486df7a0bf7ad62f8078", + "reference": "a146e1b82461c942aec7486df7a0bf7ad62f8078", "shasum": "" }, "require": { - "bacon/bacon-qr-code": "^2.0", - "ext-gd": "*", - "php": ">=7.2|^8.0" + "illuminate/config": "^10.0", + "illuminate/support": "^10.0", + "illuminate/view": "^10.0", + "php": "^8.1" }, "require-dev": { - "mockery/mockery": "~1", - "phpunit/phpunit": "~9" - }, - "suggest": { - "ext-imagick": "Allows the generation of PNG QrCodes.", - "illuminate/support": "Allows for use within Laravel." + "friendsofphp/php-cs-fixer": "^3.0", + "pestphp/pest": "^1.20", + "spatie/ray": "^1.28" }, "type": "library", - "extra": { - "laravel": { - "providers": [ - "SimpleSoftwareIO\\QrCode\\QrCodeServiceProvider" - ], - "aliases": { - "QrCode": "SimpleSoftwareIO\\QrCode\\Facades\\QrCode" - } - } - }, "autoload": { "psr-4": { - "SimpleSoftwareIO\\QrCode\\": "src" + "RyanChandler\\Blade\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -9168,24 +9081,28 @@ ], "authors": [ { - "name": "Simple Software LLC", - "email": "support@simplesoftware.io" + "name": "Ryan Chandler", + "email": "support@ryangjchandler.co.uk", + "role": "Developer" } ], - "description": "Simple QrCode is a QR code generator made for Laravel.", - "homepage": "https://www.simplesoftware.io/#/docs/simple-qrcode", + "description": "Use Laravel's Blade templating engine outside of Laravel.", + "homepage": "https://github.com/ryangjchandler/standalone-blade", "keywords": [ - "Simple", - "generator", - "laravel", - "qrcode", - "wrapper" + "ryangjchandler", + "standalone-blade" ], "support": { - "issues": "https://github.com/SimpleSoftwareIO/simple-qrcode/issues", - "source": "https://github.com/SimpleSoftwareIO/simple-qrcode/tree/4.2.0" + "issues": "https://github.com/ryangjchandler/standalone-blade/issues", + "source": "https://github.com/ryangjchandler/standalone-blade/tree/v0.2.0" }, - "time": "2021-02-08T20:43:55+00:00" + "funding": [ + { + "url": "https://github.com/ryangjchandler", + "type": "github" + } + ], + "time": "2023-02-24T15:16:34+00:00" }, { "name": "spatie/db-dumper", @@ -9376,16 +9293,16 @@ }, { "name": "spatie/laravel-backup", - "version": "8.3.3", + "version": "8.3.4", "source": { "type": "git", "url": "https://github.com/spatie/laravel-backup.git", - "reference": "a20718e833daa77a8f496fb06ac208521669a838" + "reference": "c79ec56ddc96da769e4438bd45de6227b1be368f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-backup/zipball/a20718e833daa77a8f496fb06ac208521669a838", - "reference": "a20718e833daa77a8f496fb06ac208521669a838", + "url": "https://api.github.com/repos/spatie/laravel-backup/zipball/c79ec56ddc96da769e4438bd45de6227b1be368f", + "reference": "c79ec56ddc96da769e4438bd45de6227b1be368f", "shasum": "" }, "require": { @@ -9459,7 +9376,7 @@ ], "support": { "issues": "https://github.com/spatie/laravel-backup/issues", - "source": "https://github.com/spatie/laravel-backup/tree/8.3.3" + "source": "https://github.com/spatie/laravel-backup/tree/8.3.4" }, "funding": [ { @@ -9471,7 +9388,7 @@ "type": "other" } ], - "time": "2023-09-04T13:41:27+00:00" + "time": "2023-09-18T11:25:57+00:00" }, { "name": "spatie/laravel-googletagmanager", @@ -9619,16 +9536,16 @@ }, { "name": "spatie/laravel-medialibrary", - "version": "10.12.2", + "version": "10.13.0", "source": { "type": "git", "url": "https://github.com/spatie/laravel-medialibrary.git", - "reference": "38af83a445a9ccffede87b7251102580b6f3883f" + "reference": "87fb7707bc38f0c7ff002e4618a501b5ab1827da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-medialibrary/zipball/38af83a445a9ccffede87b7251102580b6f3883f", - "reference": "38af83a445a9ccffede87b7251102580b6f3883f", + "url": "https://api.github.com/repos/spatie/laravel-medialibrary/zipball/87fb7707bc38f0c7ff002e4618a501b5ab1827da", + "reference": "87fb7707bc38f0c7ff002e4618a501b5ab1827da", "shasum": "" }, "require": { @@ -9711,7 +9628,7 @@ ], "support": { "issues": "https://github.com/spatie/laravel-medialibrary/issues", - "source": "https://github.com/spatie/laravel-medialibrary/tree/10.12.2" + "source": "https://github.com/spatie/laravel-medialibrary/tree/10.13.0" }, "funding": [ { @@ -9723,7 +9640,7 @@ "type": "github" } ], - "time": "2023-09-05T07:56:04+00:00" + "time": "2023-09-26T12:30:51+00:00" }, { "name": "spatie/laravel-package-tools", @@ -10085,16 +10002,16 @@ }, { "name": "spatie/temporary-directory", - "version": "2.1.2", + "version": "2.2.0", "source": { "type": "git", "url": "https://github.com/spatie/temporary-directory.git", - "reference": "0c804873f6b4042aa8836839dca683c7d0f71831" + "reference": "efc258c9f4da28f0c7661765b8393e4ccee3d19c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/temporary-directory/zipball/0c804873f6b4042aa8836839dca683c7d0f71831", - "reference": "0c804873f6b4042aa8836839dca683c7d0f71831", + "url": "https://api.github.com/repos/spatie/temporary-directory/zipball/efc258c9f4da28f0c7661765b8393e4ccee3d19c", + "reference": "efc258c9f4da28f0c7661765b8393e4ccee3d19c", "shasum": "" }, "require": { @@ -10130,7 +10047,7 @@ ], "support": { "issues": "https://github.com/spatie/temporary-directory/issues", - "source": "https://github.com/spatie/temporary-directory/tree/2.1.2" + "source": "https://github.com/spatie/temporary-directory/tree/2.2.0" }, "funding": [ { @@ -10142,7 +10059,7 @@ "type": "github" } ], - "time": "2023-04-28T07:47:42+00:00" + "time": "2023-09-25T07:13:36+00:00" }, { "name": "spomky-labs/base64url", @@ -15291,16 +15208,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.24.0", + "version": "1.24.2", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "3510b0a6274cc42f7219367cb3abfc123ffa09d6" + "reference": "bcad8d995980440892759db0c32acae7c8e79442" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/3510b0a6274cc42f7219367cb3abfc123ffa09d6", - "reference": "3510b0a6274cc42f7219367cb3abfc123ffa09d6", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/bcad8d995980440892759db0c32acae7c8e79442", + "reference": "bcad8d995980440892759db0c32acae7c8e79442", "shasum": "" }, "require": { @@ -15332,22 +15249,22 @@ "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.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.24.2" }, - "time": "2023-09-07T20:46:32+00:00" + "time": "2023-09-26T12:28:12+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "9.2.28", + "version": "9.2.29", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "7134a5ccaaf0f1c92a4f5501a6c9f98ac4dcc0ef" + "reference": "6a3a87ac2bbe33b25042753df8195ba4aa534c76" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/7134a5ccaaf0f1c92a4f5501a6c9f98ac4dcc0ef", - "reference": "7134a5ccaaf0f1c92a4f5501a6c9f98ac4dcc0ef", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/6a3a87ac2bbe33b25042753df8195ba4aa534c76", + "reference": "6a3a87ac2bbe33b25042753df8195ba4aa534c76", "shasum": "" }, "require": { @@ -15404,7 +15321,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.28" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.29" }, "funding": [ { @@ -15412,7 +15329,7 @@ "type": "github" } ], - "time": "2023-09-12T14:36:20+00:00" + "time": "2023-09-19T04:57:46+00:00" }, { "name": "phpunit/php-file-iterator", @@ -15657,16 +15574,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.6.12", + "version": "9.6.13", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "a122c2ebd469b751d774aa0f613dc0d67697653f" + "reference": "f3d767f7f9e191eab4189abe41ab37797e30b1be" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a122c2ebd469b751d774aa0f613dc0d67697653f", - "reference": "a122c2ebd469b751d774aa0f613dc0d67697653f", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f3d767f7f9e191eab4189abe41ab37797e30b1be", + "reference": "f3d767f7f9e191eab4189abe41ab37797e30b1be", "shasum": "" }, "require": { @@ -15740,7 +15657,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.12" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.13" }, "funding": [ { @@ -15756,20 +15673,20 @@ "type": "tidelift" } ], - "time": "2023-09-12T14:39:31+00:00" + "time": "2023-09-19T05:39:22+00:00" }, { "name": "psy/psysh", - "version": "v0.11.20", + "version": "v0.11.21", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "0fa27040553d1d280a67a4393194df5228afea5b" + "reference": "bcb22101107f3bf770523b65630c9d547f60c540" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/0fa27040553d1d280a67a4393194df5228afea5b", - "reference": "0fa27040553d1d280a67a4393194df5228afea5b", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/bcb22101107f3bf770523b65630c9d547f60c540", + "reference": "bcb22101107f3bf770523b65630c9d547f60c540", "shasum": "" }, "require": { @@ -15799,6 +15716,10 @@ "extra": { "branch-alias": { "dev-main": "0.11.x-dev" + }, + "bamarni-bin": { + "bin-links": false, + "forward-command": false } }, "autoload": { @@ -15830,9 +15751,9 @@ ], "support": { "issues": "https://github.com/bobthecow/psysh/issues", - "source": "https://github.com/bobthecow/psysh/tree/v0.11.20" + "source": "https://github.com/bobthecow/psysh/tree/v0.11.21" }, - "time": "2023-07-31T14:32:22+00:00" + "time": "2023-09-17T21:15:54+00:00" }, { "name": "sebastian/cli-parser", @@ -16932,16 +16853,16 @@ }, { "name": "spatie/ignition", - "version": "1.10.1", + "version": "1.11.2", "source": { "type": "git", "url": "https://github.com/spatie/ignition.git", - "reference": "d92b9a081e99261179b63a858c7a4b01541e7dd1" + "reference": "48b23411ca4bfbc75c75dfc638b6b36159c375aa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/ignition/zipball/d92b9a081e99261179b63a858c7a4b01541e7dd1", - "reference": "d92b9a081e99261179b63a858c7a4b01541e7dd1", + "url": "https://api.github.com/repos/spatie/ignition/zipball/48b23411ca4bfbc75c75dfc638b6b36159c375aa", + "reference": "48b23411ca4bfbc75c75dfc638b6b36159c375aa", "shasum": "" }, "require": { @@ -17011,7 +16932,7 @@ "type": "github" } ], - "time": "2023-08-21T15:06:37+00:00" + "time": "2023-09-19T15:29:52+00:00" }, { "name": "spatie/laravel-ignition",