From: Vincent Vanwaelscappel Date: Tue, 12 Sep 2023 15:40:10 +0000 (+0200) Subject: wip #6274 @0.5 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=bba3a29b3f5ac0ef32cb5f0d736ce63da0cfa411;p=fluidbook-toolbox.git wip #6274 @0.5 --- diff --git a/app/Fluidbook/Link/Custom/IntexLink.php b/app/Fluidbook/Link/Custom/IntexLink.php index d31c115c9..8010e2e44 100644 --- a/app/Fluidbook/Link/Custom/IntexLink.php +++ b/app/Fluidbook/Link/Custom/IntexLink.php @@ -8,7 +8,7 @@ class IntexLink extends CustomLink { public function ignore() { - if (!static::_getURLOfType('intex', $this->to, false)) { + if (!static::_getURL($this->to,'intex', false)) { return true; } return parent::ignore(); @@ -16,7 +16,7 @@ class IntexLink extends CustomLink public static function _getURL($to) { - return static::_getURLOfType('intex', $to); + return static::_getURL( $to,'intex'); } public function getDefaultTooltip() diff --git a/app/Fluidbook/Link/Custom/WescoLink.php b/app/Fluidbook/Link/Custom/WescoLink.php index 3d1d1d0ad..d2e28248b 100644 --- a/app/Fluidbook/Link/Custom/WescoLink.php +++ b/app/Fluidbook/Link/Custom/WescoLink.php @@ -8,7 +8,7 @@ class WescoLink extends CustomLink { public static function _getURL($to) { - return self::_getURLOfType('wesco', $to); + return self::_getURLOfType($to,'wesco'); } } diff --git a/composer.lock b/composer.lock index e58a12c3e..ddf7701ec 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": "36298aad6903b79b720e855da3abd1b6", + "content-hash": "17a71f00635fcbe7512cc6896ef3b978", "packages": [ { "name": "archtechx/enums", @@ -1008,6 +1008,148 @@ ], "time": "2023-07-28T22:50:16+00:00" }, + { + "name": "chillerlan/php-qrcode", + "version": "4.3.4", + "source": { + "type": "git", + "url": "https://github.com/chillerlan/php-qrcode.git", + "reference": "2ca4bf5ae048af1981d1023ee42a0a2a9d51e51d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/chillerlan/php-qrcode/zipball/2ca4bf5ae048af1981d1023ee42a0a2a9d51e51d", + "reference": "2ca4bf5ae048af1981d1023ee42a0a2a9d51e51d", + "shasum": "" + }, + "require": { + "chillerlan/php-settings-container": "^2.1.4", + "ext-mbstring": "*", + "php": "^7.4 || ^8.0" + }, + "require-dev": { + "phan/phan": "^5.3", + "phpunit/phpunit": "^9.5", + "setasign/fpdf": "^1.8.2" + }, + "suggest": { + "chillerlan/php-authenticator": "Yet another Google authenticator! Also creates URIs for mobile apps.", + "setasign/fpdf": "Required to use the QR FPDF output." + }, + "type": "library", + "autoload": { + "psr-4": { + "chillerlan\\QRCode\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Kazuhiko Arase", + "homepage": "https://github.com/kazuhikoarase" + }, + { + "name": "Smiley", + "email": "smiley@chillerlan.net", + "homepage": "https://github.com/codemasher" + }, + { + "name": "Contributors", + "homepage": "https://github.com/chillerlan/php-qrcode/graphs/contributors" + } + ], + "description": "A QR code generator. PHP 7.4+", + "homepage": "https://github.com/chillerlan/php-qrcode", + "keywords": [ + "phpqrcode", + "qr", + "qr code", + "qrcode", + "qrcode-generator" + ], + "support": { + "issues": "https://github.com/chillerlan/php-qrcode/issues", + "source": "https://github.com/chillerlan/php-qrcode/tree/4.3.4" + }, + "funding": [ + { + "url": "https://www.paypal.com/donate?hosted_button_id=WLYUNAT9ZTJZ4", + "type": "custom" + }, + { + "url": "https://ko-fi.com/codemasher", + "type": "ko_fi" + } + ], + "time": "2022-07-25T09:12:45+00:00" + }, + { + "name": "chillerlan/php-settings-container", + "version": "2.1.4", + "source": { + "type": "git", + "url": "https://github.com/chillerlan/php-settings-container.git", + "reference": "1beb7df3c14346d4344b0b2e12f6f9a74feabd4a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/chillerlan/php-settings-container/zipball/1beb7df3c14346d4344b0b2e12f6f9a74feabd4a", + "reference": "1beb7df3c14346d4344b0b2e12f6f9a74feabd4a", + "shasum": "" + }, + "require": { + "ext-json": "*", + "php": "^7.4 || ^8.0" + }, + "require-dev": { + "phan/phan": "^5.3", + "phpunit/phpunit": "^9.5" + }, + "type": "library", + "autoload": { + "psr-4": { + "chillerlan\\Settings\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Smiley", + "email": "smiley@chillerlan.net", + "homepage": "https://github.com/codemasher" + } + ], + "description": "A container class for immutable settings objects. Not a DI container. PHP 7.4+", + "homepage": "https://github.com/chillerlan/php-settings-container", + "keywords": [ + "PHP7", + "Settings", + "configuration", + "container", + "helper" + ], + "support": { + "issues": "https://github.com/chillerlan/php-settings-container/issues", + "source": "https://github.com/chillerlan/php-settings-container" + }, + "funding": [ + { + "url": "https://www.paypal.com/donate?hosted_button_id=WLYUNAT9ZTJZ4", + "type": "custom" + }, + { + "url": "https://ko-fi.com/codemasher", + "type": "ko_fi" + } + ], + "time": "2022-07-05T22:32:14+00:00" + }, { "name": "chrisjean/php-ico", "version": "1.0.4", @@ -1928,13 +2070,13 @@ "source": { "type": "git", "url": "git://git.cubedesigners.com/cubist_pdf.git", - "reference": "0413f5d2b2ef26068757d79f81a22654eedc8bb3" + "reference": "81f9b5cc6697ec481de852a16252eda0b2117aab" }, "dist": { "type": "tar", - "url": "https://composer.cubedesigners.com/dist/cubist/pdf/cubist-pdf-dev-master-21001b.tar", - "reference": "0413f5d2b2ef26068757d79f81a22654eedc8bb3", - "shasum": "5d13b5b8e376d3486e03d15a9ef3365054c30360" + "url": "https://composer.cubedesigners.com/dist/cubist/pdf/cubist-pdf-dev-master-9efc6e.tar", + "reference": "81f9b5cc6697ec481de852a16252eda0b2117aab", + "shasum": "92ac6b7b0e68294aec6e52c6f3fd40d9085f9d54" }, "require": { "cubist/util": "dev-master", @@ -1970,7 +2112,7 @@ "cubist", "pdf" ], - "time": "2023-09-07T15:59:20+00:00" + "time": "2023-09-08T16:29:40+00:00" }, { "name": "cubist/scorm", @@ -2015,13 +2157,13 @@ "source": { "type": "git", "url": "git://git.cubedesigners.com/cubist_util.git", - "reference": "8687dd873682a0dd603ebaf5fb75ec351b864535" + "reference": "f0424ee65afcec52bf6cd924c92e2415451fa0a6" }, "dist": { "type": "tar", - "url": "https://composer.cubedesigners.com/dist/cubist/util/cubist-util-dev-master-42ca71.tar", - "reference": "8687dd873682a0dd603ebaf5fb75ec351b864535", - "shasum": "1cf86dda70649aaa4c9301834481180db207cb93" + "url": "https://composer.cubedesigners.com/dist/cubist/util/cubist-util-dev-master-32f01f.tar", + "reference": "f0424ee65afcec52bf6cd924c92e2415451fa0a6", + "shasum": "d4d0eb9d3c6eb61cc32147b3a3d5c860573d0b6e" }, "require": { "cubist/net": "dev-master", @@ -2055,7 +2197,7 @@ } ], "description": "Utilities class", - "time": "2023-09-04T15:16:16+00:00" + "time": "2023-09-12T10:43:47+00:00" }, { "name": "cviebrock/eloquent-sluggable", @@ -3671,13 +3813,13 @@ "source": { "type": "git", "url": "git://git.cubedesigners.com/fluidbook_tools.git", - "reference": "06926ace231d5b38499411facf52b3647f4e0a34" + "reference": "0b851276da162cb425cb72b5d5d68ecbb073e6be" }, "dist": { "type": "tar", - "url": "https://composer.cubedesigners.com/dist/fluidbook/tools/fluidbook-tools-dev-master-a3c6a5.tar", - "reference": "06926ace231d5b38499411facf52b3647f4e0a34", - "shasum": "2b98542fd40d84f8dc095686d97613214c52802a" + "url": "https://composer.cubedesigners.com/dist/fluidbook/tools/fluidbook-tools-dev-master-18312e.tar", + "reference": "0b851276da162cb425cb72b5d5d68ecbb073e6be", + "shasum": "66596669cc4742b74f21f47e83f57d5699ddd490" }, "require": { "barryvdh/laravel-debugbar": "*", @@ -3711,7 +3853,7 @@ } ], "description": "Fluidbook Tools", - "time": "2023-09-08T06:47:48+00:00" + "time": "2023-09-12T14:31:17+00:00" }, { "name": "fruitcake/php-cors", @@ -5255,16 +5397,16 @@ }, { "name": "lavary/laravel-menu", - "version": "v1.8.3", + "version": "v1.8.4", "source": { "type": "git", "url": "https://github.com/lavary/laravel-menu.git", - "reference": "4f14cb9b11cfcd9839d1d87c806632c84a94d3be" + "reference": "5255e715912b50127b296da7410bd97468bf5e40" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/lavary/laravel-menu/zipball/4f14cb9b11cfcd9839d1d87c806632c84a94d3be", - "reference": "4f14cb9b11cfcd9839d1d87c806632c84a94d3be", + "url": "https://api.github.com/repos/lavary/laravel-menu/zipball/5255e715912b50127b296da7410bd97468bf5e40", + "reference": "5255e715912b50127b296da7410bd97468bf5e40", "shasum": "" }, "require": { @@ -5305,9 +5447,9 @@ ], "support": { "issues": "https://github.com/lavary/laravel-menu/issues", - "source": "https://github.com/lavary/laravel-menu/tree/v1.8.3" + "source": "https://github.com/lavary/laravel-menu/tree/v1.8.4" }, - "time": "2021-02-22T16:41:26+00:00" + "time": "2022-02-14T19:30:22+00:00" }, { "name": "league/commonmark", @@ -15196,16 +15338,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "9.2.27", + "version": "9.2.28", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "b0a88255cb70d52653d80c890bd7f38740ea50d1" + "reference": "7134a5ccaaf0f1c92a4f5501a6c9f98ac4dcc0ef" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/b0a88255cb70d52653d80c890bd7f38740ea50d1", - "reference": "b0a88255cb70d52653d80c890bd7f38740ea50d1", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/7134a5ccaaf0f1c92a4f5501a6c9f98ac4dcc0ef", + "reference": "7134a5ccaaf0f1c92a4f5501a6c9f98ac4dcc0ef", "shasum": "" }, "require": { @@ -15262,7 +15404,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.27" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.28" }, "funding": [ { @@ -15270,7 +15412,7 @@ "type": "github" } ], - "time": "2023-07-26T13:44:30+00:00" + "time": "2023-09-12T14:36:20+00:00" }, { "name": "phpunit/php-file-iterator", @@ -15515,16 +15657,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.6.11", + "version": "9.6.12", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "810500e92855eba8a7a5319ae913be2da6f957b0" + "reference": "a122c2ebd469b751d774aa0f613dc0d67697653f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/810500e92855eba8a7a5319ae913be2da6f957b0", - "reference": "810500e92855eba8a7a5319ae913be2da6f957b0", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a122c2ebd469b751d774aa0f613dc0d67697653f", + "reference": "a122c2ebd469b751d774aa0f613dc0d67697653f", "shasum": "" }, "require": { @@ -15539,7 +15681,7 @@ "phar-io/manifest": "^2.0.3", "phar-io/version": "^3.0.2", "php": ">=7.3", - "phpunit/php-code-coverage": "^9.2.13", + "phpunit/php-code-coverage": "^9.2.28", "phpunit/php-file-iterator": "^3.0.5", "phpunit/php-invoker": "^3.1.1", "phpunit/php-text-template": "^2.0.3", @@ -15598,7 +15740,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.11" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.12" }, "funding": [ { @@ -15614,7 +15756,7 @@ "type": "tidelift" } ], - "time": "2023-08-19T07:10:56+00:00" + "time": "2023-09-12T14:39:31+00:00" }, { "name": "psy/psysh",