From 1b4e22d1ad7ee473ab7c96334a805247db8f8e03 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim=20D=C3=BCsterhus?= Date: Mon, 20 Sep 2021 16:01:02 +0200 Subject: [PATCH] Move scssphp to the WoltLab fork This is for PHP 8.1 compatibility. --- .../files/lib/system/api/composer.json | 11 +- .../files/lib/system/api/composer.lock | 30 +- .../lib/system/api/composer/ClassLoader.php | 4 +- .../system/api/composer/InstalledVersions.php | 767 ++++++++---------- .../system/api/composer/autoload_files.php | 2 +- .../system/api/composer/autoload_static.php | 2 +- .../lib/system/api/composer/installed.json | 24 +- .../lib/system/api/composer/installed.php | 375 +++++---- .../api/scssphp/scssphp/src/Node/Number.php | 4 + 9 files changed, 558 insertions(+), 661 deletions(-) diff --git a/wcfsetup/install/files/lib/system/api/composer.json b/wcfsetup/install/files/lib/system/api/composer.json index 4049cbf11e..70c03d2f3a 100644 --- a/wcfsetup/install/files/lib/system/api/composer.json +++ b/wcfsetup/install/files/lib/system/api/composer.json @@ -14,8 +14,15 @@ "chrisjean/php-ico": "1.0.*", "true/punycode": "~2.0", "pear/net_idna2": "^0.2.0", - "scssphp/scssphp": "^1.4", + "scssphp/scssphp": "dev-woltlab-1.4", "guzzlehttp/guzzle": "^7.3.0", "paragonie/constant_time_encoding": "^2.3" - } + }, + "repositories": [ + { + "type": "vcs", + "url": "https://github.com/WoltLab/scssphp", + "no-api": true + } + ] } diff --git a/wcfsetup/install/files/lib/system/api/composer.lock b/wcfsetup/install/files/lib/system/api/composer.lock index 1d670d04a6..8043b3cd6c 100644 --- a/wcfsetup/install/files/lib/system/api/composer.lock +++ b/wcfsetup/install/files/lib/system/api/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": "daad7b81e20fb213695b7775be98f7fc", + "content-hash": "9ededdee2b3828cbe194908ff0edcd75", "packages": [ { "name": "chrisjean/php-ico", @@ -797,16 +797,16 @@ }, { "name": "scssphp/scssphp", - "version": "v1.4.1", + "version": "dev-woltlab-1.4", "source": { "type": "git", - "url": "https://github.com/scssphp/scssphp.git", - "reference": "ba86c963b94ec7ebd6e19d90cdab90d89667dbf7" + "url": "https://github.com/WoltLab/scssphp", + "reference": "0c5596430dce019f00d1d4f082c03db848cb3b65" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/scssphp/scssphp/zipball/ba86c963b94ec7ebd6e19d90cdab90d89667dbf7", - "reference": "ba86c963b94ec7ebd6e19d90cdab90d89667dbf7", + "url": "https://api.github.com/repos/WoltLab/scssphp/zipball/0c5596430dce019f00d1d4f082c03db848cb3b65", + "reference": "0c5596430dce019f00d1d4f082c03db848cb3b65", "shasum": "" }, "require": { @@ -831,7 +831,11 @@ "ScssPhp\\ScssPhp\\": "src/" } }, - "notification-url": "https://packagist.org/downloads/", + "autoload-dev": { + "psr-4": { + "ScssPhp\\ScssPhp\\Tests\\": "tests/" + } + }, "license": [ "MIT" ], @@ -856,11 +860,7 @@ "scss", "stylesheet" ], - "support": { - "issues": "https://github.com/scssphp/scssphp/issues", - "source": "https://github.com/scssphp/scssphp/tree/v1.4.1" - }, - "time": "2021-01-04T13:23:23+00:00" + "time": "2021-08-13T09:16:55+00:00" }, { "name": "symfony/css-selector", @@ -1061,7 +1061,9 @@ "packages-dev": [], "aliases": [], "minimum-stability": "stable", - "stability-flags": [], + "stability-flags": { + "scssphp/scssphp": 20 + }, "prefer-stable": false, "prefer-lowest": false, "platform": [], @@ -1070,5 +1072,5 @@ "php": "7.2.24", "ext-gd": "0" }, - "plugin-api-version": "2.0.0" + "plugin-api-version": "2.1.0" } diff --git a/wcfsetup/install/files/lib/system/api/composer/ClassLoader.php b/wcfsetup/install/files/lib/system/api/composer/ClassLoader.php index 247294d66e..6d0c3f2d00 100644 --- a/wcfsetup/install/files/lib/system/api/composer/ClassLoader.php +++ b/wcfsetup/install/files/lib/system/api/composer/ClassLoader.php @@ -338,7 +338,7 @@ class ClassLoader * Loads the given class or interface. * * @param string $class The name of the class - * @return bool|null True if loaded, null otherwise + * @return true|null True if loaded, null otherwise */ public function loadClass($class) { @@ -347,6 +347,8 @@ class ClassLoader return true; } + + return null; } /** diff --git a/wcfsetup/install/files/lib/system/api/composer/InstalledVersions.php b/wcfsetup/install/files/lib/system/api/composer/InstalledVersions.php index eab360eef5..b3a4e1611e 100644 --- a/wcfsetup/install/files/lib/system/api/composer/InstalledVersions.php +++ b/wcfsetup/install/files/lib/system/api/composer/InstalledVersions.php @@ -1,452 +1,337 @@ + * Jordi Boggiano + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ namespace Composer; use Composer\Autoload\ClassLoader; use Composer\Semver\VersionParser; - - - - - - - +/** + * This class is copied in every Composer installed project and available to all + * + * See also https://getcomposer.org/doc/07-runtime.md#installed-versions + * + * To require it's presence, you can require `composer-runtime-api ^2.0` + */ class InstalledVersions { -private static $installed = array ( - 'root' => - array ( - 'pretty_version' => '1.0.0+no-version-set', - 'version' => '1.0.0.0', - 'aliases' => - array ( - ), - 'reference' => NULL, - 'name' => '__root__', - ), - 'versions' => - array ( - '__root__' => - array ( - 'pretty_version' => '1.0.0+no-version-set', - 'version' => '1.0.0.0', - 'aliases' => - array ( - ), - 'reference' => NULL, - ), - 'chrisjean/php-ico' => - array ( - 'pretty_version' => '1.0.4', - 'version' => '1.0.4.0', - 'aliases' => - array ( - ), - 'reference' => 'ccd5c0d56554f3ddcd7a823e695be83e0d1e43b6', - ), - 'erusev/parsedown' => - array ( - 'pretty_version' => '1.7.4', - 'version' => '1.7.4.0', - 'aliases' => - array ( - ), - 'reference' => 'cb17b6477dfff935958ba01325f2e8a2bfa6dab3', - ), - 'ezyang/htmlpurifier' => - array ( - 'pretty_version' => 'v4.13.0', - 'version' => '4.13.0.0', - 'aliases' => - array ( - ), - 'reference' => '08e27c97e4c6ed02f37c5b2b20488046c8d90d75', - ), - 'guzzlehttp/guzzle' => - array ( - 'pretty_version' => '7.3.0', - 'version' => '7.3.0.0', - 'aliases' => - array ( - ), - 'reference' => '7008573787b430c1c1f650e3722d9bba59967628', - ), - 'guzzlehttp/promises' => - array ( - 'pretty_version' => '1.4.1', - 'version' => '1.4.1.0', - 'aliases' => - array ( - ), - 'reference' => '8e7d04f1f6450fef59366c399cfad4b9383aa30d', - ), - 'guzzlehttp/psr7' => - array ( - 'pretty_version' => '1.8.2', - 'version' => '1.8.2.0', - 'aliases' => - array ( - ), - 'reference' => 'dc960a912984efb74d0a90222870c72c87f10c91', - ), - 'paragonie/constant_time_encoding' => - array ( - 'pretty_version' => 'v2.4.0', - 'version' => '2.4.0.0', - 'aliases' => - array ( - ), - 'reference' => 'f34c2b11eb9d2c9318e13540a1dbc2a3afbd939c', - ), - 'pear/net_idna2' => - array ( - 'pretty_version' => 'v0.2.0', - 'version' => '0.2.0.0', - 'aliases' => - array ( - ), - 'reference' => '51734eaf8be2df58e8aad5835b9966459b2fb37c', - ), - 'pear/pear_exception' => - array ( - 'pretty_version' => 'v1.0.2', - 'version' => '1.0.2.0', - 'aliases' => - array ( - ), - 'reference' => 'b14fbe2ddb0b9f94f5b24cf08783d599f776fff0', - ), - 'pelago/emogrifier' => - array ( - 'pretty_version' => 'v5.0.1', - 'version' => '5.0.1.0', - 'aliases' => - array ( - ), - 'reference' => '37595a9bb62c3c25969bdd9e8d7dd24c3ac62bc9', - ), - 'psr/http-client' => - array ( - 'pretty_version' => '1.0.1', - 'version' => '1.0.1.0', - 'aliases' => - array ( - ), - 'reference' => '2dfb5f6c5eff0e91e20e913f8c5452ed95b86621', - ), - 'psr/http-client-implementation' => - array ( - 'provided' => - array ( - 0 => '1.0', - ), - ), - 'psr/http-message' => - array ( - 'pretty_version' => '1.0.1', - 'version' => '1.0.1.0', - 'aliases' => - array ( - ), - 'reference' => 'f6561bf28d520154e4b0ec72be95418abe6d9363', - ), - 'psr/http-message-implementation' => - array ( - 'provided' => - array ( - 0 => '1.0', - ), - ), - 'ralouphie/getallheaders' => - array ( - 'pretty_version' => '3.0.3', - 'version' => '3.0.3.0', - 'aliases' => - array ( - ), - 'reference' => '120b605dfeb996808c31b6477290a714d356e822', - ), - 'scssphp/scssphp' => - array ( - 'pretty_version' => 'v1.4.1', - 'version' => '1.4.1.0', - 'aliases' => - array ( - ), - 'reference' => 'ba86c963b94ec7ebd6e19d90cdab90d89667dbf7', - ), - 'symfony/css-selector' => - array ( - 'pretty_version' => 'v5.2.7', - 'version' => '5.2.7.0', - 'aliases' => - array ( - ), - 'reference' => '59a684f5ac454f066ecbe6daecce6719aed283fb', - ), - 'symfony/polyfill-mbstring' => - array ( - 'pretty_version' => 'v1.22.1', - 'version' => '1.22.1.0', - 'aliases' => - array ( - ), - 'reference' => '5232de97ee3b75b0360528dae24e73db49566ab1', - ), - 'true/punycode' => - array ( - 'pretty_version' => 'v2.1.1', - 'version' => '2.1.1.0', - 'aliases' => - array ( - ), - 'reference' => 'a4d0c11a36dd7f4e7cd7096076cab6d3378a071e', - ), - ), -); -private static $canGetVendors; -private static $installedByVendor = array(); - - - - - - - -public static function getInstalledPackages() -{ -$packages = array(); -foreach (self::getInstalled() as $installed) { -$packages[] = array_keys($installed['versions']); -} - -if (1 === \count($packages)) { -return $packages[0]; -} - -return array_keys(array_flip(\call_user_func_array('array_merge', $packages))); -} - - - - - - - - - -public static function isInstalled($packageName) -{ -foreach (self::getInstalled() as $installed) { -if (isset($installed['versions'][$packageName])) { -return true; -} -} - -return false; -} - - - - - - - - - - - - - - -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) -{ -foreach (self::getInstalled() as $installed) { -if (!isset($installed['versions'][$packageName])) { -continue; -} - -$ranges = array(); -if (isset($installed['versions'][$packageName]['pretty_version'])) { -$ranges[] = $installed['versions'][$packageName]['pretty_version']; -} -if (array_key_exists('aliases', $installed['versions'][$packageName])) { -$ranges = array_merge($ranges, $installed['versions'][$packageName]['aliases']); -} -if (array_key_exists('replaced', $installed['versions'][$packageName])) { -$ranges = array_merge($ranges, $installed['versions'][$packageName]['replaced']); -} -if (array_key_exists('provided', $installed['versions'][$packageName])) { -$ranges = array_merge($ranges, $installed['versions'][$packageName]['provided']); -} - -return implode(' || ', $ranges); -} - -throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); -} - - - - - -public static function getVersion($packageName) -{ -foreach (self::getInstalled() as $installed) { -if (!isset($installed['versions'][$packageName])) { -continue; -} - -if (!isset($installed['versions'][$packageName]['version'])) { -return null; -} - -return $installed['versions'][$packageName]['version']; -} - -throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); -} - - - - - -public static function getPrettyVersion($packageName) -{ -foreach (self::getInstalled() as $installed) { -if (!isset($installed['versions'][$packageName])) { -continue; -} - -if (!isset($installed['versions'][$packageName]['pretty_version'])) { -return null; -} - -return $installed['versions'][$packageName]['pretty_version']; -} - -throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); -} - - - - - -public static function getReference($packageName) -{ -foreach (self::getInstalled() as $installed) { -if (!isset($installed['versions'][$packageName])) { -continue; -} - -if (!isset($installed['versions'][$packageName]['reference'])) { -return null; -} - -return $installed['versions'][$packageName]['reference']; -} - -throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); -} - - - - - -public static function getRootPackage() -{ -$installed = self::getInstalled(); - -return $installed[0]['root']; -} - - - - - - - -public static function getRawData() -{ -return self::$installed; -} - - - - - - - - - - - - - - - - - - - -public static function reload($data) -{ -self::$installed = $data; -self::$installedByVendor = array(); -} - - - - - -private static function getInstalled() -{ -if (null === self::$canGetVendors) { -self::$canGetVendors = method_exists('Composer\Autoload\ClassLoader', 'getRegisteredLoaders'); -} - -$installed = array(); - -if (self::$canGetVendors) { -foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) { -if (isset(self::$installedByVendor[$vendorDir])) { -$installed[] = self::$installedByVendor[$vendorDir]; -} elseif (is_file($vendorDir.'/composer/installed.php')) { -$installed[] = self::$installedByVendor[$vendorDir] = require $vendorDir.'/composer/installed.php'; -} -} -} - -$installed[] = self::$installed; - -return $installed; -} + private static $installed; + private static $canGetVendors; + private static $installedByVendor = array(); + + /** + * Returns a list of all package names which are present, either by being installed, replaced or provided + * + * @return string[] + * @psalm-return list + */ + public static function getInstalledPackages() + { + $packages = array(); + foreach (self::getInstalled() as $installed) { + $packages[] = array_keys($installed['versions']); + } + + if (1 === \count($packages)) { + return $packages[0]; + } + + return array_keys(array_flip(\call_user_func_array('array_merge', $packages))); + } + + /** + * Returns a list of all package names with a specific type e.g. 'library' + * + * @param string $type + * @return string[] + * @psalm-return list + */ + public static function getInstalledPackagesByType($type) + { + $packagesByType = array(); + + foreach (self::getInstalled() as $installed) { + foreach ($installed['versions'] as $name => $package) { + if (isset($package['type']) && $package['type'] === $type) { + $packagesByType[] = $name; + } + } + } + + return $packagesByType; + } + + /** + * Checks whether the given package is installed + * + * This also returns true if the package name is provided or replaced by another package + * + * @param string $packageName + * @param bool $includeDevRequirements + * @return bool + */ + public static function isInstalled($packageName, $includeDevRequirements = true) + { + foreach (self::getInstalled() as $installed) { + if (isset($installed['versions'][$packageName])) { + return $includeDevRequirements || empty($installed['versions'][$packageName]['dev_requirement']); + } + } + + return false; + } + + /** + * Checks whether the given package satisfies a version constraint + * + * e.g. If you want to know whether version 2.3+ of package foo/bar is installed, you would call: + * + * Composer\InstalledVersions::satisfies(new VersionParser, 'foo/bar', '^2.3') + * + * @param VersionParser $parser Install composer/semver to have access to this class and functionality + * @param string $packageName + * @param string|null $constraint A version constraint to check for, if you pass one you have to make sure composer/semver is required by your package + * @return bool + */ + public static function satisfies(VersionParser $parser, $packageName, $constraint) + { + $constraint = $parser->parseConstraints($constraint); + $provided = $parser->parseConstraints(self::getVersionRanges($packageName)); + + return $provided->matches($constraint); + } + + /** + * Returns a version constraint representing all the range(s) which are installed for a given package + * + * It is easier to use this via isInstalled() with the $constraint argument if you need to check + * whether a given version of a package is installed, and not just whether it exists + * + * @param string $packageName + * @return string Version constraint usable with composer/semver + */ + public static function getVersionRanges($packageName) + { + foreach (self::getInstalled() as $installed) { + if (!isset($installed['versions'][$packageName])) { + continue; + } + + $ranges = array(); + if (isset($installed['versions'][$packageName]['pretty_version'])) { + $ranges[] = $installed['versions'][$packageName]['pretty_version']; + } + if (array_key_exists('aliases', $installed['versions'][$packageName])) { + $ranges = array_merge($ranges, $installed['versions'][$packageName]['aliases']); + } + if (array_key_exists('replaced', $installed['versions'][$packageName])) { + $ranges = array_merge($ranges, $installed['versions'][$packageName]['replaced']); + } + if (array_key_exists('provided', $installed['versions'][$packageName])) { + $ranges = array_merge($ranges, $installed['versions'][$packageName]['provided']); + } + + return implode(' || ', $ranges); + } + + throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); + } + + /** + * @param string $packageName + * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as version, use satisfies or getVersionRanges if you need to know if a given version is present + */ + public static function getVersion($packageName) + { + foreach (self::getInstalled() as $installed) { + if (!isset($installed['versions'][$packageName])) { + continue; + } + + if (!isset($installed['versions'][$packageName]['version'])) { + return null; + } + + return $installed['versions'][$packageName]['version']; + } + + throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); + } + + /** + * @param string $packageName + * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as version, use satisfies or getVersionRanges if you need to know if a given version is present + */ + public static function getPrettyVersion($packageName) + { + foreach (self::getInstalled() as $installed) { + if (!isset($installed['versions'][$packageName])) { + continue; + } + + if (!isset($installed['versions'][$packageName]['pretty_version'])) { + return null; + } + + return $installed['versions'][$packageName]['pretty_version']; + } + + throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); + } + + /** + * @param string $packageName + * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as reference + */ + public static function getReference($packageName) + { + foreach (self::getInstalled() as $installed) { + if (!isset($installed['versions'][$packageName])) { + continue; + } + + if (!isset($installed['versions'][$packageName]['reference'])) { + return null; + } + + return $installed['versions'][$packageName]['reference']; + } + + throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); + } + + /** + * @param string $packageName + * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as install path. Packages of type metapackages also have a null install path. + */ + public static function getInstallPath($packageName) + { + foreach (self::getInstalled() as $installed) { + if (!isset($installed['versions'][$packageName])) { + continue; + } + + return isset($installed['versions'][$packageName]['install_path']) ? $installed['versions'][$packageName]['install_path'] : null; + } + + throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); + } + + /** + * @return array + * @psalm-return array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string} + */ + public static function getRootPackage() + { + $installed = self::getInstalled(); + + return $installed[0]['root']; + } + + /** + * Returns the raw installed.php data for custom implementations + * + * @deprecated Use getAllRawData() instead which returns all datasets for all autoloaders present in the process. getRawData only returns the first dataset loaded, which may not be what you expect. + * @return array[] + * @psalm-return array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string}, versions: array} + */ + public static function getRawData() + { + @trigger_error('getRawData only returns the first dataset loaded, which may not be what you expect. Use getAllRawData() instead which returns all datasets for all autoloaders present in the process.', E_USER_DEPRECATED); + + if (null === self::$installed) { + // only require the installed.php file if this file is loaded from its dumped location, + // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937 + if (substr(__DIR__, -8, 1) !== 'C') { + self::$installed = include __DIR__ . '/installed.php'; + } else { + self::$installed = array(); + } + } + + return self::$installed; + } + + /** + * Returns the raw data of all installed.php which are currently loaded for custom implementations + * + * @return array[] + * @psalm-return list}> + */ + public static function getAllRawData() + { + return self::getInstalled(); + } + + /** + * Lets you reload the static array from another file + * + * This is only useful for complex integrations in which a project needs to use + * this class but then also needs to execute another project's autoloader in process, + * and wants to ensure both projects have access to their version of installed.php. + * + * A typical case would be PHPUnit, where it would need to make sure it reads all + * the data it needs from this class, then call reload() with + * `require $CWD/vendor/composer/installed.php` (or similar) as input to make sure + * the project in which it runs can then also use this class safely, without + * interference between PHPUnit's dependencies and the project's dependencies. + * + * @param array[] $data A vendor/composer/installed.php data set + * @return void + * + * @psalm-param array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string}, versions: array} $data + */ + public static function reload($data) + { + self::$installed = $data; + self::$installedByVendor = array(); + } + + /** + * @return array[] + * @psalm-return list}> + */ + private static function getInstalled() + { + if (null === self::$canGetVendors) { + self::$canGetVendors = method_exists('Composer\Autoload\ClassLoader', 'getRegisteredLoaders'); + } + + $installed = array(); + + if (self::$canGetVendors) { + foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) { + if (isset(self::$installedByVendor[$vendorDir])) { + $installed[] = self::$installedByVendor[$vendorDir]; + } elseif (is_file($vendorDir.'/composer/installed.php')) { + $installed[] = self::$installedByVendor[$vendorDir] = require $vendorDir.'/composer/installed.php'; + if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) { + self::$installed = $installed[count($installed) - 1]; + } + } + } + } + + if (null === self::$installed) { + // only require the installed.php file if this file is loaded from its dumped location, + // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937 + if (substr(__DIR__, -8, 1) !== 'C') { + self::$installed = require __DIR__ . '/installed.php'; + } else { + self::$installed = array(); + } + } + $installed[] = self::$installed; + + return $installed; + } } diff --git a/wcfsetup/install/files/lib/system/api/composer/autoload_files.php b/wcfsetup/install/files/lib/system/api/composer/autoload_files.php index 5e6c6ff354..5ea4f1dff3 100644 --- a/wcfsetup/install/files/lib/system/api/composer/autoload_files.php +++ b/wcfsetup/install/files/lib/system/api/composer/autoload_files.php @@ -8,8 +8,8 @@ $baseDir = $vendorDir; return array( '7b11c4dc42b3b3023073cb14e519683c' => $vendorDir . '/ralouphie/getallheaders/src/getallheaders.php', 'c964ee0ededf28c96ebd9db5099ef910' => $vendorDir . '/guzzlehttp/promises/src/functions_include.php', - '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => $vendorDir . '/symfony/polyfill-mbstring/bootstrap.php', 'a0edc8309cc5e1d60e3047b5df6b7052' => $vendorDir . '/guzzlehttp/psr7/src/functions_include.php', + '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => $vendorDir . '/symfony/polyfill-mbstring/bootstrap.php', '2cffec82183ee1cea088009cef9a6fc3' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier.composer.php', '37a3dc5111fe8f707ab4c132ef1dbc62' => $vendorDir . '/guzzlehttp/guzzle/src/functions_include.php', ); diff --git a/wcfsetup/install/files/lib/system/api/composer/autoload_static.php b/wcfsetup/install/files/lib/system/api/composer/autoload_static.php index bb916ae88f..d81f4fb95d 100644 --- a/wcfsetup/install/files/lib/system/api/composer/autoload_static.php +++ b/wcfsetup/install/files/lib/system/api/composer/autoload_static.php @@ -9,8 +9,8 @@ class ComposerStaticInita1f5f7c74275d47a45049a2936db1d0d public static $files = array ( '7b11c4dc42b3b3023073cb14e519683c' => __DIR__ . '/..' . '/ralouphie/getallheaders/src/getallheaders.php', 'c964ee0ededf28c96ebd9db5099ef910' => __DIR__ . '/..' . '/guzzlehttp/promises/src/functions_include.php', - '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php', 'a0edc8309cc5e1d60e3047b5df6b7052' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/functions_include.php', + '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php', '2cffec82183ee1cea088009cef9a6fc3' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier.composer.php', '37a3dc5111fe8f707ab4c132ef1dbc62' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/functions_include.php', ); diff --git a/wcfsetup/install/files/lib/system/api/composer/installed.json b/wcfsetup/install/files/lib/system/api/composer/installed.json index fd63ae894b..a610436ca5 100644 --- a/wcfsetup/install/files/lib/system/api/composer/installed.json +++ b/wcfsetup/install/files/lib/system/api/composer/installed.json @@ -804,17 +804,17 @@ }, { "name": "scssphp/scssphp", - "version": "v1.4.1", - "version_normalized": "1.4.1.0", + "version": "dev-woltlab-1.4", + "version_normalized": "dev-woltlab-1.4", "source": { "type": "git", - "url": "https://github.com/scssphp/scssphp.git", - "reference": "ba86c963b94ec7ebd6e19d90cdab90d89667dbf7" + "url": "https://github.com/WoltLab/scssphp", + "reference": "0c5596430dce019f00d1d4f082c03db848cb3b65" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/scssphp/scssphp/zipball/ba86c963b94ec7ebd6e19d90cdab90d89667dbf7", - "reference": "ba86c963b94ec7ebd6e19d90cdab90d89667dbf7", + "url": "https://api.github.com/repos/WoltLab/scssphp/zipball/0c5596430dce019f00d1d4f082c03db848cb3b65", + "reference": "0c5596430dce019f00d1d4f082c03db848cb3b65", "shasum": "" }, "require": { @@ -830,7 +830,7 @@ "twbs/bootstrap": "~4.3", "zurb/foundation": "~6.5" }, - "time": "2021-01-04T13:23:23+00:00", + "time": "2021-08-13T09:16:55+00:00", "bin": [ "bin/pscss" ], @@ -841,7 +841,11 @@ "ScssPhp\\ScssPhp\\": "src/" } }, - "notification-url": "https://packagist.org/downloads/", + "autoload-dev": { + "psr-4": { + "ScssPhp\\ScssPhp\\Tests\\": "tests/" + } + }, "license": [ "MIT" ], @@ -866,10 +870,6 @@ "scss", "stylesheet" ], - "support": { - "issues": "https://github.com/scssphp/scssphp/issues", - "source": "https://github.com/scssphp/scssphp/tree/v1.4.1" - }, "install-path": "../scssphp/scssphp" }, { diff --git a/wcfsetup/install/files/lib/system/api/composer/installed.php b/wcfsetup/install/files/lib/system/api/composer/installed.php index 08cad62626..e135dfd285 100644 --- a/wcfsetup/install/files/lib/system/api/composer/installed.php +++ b/wcfsetup/install/files/lib/system/api/composer/installed.php @@ -1,191 +1,188 @@ - - array ( - 'pretty_version' => '1.0.0+no-version-set', - 'version' => '1.0.0.0', - 'aliases' => - array ( + array( + 'pretty_version' => '1.0.0+no-version-set', + 'version' => '1.0.0.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../', + 'aliases' => array(), + 'reference' => NULL, + 'name' => '__root__', + 'dev' => false, + ), + 'versions' => array( + '__root__' => array( + 'pretty_version' => '1.0.0+no-version-set', + 'version' => '1.0.0.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../', + 'aliases' => array(), + 'reference' => NULL, + 'dev_requirement' => false, + ), + 'chrisjean/php-ico' => array( + 'pretty_version' => '1.0.4', + 'version' => '1.0.4.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../chrisjean/php-ico', + 'aliases' => array(), + 'reference' => 'ccd5c0d56554f3ddcd7a823e695be83e0d1e43b6', + 'dev_requirement' => false, + ), + 'erusev/parsedown' => array( + 'pretty_version' => '1.7.4', + 'version' => '1.7.4.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../erusev/parsedown', + 'aliases' => array(), + 'reference' => 'cb17b6477dfff935958ba01325f2e8a2bfa6dab3', + 'dev_requirement' => false, + ), + 'ezyang/htmlpurifier' => array( + 'pretty_version' => 'v4.13.0', + 'version' => '4.13.0.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../ezyang/htmlpurifier', + 'aliases' => array(), + 'reference' => '08e27c97e4c6ed02f37c5b2b20488046c8d90d75', + 'dev_requirement' => false, + ), + 'guzzlehttp/guzzle' => array( + 'pretty_version' => '7.3.0', + 'version' => '7.3.0.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../guzzlehttp/guzzle', + 'aliases' => array(), + 'reference' => '7008573787b430c1c1f650e3722d9bba59967628', + 'dev_requirement' => false, + ), + 'guzzlehttp/promises' => array( + 'pretty_version' => '1.4.1', + 'version' => '1.4.1.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../guzzlehttp/promises', + 'aliases' => array(), + 'reference' => '8e7d04f1f6450fef59366c399cfad4b9383aa30d', + 'dev_requirement' => false, + ), + 'guzzlehttp/psr7' => array( + 'pretty_version' => '1.8.2', + 'version' => '1.8.2.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../guzzlehttp/psr7', + 'aliases' => array(), + 'reference' => 'dc960a912984efb74d0a90222870c72c87f10c91', + 'dev_requirement' => false, + ), + 'paragonie/constant_time_encoding' => array( + 'pretty_version' => 'v2.4.0', + 'version' => '2.4.0.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../paragonie/constant_time_encoding', + 'aliases' => array(), + 'reference' => 'f34c2b11eb9d2c9318e13540a1dbc2a3afbd939c', + 'dev_requirement' => false, + ), + 'pear/net_idna2' => array( + 'pretty_version' => 'v0.2.0', + 'version' => '0.2.0.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../pear/net_idna2', + 'aliases' => array(), + 'reference' => '51734eaf8be2df58e8aad5835b9966459b2fb37c', + 'dev_requirement' => false, + ), + 'pear/pear_exception' => array( + 'pretty_version' => 'v1.0.2', + 'version' => '1.0.2.0', + 'type' => 'class', + 'install_path' => __DIR__ . '/../pear/pear_exception', + 'aliases' => array(), + 'reference' => 'b14fbe2ddb0b9f94f5b24cf08783d599f776fff0', + 'dev_requirement' => false, + ), + 'pelago/emogrifier' => array( + 'pretty_version' => 'v5.0.1', + 'version' => '5.0.1.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../pelago/emogrifier', + 'aliases' => array(), + 'reference' => '37595a9bb62c3c25969bdd9e8d7dd24c3ac62bc9', + 'dev_requirement' => false, + ), + 'psr/http-client' => array( + 'pretty_version' => '1.0.1', + 'version' => '1.0.1.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../psr/http-client', + 'aliases' => array(), + 'reference' => '2dfb5f6c5eff0e91e20e913f8c5452ed95b86621', + 'dev_requirement' => false, + ), + 'psr/http-client-implementation' => array( + 'dev_requirement' => false, + 'provided' => array( + 0 => '1.0', + ), + ), + 'psr/http-message' => array( + 'pretty_version' => '1.0.1', + 'version' => '1.0.1.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../psr/http-message', + 'aliases' => array(), + 'reference' => 'f6561bf28d520154e4b0ec72be95418abe6d9363', + 'dev_requirement' => false, + ), + 'psr/http-message-implementation' => array( + 'dev_requirement' => false, + 'provided' => array( + 0 => '1.0', + ), + ), + 'ralouphie/getallheaders' => array( + 'pretty_version' => '3.0.3', + 'version' => '3.0.3.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../ralouphie/getallheaders', + 'aliases' => array(), + 'reference' => '120b605dfeb996808c31b6477290a714d356e822', + 'dev_requirement' => false, + ), + 'scssphp/scssphp' => array( + 'pretty_version' => 'dev-woltlab-1.4', + 'version' => 'dev-woltlab-1.4', + 'type' => 'library', + 'install_path' => __DIR__ . '/../scssphp/scssphp', + 'aliases' => array(), + 'reference' => '0c5596430dce019f00d1d4f082c03db848cb3b65', + 'dev_requirement' => false, + ), + 'symfony/css-selector' => array( + 'pretty_version' => 'v5.2.7', + 'version' => '5.2.7.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../symfony/css-selector', + 'aliases' => array(), + 'reference' => '59a684f5ac454f066ecbe6daecce6719aed283fb', + 'dev_requirement' => false, + ), + 'symfony/polyfill-mbstring' => array( + 'pretty_version' => 'v1.22.1', + 'version' => '1.22.1.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../symfony/polyfill-mbstring', + 'aliases' => array(), + 'reference' => '5232de97ee3b75b0360528dae24e73db49566ab1', + 'dev_requirement' => false, + ), + 'true/punycode' => array( + 'pretty_version' => 'v2.1.1', + 'version' => '2.1.1.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../true/punycode', + 'aliases' => array(), + 'reference' => 'a4d0c11a36dd7f4e7cd7096076cab6d3378a071e', + 'dev_requirement' => false, + ), ), - 'reference' => NULL, - 'name' => '__root__', - ), - 'versions' => - array ( - '__root__' => - array ( - 'pretty_version' => '1.0.0+no-version-set', - 'version' => '1.0.0.0', - 'aliases' => - array ( - ), - 'reference' => NULL, - ), - 'chrisjean/php-ico' => - array ( - 'pretty_version' => '1.0.4', - 'version' => '1.0.4.0', - 'aliases' => - array ( - ), - 'reference' => 'ccd5c0d56554f3ddcd7a823e695be83e0d1e43b6', - ), - 'erusev/parsedown' => - array ( - 'pretty_version' => '1.7.4', - 'version' => '1.7.4.0', - 'aliases' => - array ( - ), - 'reference' => 'cb17b6477dfff935958ba01325f2e8a2bfa6dab3', - ), - 'ezyang/htmlpurifier' => - array ( - 'pretty_version' => 'v4.13.0', - 'version' => '4.13.0.0', - 'aliases' => - array ( - ), - 'reference' => '08e27c97e4c6ed02f37c5b2b20488046c8d90d75', - ), - 'guzzlehttp/guzzle' => - array ( - 'pretty_version' => '7.3.0', - 'version' => '7.3.0.0', - 'aliases' => - array ( - ), - 'reference' => '7008573787b430c1c1f650e3722d9bba59967628', - ), - 'guzzlehttp/promises' => - array ( - 'pretty_version' => '1.4.1', - 'version' => '1.4.1.0', - 'aliases' => - array ( - ), - 'reference' => '8e7d04f1f6450fef59366c399cfad4b9383aa30d', - ), - 'guzzlehttp/psr7' => - array ( - 'pretty_version' => '1.8.2', - 'version' => '1.8.2.0', - 'aliases' => - array ( - ), - 'reference' => 'dc960a912984efb74d0a90222870c72c87f10c91', - ), - 'paragonie/constant_time_encoding' => - array ( - 'pretty_version' => 'v2.4.0', - 'version' => '2.4.0.0', - 'aliases' => - array ( - ), - 'reference' => 'f34c2b11eb9d2c9318e13540a1dbc2a3afbd939c', - ), - 'pear/net_idna2' => - array ( - 'pretty_version' => 'v0.2.0', - 'version' => '0.2.0.0', - 'aliases' => - array ( - ), - 'reference' => '51734eaf8be2df58e8aad5835b9966459b2fb37c', - ), - 'pear/pear_exception' => - array ( - 'pretty_version' => 'v1.0.2', - 'version' => '1.0.2.0', - 'aliases' => - array ( - ), - 'reference' => 'b14fbe2ddb0b9f94f5b24cf08783d599f776fff0', - ), - 'pelago/emogrifier' => - array ( - 'pretty_version' => 'v5.0.1', - 'version' => '5.0.1.0', - 'aliases' => - array ( - ), - 'reference' => '37595a9bb62c3c25969bdd9e8d7dd24c3ac62bc9', - ), - 'psr/http-client' => - array ( - 'pretty_version' => '1.0.1', - 'version' => '1.0.1.0', - 'aliases' => - array ( - ), - 'reference' => '2dfb5f6c5eff0e91e20e913f8c5452ed95b86621', - ), - 'psr/http-client-implementation' => - array ( - 'provided' => - array ( - 0 => '1.0', - ), - ), - 'psr/http-message' => - array ( - 'pretty_version' => '1.0.1', - 'version' => '1.0.1.0', - 'aliases' => - array ( - ), - 'reference' => 'f6561bf28d520154e4b0ec72be95418abe6d9363', - ), - 'psr/http-message-implementation' => - array ( - 'provided' => - array ( - 0 => '1.0', - ), - ), - 'ralouphie/getallheaders' => - array ( - 'pretty_version' => '3.0.3', - 'version' => '3.0.3.0', - 'aliases' => - array ( - ), - 'reference' => '120b605dfeb996808c31b6477290a714d356e822', - ), - 'scssphp/scssphp' => - array ( - 'pretty_version' => 'v1.4.1', - 'version' => '1.4.1.0', - 'aliases' => - array ( - ), - 'reference' => 'ba86c963b94ec7ebd6e19d90cdab90d89667dbf7', - ), - 'symfony/css-selector' => - array ( - 'pretty_version' => 'v5.2.7', - 'version' => '5.2.7.0', - 'aliases' => - array ( - ), - 'reference' => '59a684f5ac454f066ecbe6daecce6719aed283fb', - ), - 'symfony/polyfill-mbstring' => - array ( - 'pretty_version' => 'v1.22.1', - 'version' => '1.22.1.0', - 'aliases' => - array ( - ), - 'reference' => '5232de97ee3b75b0360528dae24e73db49566ab1', - ), - 'true/punycode' => - array ( - 'pretty_version' => 'v2.1.1', - 'version' => '2.1.1.0', - 'aliases' => - array ( - ), - 'reference' => 'a4d0c11a36dd7f4e7cd7096076cab6d3378a071e', - ), - ), ); diff --git a/wcfsetup/install/files/lib/system/api/scssphp/scssphp/src/Node/Number.php b/wcfsetup/install/files/lib/system/api/scssphp/scssphp/src/Node/Number.php index 166de50d8e..ea10134dd4 100644 --- a/wcfsetup/install/files/lib/system/api/scssphp/scssphp/src/Node/Number.php +++ b/wcfsetup/install/files/lib/system/api/scssphp/scssphp/src/Node/Number.php @@ -143,6 +143,7 @@ class Number extends Node implements \ArrayAccess /** * {@inheritdoc} */ + #[\ReturnTypeWillChange] public function offsetExists($offset) { if ($offset === -3) { @@ -168,6 +169,7 @@ class Number extends Node implements \ArrayAccess /** * {@inheritdoc} */ + #[\ReturnTypeWillChange] public function offsetGet($offset) { switch ($offset) { @@ -194,6 +196,7 @@ class Number extends Node implements \ArrayAccess /** * {@inheritdoc} */ + #[\ReturnTypeWillChange] public function offsetSet($offset, $value) { throw new \BadMethodCallException('Number is immutable'); @@ -202,6 +205,7 @@ class Number extends Node implements \ArrayAccess /** * {@inheritdoc} */ + #[\ReturnTypeWillChange] public function offsetUnset($offset) { throw new \BadMethodCallException('Number is immutable'); -- 2.20.1