From 720ca32fe7a3d3d43d50f1cea14ad11c1e5f67d6 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Mon, 22 Aug 2022 18:13:51 +0200 Subject: [PATCH] wip #5408 @0.5 --- app/Fluidbook/Link/Cart/BastideCartLink.php | 18 ++ app/Fluidbook/Link/Cart/CFOCCartLink.php | 23 ++ .../Link/Cart/GrandPavoisCartLink.php | 13 ++ .../Link/Cart/GrandVisionCartLink.php | 18 ++ .../Link/Cart/Joueclub2021CartLink.php | 64 ++++++ .../Link/Cart/JoueclubWishlistLink.php | 25 +++ .../Link/Custom/AtlanticDownloadLink.php | 23 ++ app/Fluidbook/Link/Custom/FLFLink.php | 25 +++ .../Link/Custom/HaguenauManifLink.php | 18 ++ app/Fluidbook/Link/Custom/InpesPopinLink.php | 65 ++++++ app/Fluidbook/Link/Custom/IntexLink.php | 2 + .../Link/Custom/MiraklEaster2021Link.php | 18 ++ app/Fluidbook/Link/Custom/PierronLink.php | 13 ++ app/Fluidbook/Link/Custom/WescoLink.php | 14 ++ app/Fluidbook/Link/Custom/WescoSalesLink.php | 36 ++++ app/Fluidbook/Link/Link.php | 58 +++-- app/Jobs/FluidbookCompiler.php | 80 +++++-- composer.lock | 201 ++++-------------- 18 files changed, 511 insertions(+), 203 deletions(-) create mode 100644 app/Fluidbook/Link/Cart/BastideCartLink.php create mode 100644 app/Fluidbook/Link/Cart/CFOCCartLink.php create mode 100644 app/Fluidbook/Link/Cart/GrandPavoisCartLink.php create mode 100644 app/Fluidbook/Link/Cart/GrandVisionCartLink.php create mode 100644 app/Fluidbook/Link/Cart/Joueclub2021CartLink.php create mode 100644 app/Fluidbook/Link/Cart/JoueclubWishlistLink.php create mode 100644 app/Fluidbook/Link/Custom/AtlanticDownloadLink.php create mode 100644 app/Fluidbook/Link/Custom/FLFLink.php create mode 100644 app/Fluidbook/Link/Custom/HaguenauManifLink.php create mode 100644 app/Fluidbook/Link/Custom/InpesPopinLink.php create mode 100644 app/Fluidbook/Link/Custom/MiraklEaster2021Link.php create mode 100644 app/Fluidbook/Link/Custom/PierronLink.php create mode 100644 app/Fluidbook/Link/Custom/WescoLink.php create mode 100644 app/Fluidbook/Link/Custom/WescoSalesLink.php diff --git a/app/Fluidbook/Link/Cart/BastideCartLink.php b/app/Fluidbook/Link/Cart/BastideCartLink.php new file mode 100644 index 000000000..411a6384f --- /dev/null +++ b/app/Fluidbook/Link/Cart/BastideCartLink.php @@ -0,0 +1,18 @@ +to; + } + + public function getTooltip() + { + return 'Ajouter à ma sélection'; + } +} diff --git a/app/Fluidbook/Link/Cart/CFOCCartLink.php b/app/Fluidbook/Link/Cart/CFOCCartLink.php new file mode 100644 index 000000000..ff08ce2d2 --- /dev/null +++ b/app/Fluidbook/Link/Cart/CFOCCartLink.php @@ -0,0 +1,23 @@ +to; + } + + // public function getAdditionnalContent() + // { + // return parent::getAdditionnalContent() . ' data-cfoc-ref="' . $this->to . '" '; + // } + + public function getTooltip() + { + return 'Ajouter à ma sélection'; + } +} diff --git a/app/Fluidbook/Link/Cart/GrandPavoisCartLink.php b/app/Fluidbook/Link/Cart/GrandPavoisCartLink.php new file mode 100644 index 000000000..ab98d5974 --- /dev/null +++ b/app/Fluidbook/Link/Cart/GrandPavoisCartLink.php @@ -0,0 +1,13 @@ +to; + } +} diff --git a/app/Fluidbook/Link/Cart/Joueclub2021CartLink.php b/app/Fluidbook/Link/Cart/Joueclub2021CartLink.php new file mode 100644 index 000000000..d5e83bd7a --- /dev/null +++ b/app/Fluidbook/Link/Cart/Joueclub2021CartLink.php @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + +'; + } + + public function getAdditionnalContent() + { + $res = parent::getAdditionnalContent(); + $res .= ' data-tooltip-conditional="' . htmlspecialchars(json_encode(['.active' => 'Retirer de ma liste de cadeaux'])) . '" '; + return $res; + } +} diff --git a/app/Fluidbook/Link/Cart/JoueclubWishlistLink.php b/app/Fluidbook/Link/Cart/JoueclubWishlistLink.php new file mode 100644 index 000000000..9b0951c56 --- /dev/null +++ b/app/Fluidbook/Link/Cart/JoueclubWishlistLink.php @@ -0,0 +1,25 @@ +to; + } + + public function getTarget() + { + return '_popupiframe'; + } + + public function getDefaultTooltip() + { + return 'Ajouter à la wishlist'; + } +} diff --git a/app/Fluidbook/Link/Custom/AtlanticDownloadLink.php b/app/Fluidbook/Link/Custom/AtlanticDownloadLink.php new file mode 100644 index 000000000..cdfa27ca0 --- /dev/null +++ b/app/Fluidbook/Link/Custom/AtlanticDownloadLink.php @@ -0,0 +1,23 @@ +to . '" '; + } + + public function getTooltip() + { + return 'Télécharger les documents'; + } +} diff --git a/app/Fluidbook/Link/Custom/FLFLink.php b/app/Fluidbook/Link/Custom/FLFLink.php new file mode 100644 index 000000000..f3f48699c --- /dev/null +++ b/app/Fluidbook/Link/Custom/FLFLink.php @@ -0,0 +1,25 @@ +to; + } + + public function getTarget() + { + return '_blank'; + } + + public function getTooltip() + { + return 'Accéder à la fiche du stage sur notre site flf.fr'; + } +} diff --git a/app/Fluidbook/Link/Custom/HaguenauManifLink.php b/app/Fluidbook/Link/Custom/HaguenauManifLink.php new file mode 100644 index 000000000..6b300be3a --- /dev/null +++ b/app/Fluidbook/Link/Custom/HaguenauManifLink.php @@ -0,0 +1,18 @@ + 7, "2" => 8, "3" => 14, "4" => 16, "5" => 17, "6" => 18, "7" => 19, "8" => 20, "9" => 22, "10" => 23, "11" => 24, "12" => 27 + , "13" => 29, "14" => 32, "15" => 34, "16" => 37, "17" => 38, "18" => 41, "19" => 43, + "20" => 45, "21" => 46, "22" => 52, "23" => 53, "24" => 54, "25" => 56, "26" => 59, "27" => 60 + ); + return $fiches[$this->to]; + } +} diff --git a/app/Fluidbook/Link/Custom/InpesPopinLink.php b/app/Fluidbook/Link/Custom/InpesPopinLink.php new file mode 100644 index 000000000..902709189 --- /dev/null +++ b/app/Fluidbook/Link/Custom/InpesPopinLink.php @@ -0,0 +1,65 @@ +alternative = $this->to; + $c = parent::getHTMLContent(); + + $class = $this->getClasses(); + if ($this->display_area) { + $class[] = 'displayArea'; + } + $c = ''; + if (count($class)) { + $c = ' class="' . implode(' ', $class) . '"'; + } + $tooltip = $this->getTooltipAttribute(); + + return 'getAdditionnalContent() . '>'; + } + + public function getCSSContainer() + { + if ($this->moveOnEvenPage()) { + $this->page--; + $this->left += $this->compiler->width; + } + + $css = '#l_' . $this->id . '{'; + $css .= 'left:' . $this->left * $this->getCssScale() . 'px;top:' . $this->top * $this->getCssScale() . 'px;'; + $css .= 'width:' . $this->width * $this->getCssScale() . 'px;height:' . $this->height * $this->getCssScale() . 'px;'; + $css .= $this->getCSSZIndex(); + if ($this->rot) { + $css .= wsHTML5::writeCSSUA('transform', 'rotate(' . $this->rot . 'deg)'); + $css .= wsHTML5::writeCSSUA('transform-origin', '0% 0%'); + } + $css .= $this->getCSS(); + $css .= '}'; + return $css; + } + + public function getCSS() + { + return ""; + } + + public function getClasses() + { + $res = parent::getClasses(); + $res[] = 'popin'; + return $res; + } + + public function getAdditionnalContent() + { + $res = parent::getAdditionnalContent(); + $res .= ' data-src="' . $this->_url . '" data-width="900" data-height="650"'; + return $res; + } +} diff --git a/app/Fluidbook/Link/Custom/IntexLink.php b/app/Fluidbook/Link/Custom/IntexLink.php index eec4a6adb..eb0c6ff74 100644 --- a/app/Fluidbook/Link/Custom/IntexLink.php +++ b/app/Fluidbook/Link/Custom/IntexLink.php @@ -2,6 +2,8 @@ namespace App\Fluidbook\Link\Custom; +use Fluidbook\Tools\Links\CustomLink; + class IntexLink extends CustomLink { public static function _getURL($to) diff --git a/app/Fluidbook/Link/Custom/MiraklEaster2021Link.php b/app/Fluidbook/Link/Custom/MiraklEaster2021Link.php new file mode 100644 index 000000000..be4c2704c --- /dev/null +++ b/app/Fluidbook/Link/Custom/MiraklEaster2021Link.php @@ -0,0 +1,18 @@ +to . '" '; + } +} diff --git a/app/Fluidbook/Link/Custom/PierronLink.php b/app/Fluidbook/Link/Custom/PierronLink.php new file mode 100644 index 000000000..70f18ae14 --- /dev/null +++ b/app/Fluidbook/Link/Custom/PierronLink.php @@ -0,0 +1,13 @@ + 1) { + $init['to'] = $e[1]; + } + parent::__construct($id, $init, $compiler); + } + + public function getUrl() + { + return '#'; + } + + public function getAdditionnalContent() + { + $e = explode(':', $this->to); + if (count($e) > 1) { + $this->to = $e[1]; + } + return parent::getAdditionnalContent() . ' data-wescosales-ref="' . $this->to . '" '; + } + + public function getTooltip() + { + return 'Consulter les ventes de ce produit'; + } +} diff --git a/app/Fluidbook/Link/Link.php b/app/Fluidbook/Link/Link.php index abb057ec1..71bfa13f3 100644 --- a/app/Fluidbook/Link/Link.php +++ b/app/Fluidbook/Link/Link.php @@ -2,10 +2,24 @@ namespace App\Fluidbook\Link; +use App\Fluidbook\Link\Cart\BastideCartLink; +use App\Fluidbook\Link\Cart\CFOCCartLink; +use App\Fluidbook\Link\Cart\GrandPavoisCartLink; +use App\Fluidbook\Link\Cart\GrandVisionCartLink; +use App\Fluidbook\Link\Cart\Joueclub2021CartLink; +use App\Fluidbook\Link\Cart\JoueclubWishlistLink; use App\Fluidbook\Link\Cart\PumaCartLink; +use App\Fluidbook\Link\Custom\AtlanticDownloadLink; +use App\Fluidbook\Link\Custom\FLFLink; +use App\Fluidbook\Link\Custom\HaguenauManifLink; +use App\Fluidbook\Link\Custom\InpesPopinLink; +use App\Fluidbook\Link\Custom\IntexLink; +use App\Fluidbook\Link\Custom\MiraklEaster2021Link; +use App\Fluidbook\Link\Custom\PierronLink; +use App\Fluidbook\Link\Custom\WescoLink; +use App\Fluidbook\Link\Custom\WescoSalesLink; use Cubist\Util\ArrayUtil; use Fluidbook\Tools\Links\CartLink; -use Fluidbook\Tools\Links\CustomLink; use Fluidbook\Tools\Links\ZoomProductLink; class Link extends \Fluidbook\Tools\Links\Link @@ -19,53 +33,51 @@ class Link extends \Fluidbook\Tools\Links\Link switch ($init['type']) { case 7: - if ($compiler->book->parametres->basketManager === 'Puma') { - return new PumaCartLink($id, $init, $compiler); - } - if ($compiler->book->parametres->basketManager === 'MIF') { - return new CartLink($id, $init, $compiler); + switch ($compiler->getSetting('basketManager')) { + case 'Puma': + return new PumaCartLink($id, $init, $compiler); + case 'MIF': + return new CartLink($id, $init, $compiler); } - switch ($compiler->book->parametres->customLinkClass) { + switch ($compiler->getSetting('customLinkClass')) { case 'IntexLink': - return new intexLink($id, $init, $compiler); + return new IntexLink($id, $init, $compiler); case 'WescoLink': - return new wescoLink($id, $init, $compiler); + return new WescoLink($id, $init, $compiler); case 'HaguenauManifLink': - return new haguenauManifLink($id, $init, $compiler); + return new HaguenauManifLink($id, $init, $compiler); case 'FLFLink': - return new flfLink($id, $init, $compiler); + return new FLFLink($id, $init, $compiler); case 'InpesPopinLink': - return new inpesPopinLink($id, $init, $compiler); + return new InpesPopinLink($id, $init, $compiler); case 'PierronLink': - return new pierronLink($id, $init, $compiler); + return new PierronLink($id, $init, $compiler); case 'WescoSalesLink': - return new wescoSalesLink($id, $init, $compiler); + return new WescoSalesLink($id, $init, $compiler); case 'AtlanticDownloadLink': - return new atlanticDownloadLink($id, $init, $compiler); + return new AtlanticDownloadLink($id, $init, $compiler); case 'MiraklEaster2021': - return new miraklEaster2021Link($id, $init, $compiler); + return new MiraklEaster2021Link($id, $init, $compiler); default : break; } case 12: // Basket / Cart links - if ($compiler->book->parametres->product_zoom_references !== '') { + if ($compiler->getSetting('product_zoom_references', '') !== '') { return new zoomProductLink($id, $init, $compiler); } - switch ($compiler->book->parametres->basketManager) { + switch ($compiler->getSetting('basketManager')) { case 'Bastide': return new BastideCartLink($id, $init, $compiler); case 'CFOC': return new CFOCCartLink($id, $init, $compiler); case 'GrandVision': - return new grandVisionCartLink($id, $init, $compiler); + return new GrandVisionCartLink($id, $init, $compiler); case 'GrandPavois': - return new grandPavoisCartLink($id, $init, $compiler); + return new GrandPavoisCartLink($id, $init, $compiler); case 'JoueclubWishlist2021': - return new joueclub2021CartLink($id, $init, $compiler); + return new Joueclub2021CartLink($id, $init, $compiler); case 'JoueclubWishlist': return new JoueclubWishlistLink($id, $init, $compiler); - case 'Remarkable': - return new remarkableCartLink($id, $init, $compiler); case 'ZoomProductLink': case 'Flexipan': case 'Puma': diff --git a/app/Jobs/FluidbookCompiler.php b/app/Jobs/FluidbookCompiler.php index 574ad2209..8936fe0ee 100644 --- a/app/Jobs/FluidbookCompiler.php +++ b/app/Jobs/FluidbookCompiler.php @@ -8,10 +8,12 @@ use App\Models\Traits\FluidbookPlayerBranches; use App\Util\FluidbookLinks; use Cubist\Util\ArrayUtil; use Cubist\Util\CommandLine; +use Cubist\Util\Data; use Cubist\Util\Files\Files; use Cubist\Util\Files\VirtualDirectory; use Cubist\Util\Graphics\Color; use Cubist\Util\Graphics\Image; +use Cubist\Util\Graphics\Resizer; use Cubist\Util\ObjectUtil; use Cubist\Util\PHP; use Cubist\Util\Text; @@ -19,15 +21,18 @@ use Cubist\Util\Url; use DOMDocument; use DOMElement; use DOMXPath; +use Fluidbook\Tools\Compiler\CompilerInterface; use Fluidbook\Tools\Links\AnchorLink; use Fluidbook\Tools\Links\ContentLink; use App\Fluidbook\Link\Link; use Illuminate\Console\Command; use SimpleXMLElement; +use SplFileInfo; -class FluidbookCompiler extends Base +class FluidbookCompiler extends Base implements CompilerInterface { use FluidbookPlayerBranches; + use \Fluidbook\Tools\Compiler\FluidbookCompiler; protected static $uaPrefixes = array('-moz-', '-webkit-', '-o-', '-ms-', ''); @@ -176,8 +181,6 @@ class FluidbookCompiler extends Base public $fontDocs = array(); public $dir; public $z = 3; - public $vdir; - public $wdir; protected $_lottieIDByHash = []; public $book; public $pages; @@ -202,7 +205,6 @@ class FluidbookCompiler extends Base public $cache = array(); public $backgroundsPrefix = array(); public $svg = true; - public $config = array(); public $assets = ''; public $phonegap = false; public $phonegapVersion; @@ -363,6 +365,27 @@ class FluidbookCompiler extends Base $this->log('Defined dimensions'); } + + public function getSetting($key, $default = null) + { + if ($this->fluidbookSettings->has($key)) { + return $this->fluidbookSettings->get($key, $default); + } + if ($this->themeSettings->has($key)) { + return $this->themeSettings->get($key, $default); + } + return $default; + } + + public function setSetting($key, $value) + { + if ($this->themeSettings->has($key)) { + $this->themeSettings->set($key, $value); + return; + } + $this->fluidbookSettings->set($key, $value); + } + public function themeAsset($key, $default = null) { $collection = $this->theme->{$key}; @@ -421,19 +444,22 @@ class FluidbookCompiler extends Base public function initConfig() { - $this->config = ObjectUtil::merge($this->fluidbookSettings->getRawData()['settings'], $this->themeSettings->getRawData()); + $this->config = new Data(array_merge($this->fluidbookSettings->getRawData()['settings'], $this->themeSettings->getRawData())); $this->config->bookmarkDisablePages = ArrayUtil::parseRange($this->config->bookmarkDisablePages); $this->config->rasterizePages = ArrayUtil::parseRange($this->config->rasterizePages); $this->config->vectorPages = array_diff(ArrayUtil::parseRange($this->config->vectorPages), $this->config->rasterizePages); - $this->config->tabsHideOnPages = ArrayUtil::parseRange($this->config->tabsHideOnPages); + + $hideOnPages = ArrayUtil::parseRange($this->config->tabsHideOnPages); $this->config->tabsDisabledOnPages = ArrayUtil::parseRange($this->config->tabsDisabledOnPages); + if ($this->config->tabsHideOnCover) { - $this->config->tabsHideOnPages[] = 0; - $this->config->tabsHideOnPages[] = 1; + $hideOnPages[] = 0; + $hideOnPages[] = 1; } if ($this->config->tabsHideOnLastPage) { - $this->config->tabsHideOnPages[] = count($this->pages); + $hideOnPages[] = count($this->pages); } + $this->config->tabsHideOnPages = $hideOnPages; $this->config->triggersLinks = []; $this->config->hasContentLock = false; } @@ -573,7 +599,7 @@ class FluidbookCompiler extends Base $opt = $odir . '/' . $n; if (!file_exists($opt) || !filesize($opt) || filemtime($opt) < filemtime($f)) { // Optimize original image - $convert = new Image_Resizer_ImageMagick(); + $convert = new Resizer(); $convert->loadImage($f); $convert->resize(1080, null, 'ratio', false, 'C', 'M', 'white'); $convert->output('jpg', $opt, 75); @@ -582,7 +608,6 @@ class FluidbookCompiler extends Base } $this->vdir->copy($opt, 'data/commerce/' . $n); } - } public function findEAN($array) @@ -2040,7 +2065,7 @@ height="0" width="0" style="display:none;visibility:hidden"> $lang = $daoLang->selectById($this->getFluidbook()->lang); $langs = $daoLang->selectAll(); - $t = CubeIT_Util_Object::toArray($this->getFluidbook()->traductions); + $t = ObjectUtil::toArray($this->getFluidbook()->traductions); $traductions = (!is_countable($t) || !count($t)) ? $lang->traductions : $t; @@ -2481,9 +2506,9 @@ height="0" width="0" style="display:none;visibility:hidden"> } foreach ($allpages as $i) { - $this->config->links[$i] = $this->_htmlLinkList($pages[$i] ?? []); - $this->config->clinks[$i] = $this->_htmlLinkList($cpages[$i] ?? []); - $this->config->ctlinks[$i] = $this->_htmlLinkList($ctpages[$i] ?? []); + $this->config->set('links.' . $i, $this->_htmlLinkList($pages[$i] ?? [])); + $this->config->set('clinks.' . $i, $this->_htmlLinkList($cpages[$i] ?? [])); + $this->config->set('ctlinks.' . $i, $this->_htmlLinkList($ctpages[$i] ?? [])); } if ($this->writeLinksData) { @@ -2920,12 +2945,33 @@ height="0" width="0" style="display:none;visibility:hidden"> } + /** + * @param $page + * @return array + */ protected function getPageDimension($page) { - $d = $this->getFluidbook()->getDocumentSize($page); - $this->config->pagesDimensions[$page] = array($this->cssWidth, $d[1] * ($this->cssWidth / $d[0])); + $k = 'pagesDimensions.' . $page; + if (!$this->config->has($k)) { + $d = $this->getFluidbook()->getDocumentSize($page); + $res = [$this->cssWidth, $d[1] * ($this->cssWidth / $d[0])]; + $this->config->set($k, $res); + return $res; + } + return $this->config->get($k); + } + + public function getWidth() + { + return $this->getPageDimension(1)[0]; + } + + public function getHeight() + { + return $this->getPageDimension(1)[1]; } + protected function _makeCover($orig) { $cached = $this->wdir . '/_cover.jpg'; diff --git a/composer.lock b/composer.lock index e5adcd34d..ec420ff48 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": "6bf7dc70ab8577e11a99bba012989f5e", + "content-hash": "e6570a7a1b3b53182de40f6e0ce4f5e2", "packages": [ { "name": "ahmadshah/lucy", @@ -1658,13 +1658,13 @@ "source": { "type": "git", "url": "git://git.cubedesigners.com/cubist_cms-back.git", - "reference": "cecb3fa12c91e88d9cd866e52fc8e44d2fdad48b" + "reference": "ac8952128ec46fa8b82fb7220edb6e4aff92a55f" }, "dist": { "type": "tar", - "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-master-a5b709.tar", - "reference": "cecb3fa12c91e88d9cd866e52fc8e44d2fdad48b", - "shasum": "324108a8a96933b9fb578e7637f714c1e488d362" + "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-master-609888.tar", + "reference": "ac8952128ec46fa8b82fb7220edb6e4aff92a55f", + "shasum": "5f5503bcc723bc2ec8a15b3556ae5202a898fe69" }, "require": { "backpack/backupmanager": "^3.0", @@ -1745,7 +1745,7 @@ } ], "description": "Cubist Backpack extension", - "time": "2022-08-16T18:09:47+00:00" + "time": "2022-08-22T14:35:17+00:00" }, { "name": "cubist/cms-front", @@ -2039,13 +2039,13 @@ "source": { "type": "git", "url": "git://git.cubedesigners.com/cubist_pdf.git", - "reference": "b93a3841c212ca8bf9793da611d90497b4f9a6de" + "reference": "a9776fd1cf4698352dfe7421aafc53ed0b4c1d6e" }, "dist": { "type": "tar", - "url": "https://composer.cubedesigners.com/dist/cubist/pdf/cubist-pdf-dev-master-876ad1.tar", - "reference": "b93a3841c212ca8bf9793da611d90497b4f9a6de", - "shasum": "7c956335d1f230f7f7bd313e72dd04115f2fea1f" + "url": "https://composer.cubedesigners.com/dist/cubist/pdf/cubist-pdf-dev-master-7c7ca6.tar", + "reference": "a9776fd1cf4698352dfe7421aafc53ed0b4c1d6e", + "shasum": "af35bdf43a35c2b9ca7420d0672289b586f5593b" }, "require": { "cubist/util": "dev-master", @@ -2053,7 +2053,7 @@ "ext-json": "*", "ext-libxml": "*", "laravel/framework": "~5.8|^6.0|^7.0|^8.0", - "php": ">=7.3.0" + "php": ">=8.0" }, "default-branch": true, "type": "library", @@ -2081,7 +2081,7 @@ "cubist", "pdf" ], - "time": "2022-07-21T18:23:40+00:00" + "time": "2022-08-22T14:43:58+00:00" }, { "name": "cubist/scorm", @@ -2126,13 +2126,13 @@ "source": { "type": "git", "url": "git://git.cubedesigners.com/cubist_util.git", - "reference": "01408416b4bd244224d5cf8ab22d15acc00d088f" + "reference": "5f746d46b5892cf178f25ad8a2ba1e3d2cba0568" }, "dist": { "type": "tar", - "url": "https://composer.cubedesigners.com/dist/cubist/util/cubist-util-dev-master-6b76a2.tar", - "reference": "01408416b4bd244224d5cf8ab22d15acc00d088f", - "shasum": "0e5bda028ed33cfd7d443cf068d21832737ad7b3" + "url": "https://composer.cubedesigners.com/dist/cubist/util/cubist-util-dev-master-19118f.tar", + "reference": "5f746d46b5892cf178f25ad8a2ba1e3d2cba0568", + "shasum": "930fe6d64099ab08dd7a1950d2c1ec20647ef9fb" }, "require": { "cubist/net": "dev-master", @@ -2163,7 +2163,7 @@ } ], "description": "Utilities class", - "time": "2022-08-18T12:23:22+00:00" + "time": "2022-08-22T14:49:19+00:00" }, { "name": "cviebrock/eloquent-sluggable", @@ -2474,16 +2474,16 @@ }, { "name": "doctrine/dbal", - "version": "3.4.1", + "version": "3.4.2", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "94e016428884227245fb1219e0de7d8b86ca16d7" + "reference": "22de295f10edbe00df74f517612f1fbd711131e2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/94e016428884227245fb1219e0de7d8b86ca16d7", - "reference": "94e016428884227245fb1219e0de7d8b86ca16d7", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/22de295f10edbe00df74f517612f1fbd711131e2", + "reference": "22de295f10edbe00df74f517612f1fbd711131e2", "shasum": "" }, "require": { @@ -2565,7 +2565,7 @@ ], "support": { "issues": "https://github.com/doctrine/dbal/issues", - "source": "https://github.com/doctrine/dbal/tree/3.4.1" + "source": "https://github.com/doctrine/dbal/tree/3.4.2" }, "funding": [ { @@ -2581,7 +2581,7 @@ "type": "tidelift" } ], - "time": "2022-08-16T18:37:46+00:00" + "time": "2022-08-21T14:21:06+00:00" }, { "name": "doctrine/deprecations", @@ -3415,13 +3415,13 @@ "source": { "type": "git", "url": "git://git.cubedesigners.com/fluidbook_tools.git", - "reference": "42b0cc5eb306f6548e4ccb80419edcb02e701381" + "reference": "d5e3e0fc0176fdb7764669032f02ad1bf638a9d2" }, "dist": { "type": "tar", - "url": "https://composer.cubedesigners.com/dist/fluidbook/tools/fluidbook-tools-dev-master-15675b.tar", - "reference": "42b0cc5eb306f6548e4ccb80419edcb02e701381", - "shasum": "e77e8ac9a4eb34cff9d0cfda77aa9c4a2b1da4f6" + "url": "https://composer.cubedesigners.com/dist/fluidbook/tools/fluidbook-tools-dev-master-1651ab.tar", + "reference": "d5e3e0fc0176fdb7764669032f02ad1bf638a9d2", + "shasum": "82602466fb73e0eb1ab91a3a70e44c62c0bb6ef8" }, "require": { "barryvdh/laravel-debugbar": "^3.6", @@ -3455,7 +3455,7 @@ } ], "description": "Fluidbook Tools", - "time": "2022-05-17T15:41:12+00:00" + "time": "2022-08-22T15:58:45+00:00" }, { "name": "genealabs/laravel-model-caching", @@ -4181,7 +4181,7 @@ }, { "name": "jane-php/json-schema-runtime", - "version": "v7.3.0", + "version": "v7.3.1", "source": { "type": "git", "url": "https://github.com/janephp/json-schema-runtime.git", @@ -4237,13 +4237,13 @@ ], "description": "Jane runtime Library", "support": { - "source": "https://github.com/janephp/json-schema-runtime/tree/v7.3.0" + "source": "https://github.com/janephp/json-schema-runtime/tree/v7.3.1" }, "time": "2021-12-16T13:26:58+00:00" }, { "name": "jane-php/open-api-runtime", - "version": "v7.3.0", + "version": "v7.3.1", "source": { "type": "git", "url": "https://github.com/janephp/open-api-runtime.git", @@ -4300,7 +4300,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.3.0" + "source": "https://github.com/janephp/open-api-runtime/tree/v7.3.1" }, "time": "2021-12-16T13:26:58+00:00" }, @@ -13490,63 +13490,6 @@ }, "time": "2020-06-27T09:03:43+00:00" }, - { - "name": "phpdocumentor/reflection-docblock", - "version": "5.3.0", - "source": { - "type": "git", - "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "622548b623e81ca6d78b721c5e029f4ce664f170" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/622548b623e81ca6d78b721c5e029f4ce664f170", - "reference": "622548b623e81ca6d78b721c5e029f4ce664f170", - "shasum": "" - }, - "require": { - "ext-filter": "*", - "php": "^7.2 || ^8.0", - "phpdocumentor/reflection-common": "^2.2", - "phpdocumentor/type-resolver": "^1.3", - "webmozart/assert": "^1.9.1" - }, - "require-dev": { - "mockery/mockery": "~1.3.2", - "psalm/phar": "^4.8" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "5.x-dev" - } - }, - "autoload": { - "psr-4": { - "phpDocumentor\\Reflection\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Mike van Riel", - "email": "me@mikevanriel.com" - }, - { - "name": "Jaap van Otterdijk", - "email": "account@ijaap.nl" - } - ], - "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "support": { - "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.3.0" - }, - "time": "2021-10-19T17:43:47+00:00" - }, { "name": "phpdocumentor/type-resolver", "version": "1.6.1", @@ -13597,73 +13540,6 @@ }, "time": "2022-03-15T21:29:03+00:00" }, - { - "name": "phpspec/prophecy", - "version": "v1.15.0", - "source": { - "type": "git", - "url": "https://github.com/phpspec/prophecy.git", - "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/bbcd7380b0ebf3961ee21409db7b38bc31d69a13", - "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13", - "shasum": "" - }, - "require": { - "doctrine/instantiator": "^1.2", - "php": "^7.2 || ~8.0, <8.2", - "phpdocumentor/reflection-docblock": "^5.2", - "sebastian/comparator": "^3.0 || ^4.0", - "sebastian/recursion-context": "^3.0 || ^4.0" - }, - "require-dev": { - "phpspec/phpspec": "^6.0 || ^7.0", - "phpunit/phpunit": "^8.0 || ^9.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Prophecy\\": "src/Prophecy" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Konstantin Kudryashov", - "email": "ever.zet@gmail.com", - "homepage": "http://everzet.com" - }, - { - "name": "Marcello Duarte", - "email": "marcello.duarte@gmail.com" - } - ], - "description": "Highly opinionated mocking framework for PHP 5.3+", - "homepage": "https://github.com/phpspec/prophecy", - "keywords": [ - "Double", - "Dummy", - "fake", - "mock", - "spy", - "stub" - ], - "support": { - "issues": "https://github.com/phpspec/prophecy/issues", - "source": "https://github.com/phpspec/prophecy/tree/v1.15.0" - }, - "time": "2021-12-08T12:19:24+00:00" - }, { "name": "phpunit/php-code-coverage", "version": "7.0.15", @@ -13963,16 +13839,16 @@ }, { "name": "phpunit/phpunit", - "version": "8.5.28", + "version": "8.5.29", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "8f2d1c9c7b30382459c871467853da1a6e44fbd4" + "reference": "e8c563c47a9a303662955518ca532b022b337f4d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/8f2d1c9c7b30382459c871467853da1a6e44fbd4", - "reference": "8f2d1c9c7b30382459c871467853da1a6e44fbd4", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/e8c563c47a9a303662955518ca532b022b337f4d", + "reference": "e8c563c47a9a303662955518ca532b022b337f4d", "shasum": "" }, "require": { @@ -13987,7 +13863,6 @@ "phar-io/manifest": "^2.0.3", "phar-io/version": "^3.0.2", "php": ">=7.2", - "phpspec/prophecy": "^1.10.3", "phpunit/php-code-coverage": "^7.0.12", "phpunit/php-file-iterator": "^2.0.4", "phpunit/php-text-template": "^1.2.1", @@ -14041,7 +13916,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/8.5.28" + "source": "https://github.com/sebastianbergmann/phpunit/tree/8.5.29" }, "funding": [ { @@ -14053,7 +13928,7 @@ "type": "github" } ], - "time": "2022-07-29T09:20:50+00:00" + "time": "2022-08-22T13:59:39+00:00" }, { "name": "psy/psysh", -- 2.39.5