From 877d06061d7c6022ef23fbf666f91b47e09cc5d4 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Thu, 14 Oct 2021 21:13:06 +0200 Subject: [PATCH] wip #4793 @0:05 --- composer.lock | 340 ++++++++++++++++++++--------------------- src/Compiler/Links.php | 2 +- src/Links/Link.php | 47 ++++++ 3 files changed, 211 insertions(+), 178 deletions(-) diff --git a/composer.lock b/composer.lock index cb9cac6..c8c1db9 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": "48305c7ffc70ecc105e04c22d7f8fb18", + "content-hash": "0cda6f0654eebbbfe18c34a34ef52c26", "packages": [ { "name": "barryvdh/laravel-debugbar", @@ -194,13 +194,13 @@ "source": { "type": "git", "url": "git://git.cubedesigners.com/cubist_util.git", - "reference": "2e5ce49625c437ce2dc155802189cc992d1f72c6" + "reference": "29b6efcedceac21c520a2aa50949c29a0a6599de" }, "dist": { "type": "tar", - "url": "https://composer.cubedesigners.com/dist/cubist/util/cubist-util-dev-master-3f73fc.tar", - "reference": "2e5ce49625c437ce2dc155802189cc992d1f72c6", - "shasum": "2474139d9b492690ee5656902d81b84bbc173106" + "url": "https://composer.cubedesigners.com/dist/cubist/util/cubist-util-dev-master-310521.tar", + "reference": "29b6efcedceac21c520a2aa50949c29a0a6599de", + "shasum": "54657d5f98931ca3f4655c69722c1cd7574e58a9" }, "require": { "cubist/net": "dev-master", @@ -210,8 +210,9 @@ "ext-libxml": "*", "ext-mbstring": "*", "ext-simplexml": "*", + "ext-sodium": "*", "laravel/framework": "~5.8|^6.0|^7.0|^8.0", - "php": ">=7.0.0" + "php": ">=7.2" }, "default-branch": true, "type": "library", @@ -230,7 +231,7 @@ } ], "description": "Utilities class", - "time": "2021-09-22T08:26:26+00:00" + "time": "2021-10-14T19:11:12+00:00" }, { "name": "dflydev/dot-access-data", @@ -238,12 +239,12 @@ "source": { "type": "git", "url": "https://github.com/dflydev/dflydev-dot-access-data.git", - "reference": "0992cc19268b259a39e86f296da5f0677841f42c" + "reference": "b2444050c080a65095d47f56f7ad8a18ab07a95f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dflydev/dflydev-dot-access-data/zipball/0992cc19268b259a39e86f296da5f0677841f42c", - "reference": "0992cc19268b259a39e86f296da5f0677841f42c", + "url": "https://api.github.com/repos/dflydev/dflydev-dot-access-data/zipball/b2444050c080a65095d47f56f7ad8a18ab07a95f", + "reference": "b2444050c080a65095d47f56f7ad8a18ab07a95f", "shasum": "" }, "require": { @@ -254,7 +255,7 @@ "phpunit/phpunit": "^7.5 || ^8.5 || ^9.3", "scrutinizer/ocular": "1.6.0", "squizlabs/php_codesniffer": "^3.5", - "vimeo/psalm": "^3.14" + "vimeo/psalm": "^4.0.0" }, "default-branch": true, "type": "library", @@ -304,9 +305,9 @@ ], "support": { "issues": "https://github.com/dflydev/dflydev-dot-access-data/issues", - "source": "https://github.com/dflydev/dflydev-dot-access-data/tree/v3.0.1" + "source": "https://github.com/dflydev/dflydev-dot-access-data/tree/main" }, - "time": "2021-08-13T13:06:58+00:00" + "time": "2021-10-06T16:53:15+00:00" }, { "name": "doctrine/inflector", @@ -871,12 +872,12 @@ "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "3d1ead403e05ee0b9aa93a6ff720704970aec9c8" + "reference": "858718579f63ec629e1d24f8540f3f04abb82d41" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/3d1ead403e05ee0b9aa93a6ff720704970aec9c8", - "reference": "3d1ead403e05ee0b9aa93a6ff720704970aec9c8", + "url": "https://api.github.com/repos/laravel/framework/zipball/858718579f63ec629e1d24f8540f3f04abb82d41", + "reference": "858718579f63ec629e1d24f8540f3f04abb82d41", "shasum": "" }, "require": { @@ -896,7 +897,7 @@ "psr/container": "^1.0", "psr/log": "^1.0 || ^2.0", "psr/simple-cache": "^1.0", - "ramsey/uuid": "^4.0", + "ramsey/uuid": "^4.2.2", "swiftmailer/swiftmailer": "^6.0", "symfony/console": "^5.1.4", "symfony/error-handler": "^5.1.4", @@ -1035,7 +1036,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2021-09-21T18:36:59+00:00" + "time": "2021-10-14T18:05:05+00:00" }, { "name": "laravel/serializable-closure", @@ -1043,12 +1044,12 @@ "source": { "type": "git", "url": "https://github.com/laravel/serializable-closure.git", - "reference": "2f4d826e04f2f54df30716b6d3a5dbe761b14a4e" + "reference": "6cfc678735f22ccedad761b8cae2bab14c3d8e5b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/2f4d826e04f2f54df30716b6d3a5dbe761b14a4e", - "reference": "2f4d826e04f2f54df30716b6d3a5dbe761b14a4e", + "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/6cfc678735f22ccedad761b8cae2bab14c3d8e5b", + "reference": "6cfc678735f22ccedad761b8cae2bab14c3d8e5b", "shasum": "" }, "require": { @@ -1095,7 +1096,7 @@ "issues": "https://github.com/laravel/serializable-closure/issues", "source": "https://github.com/laravel/serializable-closure" }, - "time": "2021-09-14T15:41:19+00:00" + "time": "2021-10-07T14:00:57+00:00" }, { "name": "league/commonmark", @@ -1103,12 +1104,12 @@ "source": { "type": "git", "url": "https://github.com/thephpleague/commonmark.git", - "reference": "cbcb58f4a55394fc1470f82c00e2bc9bb48f0f75" + "reference": "df50865e23dd6634b1ec441ae59194bdb8171efc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/cbcb58f4a55394fc1470f82c00e2bc9bb48f0f75", - "reference": "cbcb58f4a55394fc1470f82c00e2bc9bb48f0f75", + "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/df50865e23dd6634b1ec441ae59194bdb8171efc", + "reference": "df50865e23dd6634b1ec441ae59194bdb8171efc", "shasum": "" }, "require": { @@ -1182,10 +1183,6 @@ "source": "https://github.com/thephpleague/commonmark" }, "funding": [ - { - "url": "https://enjoy.gitstore.app/repositories/thephpleague/commonmark", - "type": "custom" - }, { "url": "https://www.colinodell.com/sponsor", "type": "custom" @@ -1198,16 +1195,12 @@ "url": "https://github.com/colinodell", "type": "github" }, - { - "url": "https://www.patreon.com/colinodell", - "type": "patreon" - }, { "url": "https://tidelift.com/funding/github/packagist/league/commonmark", "type": "tidelift" } ], - "time": "2021-09-12T20:44:15+00:00" + "time": "2021-10-04T13:51:01+00:00" }, { "name": "league/config", @@ -1215,12 +1208,12 @@ "source": { "type": "git", "url": "https://github.com/thephpleague/config.git", - "reference": "a9d39eeeb6cc49d10a6e6c36f22c4c1f4a767f3e" + "reference": "041e508f1e0885a3e0f40092ec0fc4bda22adf4f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/config/zipball/a9d39eeeb6cc49d10a6e6c36f22c4c1f4a767f3e", - "reference": "a9d39eeeb6cc49d10a6e6c36f22c4c1f4a767f3e", + "url": "https://api.github.com/repos/thephpleague/config/zipball/041e508f1e0885a3e0f40092ec0fc4bda22adf4f", + "reference": "041e508f1e0885a3e0f40092ec0fc4bda22adf4f", "shasum": "" }, "require": { @@ -1290,7 +1283,7 @@ "type": "github" } ], - "time": "2021-08-14T12:15:32+00:00" + "time": "2021-10-01T14:55:09+00:00" }, { "name": "league/flysystem", @@ -1458,16 +1451,16 @@ }, { "name": "league/mime-type-detection", - "version": "1.7.0", + "version": "1.8.0", "source": { "type": "git", "url": "https://github.com/thephpleague/mime-type-detection.git", - "reference": "3b9dff8aaf7323590c1d2e443db701eb1f9aa0d3" + "reference": "b38b25d7b372e9fddb00335400467b223349fd7e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/3b9dff8aaf7323590c1d2e443db701eb1f9aa0d3", - "reference": "3b9dff8aaf7323590c1d2e443db701eb1f9aa0d3", + "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/b38b25d7b372e9fddb00335400467b223349fd7e", + "reference": "b38b25d7b372e9fddb00335400467b223349fd7e", "shasum": "" }, "require": { @@ -1498,7 +1491,7 @@ "description": "Mime-type detection for Flysystem", "support": { "issues": "https://github.com/thephpleague/mime-type-detection/issues", - "source": "https://github.com/thephpleague/mime-type-detection/tree/1.7.0" + "source": "https://github.com/thephpleague/mime-type-detection/tree/1.8.0" }, "funding": [ { @@ -1510,7 +1503,7 @@ "type": "tidelift" } ], - "time": "2021-01-18T20:58:21+00:00" + "time": "2021-09-25T08:23:19+00:00" }, { "name": "maennchen/zipstream-php", @@ -1655,12 +1648,12 @@ "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "437e7a1c50044b92773b361af77620efb76fff59" + "reference": "4a11cadb275fa3af3c1e631c01d2a30bd6544b47" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/437e7a1c50044b92773b361af77620efb76fff59", - "reference": "437e7a1c50044b92773b361af77620efb76fff59", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/4a11cadb275fa3af3c1e631c01d2a30bd6544b47", + "reference": "4a11cadb275fa3af3c1e631c01d2a30bd6544b47", "shasum": "" }, "require": { @@ -1676,7 +1669,7 @@ "elasticsearch/elasticsearch": "^7", "graylog2/gelf-php": "^1.4.2", "mongodb/mongodb": "^1.8", - "php-amqplib/php-amqplib": "~2.4", + "php-amqplib/php-amqplib": "~2.4 || ^3", "php-console/php-console": "^3.1.3", "phpspec/prophecy": "^1.6.1", "phpstan/phpstan": "^0.12.91", @@ -1735,7 +1728,7 @@ ], "support": { "issues": "https://github.com/Seldaek/monolog/issues", - "source": "https://github.com/Seldaek/monolog/tree/2.3.4" + "source": "https://github.com/Seldaek/monolog/tree/main" }, "funding": [ { @@ -1747,7 +1740,7 @@ "type": "tidelift" } ], - "time": "2021-09-15T11:27:21+00:00" + "time": "2021-10-13T20:29:04+00:00" }, { "name": "myclabs/php-enum", @@ -1910,16 +1903,16 @@ "source": { "type": "git", "url": "https://github.com/nette/schema.git", - "reference": "a6c575f207ea6b59632946358f32b7d4cb1a054b" + "reference": "9a0295465f79ecf1b1a6e35fff3380599c69902d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/schema/zipball/a6c575f207ea6b59632946358f32b7d4cb1a054b", - "reference": "a6c575f207ea6b59632946358f32b7d4cb1a054b", + "url": "https://api.github.com/repos/nette/schema/zipball/9a0295465f79ecf1b1a6e35fff3380599c69902d", + "reference": "9a0295465f79ecf1b1a6e35fff3380599c69902d", "shasum": "" }, "require": { - "nette/utils": "^3.1.5 || ^4.0", + "nette/utils": "^2.5.7 || ^3.1.5 || ^4.0", "php": ">=7.1 <8.2" }, "require-dev": { @@ -1964,7 +1957,7 @@ "issues": "https://github.com/nette/schema/issues", "source": "https://github.com/nette/schema/tree/v1.2" }, - "time": "2021-09-19T17:34:36+00:00" + "time": "2021-10-09T20:21:28+00:00" }, { "name": "nette/utils", @@ -1972,12 +1965,12 @@ "source": { "type": "git", "url": "https://github.com/nette/utils.git", - "reference": "25d75271d2d88f211d4684638cbc938a75868b12" + "reference": "75af0ff0bf4db0df8aa07ea07a94437d0291b631" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/utils/zipball/25d75271d2d88f211d4684638cbc938a75868b12", - "reference": "25d75271d2d88f211d4684638cbc938a75868b12", + "url": "https://api.github.com/repos/nette/utils/zipball/75af0ff0bf4db0df8aa07ea07a94437d0291b631", + "reference": "75af0ff0bf4db0df8aa07ea07a94437d0291b631", "shasum": "" }, "require": { @@ -2050,7 +2043,7 @@ "issues": "https://github.com/nette/utils/issues", "source": "https://github.com/nette/utils/tree/master" }, - "time": "2021-09-22T00:14:13+00:00" + "time": "2021-10-11T10:51:26+00:00" }, { "name": "opis/closure", @@ -2455,12 +2448,12 @@ "source": { "type": "git", "url": "https://github.com/php-fig/simple-cache.git", - "reference": "5a7b96b1dda5d957e01bc1bfe77dcca09c5a7474" + "reference": "66e27efc65ddef47d3008c243a235ab9359b5754" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/5a7b96b1dda5d957e01bc1bfe77dcca09c5a7474", - "reference": "5a7b96b1dda5d957e01bc1bfe77dcca09c5a7474", + "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/66e27efc65ddef47d3008c243a235ab9359b5754", + "reference": "66e27efc65ddef47d3008c243a235ab9359b5754", "shasum": "" }, "require": { @@ -2485,7 +2478,7 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "description": "Common interfaces for simple caching", @@ -2499,7 +2492,7 @@ "support": { "source": "https://github.com/php-fig/simple-cache/tree/master" }, - "time": "2020-04-21T06:43:17+00:00" + "time": "2021-10-06T11:02:22+00:00" }, { "name": "ralouphie/getallheaders", @@ -2547,16 +2540,16 @@ }, { "name": "ramsey/collection", - "version": "1.2.1", + "version": "1.2.2", "source": { "type": "git", "url": "https://github.com/ramsey/collection.git", - "reference": "eaca1dc1054ddd10cbd83c1461907bee6fb528fa" + "reference": "cccc74ee5e328031b15640b51056ee8d3bb66c0a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ramsey/collection/zipball/eaca1dc1054ddd10cbd83c1461907bee6fb528fa", - "reference": "eaca1dc1054ddd10cbd83c1461907bee6fb528fa", + "url": "https://api.github.com/repos/ramsey/collection/zipball/cccc74ee5e328031b15640b51056ee8d3bb66c0a", + "reference": "cccc74ee5e328031b15640b51056ee8d3bb66c0a", "shasum": "" }, "require": { @@ -2610,7 +2603,7 @@ ], "support": { "issues": "https://github.com/ramsey/collection/issues", - "source": "https://github.com/ramsey/collection/tree/1.2.1" + "source": "https://github.com/ramsey/collection/tree/1.2.2" }, "funding": [ { @@ -2622,7 +2615,7 @@ "type": "tidelift" } ], - "time": "2021-08-06T03:41:06+00:00" + "time": "2021-10-10T03:01:02+00:00" }, { "name": "ramsey/uuid", @@ -2630,20 +2623,21 @@ "source": { "type": "git", "url": "https://github.com/ramsey/uuid.git", - "reference": "fe665a03df4f056aa65af552a96e1976df8c8dae" + "reference": "cd372a7b47a54734cbd491df40b5a48614d8d374" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ramsey/uuid/zipball/fe665a03df4f056aa65af552a96e1976df8c8dae", - "reference": "fe665a03df4f056aa65af552a96e1976df8c8dae", + "url": "https://api.github.com/repos/ramsey/uuid/zipball/cd372a7b47a54734cbd491df40b5a48614d8d374", + "reference": "cd372a7b47a54734cbd491df40b5a48614d8d374", "shasum": "" }, "require": { "brick/math": "^0.8 || ^0.9", "ext-json": "*", - "php": "^7.2 || ^8", + "php": "^7.2 || ^8.0", "ramsey/collection": "^1.0", - "symfony/polyfill-ctype": "^1.8" + "symfony/polyfill-ctype": "^1.8", + "symfony/polyfill-php80": "^1.14" }, "replace": { "rhumsaa/uuid": "self.version" @@ -2708,7 +2702,7 @@ ], "support": { "issues": "https://github.com/ramsey/uuid/issues", - "source": "https://github.com/ramsey/uuid/tree/4.2.1" + "source": "https://github.com/ramsey/uuid/tree/main" }, "funding": [ { @@ -2720,7 +2714,7 @@ "type": "tidelift" } ], - "time": "2021-08-11T01:06:55+00:00" + "time": "2021-10-13T18:44:27+00:00" }, { "name": "spatie/image", @@ -2847,16 +2841,16 @@ }, { "name": "spatie/laravel-medialibrary", - "version": "dev-main", + "version": "9.8.2", "source": { "type": "git", "url": "https://github.com/spatie/laravel-medialibrary.git", - "reference": "d06251850967f294f394f6a275969a70d88a29f1" + "reference": "b87d7695bb190f5947ef6c892d0a167e6e1c03f9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-medialibrary/zipball/d06251850967f294f394f6a275969a70d88a29f1", - "reference": "d06251850967f294f394f6a275969a70d88a29f1", + "url": "https://api.github.com/repos/spatie/laravel-medialibrary/zipball/b87d7695bb190f5947ef6c892d0a167e6e1c03f9", + "reference": "b87d7695bb190f5947ef6c892d0a167e6e1c03f9", "shasum": "" }, "require": { @@ -2897,7 +2891,6 @@ "php-ffmpeg/php-ffmpeg": "Required for generating video thumbnails", "spatie/pdf-to-image": "Required for generating thumbsnails of PDFs and SVGs" }, - "default-branch": true, "type": "library", "extra": { "laravel": { @@ -2937,7 +2930,7 @@ ], "support": { "issues": "https://github.com/spatie/laravel-medialibrary/issues", - "source": "https://github.com/spatie/laravel-medialibrary/tree/main" + "source": "https://github.com/spatie/laravel-medialibrary/tree/9.8.2" }, "funding": [ { @@ -2949,7 +2942,7 @@ "type": "github" } ], - "time": "2021-10-14T09:34:28+00:00" + "time": "2021-10-12T22:33:09+00:00" }, { "name": "spatie/temporary-directory", @@ -3094,12 +3087,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "d386ddb6ca52187ab3491e0ae59a33f0abc73578" + "reference": "6b71e16a5e9c1a163268c60cb1a528a01d72e5d9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/d386ddb6ca52187ab3491e0ae59a33f0abc73578", - "reference": "d386ddb6ca52187ab3491e0ae59a33f0abc73578", + "url": "https://api.github.com/repos/symfony/console/zipball/6b71e16a5e9c1a163268c60cb1a528a01d72e5d9", + "reference": "6b71e16a5e9c1a163268c60cb1a528a01d72e5d9", "shasum": "" }, "require": { @@ -3185,7 +3178,7 @@ "type": "tidelift" } ], - "time": "2021-09-20T17:52:42+00:00" + "time": "2021-10-06T07:48:19+00:00" }, { "name": "symfony/css-selector", @@ -3258,12 +3251,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "2f9160e92eb64c95da7368c867b663a8e34e980c" + "reference": "43ede438d4cb52cd589ae5dc070e9323866ba8e0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/2f9160e92eb64c95da7368c867b663a8e34e980c", - "reference": "2f9160e92eb64c95da7368c867b663a8e34e980c", + "url": "https://api.github.com/repos/symfony/debug/zipball/43ede438d4cb52cd589ae5dc070e9323866ba8e0", + "reference": "43ede438d4cb52cd589ae5dc070e9323866ba8e0", "shasum": "" }, "require": { @@ -3303,7 +3296,7 @@ "description": "Provides tools to ease debugging PHP code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/debug/tree/v4.4.27" + "source": "https://github.com/symfony/debug/tree/v4.4.31" }, "funding": [ { @@ -3319,11 +3312,11 @@ "type": "tidelift" } ], - "time": "2021-07-22T07:21:39+00:00" + "time": "2021-09-24T13:30:14+00:00" }, { "name": "symfony/deprecation-contracts", - "version": "dev-main", + "version": "2.5.x-dev", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", @@ -3338,7 +3331,6 @@ "require": { "php": ">=7.1" }, - "default-branch": true, "type": "library", "extra": { "branch-alias": { @@ -3395,12 +3387,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "50aecc237b1e370564420a16b4d2ef2e2ffcbb17" + "reference": "91eb974ecb7cb2dac0520af5e16a6d75b7970a96" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/50aecc237b1e370564420a16b4d2ef2e2ffcbb17", - "reference": "50aecc237b1e370564420a16b4d2ef2e2ffcbb17", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/91eb974ecb7cb2dac0520af5e16a6d75b7970a96", + "reference": "91eb974ecb7cb2dac0520af5e16a6d75b7970a96", "shasum": "" }, "require": { @@ -3458,7 +3450,7 @@ "type": "tidelift" } ], - "time": "2021-09-13T19:56:21+00:00" + "time": "2021-10-04T18:34:22+00:00" }, { "name": "symfony/event-dispatcher", @@ -3466,12 +3458,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "8102f60b2f450740b03602839afa4b4652c801f5" + "reference": "838fec150291a4466b5c056adf7fc56b86094003" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/8102f60b2f450740b03602839afa4b4652c801f5", - "reference": "8102f60b2f450740b03602839afa4b4652c801f5", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/838fec150291a4466b5c056adf7fc56b86094003", + "reference": "838fec150291a4466b5c056adf7fc56b86094003", "shasum": "" }, "require": { @@ -3541,7 +3533,7 @@ "type": "tidelift" } ], - "time": "2021-09-01T00:25:59+00:00" + "time": "2021-10-06T08:10:14+00:00" }, { "name": "symfony/event-dispatcher-contracts", @@ -3549,12 +3541,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", - "reference": "9af5330a64a6aebd8eabad988b50b77d8a9ec8a7" + "reference": "aa5422287b75594b90ee9cd807caf8f0df491385" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/9af5330a64a6aebd8eabad988b50b77d8a9ec8a7", - "reference": "9af5330a64a6aebd8eabad988b50b77d8a9ec8a7", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/aa5422287b75594b90ee9cd807caf8f0df491385", + "reference": "aa5422287b75594b90ee9cd807caf8f0df491385", "shasum": "" }, "require": { @@ -3568,7 +3560,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "2.5-dev" + "dev-main": "3.0-dev" }, "thanks": { "name": "symfony/contracts", @@ -3621,7 +3613,7 @@ "type": "tidelift" } ], - "time": "2021-06-09T13:36:38+00:00" + "time": "2021-07-15T12:33:35+00:00" }, { "name": "symfony/finder", @@ -3629,12 +3621,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "982b4a1044ec54a2ad55c8001bf66dbdb3e3c4c1" + "reference": "3d70c86483c61de33232a6197cf84e356f88fdf1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/982b4a1044ec54a2ad55c8001bf66dbdb3e3c4c1", - "reference": "982b4a1044ec54a2ad55c8001bf66dbdb3e3c4c1", + "url": "https://api.github.com/repos/symfony/finder/zipball/3d70c86483c61de33232a6197cf84e356f88fdf1", + "reference": "3d70c86483c61de33232a6197cf84e356f88fdf1", "shasum": "" }, "require": { @@ -3684,29 +3676,28 @@ "type": "tidelift" } ], - "time": "2021-08-25T15:53:43+00:00" + "time": "2021-10-04T18:34:22+00:00" }, { "name": "symfony/http-client-contracts", - "version": "dev-main", + "version": "2.5.x-dev", "source": { "type": "git", "url": "https://github.com/symfony/http-client-contracts.git", - "reference": "ca13f193ea37c433ebca50c7c5e67f00a9538732" + "reference": "7a2f0112e6d9f2be69e3bc9ce59c8d9dfe7f96ca" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/ca13f193ea37c433ebca50c7c5e67f00a9538732", - "reference": "ca13f193ea37c433ebca50c7c5e67f00a9538732", + "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/7a2f0112e6d9f2be69e3bc9ce59c8d9dfe7f96ca", + "reference": "7a2f0112e6d9f2be69e3bc9ce59c8d9dfe7f96ca", "shasum": "" }, "require": { - "php": ">=8.0.2" + "php": ">=7.2.5" }, "suggest": { "symfony/http-client-implementation": "" }, - "default-branch": true, "type": "library", "extra": { "branch-alias": { @@ -3747,7 +3738,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/http-client-contracts/tree/main" + "source": "https://github.com/symfony/http-client-contracts/tree/2.5" }, "funding": [ { @@ -3763,7 +3754,7 @@ "type": "tidelift" } ], - "time": "2021-07-13T09:36:22+00:00" + "time": "2021-07-13T09:35:11+00:00" }, { "name": "symfony/http-foundation", @@ -3771,12 +3762,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "65808acd52ee65add91353cde5cb432021a9ca43" + "reference": "c5a62a900abce13e979503ec96f89c1974df92c0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/65808acd52ee65add91353cde5cb432021a9ca43", - "reference": "65808acd52ee65add91353cde5cb432021a9ca43", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/c5a62a900abce13e979503ec96f89c1974df92c0", + "reference": "c5a62a900abce13e979503ec96f89c1974df92c0", "shasum": "" }, "require": { @@ -3836,7 +3827,7 @@ "type": "tidelift" } ], - "time": "2021-09-14T13:02:56+00:00" + "time": "2021-10-13T06:03:16+00:00" }, { "name": "symfony/http-kernel", @@ -3844,12 +3835,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "5306f8a42c48943bfbf604eeb045550c984bc1f7" + "reference": "f055dad8a110b6b8dd09fca0e0928b1f753d2d76" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/5306f8a42c48943bfbf604eeb045550c984bc1f7", - "reference": "5306f8a42c48943bfbf604eeb045550c984bc1f7", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/f055dad8a110b6b8dd09fca0e0928b1f753d2d76", + "reference": "f055dad8a110b6b8dd09fca0e0928b1f753d2d76", "shasum": "" }, "require": { @@ -3948,7 +3939,7 @@ "type": "tidelift" } ], - "time": "2021-09-10T12:48:18+00:00" + "time": "2021-10-08T23:17:06+00:00" }, { "name": "symfony/mime", @@ -3956,12 +3947,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "b01b4ca3fe4aa40c1e1f22ff2c5b4bb503d52699" + "reference": "17f3a3d210bdb94824ac3bc48ee6ba57407982e2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/b01b4ca3fe4aa40c1e1f22ff2c5b4bb503d52699", - "reference": "b01b4ca3fe4aa40c1e1f22ff2c5b4bb503d52699", + "url": "https://api.github.com/repos/symfony/mime/zipball/17f3a3d210bdb94824ac3bc48ee6ba57407982e2", + "reference": "17f3a3d210bdb94824ac3bc48ee6ba57407982e2", "shasum": "" }, "require": { @@ -4031,7 +4022,7 @@ "type": "tidelift" } ], - "time": "2021-09-10T12:30:46+00:00" + "time": "2021-10-06T07:48:14+00:00" }, { "name": "symfony/polyfill-ctype", @@ -4857,12 +4848,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "a3ab47968ef2cc5124efc4f1b6b4e7a61b85a543" + "reference": "b076aa9be226405545de739ef6711f6141651700" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/a3ab47968ef2cc5124efc4f1b6b4e7a61b85a543", - "reference": "a3ab47968ef2cc5124efc4f1b6b4e7a61b85a543", + "url": "https://api.github.com/repos/symfony/process/zipball/b076aa9be226405545de739ef6711f6141651700", + "reference": "b076aa9be226405545de739ef6711f6141651700", "shasum": "" }, "require": { @@ -4911,7 +4902,7 @@ "type": "tidelift" } ], - "time": "2021-08-24T19:02:39+00:00" + "time": "2021-10-06T07:48:14+00:00" }, { "name": "symfony/routing", @@ -4919,12 +4910,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "6097f4eef3b8d4d0691cc1b164aa32c14565882d" + "reference": "5a54b92c019b61e6fbf9c989750f25790aa0baca" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/6097f4eef3b8d4d0691cc1b164aa32c14565882d", - "reference": "6097f4eef3b8d4d0691cc1b164aa32c14565882d", + "url": "https://api.github.com/repos/symfony/routing/zipball/5a54b92c019b61e6fbf9c989750f25790aa0baca", + "reference": "5a54b92c019b61e6fbf9c989750f25790aa0baca", "shasum": "" }, "require": { @@ -5001,24 +4992,24 @@ "type": "tidelift" } ], - "time": "2021-09-08T12:50:02+00:00" + "time": "2021-10-06T07:48:14+00:00" }, { "name": "symfony/service-contracts", - "version": "dev-main", + "version": "2.5.x-dev", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "8c29a2aeea95d18ce58bd2ee60725089cec39ebc" + "reference": "56b990c18120c91eaf0d38a93fabfa2a1f7fa413" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/8c29a2aeea95d18ce58bd2ee60725089cec39ebc", - "reference": "8c29a2aeea95d18ce58bd2ee60725089cec39ebc", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/56b990c18120c91eaf0d38a93fabfa2a1f7fa413", + "reference": "56b990c18120c91eaf0d38a93fabfa2a1f7fa413", "shasum": "" }, "require": { - "php": ">=8.0.2", + "php": ">=7.2.5", "psr/container": "^1.1" }, "conflict": { @@ -5027,7 +5018,6 @@ "suggest": { "symfony/service-implementation": "" }, - "default-branch": true, "type": "library", "extra": { "branch-alias": { @@ -5068,7 +5058,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/main" + "source": "https://github.com/symfony/service-contracts/tree/2.5" }, "funding": [ { @@ -5084,7 +5074,7 @@ "type": "tidelift" } ], - "time": "2021-07-13T09:36:22+00:00" + "time": "2021-07-13T09:35:11+00:00" }, { "name": "symfony/string", @@ -5177,12 +5167,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "815ec5d1c49358e253bb7160b0584d4f9db9ea5f" + "reference": "74f0cb2c547211bd9860476dd6600e8032204afc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/815ec5d1c49358e253bb7160b0584d4f9db9ea5f", - "reference": "815ec5d1c49358e253bb7160b0584d4f9db9ea5f", + "url": "https://api.github.com/repos/symfony/translation/zipball/74f0cb2c547211bd9860476dd6600e8032204afc", + "reference": "74f0cb2c547211bd9860476dd6600e8032204afc", "shasum": "" }, "require": { @@ -5266,29 +5256,28 @@ "type": "tidelift" } ], - "time": "2021-09-10T10:26:24+00:00" + "time": "2021-10-11T15:43:29+00:00" }, { "name": "symfony/translation-contracts", - "version": "dev-main", + "version": "2.5.x-dev", "source": { "type": "git", "url": "https://github.com/symfony/translation-contracts.git", - "reference": "2e3846007eb02fc90529798f7f442ff64e9b3fc9" + "reference": "6e2aa82901f45c38761ba61c1082584ae6f5dbda" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/2e3846007eb02fc90529798f7f442ff64e9b3fc9", - "reference": "2e3846007eb02fc90529798f7f442ff64e9b3fc9", + "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/6e2aa82901f45c38761ba61c1082584ae6f5dbda", + "reference": "6e2aa82901f45c38761ba61c1082584ae6f5dbda", "shasum": "" }, "require": { - "php": ">=8.0.2" + "php": ">=7.2.5" }, "suggest": { "symfony/translation-implementation": "" }, - "default-branch": true, "type": "library", "extra": { "branch-alias": { @@ -5329,7 +5318,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/translation-contracts/tree/main" + "source": "https://github.com/symfony/translation-contracts/tree/2.5" }, "funding": [ { @@ -5345,7 +5334,7 @@ "type": "tidelift" } ], - "time": "2021-07-13T10:08:27+00:00" + "time": "2021-07-13T10:07:36+00:00" }, { "name": "symfony/var-dumper", @@ -5353,12 +5342,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "42a7c869e84fe8fdea13026bfb05b21de19293cc" + "reference": "a60e015a49db26dda873ca3ef74776db65f5e709" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/42a7c869e84fe8fdea13026bfb05b21de19293cc", - "reference": "42a7c869e84fe8fdea13026bfb05b21de19293cc", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/a60e015a49db26dda873ca3ef74776db65f5e709", + "reference": "a60e015a49db26dda873ca3ef74776db65f5e709", "shasum": "" }, "require": { @@ -5434,7 +5423,7 @@ "type": "tidelift" } ], - "time": "2021-09-08T11:52:27+00:00" + "time": "2021-10-06T12:45:54+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -5496,12 +5485,12 @@ "source": { "type": "git", "url": "https://github.com/vlucas/phpdotenv.git", - "reference": "3349d8cd26a23c42b1adecda4b5a687637b21242" + "reference": "accaddf133651d4b5cf81a119f25296736ffc850" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/3349d8cd26a23c42b1adecda4b5a687637b21242", - "reference": "3349d8cd26a23c42b1adecda4b5a687637b21242", + "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/accaddf133651d4b5cf81a119f25296736ffc850", + "reference": "accaddf133651d4b5cf81a119f25296736ffc850", "shasum": "" }, "require": { @@ -5516,7 +5505,7 @@ "require-dev": { "bamarni/composer-bin-plugin": "^1.4.1", "ext-filter": "*", - "phpunit/phpunit": "^7.5.20 || ^8.5.20 || ^9.5.8" + "phpunit/phpunit": "^7.5.20 || ^8.5.21 || ^9.5.10" }, "suggest": { "ext-filter": "Required to use the boolean validator." @@ -5525,7 +5514,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "5.4-dev" + "dev-master": "5.3-dev" } }, "autoload": { @@ -5540,13 +5529,11 @@ "authors": [ { "name": "Graham Campbell", - "email": "hello@gjcampbell.co.uk", - "homepage": "https://gjcampbell.co.uk/" + "email": "hello@gjcampbell.co.uk" }, { "name": "Vance Lucas", - "email": "vance@vancelucas.com", - "homepage": "https://vancelucas.com/" + "email": "vance@vancelucas.com" } ], "description": "Loads environment variables from `.env` to `getenv()`, `$_ENV` and `$_SERVER` automagically.", @@ -5557,7 +5544,7 @@ ], "support": { "issues": "https://github.com/vlucas/phpdotenv/issues", - "source": "https://github.com/vlucas/phpdotenv/tree/master" + "source": "https://github.com/vlucas/phpdotenv/tree/v5.3.1" }, "funding": [ { @@ -5569,7 +5556,7 @@ "type": "tidelift" } ], - "time": "2021-09-02T23:18:34+00:00" + "time": "2021-10-02T19:24:42+00:00" }, { "name": "voku/portable-ascii", @@ -5709,8 +5696,7 @@ "aliases": [], "minimum-stability": "dev", "stability-flags": { - "cubist/util": 20, - "spatie/laravel-medialibrary": 20 + "cubist/util": 20 }, "prefer-stable": false, "prefer-lowest": false, diff --git a/src/Compiler/Links.php b/src/Compiler/Links.php index 986aacf..5b658aa 100644 --- a/src/Compiler/Links.php +++ b/src/Compiler/Links.php @@ -69,7 +69,7 @@ trait Links foreach ($linksCopy as $k => $linkData) { if ($linkData['type'] == 35 || $linkData['type'] == 15 || $linkData['type'] == 39) { - $linkData = wsLinks::decryptLink($linkData); + $linkData = self::decryptLink($linkData); $animations = ContentLink::parseAnimations($linkData['image_rollover']); foreach ($animations as $animation) { if (isset($animation['backgroundcolor']) && $animation['backgroundcolor'] !== 'transparent') { diff --git a/src/Links/Link.php b/src/Links/Link.php index 8eca28a..4af24cc 100644 --- a/src/Links/Link.php +++ b/src/Links/Link.php @@ -3,6 +3,7 @@ namespace Fluidbook\Tools\Links; use Cubist\Util\ArrayUtil; +use Cubist\Util\Crypt; use Cubist\Util\CSS; use Cubist\Util\Json; use Cubist\Util\ObjectUtil; @@ -629,4 +630,50 @@ class Link return $res; } + /** + * @throws \SodiumException + */ + public static function decryptLink($link) + { + $array = false; + if (is_array($link)) { + $array = true; + $link = ObjectUtil::asObject($link); + } + + foreach ($link as $attr => $item) { + if (!str_starts_with($item, '///')) { + continue; + } + $v = Crypt::safeDecrypt(substr($item, 3), self::_getLinkKey()); + $e = explode('|||', $v); + if ($e[0] === $link->uid) { + $link->$attr = $e[1]; + } else { + $link->$attr = ''; + } + } + if (!$array) { + return $link; + } + return ArrayUtil::asArray($link); + } + + public static function decryptLinks($links) + { + $res = []; + foreach ($links as $key => $link) { + $res[$key] = self::decryptLink($link); + } + return $res; + } + + public static function _getLinkKey() + { + if (self::$_linksKey === null) { + self::$_linksKey = base64_decode('o2p2yYGI8yMEHf+Y5/e6NdTINbbXg3NIo8BODgdhPxI='); + } + return self::$_linksKey; + } + } -- 2.39.5