From 371e85ab4f8d14d7e47c24b42443a2948dfa6351 Mon Sep 17 00:00:00 2001 From: RealStickman Date: Fri, 12 Aug 2022 20:03:01 +0200 Subject: [PATCH] (Grav GitSync) Automatic Commit from RealStickman --- plugins/admin/CHANGELOG.md | 6 ++ plugins/admin/blueprints.yaml | 2 +- plugins/admin/composer.lock | 94 ++++++++++--------- .../themes/grav/css/codemirror/codemirror.css | 2 + plugins/admin/vendor/autoload.php | 5 + plugins/admin/vendor/bin/pscss | 15 ++- .../vendor/composer/InstalledVersions.php | 16 ++-- .../vendor/composer/autoload_classmap.php | 2 +- .../admin/vendor/composer/autoload_files.php | 2 +- .../vendor/composer/autoload_namespaces.php | 2 +- .../admin/vendor/composer/autoload_psr4.php | 2 +- .../admin/vendor/composer/autoload_real.php | 31 +----- plugins/admin/vendor/composer/installed.json | 20 ++-- plugins/admin/vendor/composer/installed.php | 18 ++-- .../vendor/scssphp/scssphp/composer.json | 6 ++ .../vendor/scssphp/scssphp/src/Compiler.php | 8 +- .../vendor/scssphp/scssphp/src/Version.php | 2 +- 17 files changed, 128 insertions(+), 105 deletions(-) diff --git a/plugins/admin/CHANGELOG.md b/plugins/admin/CHANGELOG.md index 4764d22..0a57a76 100644 --- a/plugins/admin/CHANGELOG.md +++ b/plugins/admin/CHANGELOG.md @@ -1,3 +1,9 @@ +# v1.10.35 +## 08/04/2022 + +1. [](#improved) + * Improvements in CodeMirror editor in RTL mode [#359](https://github.com/getgrav/grav-plugin-admin/issues/359), [#2297](https://github.com/getgrav/grav-plugin-admin/pull/2297) + # v1.10.34 ## 06/22/2022 diff --git a/plugins/admin/blueprints.yaml b/plugins/admin/blueprints.yaml index f15df94..3a4bec4 100644 --- a/plugins/admin/blueprints.yaml +++ b/plugins/admin/blueprints.yaml @@ -1,7 +1,7 @@ name: Admin Panel slug: admin type: plugin -version: 1.10.34 +version: 1.10.35 description: Adds an advanced administration panel to manage your site icon: empire author: diff --git a/plugins/admin/composer.lock b/plugins/admin/composer.lock index 4b74cde..5192890 100644 --- a/plugins/admin/composer.lock +++ b/plugins/admin/composer.lock @@ -190,16 +190,16 @@ }, { "name": "scssphp/scssphp", - "version": "v1.10.3", + "version": "v1.10.4", "source": { "type": "git", "url": "https://github.com/scssphp/scssphp.git", - "reference": "0f1e1516ed2412ad43e42a6a319e77624ba1f713" + "reference": "8ed20753db2d3d82629e6f5d35535bbbd3893b0c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/scssphp/scssphp/zipball/0f1e1516ed2412ad43e42a6a319e77624ba1f713", - "reference": "0f1e1516ed2412ad43e42a6a319e77624ba1f713", + "url": "https://api.github.com/repos/scssphp/scssphp/zipball/8ed20753db2d3d82629e6f5d35535bbbd3893b0c", + "reference": "8ed20753db2d3d82629e6f5d35535bbbd3893b0c", "shasum": "" }, "require": { @@ -226,6 +226,12 @@ "bin/pscss" ], "type": "library", + "extra": { + "bamarni-bin": { + "forward-command": false, + "bin-links": false + } + }, "autoload": { "psr-4": { "ScssPhp\\ScssPhp\\": "src/" @@ -258,9 +264,9 @@ ], "support": { "issues": "https://github.com/scssphp/scssphp/issues", - "source": "https://github.com/scssphp/scssphp/tree/v1.10.3" + "source": "https://github.com/scssphp/scssphp/tree/v1.10.4" }, - "time": "2022-05-16T07:22:18+00:00" + "time": "2022-07-26T16:28:33+00:00" } ], "packages-dev": [ @@ -697,24 +703,24 @@ }, { "name": "guzzlehttp/guzzle", - "version": "6.5.7", + "version": "6.5.8", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "724562fa861e21a4071c652c8a159934e4f05592" + "reference": "a52f0440530b54fa079ce76e8c5d196a42cad981" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/724562fa861e21a4071c652c8a159934e4f05592", - "reference": "724562fa861e21a4071c652c8a159934e4f05592", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/a52f0440530b54fa079ce76e8c5d196a42cad981", + "reference": "a52f0440530b54fa079ce76e8c5d196a42cad981", "shasum": "" }, "require": { "ext-json": "*", "guzzlehttp/promises": "^1.0", - "guzzlehttp/psr7": "^1.6.1", + "guzzlehttp/psr7": "^1.9", "php": ">=5.5", - "symfony/polyfill-intl-idn": "^1.17.0" + "symfony/polyfill-intl-idn": "^1.17" }, "require-dev": { "ext-curl": "*", @@ -792,7 +798,7 @@ ], "support": { "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/6.5.7" + "source": "https://github.com/guzzle/guzzle/tree/6.5.8" }, "funding": [ { @@ -808,7 +814,7 @@ "type": "tidelift" } ], - "time": "2022-06-09T21:36:50+00:00" + "time": "2022-06-20T22:16:07+00:00" }, { "name": "guzzlehttp/promises", @@ -896,16 +902,16 @@ }, { "name": "guzzlehttp/psr7", - "version": "1.8.5", + "version": "1.9.0", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "337e3ad8e5716c15f9657bd214d16cc5e69df268" + "reference": "e98e3e6d4f86621a9b75f623996e6bbdeb4b9318" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/337e3ad8e5716c15f9657bd214d16cc5e69df268", - "reference": "337e3ad8e5716c15f9657bd214d16cc5e69df268", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/e98e3e6d4f86621a9b75f623996e6bbdeb4b9318", + "reference": "e98e3e6d4f86621a9b75f623996e6bbdeb4b9318", "shasum": "" }, "require": { @@ -926,7 +932,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.7-dev" + "dev-master": "1.9-dev" } }, "autoload": { @@ -986,7 +992,7 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/1.8.5" + "source": "https://github.com/guzzle/psr7/tree/1.9.0" }, "funding": [ { @@ -1002,7 +1008,7 @@ "type": "tidelift" } ], - "time": "2022-03-20T21:51:18+00:00" + "time": "2022-06-20T21:43:03+00:00" }, { "name": "myclabs/deep-copy", @@ -2662,16 +2668,16 @@ }, { "name": "symfony/console", - "version": "v4.4.42", + "version": "v4.4.43", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "cce7a9f99e22937a71a16b23afa762558808d587" + "reference": "8a2628d2d5639f35113dc1b833ecd91e1ed1cf46" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/cce7a9f99e22937a71a16b23afa762558808d587", - "reference": "cce7a9f99e22937a71a16b23afa762558808d587", + "url": "https://api.github.com/repos/symfony/console/zipball/8a2628d2d5639f35113dc1b833ecd91e1ed1cf46", + "reference": "8a2628d2d5639f35113dc1b833ecd91e1ed1cf46", "shasum": "" }, "require": { @@ -2732,7 +2738,7 @@ "description": "Eases the creation of beautiful and testable command line interfaces", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/console/tree/v4.4.42" + "source": "https://github.com/symfony/console/tree/v4.4.43" }, "funding": [ { @@ -2748,7 +2754,7 @@ "type": "tidelift" } ], - "time": "2022-05-14T12:35:33+00:00" + "time": "2022-06-23T12:22:25+00:00" }, { "name": "symfony/css-selector", @@ -2818,7 +2824,7 @@ }, { "name": "symfony/deprecation-contracts", - "version": "v2.5.1", + "version": "v2.5.2", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", @@ -2865,7 +2871,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.1" + "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.2" }, "funding": [ { @@ -3043,7 +3049,7 @@ }, { "name": "symfony/event-dispatcher-contracts", - "version": "v1.1.12", + "version": "v1.1.13", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", @@ -3102,7 +3108,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v1.1.12" + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v1.1.13" }, "funding": [ { @@ -3665,16 +3671,16 @@ }, { "name": "symfony/service-contracts", - "version": "v2.5.1", + "version": "v2.5.2", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "24d9dc654b83e91aa59f9d167b131bc3b5bea24c" + "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/24d9dc654b83e91aa59f9d167b131bc3b5bea24c", - "reference": "24d9dc654b83e91aa59f9d167b131bc3b5bea24c", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/4b426aac47d6427cc1a1d0f7e2ac724627f5966c", + "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c", "shasum": "" }, "require": { @@ -3728,7 +3734,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v2.5.1" + "source": "https://github.com/symfony/service-contracts/tree/v2.5.2" }, "funding": [ { @@ -3744,20 +3750,20 @@ "type": "tidelift" } ], - "time": "2022-03-13T20:07:29+00:00" + "time": "2022-05-30T19:17:29+00:00" }, { "name": "symfony/yaml", - "version": "v4.4.37", + "version": "v4.4.43", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "d7f637cc0f0cc14beb0984f2bb50da560b271311" + "reference": "07e392f0ef78376d080d5353c081a5e5704835bd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/d7f637cc0f0cc14beb0984f2bb50da560b271311", - "reference": "d7f637cc0f0cc14beb0984f2bb50da560b271311", + "url": "https://api.github.com/repos/symfony/yaml/zipball/07e392f0ef78376d080d5353c081a5e5704835bd", + "reference": "07e392f0ef78376d080d5353c081a5e5704835bd", "shasum": "" }, "require": { @@ -3799,7 +3805,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v4.4.37" + "source": "https://github.com/symfony/yaml/tree/v4.4.43" }, "funding": [ { @@ -3815,7 +3821,7 @@ "type": "tidelift" } ], - "time": "2022-01-24T20:11:01+00:00" + "time": "2022-06-20T08:31:17+00:00" }, { "name": "theseer/tokenizer", @@ -3941,5 +3947,5 @@ "platform-overrides": { "php": "7.3.6" }, - "plugin-api-version": "2.2.0" + "plugin-api-version": "2.3.0" } diff --git a/plugins/admin/themes/grav/css/codemirror/codemirror.css b/plugins/admin/themes/grav/css/codemirror/codemirror.css index e703d59..4d10704 100644 --- a/plugins/admin/themes/grav/css/codemirror/codemirror.css +++ b/plugins/admin/themes/grav/css/codemirror/codemirror.css @@ -263,6 +263,8 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;} .CodeMirror-widget {} +.CodeMirror-rtl pre { direction: rtl; } + .CodeMirror-code { outline: none; } diff --git a/plugins/admin/vendor/autoload.php b/plugins/admin/vendor/autoload.php index 442a0b9..4aaf501 100644 --- a/plugins/admin/vendor/autoload.php +++ b/plugins/admin/vendor/autoload.php @@ -2,6 +2,11 @@ // autoload.php @generated by Composer +if (PHP_VERSION_ID < 50600) { + echo 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL; + exit(1); +} + require_once __DIR__ . '/composer/autoload_real.php'; return ComposerAutoloaderInit38a448a612c5797456d245c809d4a914::getLoader(); diff --git a/plugins/admin/vendor/bin/pscss b/plugins/admin/vendor/bin/pscss index b33931e..9743992 100644 --- a/plugins/admin/vendor/bin/pscss +++ b/plugins/admin/vendor/bin/pscss @@ -66,6 +66,16 @@ if (PHP_VERSION_ID < 80000) { return $operation ? flock($this->handle, $operation) : true; } + public function stream_seek($offset, $whence) + { + if (0 === fseek($this->handle, $offset, $whence)) { + $this->position = ftell($this->handle); + return true; + } + + return false; + } + public function stream_tell() { return $this->position; @@ -98,7 +108,10 @@ if (PHP_VERSION_ID < 80000) { } } - if (function_exists('stream_wrapper_register') && stream_wrapper_register('phpvfscomposer', 'Composer\BinProxyWrapper')) { + if ( + (function_exists('stream_get_wrappers') && in_array('phpvfscomposer', stream_get_wrappers(), true)) + || (function_exists('stream_wrapper_register') && stream_wrapper_register('phpvfscomposer', 'Composer\BinProxyWrapper')) + ) { include("phpvfscomposer://" . __DIR__ . '/..'.'/scssphp/scssphp/bin/pscss'); exit(0); } diff --git a/plugins/admin/vendor/composer/InstalledVersions.php b/plugins/admin/vendor/composer/InstalledVersions.php index d50e0c9..c6b54af 100644 --- a/plugins/admin/vendor/composer/InstalledVersions.php +++ b/plugins/admin/vendor/composer/InstalledVersions.php @@ -21,12 +21,14 @@ use Composer\Semver\VersionParser; * See also https://getcomposer.org/doc/07-runtime.md#installed-versions * * To require its presence, you can require `composer-runtime-api ^2.0` + * + * @final */ class InstalledVersions { /** * @var mixed[]|null - * @psalm-var array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array}|array{}|null + * @psalm-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}|array{}|null */ private static $installed; @@ -37,7 +39,7 @@ class InstalledVersions /** * @var array[] - * @psalm-var array}> + * @psalm-var array}> */ private static $installedByVendor = array(); @@ -241,7 +243,7 @@ class InstalledVersions /** * @return array - * @psalm-return array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string} + * @psalm-return array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool} */ public static function getRootPackage() { @@ -255,7 +257,7 @@ class InstalledVersions * * @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, type: string}, versions: array} + * @psalm-return array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array} */ public static function getRawData() { @@ -278,7 +280,7 @@ class InstalledVersions * Returns the raw data of all installed.php which are currently loaded for custom implementations * * @return array[] - * @psalm-return list}> + * @psalm-return list}> */ public static function getAllRawData() { @@ -301,7 +303,7 @@ class InstalledVersions * @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, type: string}, versions: array} $data + * @psalm-param array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array} $data */ public static function reload($data) { @@ -311,7 +313,7 @@ class InstalledVersions /** * @return array[] - * @psalm-return list}> + * @psalm-return list}> */ private static function getInstalled() { diff --git a/plugins/admin/vendor/composer/autoload_classmap.php b/plugins/admin/vendor/composer/autoload_classmap.php index cefb86c..11af3cb 100644 --- a/plugins/admin/vendor/composer/autoload_classmap.php +++ b/plugins/admin/vendor/composer/autoload_classmap.php @@ -2,7 +2,7 @@ // autoload_classmap.php @generated by Composer -$vendorDir = dirname(dirname(__FILE__)); +$vendorDir = dirname(__DIR__); $baseDir = dirname($vendorDir); return array( diff --git a/plugins/admin/vendor/composer/autoload_files.php b/plugins/admin/vendor/composer/autoload_files.php index 77e767d..c4d9d6a 100644 --- a/plugins/admin/vendor/composer/autoload_files.php +++ b/plugins/admin/vendor/composer/autoload_files.php @@ -2,7 +2,7 @@ // autoload_files.php @generated by Composer -$vendorDir = dirname(dirname(__FILE__)); +$vendorDir = dirname(__DIR__); $baseDir = dirname($vendorDir); return array( diff --git a/plugins/admin/vendor/composer/autoload_namespaces.php b/plugins/admin/vendor/composer/autoload_namespaces.php index bde9707..24d7952 100644 --- a/plugins/admin/vendor/composer/autoload_namespaces.php +++ b/plugins/admin/vendor/composer/autoload_namespaces.php @@ -2,7 +2,7 @@ // autoload_namespaces.php @generated by Composer -$vendorDir = dirname(dirname(__FILE__)); +$vendorDir = dirname(__DIR__); $baseDir = dirname($vendorDir); return array( diff --git a/plugins/admin/vendor/composer/autoload_psr4.php b/plugins/admin/vendor/composer/autoload_psr4.php index cdc21be..4fc02d2 100644 --- a/plugins/admin/vendor/composer/autoload_psr4.php +++ b/plugins/admin/vendor/composer/autoload_psr4.php @@ -2,7 +2,7 @@ // autoload_psr4.php @generated by Composer -$vendorDir = dirname(dirname(__FILE__)); +$vendorDir = dirname(__DIR__); $baseDir = dirname($vendorDir); return array( diff --git a/plugins/admin/vendor/composer/autoload_real.php b/plugins/admin/vendor/composer/autoload_real.php index 4746600..3100e5b 100644 --- a/plugins/admin/vendor/composer/autoload_real.php +++ b/plugins/admin/vendor/composer/autoload_real.php @@ -25,38 +25,15 @@ class ComposerAutoloaderInit38a448a612c5797456d245c809d4a914 require __DIR__ . '/platform_check.php'; spl_autoload_register(array('ComposerAutoloaderInit38a448a612c5797456d245c809d4a914', 'loadClassLoader'), true, true); - self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__))); + self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); spl_autoload_unregister(array('ComposerAutoloaderInit38a448a612c5797456d245c809d4a914', 'loadClassLoader')); - $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded()); - if ($useStaticLoader) { - require __DIR__ . '/autoload_static.php'; - - call_user_func(\Composer\Autoload\ComposerStaticInit38a448a612c5797456d245c809d4a914::getInitializer($loader)); - } else { - $map = require __DIR__ . '/autoload_namespaces.php'; - foreach ($map as $namespace => $path) { - $loader->set($namespace, $path); - } - - $map = require __DIR__ . '/autoload_psr4.php'; - foreach ($map as $namespace => $path) { - $loader->setPsr4($namespace, $path); - } - - $classMap = require __DIR__ . '/autoload_classmap.php'; - if ($classMap) { - $loader->addClassMap($classMap); - } - } + require __DIR__ . '/autoload_static.php'; + call_user_func(\Composer\Autoload\ComposerStaticInit38a448a612c5797456d245c809d4a914::getInitializer($loader)); $loader->register(true); - if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInit38a448a612c5797456d245c809d4a914::$files; - } else { - $includeFiles = require __DIR__ . '/autoload_files.php'; - } + $includeFiles = \Composer\Autoload\ComposerStaticInit38a448a612c5797456d245c809d4a914::$files; foreach ($includeFiles as $fileIdentifier => $file) { composerRequire38a448a612c5797456d245c809d4a914($fileIdentifier, $file); } diff --git a/plugins/admin/vendor/composer/installed.json b/plugins/admin/vendor/composer/installed.json index c0b8c93..2b81331 100644 --- a/plugins/admin/vendor/composer/installed.json +++ b/plugins/admin/vendor/composer/installed.json @@ -193,17 +193,17 @@ }, { "name": "scssphp/scssphp", - "version": "v1.10.3", - "version_normalized": "1.10.3.0", + "version": "v1.10.4", + "version_normalized": "1.10.4.0", "source": { "type": "git", "url": "https://github.com/scssphp/scssphp.git", - "reference": "0f1e1516ed2412ad43e42a6a319e77624ba1f713" + "reference": "8ed20753db2d3d82629e6f5d35535bbbd3893b0c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/scssphp/scssphp/zipball/0f1e1516ed2412ad43e42a6a319e77624ba1f713", - "reference": "0f1e1516ed2412ad43e42a6a319e77624ba1f713", + "url": "https://api.github.com/repos/scssphp/scssphp/zipball/8ed20753db2d3d82629e6f5d35535bbbd3893b0c", + "reference": "8ed20753db2d3d82629e6f5d35535bbbd3893b0c", "shasum": "" }, "require": { @@ -226,11 +226,17 @@ "ext-iconv": "Can be used as fallback when ext-mbstring is not available", "ext-mbstring": "For best performance, mbstring should be installed as it is faster than ext-iconv" }, - "time": "2022-05-16T07:22:18+00:00", + "time": "2022-07-26T16:28:33+00:00", "bin": [ "bin/pscss" ], "type": "library", + "extra": { + "bamarni-bin": { + "forward-command": false, + "bin-links": false + } + }, "installation-source": "dist", "autoload": { "psr-4": { @@ -264,7 +270,7 @@ ], "support": { "issues": "https://github.com/scssphp/scssphp/issues", - "source": "https://github.com/scssphp/scssphp/tree/v1.10.3" + "source": "https://github.com/scssphp/scssphp/tree/v1.10.4" }, "install-path": "../scssphp/scssphp" } diff --git a/plugins/admin/vendor/composer/installed.php b/plugins/admin/vendor/composer/installed.php index 2bde2d2..033a15b 100644 --- a/plugins/admin/vendor/composer/installed.php +++ b/plugins/admin/vendor/composer/installed.php @@ -1,40 +1,40 @@ array( + 'name' => 'getgrav/grav-plugin-admin', 'pretty_version' => 'dev-develop', 'version' => 'dev-develop', + 'reference' => '713002e2b83b9660bfcefe5bb0d76954eedf2b90', 'type' => 'grav-plugin', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), - 'reference' => '0a5b51b9e2c2eb9626b17c8b164dcfc3296ccf3c', - 'name' => 'getgrav/grav-plugin-admin', 'dev' => false, ), 'versions' => array( 'getgrav/grav-plugin-admin' => array( 'pretty_version' => 'dev-develop', 'version' => 'dev-develop', + 'reference' => '713002e2b83b9660bfcefe5bb0d76954eedf2b90', 'type' => 'grav-plugin', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), - 'reference' => '0a5b51b9e2c2eb9626b17c8b164dcfc3296ccf3c', 'dev_requirement' => false, ), 'laminas/laminas-xml' => array( 'pretty_version' => '1.4.0', 'version' => '1.4.0.0', + 'reference' => 'dcadeefdb6d7ed6b39d772b47e3845003d6ea60f', 'type' => 'library', 'install_path' => __DIR__ . '/../laminas/laminas-xml', 'aliases' => array(), - 'reference' => 'dcadeefdb6d7ed6b39d772b47e3845003d6ea60f', 'dev_requirement' => false, ), 'laminas/laminas-zendframework-bridge' => array( 'pretty_version' => '1.4.1', 'version' => '1.4.1.0', + 'reference' => '88bf037259869891afce6504cacc4f8a07b24d0f', 'type' => 'library', 'install_path' => __DIR__ . '/../laminas/laminas-zendframework-bridge', 'aliases' => array(), - 'reference' => '88bf037259869891afce6504cacc4f8a07b24d0f', 'dev_requirement' => false, ), 'miniflux/picofeed' => array( @@ -46,19 +46,19 @@ 'p3k/picofeed' => array( 'pretty_version' => 'v0.1.40', 'version' => '0.1.40.0', + 'reference' => '356fd66d48779193b10ac28532cb4a4e11bb801c', 'type' => 'library', 'install_path' => __DIR__ . '/../p3k/picofeed', 'aliases' => array(), - 'reference' => '356fd66d48779193b10ac28532cb4a4e11bb801c', 'dev_requirement' => false, ), 'scssphp/scssphp' => array( - 'pretty_version' => 'v1.10.3', - 'version' => '1.10.3.0', + 'pretty_version' => 'v1.10.4', + 'version' => '1.10.4.0', + 'reference' => '8ed20753db2d3d82629e6f5d35535bbbd3893b0c', 'type' => 'library', 'install_path' => __DIR__ . '/../scssphp/scssphp', 'aliases' => array(), - 'reference' => '0f1e1516ed2412ad43e42a6a319e77624ba1f713', 'dev_requirement' => false, ), 'symfony/polyfill-php72' => array( diff --git a/plugins/admin/vendor/scssphp/scssphp/composer.json b/plugins/admin/vendor/scssphp/scssphp/composer.json index 3c60ca8..269a473 100644 --- a/plugins/admin/vendor/scssphp/scssphp/composer.json +++ b/plugins/admin/vendor/scssphp/scssphp/composer.json @@ -107,5 +107,11 @@ "allow-plugins": { "bamarni/composer-bin-plugin": true } + }, + "extra": { + "bamarni-bin": { + "forward-command": false, + "bin-links": false + } } } diff --git a/plugins/admin/vendor/scssphp/scssphp/src/Compiler.php b/plugins/admin/vendor/scssphp/scssphp/src/Compiler.php index eecfa48..f4ab328 100644 --- a/plugins/admin/vendor/scssphp/scssphp/src/Compiler.php +++ b/plugins/admin/vendor/scssphp/scssphp/src/Compiler.php @@ -3544,11 +3544,11 @@ EOL; // 1. op[op name][left type][right type] // 2. op[left type][right type] (passing the op as first arg) // 3. op[op name] - if (\is_callable([$this, $fn = "op${ucOpName}${ucLType}${ucRType}"])) { + if (\is_callable([$this, $fn = "op{$ucOpName}{$ucLType}{$ucRType}"])) { $out = $this->$fn($left, $right, $shouldEval); - } elseif (\is_callable([$this, $fn = "op${ucLType}${ucRType}"])) { + } elseif (\is_callable([$this, $fn = "op{$ucLType}{$ucRType}"])) { $out = $this->$fn($op, $left, $right, $shouldEval); - } elseif (\is_callable([$this, $fn = "op${ucOpName}"])) { + } elseif (\is_callable([$this, $fn = "op{$ucOpName}"])) { $out = $this->$fn($left, $right, $shouldEval); } else { $out = null; @@ -3892,7 +3892,7 @@ EOL; // Special functions overriding a CSS function are case-insensitive. We normalize them as lowercase // to avoid the deprecation warning about the wrong case being used. - if ($lowercasedName === 'min' || $lowercasedName === 'max') { + if ($lowercasedName === 'min' || $lowercasedName === 'max' || $lowercasedName === 'rgb' || $lowercasedName === 'rgba' || $lowercasedName === 'hsl' || $lowercasedName === 'hsla') { $normalizedName = $lowercasedName; } diff --git a/plugins/admin/vendor/scssphp/scssphp/src/Version.php b/plugins/admin/vendor/scssphp/scssphp/src/Version.php index c7f1441..a9efaa3 100644 --- a/plugins/admin/vendor/scssphp/scssphp/src/Version.php +++ b/plugins/admin/vendor/scssphp/scssphp/src/Version.php @@ -19,5 +19,5 @@ namespace ScssPhp\ScssPhp; */ class Version { - const VERSION = '1.10.3'; + const VERSION = '1.10.4'; }