diff --git a/.ddev/commands/web/localdev b/.ddev/commands/web/localdev new file mode 100755 index 00000000000..6d67d3ac980 --- /dev/null +++ b/.ddev/commands/web/localdev @@ -0,0 +1,19 @@ +#!/bin/bash + +## Description: create local development directory +## Usage: localdev +## Example: ddev localdev + +if [ ! -d ".localdev/" ] +then + mkdir ".localdev/" + echo "Directory created." +fi + +if ! grep -q "./.localdev/*" composer.json; then + php vendor/bin/composer config repositories.local '{"type": "path", "url": "./.localdev/*", "canonical": false}' + echo "Patched composer.json." +fi + +cd ".localdev/" || exit +git clone "$@" diff --git a/composer.json b/composer.json index 4a17a660bd4..0adc13bc4b0 100644 --- a/composer.json +++ b/composer.json @@ -38,6 +38,7 @@ }, "require-dev": { "ext-xmlreader": "*", + "composer/composer": "^2.7", "dealerdirect/phpcodesniffer-composer-installer": "^1.0.0", "friendsofphp/php-cs-fixer": "^3.4", "macopedia/phpstan-magento1": "^1.0.5", diff --git a/composer.lock b/composer.lock index ccc9b1b7a0f..d19eb6225ee 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": "e922be8b6a32ba8038db76d87c2d7bd2", + "content-hash": "4145fa474cc19fcb7e54182748e81bdf", "packages": [ { "name": "colinmollenhour/cache-backend-redis", @@ -834,16 +834,16 @@ }, { "name": "phpseclib/phpseclib", - "version": "3.0.41", + "version": "3.0.42", "source": { "type": "git", "url": "https://github.com/phpseclib/phpseclib.git", - "reference": "621c73f7dcb310b61de34d1da4c4204e8ace6ceb" + "reference": "db92f1b1987b12b13f248fe76c3a52cadb67bb98" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/621c73f7dcb310b61de34d1da4c4204e8ace6ceb", - "reference": "621c73f7dcb310b61de34d1da4c4204e8ace6ceb", + "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/db92f1b1987b12b13f248fe76c3a52cadb67bb98", + "reference": "db92f1b1987b12b13f248fe76c3a52cadb67bb98", "shasum": "" }, "require": { @@ -924,7 +924,7 @@ ], "support": { "issues": "https://github.com/phpseclib/phpseclib/issues", - "source": "https://github.com/phpseclib/phpseclib/tree/3.0.41" + "source": "https://github.com/phpseclib/phpseclib/tree/3.0.42" }, "funding": [ { @@ -940,7 +940,7 @@ "type": "tidelift" } ], - "time": "2024-08-12T00:13:54+00:00" + "time": "2024-09-16T03:06:04+00:00" }, { "name": "psr/container", @@ -2280,6 +2280,338 @@ ], "time": "2022-12-23T10:58:28+00:00" }, + { + "name": "composer/ca-bundle", + "version": "1.5.1", + "source": { + "type": "git", + "url": "https://github.com/composer/ca-bundle.git", + "reference": "063d9aa8696582f5a41dffbbaf3c81024f0a604a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/063d9aa8696582f5a41dffbbaf3c81024f0a604a", + "reference": "063d9aa8696582f5a41dffbbaf3c81024f0a604a", + "shasum": "" + }, + "require": { + "ext-openssl": "*", + "ext-pcre": "*", + "php": "^7.2 || ^8.0" + }, + "require-dev": { + "phpstan/phpstan": "^1.10", + "psr/log": "^1.0 || ^2.0 || ^3.0", + "symfony/phpunit-bridge": "^4.2 || ^5", + "symfony/process": "^4.0 || ^5.0 || ^6.0 || ^7.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Composer\\CaBundle\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + } + ], + "description": "Lets you find a path to the system CA bundle, and includes a fallback to the Mozilla CA bundle.", + "keywords": [ + "cabundle", + "cacert", + "certificate", + "ssl", + "tls" + ], + "support": { + "irc": "irc://irc.freenode.org/composer", + "issues": "https://github.com/composer/ca-bundle/issues", + "source": "https://github.com/composer/ca-bundle/tree/1.5.1" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2024-07-08T15:28:20+00:00" + }, + { + "name": "composer/class-map-generator", + "version": "1.3.4", + "source": { + "type": "git", + "url": "https://github.com/composer/class-map-generator.git", + "reference": "b1b3fd0b4eaf3ddf3ee230bc340bf3fff454a1a3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/class-map-generator/zipball/b1b3fd0b4eaf3ddf3ee230bc340bf3fff454a1a3", + "reference": "b1b3fd0b4eaf3ddf3ee230bc340bf3fff454a1a3", + "shasum": "" + }, + "require": { + "composer/pcre": "^2.1 || ^3.1", + "php": "^7.2 || ^8.0", + "symfony/finder": "^4.4 || ^5.3 || ^6 || ^7" + }, + "require-dev": { + "phpstan/phpstan": "^1.6", + "phpstan/phpstan-deprecation-rules": "^1", + "phpstan/phpstan-phpunit": "^1", + "phpstan/phpstan-strict-rules": "^1.1", + "symfony/filesystem": "^5.4 || ^6", + "symfony/phpunit-bridge": "^5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Composer\\ClassMapGenerator\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "https://seld.be" + } + ], + "description": "Utilities to scan PHP code and generate class maps.", + "keywords": [ + "classmap" + ], + "support": { + "issues": "https://github.com/composer/class-map-generator/issues", + "source": "https://github.com/composer/class-map-generator/tree/1.3.4" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2024-06-12T14:13:04+00:00" + }, + { + "name": "composer/composer", + "version": "2.7.7", + "source": { + "type": "git", + "url": "https://github.com/composer/composer.git", + "reference": "291942978f39435cf904d33739f98d7d4eca7b23" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/composer/zipball/291942978f39435cf904d33739f98d7d4eca7b23", + "reference": "291942978f39435cf904d33739f98d7d4eca7b23", + "shasum": "" + }, + "require": { + "composer/ca-bundle": "^1.0", + "composer/class-map-generator": "^1.3.3", + "composer/metadata-minifier": "^1.0", + "composer/pcre": "^2.1 || ^3.1", + "composer/semver": "^3.3", + "composer/spdx-licenses": "^1.5.7", + "composer/xdebug-handler": "^2.0.2 || ^3.0.3", + "justinrainbow/json-schema": "^5.2.11", + "php": "^7.2.5 || ^8.0", + "psr/log": "^1.0 || ^2.0 || ^3.0", + "react/promise": "^2.8 || ^3", + "seld/jsonlint": "^1.4", + "seld/phar-utils": "^1.2", + "seld/signal-handler": "^2.0", + "symfony/console": "^5.4.11 || ^6.0.11 || ^7", + "symfony/filesystem": "^5.4 || ^6.0 || ^7", + "symfony/finder": "^5.4 || ^6.0 || ^7", + "symfony/polyfill-php73": "^1.24", + "symfony/polyfill-php80": "^1.24", + "symfony/polyfill-php81": "^1.24", + "symfony/process": "^5.4 || ^6.0 || ^7" + }, + "require-dev": { + "phpstan/phpstan": "^1.11.0", + "phpstan/phpstan-deprecation-rules": "^1.2.0", + "phpstan/phpstan-phpunit": "^1.4.0", + "phpstan/phpstan-strict-rules": "^1.6.0", + "phpstan/phpstan-symfony": "^1.4.0", + "symfony/phpunit-bridge": "^6.4.1 || ^7.0.1" + }, + "suggest": { + "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages", + "ext-zip": "Enabling the zip extension allows you to unzip archives", + "ext-zlib": "Allow gzip compression of HTTP requests" + }, + "bin": [ + "bin/composer" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "2.7-dev" + }, + "phpstan": { + "includes": [ + "phpstan/rules.neon" + ] + } + }, + "autoload": { + "psr-4": { + "Composer\\": "src/Composer/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nils Adermann", + "email": "naderman@naderman.de", + "homepage": "https://www.naderman.de" + }, + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "https://seld.be" + } + ], + "description": "Composer helps you declare, manage and install dependencies of PHP projects. It ensures you have the right stack everywhere.", + "homepage": "https://getcomposer.org/", + "keywords": [ + "autoload", + "dependency", + "package" + ], + "support": { + "irc": "ircs://irc.libera.chat:6697/composer", + "issues": "https://github.com/composer/composer/issues", + "security": "https://github.com/composer/composer/security/policy", + "source": "https://github.com/composer/composer/tree/2.7.7" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2024-06-10T20:11:12+00:00" + }, + { + "name": "composer/metadata-minifier", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/composer/metadata-minifier.git", + "reference": "c549d23829536f0d0e984aaabbf02af91f443207" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/metadata-minifier/zipball/c549d23829536f0d0e984aaabbf02af91f443207", + "reference": "c549d23829536f0d0e984aaabbf02af91f443207", + "shasum": "" + }, + "require": { + "php": "^5.3.2 || ^7.0 || ^8.0" + }, + "require-dev": { + "composer/composer": "^2", + "phpstan/phpstan": "^0.12.55", + "symfony/phpunit-bridge": "^4.2 || ^5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Composer\\MetadataMinifier\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + } + ], + "description": "Small utility library that handles metadata minification and expansion.", + "keywords": [ + "composer", + "compression" + ], + "support": { + "issues": "https://github.com/composer/metadata-minifier/issues", + "source": "https://github.com/composer/metadata-minifier/tree/1.0.0" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2021-04-07T13:37:33+00:00" + }, { "name": "composer/pcre", "version": "3.1.4", @@ -2432,6 +2764,86 @@ ], "time": "2024-07-12T11:35:52+00:00" }, + { + "name": "composer/spdx-licenses", + "version": "1.5.8", + "source": { + "type": "git", + "url": "https://github.com/composer/spdx-licenses.git", + "reference": "560bdcf8deb88ae5d611c80a2de8ea9d0358cc0a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/560bdcf8deb88ae5d611c80a2de8ea9d0358cc0a", + "reference": "560bdcf8deb88ae5d611c80a2de8ea9d0358cc0a", + "shasum": "" + }, + "require": { + "php": "^5.3.2 || ^7.0 || ^8.0" + }, + "require-dev": { + "phpstan/phpstan": "^0.12.55", + "symfony/phpunit-bridge": "^4.2 || ^5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Composer\\Spdx\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nils Adermann", + "email": "naderman@naderman.de", + "homepage": "http://www.naderman.de" + }, + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + }, + { + "name": "Rob Bast", + "email": "rob.bast@gmail.com", + "homepage": "http://robbast.nl" + } + ], + "description": "SPDX licenses list and validation library.", + "keywords": [ + "license", + "spdx", + "validator" + ], + "support": { + "irc": "ircs://irc.libera.chat:6697/composer", + "issues": "https://github.com/composer/spdx-licenses/issues", + "source": "https://github.com/composer/spdx-licenses/tree/1.5.8" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2023-11-20T07:44:33+00:00" + }, { "name": "composer/xdebug-handler", "version": "3.0.5", @@ -5616,18 +6028,191 @@ ], "time": "2020-09-28T06:39:44+00:00" }, + { + "name": "seld/jsonlint", + "version": "1.11.0", + "source": { + "type": "git", + "url": "https://github.com/Seldaek/jsonlint.git", + "reference": "1748aaf847fc731cfad7725aec413ee46f0cc3a2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/1748aaf847fc731cfad7725aec413ee46f0cc3a2", + "reference": "1748aaf847fc731cfad7725aec413ee46f0cc3a2", + "shasum": "" + }, + "require": { + "php": "^5.3 || ^7.0 || ^8.0" + }, + "require-dev": { + "phpstan/phpstan": "^1.11", + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0 || ^8.5.13" + }, + "bin": [ + "bin/jsonlint" + ], + "type": "library", + "autoload": { + "psr-4": { + "Seld\\JsonLint\\": "src/Seld/JsonLint/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "https://seld.be" + } + ], + "description": "JSON Linter", + "keywords": [ + "json", + "linter", + "parser", + "validator" + ], + "support": { + "issues": "https://github.com/Seldaek/jsonlint/issues", + "source": "https://github.com/Seldaek/jsonlint/tree/1.11.0" + }, + "funding": [ + { + "url": "https://github.com/Seldaek", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/seld/jsonlint", + "type": "tidelift" + } + ], + "time": "2024-07-11T14:55:45+00:00" + }, + { + "name": "seld/phar-utils", + "version": "1.2.1", + "source": { + "type": "git", + "url": "https://github.com/Seldaek/phar-utils.git", + "reference": "ea2f4014f163c1be4c601b9b7bd6af81ba8d701c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Seldaek/phar-utils/zipball/ea2f4014f163c1be4c601b9b7bd6af81ba8d701c", + "reference": "ea2f4014f163c1be4c601b9b7bd6af81ba8d701c", + "shasum": "" + }, + "require": { + "php": ">=5.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Seld\\PharUtils\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be" + } + ], + "description": "PHAR file format utilities, for when PHP phars you up", + "keywords": [ + "phar" + ], + "support": { + "issues": "https://github.com/Seldaek/phar-utils/issues", + "source": "https://github.com/Seldaek/phar-utils/tree/1.2.1" + }, + "time": "2022-08-31T10:31:18+00:00" + }, + { + "name": "seld/signal-handler", + "version": "2.0.2", + "source": { + "type": "git", + "url": "https://github.com/Seldaek/signal-handler.git", + "reference": "04a6112e883ad76c0ada8e4a9f7520bbfdb6bb98" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Seldaek/signal-handler/zipball/04a6112e883ad76c0ada8e4a9f7520bbfdb6bb98", + "reference": "04a6112e883ad76c0ada8e4a9f7520bbfdb6bb98", + "shasum": "" + }, + "require": { + "php": ">=7.2.0" + }, + "require-dev": { + "phpstan/phpstan": "^1", + "phpstan/phpstan-deprecation-rules": "^1.0", + "phpstan/phpstan-phpunit": "^1", + "phpstan/phpstan-strict-rules": "^1.3", + "phpunit/phpunit": "^7.5.20 || ^8.5.23", + "psr/log": "^1 || ^2 || ^3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "2.x-dev" + } + }, + "autoload": { + "psr-4": { + "Seld\\Signal\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + } + ], + "description": "Simple unix signal handler that silently fails where signals are not supported for easy cross-platform development", + "keywords": [ + "posix", + "sigint", + "signal", + "sigterm", + "unix" + ], + "support": { + "issues": "https://github.com/Seldaek/signal-handler/issues", + "source": "https://github.com/Seldaek/signal-handler/tree/2.0.2" + }, + "time": "2023-09-03T09:24:00+00:00" + }, { "name": "squizlabs/php_codesniffer", - "version": "3.10.2", + "version": "3.10.3", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", - "reference": "86e5f5dd9a840c46810ebe5ff1885581c42a3017" + "reference": "62d32998e820bddc40f99f8251958aed187a5c9c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/86e5f5dd9a840c46810ebe5ff1885581c42a3017", - "reference": "86e5f5dd9a840c46810ebe5ff1885581c42a3017", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/62d32998e820bddc40f99f8251958aed187a5c9c", + "reference": "62d32998e820bddc40f99f8251958aed187a5c9c", "shasum": "" }, "require": { @@ -5694,7 +6279,7 @@ "type": "open_collective" } ], - "time": "2024-07-21T23:26:44+00:00" + "time": "2024-09-18T10:38:58+00:00" }, { "name": "symfony/config", diff --git a/skin/adminhtml/default/openmage/menu.css b/skin/adminhtml/default/openmage/menu.css index 6504f895864..3adbae627f9 100644 --- a/skin/adminhtml/default/openmage/menu.css +++ b/skin/adminhtml/default/openmage/menu.css @@ -11,7 +11,7 @@ 240 = blue, 300 = purple */ -#nav ul li, #nav ul li.active { +#nav ul li.active, #nav ul li { float: none; height: auto; background: none; @@ -132,6 +132,9 @@ #nav li.parent li a { cursor: pointer; } +#nav li.level1 > a.active:not(:hover), #nav li.level2 > a.active:not(:hover), #nav li.level3 > a.active:not(:hover) { + background: #e6e6e6; +} #nav li#bubblelauncher-status a { background-position: center 8px; line-height: 38px; @@ -157,7 +160,7 @@ width: 189px; top: 38px; left: -10000px; - box-shadow: rgba(0, 0, 0, 0.18039) 1px 3px 4px; + box-shadow: rgba(0, 0, 0, 0.180392) 1px 3px 4px; } #nav ul li { padding: 0; @@ -237,7 +240,7 @@ top: 40px; right: -10000px; display: none; - box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.20784), 0 0 5px rgba(0, 0, 0, 0.20784); + box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.207843), 0 0 5px rgba(0, 0, 0, 0.207843); background: #fff; } #usermenu ul li a:hover { @@ -251,7 +254,7 @@ display: block; } #usermenu li ul span { - border-bottom: 1px dotted #a6c4d9; + border-bottom: 1px dotted hsl(205, 40%, 75%); display: block; line-height: 31px; padding: 0 10px; @@ -263,7 +266,7 @@ #usermenu li.over ul a { color: #000537; text-decoration: none; - background: #ecf3f9; + background: hsl(205, 52%, 95%); display: block; } #usermenu > li > a { diff --git a/skin/adminhtml/default/openmage/menu.css.map b/skin/adminhtml/default/openmage/menu.css.map index 93e3112ef89..efc96494ea3 100644 --- a/skin/adminhtml/default/openmage/menu.css.map +++ b/skin/adminhtml/default/openmage/menu.css.map @@ -1,7 +1 @@ -{ -"version": 3, -"mappings": "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", -"sources": ["scss/menu.scss","scss/_variables.scss","scss/_base.scss"], -"names": [], -"file": "menu.css" -} +{"version":3,"sourceRoot":"","sources":["scss/menu.scss","scss/_variables.scss","scss/_base.scss"],"names":[],"mappings":"AAAA;AAAA;AAAA;AAAA;AC+FA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;ACwEA;EACE;EACA;EACA;EACA;;;AAwIF;EACE,OD5PgB;EC6PhB;EACA;EACA;;;AFhTF;EACE,YCPmB;EDQnB;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAIJ;EACE;;AACA;EACE;EACA;EACA;;AAEA;EACE;;AAEA;EACE,OCGc;;ADAhB;EACE;;AAEA;EACE;;AAGF;EACE,OCTY;EDUZ;;AAGF;EACE;;AAEA;EACE;;AAGF;EACE;;AAMR;EACE;EACA,OCgBE;EDfF;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;;AAKF;EACE;EACA;EACA,OCLA;EDMA;EACA;;AAEA;EACE;EACA,OCXF;;ADeF;EACE;EACA;EACA,OCtCS;EDuCT,QCxCS;EDyCT;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA,OC7BA;;ADkCF;EACE;;AAKE;EACE;;AAKE;EACE;;AAGF;EACE;;AAIJ;EACE;;AAKN;EACE;;AAOF;EACE;;AAMJ;EACE;EACA;EACA;;AAGF;EACE;;AAKN;EACE;EACA;EACA;EACA;EACA,OC7FI;ED8FJ;;AAEA;EACE;EACA;;AAIJ;EACE;EACA;EACA;EACA;EAEA;;AAEA;EAEE;;AAKE;EACE,OCnKY;EDoKZ;;AAIJ;EACE,YC5HA;ED6HA;EACA,OC3Kc;ED4Kd;;AAEA;EACE,YC/KY;EDgLZ,OCnIF;;ADwIA;EACE;EACA;;AAKE;EACE;EACA;;AAGF;EACE;;AAIJ;EACE;;AAKN;EACE;;AAEA;EACE;;AAKN;EACE;EACA;EACA;;AAEA;EACE;EACA;;AAIJ;EACE;EACA;EACA;EACA;;AAEA;EACE;;AAMJ;EACE;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;;;AAKN;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EAEA;EACA,YC3NI;;AD6NF;EAEE,YC5Qc;;AD8QhB;EACE;;AAMF;EACE;EACA;;AAEF;EACE;EACA;EACA;EACA;;AAGJ;EACE;EACA;;AACA;EACE,OCzTY;ED0TZ;EACA,YChOQ;EDiOR;;AAIN;EACE;EACA;;AACA;EACE;EACA","file":"menu.css"} \ No newline at end of file diff --git a/skin/adminhtml/default/openmage/scss/menu.scss b/skin/adminhtml/default/openmage/scss/menu.scss index 3c8962c5389..5777a526b57 100644 --- a/skin/adminhtml/default/openmage/scss/menu.scss +++ b/skin/adminhtml/default/openmage/scss/menu.scss @@ -145,6 +145,14 @@ } } + &.level1, &.level2, &.level3 { + > a { + &.active:not(:hover) { + background: darken($white,10); + } + } + } + &#bubblelauncher-status { a { background-position: center 8px; diff --git a/tests/unit/Varien/Data/Form/Filter/DateTest.php b/tests/unit/Varien/Data/Form/Filter/DateTest.php new file mode 100644 index 00000000000..d4401088952 --- /dev/null +++ b/tests/unit/Varien/Data/Form/Filter/DateTest.php @@ -0,0 +1,53 @@ +subject = new Varien_Data_Form_Filter_Date(null, 'en_US'); + } + + /** + * @group Varien_Data + */ + public function testInputFilter(): void + { + $this->assertEquals('', $this->subject->inputFilter('')); + $this->assertEquals(null, $this->subject->inputFilter(null)); + $this->assertEquals('1990-05-18', $this->subject->inputFilter('1990-05-18')); + $this->assertEquals('0090-05-18', $this->subject->inputFilter('90-05-18')); + $this->assertEquals('1990-05-08', $this->subject->inputFilter('1990-5-8')); + $this->assertEquals('1970-01-01', $this->subject->inputFilter('1970-01-01')); + + try { + $this->subject->inputFilter('1990-18-18'); + } catch (Throwable $e) { + // PHP7: bcsub(): bcmath function argument is not well-formed + // PHP8: bcsub(): Argument #1 ($num1) is not well-formed + $this->assertStringStartsWith('bcsub():', $e->getMessage()); + } + } +} diff --git a/tests/unit/Varien/Data/Form/Filter/DatetimeTest.php b/tests/unit/Varien/Data/Form/Filter/DatetimeTest.php new file mode 100644 index 00000000000..152cfad883a --- /dev/null +++ b/tests/unit/Varien/Data/Form/Filter/DatetimeTest.php @@ -0,0 +1,52 @@ +subject = new Varien_Data_Form_Filter_Datetime(null, 'en_US'); + } + + /** + * @group Varien_Data + */ + public function testInputFilter(): void + { + $this->assertEquals('', $this->subject->inputFilter('')); + $this->assertEquals(null, $this->subject->inputFilter(null)); + $this->assertEquals('1990-05-18 00:00:00', $this->subject->inputFilter('1990-05-18')); + $this->assertEquals('0090-05-18 00:00:00', $this->subject->inputFilter('90-05-18')); + $this->assertEquals('1990-05-08 00:00:00', $this->subject->inputFilter('1990-5-8')); + + try { + $this->subject->inputFilter('1990-18-18'); + } catch (Throwable $e) { + // PHP7: bcsub(): bcmath function argument is not well-formed + // PHP8: bcsub(): Argument #1 ($num1) is not well-formed + $this->assertStringStartsWith('bcsub():', $e->getMessage()); + } + } +}