From 8870cb23118e26801141ddfb17af98229f06f05b Mon Sep 17 00:00:00 2001 From: Bastian Allgeier Date: Fri, 12 Feb 2021 11:33:03 +0100 Subject: [PATCH] Update composer dependencies --- .php_cs | 0 composer.json | 3 +- composer.lock | 30 ++-- vendor/composer/ClassLoader.php | 6 +- vendor/composer/InstalledVersions.php | 218 ++++++++++++++++++++++++++ vendor/composer/autoload_classmap.php | 9 ++ vendor/composer/autoload_real.php | 5 +- vendor/composer/autoload_static.php | 9 ++ vendor/composer/installed.php | 33 ++++ 9 files changed, 297 insertions(+), 16 deletions(-) mode change 100755 => 100644 .php_cs create mode 100644 vendor/composer/InstalledVersions.php create mode 100644 vendor/composer/installed.php diff --git a/.php_cs b/.php_cs old mode 100755 new mode 100644 diff --git a/composer.json b/composer.json index 101820b..9d90e99 100755 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ } ], "require": { - "getkirby/composer-installer": "^1.1" + "getkirby/composer-installer": "^1.2.0" }, "config": { "optimize-autoloader": true @@ -23,7 +23,6 @@ } }, "scripts": { - "analyze": "phpstan analyse", "fix": "php-cs-fixer fix --config .php_cs" } } diff --git a/composer.lock b/composer.lock index 34180b4..59396e3 100644 --- a/composer.lock +++ b/composer.lock @@ -4,28 +4,27 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "d9492eb71518603bf58b82cdde625bea", + "content-hash": "2ce11eac97f3a4a6262d48ad4d68566f", "packages": [ { "name": "getkirby/composer-installer", - "version": "1.1.4", + "version": "1.2.1", "source": { "type": "git", "url": "https://github.com/getkirby/composer-installer.git", - "reference": "2d6b8f5601a31caeeea45623e1643fbb437eb94e" + "reference": "c98ece30bfba45be7ce457e1102d1b169d922f3d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/getkirby/composer-installer/zipball/2d6b8f5601a31caeeea45623e1643fbb437eb94e", - "reference": "2d6b8f5601a31caeeea45623e1643fbb437eb94e", + "url": "https://api.github.com/repos/getkirby/composer-installer/zipball/c98ece30bfba45be7ce457e1102d1b169d922f3d", + "reference": "c98ece30bfba45be7ce457e1102d1b169d922f3d", "shasum": "" }, "require": { - "composer-plugin-api": "^1.0" + "composer-plugin-api": "^1.0 || ^2.0" }, "require-dev": { - "composer/composer": "^1.8", - "phpunit/phpunit": "^7.0" + "composer/composer": "^1.8 || ^2.0" }, "type": "composer-plugin", "extra": { @@ -42,7 +41,17 @@ ], "description": "Kirby's custom Composer installer for the Kirby CMS and for Kirby plugins", "homepage": "https://getkirby.com", - "time": "2019-02-11T20:27:36+00:00" + "support": { + "issues": "https://github.com/getkirby/composer-installer/issues", + "source": "https://github.com/getkirby/composer-installer/tree/1.2.1" + }, + "funding": [ + { + "url": "https://getkirby.com/buy", + "type": "custom" + } + ], + "time": "2020-12-28T12:54:39+00:00" } ], "packages-dev": [], @@ -52,5 +61,6 @@ "prefer-stable": false, "prefer-lowest": false, "platform": [], - "platform-dev": [] + "platform-dev": [], + "plugin-api-version": "2.0.0" } diff --git a/vendor/composer/ClassLoader.php b/vendor/composer/ClassLoader.php index fce8549..1a58957 100644 --- a/vendor/composer/ClassLoader.php +++ b/vendor/composer/ClassLoader.php @@ -37,8 +37,8 @@ * * @author Fabien Potencier * @author Jordi Boggiano - * @see http://www.php-fig.org/psr/psr-0/ - * @see http://www.php-fig.org/psr/psr-4/ + * @see https://www.php-fig.org/psr/psr-0/ + * @see https://www.php-fig.org/psr/psr-4/ */ class ClassLoader { @@ -60,7 +60,7 @@ class ClassLoader public function getPrefixes() { if (!empty($this->prefixesPsr0)) { - return call_user_func_array('array_merge', $this->prefixesPsr0); + return call_user_func_array('array_merge', array_values($this->prefixesPsr0)); } return array(); diff --git a/vendor/composer/InstalledVersions.php b/vendor/composer/InstalledVersions.php new file mode 100644 index 0000000..39e8ea8 --- /dev/null +++ b/vendor/composer/InstalledVersions.php @@ -0,0 +1,218 @@ + + array ( + 'pretty_version' => 'dev-master', + 'version' => 'dev-master', + 'aliases' => + array ( + ), + 'reference' => '25ac46be1a6301420d0d58a7c649bfdb1ca9c2e7', + 'name' => 'getkirby/kql', + ), + 'versions' => + array ( + 'getkirby/composer-installer' => + array ( + 'pretty_version' => '1.2.1', + 'version' => '1.2.1.0', + 'aliases' => + array ( + ), + 'reference' => 'c98ece30bfba45be7ce457e1102d1b169d922f3d', + ), + 'getkirby/kql' => + array ( + 'pretty_version' => 'dev-master', + 'version' => 'dev-master', + 'aliases' => + array ( + ), + 'reference' => '25ac46be1a6301420d0d58a7c649bfdb1ca9c2e7', + ), + ), +); + + + + + + + +public static function getInstalledPackages() +{ +return array_keys(self::$installed['versions']); +} + + + + + + + + + +public static function isInstalled($packageName) +{ +return isset(self::$installed['versions'][$packageName]); +} + + + + + + + + + + + + + + +public static function satisfies(VersionParser $parser, $packageName, $constraint) +{ +$constraint = $parser->parseConstraints($constraint); +$provided = $parser->parseConstraints(self::getVersionRanges($packageName)); + +return $provided->matches($constraint); +} + + + + + + + + + + +public static function getVersionRanges($packageName) +{ +if (!isset(self::$installed['versions'][$packageName])) { +throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); +} + +$ranges = array(); +if (isset(self::$installed['versions'][$packageName]['pretty_version'])) { +$ranges[] = self::$installed['versions'][$packageName]['pretty_version']; +} +if (array_key_exists('aliases', self::$installed['versions'][$packageName])) { +$ranges = array_merge($ranges, self::$installed['versions'][$packageName]['aliases']); +} +if (array_key_exists('replaced', self::$installed['versions'][$packageName])) { +$ranges = array_merge($ranges, self::$installed['versions'][$packageName]['replaced']); +} +if (array_key_exists('provided', self::$installed['versions'][$packageName])) { +$ranges = array_merge($ranges, self::$installed['versions'][$packageName]['provided']); +} + +return implode(' || ', $ranges); +} + + + + + +public static function getVersion($packageName) +{ +if (!isset(self::$installed['versions'][$packageName])) { +throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); +} + +if (!isset(self::$installed['versions'][$packageName]['version'])) { +return null; +} + +return self::$installed['versions'][$packageName]['version']; +} + + + + + +public static function getPrettyVersion($packageName) +{ +if (!isset(self::$installed['versions'][$packageName])) { +throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); +} + +if (!isset(self::$installed['versions'][$packageName]['pretty_version'])) { +return null; +} + +return self::$installed['versions'][$packageName]['pretty_version']; +} + + + + + +public static function getReference($packageName) +{ +if (!isset(self::$installed['versions'][$packageName])) { +throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); +} + +if (!isset(self::$installed['versions'][$packageName]['reference'])) { +return null; +} + +return self::$installed['versions'][$packageName]['reference']; +} + + + + + +public static function getRootPackage() +{ +return self::$installed['root']; +} + + + + + + + +public static function getRawData() +{ +return self::$installed; +} + + + + + + + + + + + + + + + + + + + +public static function reload($data) +{ +self::$installed = $data; +} +} diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 1369a5d..c4ad8f6 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -6,6 +6,7 @@ $baseDir = dirname($vendorDir); return array( + 'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php', 'Kirby\\ComposerInstaller\\CmsInstaller' => $vendorDir . '/getkirby/composer-installer/src/ComposerInstaller/CmsInstaller.php', 'Kirby\\ComposerInstaller\\Installer' => $vendorDir . '/getkirby/composer-installer/src/ComposerInstaller/Installer.php', 'Kirby\\ComposerInstaller\\Plugin' => $vendorDir . '/getkirby/composer-installer/src/ComposerInstaller/Plugin.php', @@ -13,6 +14,8 @@ 'Kirby\\Kql\\Help' => $baseDir . '/src/Kql/Help.php', 'Kirby\\Kql\\Interceptor' => $baseDir . '/src/Kql/Interceptor.php', 'Kirby\\Kql\\Interceptors\\Cms\\App' => $baseDir . '/src/Kql/Interceptors/Cms/App.php', + 'Kirby\\Kql\\Interceptors\\Cms\\Block' => $baseDir . '/src/Kql/Interceptors/Cms/Block.php', + 'Kirby\\Kql\\Interceptors\\Cms\\Blocks' => $baseDir . '/src/Kql/Interceptors/Cms/Blocks.php', 'Kirby\\Kql\\Interceptors\\Cms\\Blueprint' => $baseDir . '/src/Kql/Interceptors/Cms/Blueprint.php', 'Kirby\\Kql\\Interceptors\\Cms\\Collection' => $baseDir . '/src/Kql/Interceptors/Cms/Collection.php', 'Kirby\\Kql\\Interceptors\\Cms\\Content' => $baseDir . '/src/Kql/Interceptors/Cms/Content.php', @@ -20,6 +23,10 @@ 'Kirby\\Kql\\Interceptors\\Cms\\File' => $baseDir . '/src/Kql/Interceptors/Cms/File.php', 'Kirby\\Kql\\Interceptors\\Cms\\FileVersion' => $baseDir . '/src/Kql/Interceptors/Cms/FileVersion.php', 'Kirby\\Kql\\Interceptors\\Cms\\Files' => $baseDir . '/src/Kql/Interceptors/Cms/Files.php', + 'Kirby\\Kql\\Interceptors\\Cms\\Layout' => $baseDir . '/src/Kql/Interceptors/Cms/Layout.php', + 'Kirby\\Kql\\Interceptors\\Cms\\LayoutColumn' => $baseDir . '/src/Kql/Interceptors/Cms/LayoutColumn.php', + 'Kirby\\Kql\\Interceptors\\Cms\\LayoutColumns' => $baseDir . '/src/Kql/Interceptors/Cms/LayoutColumns.php', + 'Kirby\\Kql\\Interceptors\\Cms\\Layouts' => $baseDir . '/src/Kql/Interceptors/Cms/Layouts.php', 'Kirby\\Kql\\Interceptors\\Cms\\Model' => $baseDir . '/src/Kql/Interceptors/Cms/Model.php', 'Kirby\\Kql\\Interceptors\\Cms\\Page' => $baseDir . '/src/Kql/Interceptors/Cms/Page.php', 'Kirby\\Kql\\Interceptors\\Cms\\Pages' => $baseDir . '/src/Kql/Interceptors/Cms/Pages.php', @@ -27,9 +34,11 @@ 'Kirby\\Kql\\Interceptors\\Cms\\Site' => $baseDir . '/src/Kql/Interceptors/Cms/Site.php', 'Kirby\\Kql\\Interceptors\\Cms\\Structure' => $baseDir . '/src/Kql/Interceptors/Cms/Structure.php', 'Kirby\\Kql\\Interceptors\\Cms\\StructureObject' => $baseDir . '/src/Kql/Interceptors/Cms/StructureObject.php', + 'Kirby\\Kql\\Interceptors\\Cms\\Translation' => $baseDir . '/src/Kql/Interceptors/Cms/Translation.php', 'Kirby\\Kql\\Interceptors\\Cms\\User' => $baseDir . '/src/Kql/Interceptors/Cms/User.php', 'Kirby\\Kql\\Interceptors\\Cms\\Users' => $baseDir . '/src/Kql/Interceptors/Cms/Users.php', 'Kirby\\Kql\\Interceptors\\Interceptor' => $baseDir . '/src/Kql/Interceptors/Interceptor.php', + 'Kirby\\Kql\\Interceptors\\Toolkit\\Obj' => $baseDir . '/src/Kql/Interceptors/Toolkit/Obj.php', 'Kirby\\Kql\\Kql' => $baseDir . '/src/Kql/Kql.php', 'Kirby\\Kql\\Query' => $baseDir . '/src/Kql/Query.php', ); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 0d20aec..5f2b3b7 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -13,6 +13,9 @@ public static function loadClassLoader($class) } } + /** + * @return \Composer\Autoload\ClassLoader + */ public static function getLoader() { if (null !== self::$loader) { @@ -25,7 +28,7 @@ public static function getLoader() $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded()); if ($useStaticLoader) { - require_once __DIR__ . '/autoload_static.php'; + require __DIR__ . '/autoload_static.php'; call_user_func(\Composer\Autoload\ComposerStaticInitce81ad819bd8a4fdf01799db40d8b86b::getInitializer($loader)); } else { diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 9c34bef..73cb48e 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -22,6 +22,7 @@ class ComposerStaticInitce81ad819bd8a4fdf01799db40d8b86b ); public static $classMap = array ( + 'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php', 'Kirby\\ComposerInstaller\\CmsInstaller' => __DIR__ . '/..' . '/getkirby/composer-installer/src/ComposerInstaller/CmsInstaller.php', 'Kirby\\ComposerInstaller\\Installer' => __DIR__ . '/..' . '/getkirby/composer-installer/src/ComposerInstaller/Installer.php', 'Kirby\\ComposerInstaller\\Plugin' => __DIR__ . '/..' . '/getkirby/composer-installer/src/ComposerInstaller/Plugin.php', @@ -29,6 +30,8 @@ class ComposerStaticInitce81ad819bd8a4fdf01799db40d8b86b 'Kirby\\Kql\\Help' => __DIR__ . '/../..' . '/src/Kql/Help.php', 'Kirby\\Kql\\Interceptor' => __DIR__ . '/../..' . '/src/Kql/Interceptor.php', 'Kirby\\Kql\\Interceptors\\Cms\\App' => __DIR__ . '/../..' . '/src/Kql/Interceptors/Cms/App.php', + 'Kirby\\Kql\\Interceptors\\Cms\\Block' => __DIR__ . '/../..' . '/src/Kql/Interceptors/Cms/Block.php', + 'Kirby\\Kql\\Interceptors\\Cms\\Blocks' => __DIR__ . '/../..' . '/src/Kql/Interceptors/Cms/Blocks.php', 'Kirby\\Kql\\Interceptors\\Cms\\Blueprint' => __DIR__ . '/../..' . '/src/Kql/Interceptors/Cms/Blueprint.php', 'Kirby\\Kql\\Interceptors\\Cms\\Collection' => __DIR__ . '/../..' . '/src/Kql/Interceptors/Cms/Collection.php', 'Kirby\\Kql\\Interceptors\\Cms\\Content' => __DIR__ . '/../..' . '/src/Kql/Interceptors/Cms/Content.php', @@ -36,6 +39,10 @@ class ComposerStaticInitce81ad819bd8a4fdf01799db40d8b86b 'Kirby\\Kql\\Interceptors\\Cms\\File' => __DIR__ . '/../..' . '/src/Kql/Interceptors/Cms/File.php', 'Kirby\\Kql\\Interceptors\\Cms\\FileVersion' => __DIR__ . '/../..' . '/src/Kql/Interceptors/Cms/FileVersion.php', 'Kirby\\Kql\\Interceptors\\Cms\\Files' => __DIR__ . '/../..' . '/src/Kql/Interceptors/Cms/Files.php', + 'Kirby\\Kql\\Interceptors\\Cms\\Layout' => __DIR__ . '/../..' . '/src/Kql/Interceptors/Cms/Layout.php', + 'Kirby\\Kql\\Interceptors\\Cms\\LayoutColumn' => __DIR__ . '/../..' . '/src/Kql/Interceptors/Cms/LayoutColumn.php', + 'Kirby\\Kql\\Interceptors\\Cms\\LayoutColumns' => __DIR__ . '/../..' . '/src/Kql/Interceptors/Cms/LayoutColumns.php', + 'Kirby\\Kql\\Interceptors\\Cms\\Layouts' => __DIR__ . '/../..' . '/src/Kql/Interceptors/Cms/Layouts.php', 'Kirby\\Kql\\Interceptors\\Cms\\Model' => __DIR__ . '/../..' . '/src/Kql/Interceptors/Cms/Model.php', 'Kirby\\Kql\\Interceptors\\Cms\\Page' => __DIR__ . '/../..' . '/src/Kql/Interceptors/Cms/Page.php', 'Kirby\\Kql\\Interceptors\\Cms\\Pages' => __DIR__ . '/../..' . '/src/Kql/Interceptors/Cms/Pages.php', @@ -43,9 +50,11 @@ class ComposerStaticInitce81ad819bd8a4fdf01799db40d8b86b 'Kirby\\Kql\\Interceptors\\Cms\\Site' => __DIR__ . '/../..' . '/src/Kql/Interceptors/Cms/Site.php', 'Kirby\\Kql\\Interceptors\\Cms\\Structure' => __DIR__ . '/../..' . '/src/Kql/Interceptors/Cms/Structure.php', 'Kirby\\Kql\\Interceptors\\Cms\\StructureObject' => __DIR__ . '/../..' . '/src/Kql/Interceptors/Cms/StructureObject.php', + 'Kirby\\Kql\\Interceptors\\Cms\\Translation' => __DIR__ . '/../..' . '/src/Kql/Interceptors/Cms/Translation.php', 'Kirby\\Kql\\Interceptors\\Cms\\User' => __DIR__ . '/../..' . '/src/Kql/Interceptors/Cms/User.php', 'Kirby\\Kql\\Interceptors\\Cms\\Users' => __DIR__ . '/../..' . '/src/Kql/Interceptors/Cms/Users.php', 'Kirby\\Kql\\Interceptors\\Interceptor' => __DIR__ . '/../..' . '/src/Kql/Interceptors/Interceptor.php', + 'Kirby\\Kql\\Interceptors\\Toolkit\\Obj' => __DIR__ . '/../..' . '/src/Kql/Interceptors/Toolkit/Obj.php', 'Kirby\\Kql\\Kql' => __DIR__ . '/../..' . '/src/Kql/Kql.php', 'Kirby\\Kql\\Query' => __DIR__ . '/../..' . '/src/Kql/Query.php', ); diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php new file mode 100644 index 0000000..e41f55c --- /dev/null +++ b/vendor/composer/installed.php @@ -0,0 +1,33 @@ + + array ( + 'pretty_version' => 'dev-master', + 'version' => 'dev-master', + 'aliases' => + array ( + ), + 'reference' => '25ac46be1a6301420d0d58a7c649bfdb1ca9c2e7', + 'name' => 'getkirby/kql', + ), + 'versions' => + array ( + 'getkirby/composer-installer' => + array ( + 'pretty_version' => '1.2.1', + 'version' => '1.2.1.0', + 'aliases' => + array ( + ), + 'reference' => 'c98ece30bfba45be7ce457e1102d1b169d922f3d', + ), + 'getkirby/kql' => + array ( + 'pretty_version' => 'dev-master', + 'version' => 'dev-master', + 'aliases' => + array ( + ), + 'reference' => '25ac46be1a6301420d0d58a7c649bfdb1ca9c2e7', + ), + ), +);