diff --git a/app/composer.lock b/app/composer.lock index 6d1436e62..d3510c4c6 100644 --- a/app/composer.lock +++ b/app/composer.lock @@ -33,13 +33,13 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "3.x-dev" - }, "phpstan": { "includes": [ "extension.neon" ] + }, + "branch-alias": { + "dev-main": "3.x-dev" } }, "autoload": { @@ -3653,12 +3653,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "4aa68d3ea343b9576b5fdebef1332f701a7bc994" + "reference": "5a88337185d08d54ac102bc6eb137fc432ea70fb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/4aa68d3ea343b9576b5fdebef1332f701a7bc994", - "reference": "4aa68d3ea343b9576b5fdebef1332f701a7bc994", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/5a88337185d08d54ac102bc6eb137fc432ea70fb", + "reference": "5a88337185d08d54ac102bc6eb137fc432ea70fb", "shasum": "" }, "conflict": { @@ -3947,6 +3947,7 @@ "james-heinrich/phpthumb": "<1.7.12", "jasig/phpcas": "<1.3.3", "jcbrand/converse.js": "<3.3.3", + "joelbutcher/socialstream": "<6.2", "johnbillion/wp-crontrol": "<1.16.2", "joomla/application": "<1.0.13", "joomla/archive": "<1.1.12|>=2,<2.0.1", @@ -4207,7 +4208,7 @@ "shopware/storefront": "<=6.4.8.1|>=6.5.8,<6.5.8.7-dev", "shopxo/shopxo": "<=6.1", "showdoc/showdoc": "<2.10.4", - "shuchkin/simplexlsx": ">=1.0.12,<1.1.12", + "shuchkin/simplexlsx": ">=1.0.12,<1.1.13", "silverstripe-australia/advancedreports": ">=1,<=2", "silverstripe/admin": "<1.13.19|>=2,<2.1.8", "silverstripe/assets": ">=1,<1.11.1", @@ -4245,7 +4246,7 @@ "snipe/snipe-it": "<=7.0.13", "socalnick/scn-social-auth": "<1.15.2", "socialiteproviders/steam": "<1.1", - "spatie/browsershot": "<5.0.2", + "spatie/browsershot": "<5.0.3", "spatie/image-optimizer": "<1.7.3", "spencer14420/sp-php-email-handler": "<1", "spipu/html2pdf": "<5.2.8", @@ -4497,7 +4498,7 @@ "type": "tidelift" } ], - "time": "2024-12-18T20:05:40+00:00" + "time": "2024-12-23T19:04:22+00:00" }, { "name": "shipmonk/composer-dependency-analyser", diff --git a/app/vendor/composer/InstalledVersions.php b/app/vendor/composer/InstalledVersions.php index 51e734a77..07b32ed6e 100644 --- a/app/vendor/composer/InstalledVersions.php +++ b/app/vendor/composer/InstalledVersions.php @@ -322,6 +322,7 @@ private static function getInstalled() } $installed = array(); + $copiedLocalDir = false; if (self::$canGetVendors) { foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) { @@ -330,9 +331,11 @@ private static function getInstalled() } elseif (is_file($vendorDir.'/composer/installed.php')) { /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array} $required */ $required = require $vendorDir.'/composer/installed.php'; - $installed[] = self::$installedByVendor[$vendorDir] = $required; - if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) { - self::$installed = $installed[count($installed) - 1]; + self::$installedByVendor[$vendorDir] = $required; + $installed[] = $required; + if (strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) { + self::$installed = $required; + $copiedLocalDir = true; } } } @@ -350,7 +353,7 @@ private static function getInstalled() } } - if (self::$installed !== array()) { + if (self::$installed !== array() && !$copiedLocalDir) { $installed[] = self::$installed; } diff --git a/app/vendor/composer/autoload_psr4.php b/app/vendor/composer/autoload_psr4.php index e332b3b56..2fc07b938 100644 --- a/app/vendor/composer/autoload_psr4.php +++ b/app/vendor/composer/autoload_psr4.php @@ -35,7 +35,7 @@ 'PHP_Parallel_Lint\\PhpConsoleHighlighter\\' => array($vendorDir . '/php-parallel-lint/php-console-highlighter/src'), 'PHP_Parallel_Lint\\PhpConsoleColor\\' => array($vendorDir . '/php-parallel-lint/php-console-color/src'), 'PHPStan\\PhpDocParser\\' => array($vendorDir . '/phpstan/phpdoc-parser/src'), - 'PHPStan\\' => array($vendorDir . '/phpstan/phpstan-nette/src', $vendorDir . '/phpstan/phpstan-deprecation-rules/src'), + 'PHPStan\\' => array($vendorDir . '/phpstan/phpstan-deprecation-rules/src', $vendorDir . '/phpstan/phpstan-nette/src'), 'MichalSpacekCz\\' => array($baseDir . '/src'), 'JetBrains\\PhpStorm\\' => array($vendorDir . '/jetbrains/phpstorm-attributes/src'), 'Contributte\\Translation\\' => array($vendorDir . '/contributte/translation/src'), diff --git a/app/vendor/composer/autoload_static.php b/app/vendor/composer/autoload_static.php index e53834461..e1722e1a3 100644 --- a/app/vendor/composer/autoload_static.php +++ b/app/vendor/composer/autoload_static.php @@ -184,8 +184,8 @@ class ComposerStaticInit247de957f14f643f393d210a332dd05b ), 'PHPStan\\' => array ( - 0 => __DIR__ . '/..' . '/phpstan/phpstan-nette/src', - 1 => __DIR__ . '/..' . '/phpstan/phpstan-deprecation-rules/src', + 0 => __DIR__ . '/..' . '/phpstan/phpstan-deprecation-rules/src', + 1 => __DIR__ . '/..' . '/phpstan/phpstan-nette/src', ), 'MichalSpacekCz\\' => array ( diff --git a/app/vendor/composer/installed.json b/app/vendor/composer/installed.json index b611a4333..27f0ab8fe 100644 --- a/app/vendor/composer/installed.json +++ b/app/vendor/composer/installed.json @@ -2468,12 +2468,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "4aa68d3ea343b9576b5fdebef1332f701a7bc994" + "reference": "5a88337185d08d54ac102bc6eb137fc432ea70fb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/4aa68d3ea343b9576b5fdebef1332f701a7bc994", - "reference": "4aa68d3ea343b9576b5fdebef1332f701a7bc994", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/5a88337185d08d54ac102bc6eb137fc432ea70fb", + "reference": "5a88337185d08d54ac102bc6eb137fc432ea70fb", "shasum": "" }, "conflict": { @@ -2762,6 +2762,7 @@ "james-heinrich/phpthumb": "<1.7.12", "jasig/phpcas": "<1.3.3", "jcbrand/converse.js": "<3.3.3", + "joelbutcher/socialstream": "<6.2", "johnbillion/wp-crontrol": "<1.16.2", "joomla/application": "<1.0.13", "joomla/archive": "<1.1.12|>=2,<2.0.1", @@ -3022,7 +3023,7 @@ "shopware/storefront": "<=6.4.8.1|>=6.5.8,<6.5.8.7-dev", "shopxo/shopxo": "<=6.1", "showdoc/showdoc": "<2.10.4", - "shuchkin/simplexlsx": ">=1.0.12,<1.1.12", + "shuchkin/simplexlsx": ">=1.0.12,<1.1.13", "silverstripe-australia/advancedreports": ">=1,<=2", "silverstripe/admin": "<1.13.19|>=2,<2.1.8", "silverstripe/assets": ">=1,<1.11.1", @@ -3060,7 +3061,7 @@ "snipe/snipe-it": "<=7.0.13", "socalnick/scn-social-auth": "<1.15.2", "socialiteproviders/steam": "<1.1", - "spatie/browsershot": "<5.0.2", + "spatie/browsershot": "<5.0.3", "spatie/image-optimizer": "<1.7.3", "spencer14420/sp-php-email-handler": "<1", "spipu/html2pdf": "<5.2.8", @@ -3276,7 +3277,7 @@ "zfr/zfr-oauth2-server-module": "<0.1.2", "zoujingli/thinkadmin": "<=6.1.53" }, - "time": "2024-12-18T20:05:40+00:00", + "time": "2024-12-23T19:04:22+00:00", "default-branch": true, "type": "metapackage", "notification-url": "https://packagist.org/downloads/", diff --git a/app/vendor/composer/installed.php b/app/vendor/composer/installed.php index b58e33a28..ada85951c 100644 --- a/app/vendor/composer/installed.php +++ b/app/vendor/composer/installed.php @@ -403,7 +403,7 @@ 'roave/security-advisories' => array( 'pretty_version' => 'dev-latest', 'version' => 'dev-latest', - 'reference' => '4aa68d3ea343b9576b5fdebef1332f701a7bc994', + 'reference' => '5a88337185d08d54ac102bc6eb137fc432ea70fb', 'type' => 'metapackage', 'install_path' => null, 'aliases' => array(