diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index aec1aac8f9..37a65d219e 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -105,7 +105,7 @@ jobs: mv data/config/config.php.bak data/config/config.php - name: Upload coverage - uses: codecov/codecov-action@v4 + uses: codecov/codecov-action@v5 with: files: ./coverage1.xml,./coverage2.xml,./coverage3.xml token: ${{ secrets.CODECOV_TOKEN }} diff --git a/composer.json b/composer.json index c0a3dd831b..02284dba1d 100644 --- a/composer.json +++ b/composer.json @@ -27,8 +27,8 @@ "friendsofphp/php-cs-fixer": "^3.9", "nanasess/ec-cube2-class-extends-stubs": "^1.0", "nanasess/eccube2-fixture-generator": "^2.0", - "phpdocumentor/reflection-docblock": "~5.4.0", - "phpstan/phpstan": "^1.10", + "phpdocumentor/reflection-docblock": "~5.5.1", + "phpstan/phpstan": "^2.0", "phpunit/phpunit": "^9.6", "symfony/yaml": "^5.4 || ^6.4" }, diff --git a/composer.lock b/composer.lock index ceabf8b90a..615706a368 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": "83bfd4524f7afe4c75e48dbbcba0e5ca", + "content-hash": "8193790eda3917eed8b2431b71f28b80", "packages": [ { "name": "mobiledetect/mobiledetectlib", @@ -752,16 +752,16 @@ }, { "name": "smarty/smarty", - "version": "v5.4.1", + "version": "v5.4.2", "source": { "type": "git", "url": "https://github.com/smarty-php/smarty.git", - "reference": "cd58df7a2603b7d925e5db5c9d50f10987695fd3" + "reference": "642a97adcc2bf6c1b2458d6afeeb36ae001c1c2f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/smarty-php/smarty/zipball/cd58df7a2603b7d925e5db5c9d50f10987695fd3", - "reference": "cd58df7a2603b7d925e5db5c9d50f10987695fd3", + "url": "https://api.github.com/repos/smarty-php/smarty/zipball/642a97adcc2bf6c1b2458d6afeeb36ae001c1c2f", + "reference": "642a97adcc2bf6c1b2458d6afeeb36ae001c1c2f", "shasum": "" }, "require": { @@ -816,9 +816,9 @@ "support": { "forum": "https://github.com/smarty-php/smarty/discussions", "issues": "https://github.com/smarty-php/smarty/issues", - "source": "https://github.com/smarty-php/smarty/tree/v5.4.1" + "source": "https://github.com/smarty-php/smarty/tree/v5.4.2" }, - "time": "2024-08-29T23:10:45+00:00" + "time": "2024-11-20T21:18:16+00:00" }, { "name": "symfony/polyfill-mbstring", @@ -846,8 +846,8 @@ "type": "library", "extra": { "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -902,18 +902,82 @@ } ], "packages-dev": [ + { + "name": "clue/ndjson-react", + "version": "v1.3.0", + "source": { + "type": "git", + "url": "https://github.com/clue/reactphp-ndjson.git", + "reference": "392dc165fce93b5bb5c637b67e59619223c931b0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/clue/reactphp-ndjson/zipball/392dc165fce93b5bb5c637b67e59619223c931b0", + "reference": "392dc165fce93b5bb5c637b67e59619223c931b0", + "shasum": "" + }, + "require": { + "php": ">=5.3", + "react/stream": "^1.2" + }, + "require-dev": { + "phpunit/phpunit": "^9.5 || ^5.7 || ^4.8.35", + "react/event-loop": "^1.2" + }, + "type": "library", + "autoload": { + "psr-4": { + "Clue\\React\\NDJson\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Christian Lück", + "email": "christian@clue.engineering" + } + ], + "description": "Streaming newline-delimited JSON (NDJSON) parser and encoder for ReactPHP.", + "homepage": "https://github.com/clue/reactphp-ndjson", + "keywords": [ + "NDJSON", + "json", + "jsonlines", + "newline", + "reactphp", + "streaming" + ], + "support": { + "issues": "https://github.com/clue/reactphp-ndjson/issues", + "source": "https://github.com/clue/reactphp-ndjson/tree/v1.3.0" + }, + "funding": [ + { + "url": "https://clue.engineering/support", + "type": "custom" + }, + { + "url": "https://github.com/clue", + "type": "github" + } + ], + "time": "2022-12-23T10:58:28+00:00" + }, { "name": "composer/pcre", - "version": "3.3.1", + "version": "3.3.2", "source": { "type": "git", "url": "https://github.com/composer/pcre.git", - "reference": "63aaeac21d7e775ff9bc9d45021e1745c97521c4" + "reference": "b2bed4734f0cc156ee1fe9c0da2550420d99a21e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/pcre/zipball/63aaeac21d7e775ff9bc9d45021e1745c97521c4", - "reference": "63aaeac21d7e775ff9bc9d45021e1745c97521c4", + "url": "https://api.github.com/repos/composer/pcre/zipball/b2bed4734f0cc156ee1fe9c0da2550420d99a21e", + "reference": "b2bed4734f0cc156ee1fe9c0da2550420d99a21e", "shasum": "" }, "require": { @@ -923,8 +987,8 @@ "phpstan/phpstan": "<1.11.10" }, "require-dev": { - "phpstan/phpstan": "^1.11.10", - "phpstan/phpstan-strict-rules": "^1.1", + "phpstan/phpstan": "^1.12 || ^2", + "phpstan/phpstan-strict-rules": "^1 || ^2", "phpunit/phpunit": "^8 || ^9" }, "type": "library", @@ -963,7 +1027,7 @@ ], "support": { "issues": "https://github.com/composer/pcre/issues", - "source": "https://github.com/composer/pcre/tree/3.3.1" + "source": "https://github.com/composer/pcre/tree/3.3.2" }, "funding": [ { @@ -979,7 +1043,7 @@ "type": "tidelift" } ], - "time": "2024-08-27T18:44:43+00:00" + "time": "2024-11-12T16:29:46+00:00" }, { "name": "composer/semver", @@ -1128,82 +1192,6 @@ ], "time": "2024-05-06T16:37:16+00:00" }, - { - "name": "doctrine/annotations", - "version": "1.14.4", - "source": { - "type": "git", - "url": "https://github.com/doctrine/annotations.git", - "reference": "253dca476f70808a5aeed3a47cc2cc88c5cab915" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/253dca476f70808a5aeed3a47cc2cc88c5cab915", - "reference": "253dca476f70808a5aeed3a47cc2cc88c5cab915", - "shasum": "" - }, - "require": { - "doctrine/lexer": "^1 || ^2", - "ext-tokenizer": "*", - "php": "^7.1 || ^8.0", - "psr/cache": "^1 || ^2 || ^3" - }, - "require-dev": { - "doctrine/cache": "^1.11 || ^2.0", - "doctrine/coding-standard": "^9 || ^12", - "phpstan/phpstan": "~1.4.10 || ^1.10.28", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "symfony/cache": "^4.4 || ^5.4 || ^6.4 || ^7", - "vimeo/psalm": "^4.30 || ^5.14" - }, - "suggest": { - "php": "PHP 8.0 or higher comes with attributes, a native replacement for annotations" - }, - "type": "library", - "autoload": { - "psr-4": { - "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com" - }, - { - "name": "Roman Borschel", - "email": "roman@code-factory.org" - }, - { - "name": "Benjamin Eberlei", - "email": "kontakt@beberlei.de" - }, - { - "name": "Jonathan Wage", - "email": "jonwage@gmail.com" - }, - { - "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com" - } - ], - "description": "Docblock Annotations Parser", - "homepage": "https://www.doctrine-project.org/projects/annotations.html", - "keywords": [ - "annotations", - "docblock", - "parser" - ], - "support": { - "issues": "https://github.com/doctrine/annotations/issues", - "source": "https://github.com/doctrine/annotations/tree/1.14.4" - }, - "time": "2024-09-05T10:15:52+00:00" - }, { "name": "doctrine/deprecations", "version": "1.1.3", @@ -1322,34 +1310,29 @@ "time": "2022-12-30T00:15:36+00:00" }, { - "name": "doctrine/lexer", - "version": "2.1.1", + "name": "evenement/evenement", + "version": "v3.0.2", "source": { "type": "git", - "url": "https://github.com/doctrine/lexer.git", - "reference": "861c870e8b75f7c8f69c146c7f89cc1c0f1b49b6" + "url": "https://github.com/igorw/evenement.git", + "reference": "0a16b0d71ab13284339abb99d9d2bd813640efbc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/lexer/zipball/861c870e8b75f7c8f69c146c7f89cc1c0f1b49b6", - "reference": "861c870e8b75f7c8f69c146c7f89cc1c0f1b49b6", + "url": "https://api.github.com/repos/igorw/evenement/zipball/0a16b0d71ab13284339abb99d9d2bd813640efbc", + "reference": "0a16b0d71ab13284339abb99d9d2bd813640efbc", "shasum": "" }, "require": { - "doctrine/deprecations": "^1.0", - "php": "^7.1 || ^8.0" + "php": ">=7.0" }, "require-dev": { - "doctrine/coding-standard": "^9 || ^12", - "phpstan/phpstan": "^1.3", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6", - "psalm/plugin-phpunit": "^0.18.3", - "vimeo/psalm": "^4.11 || ^5.21" + "phpunit/phpunit": "^9 || ^6" }, "type": "library", "autoload": { "psr-4": { - "Doctrine\\Common\\Lexer\\": "src" + "Evenement\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -1358,46 +1341,20 @@ ], "authors": [ { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com" - }, - { - "name": "Roman Borschel", - "email": "roman@code-factory.org" - }, - { - "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com" + "name": "Igor Wiedler", + "email": "igor@wiedler.ch" } ], - "description": "PHP Doctrine Lexer parser library that can be used in Top-Down, Recursive Descent Parsers.", - "homepage": "https://www.doctrine-project.org/projects/lexer.html", + "description": "Événement is a very simple event dispatching library for PHP", "keywords": [ - "annotations", - "docblock", - "lexer", - "parser", - "php" + "event-dispatcher", + "event-emitter" ], "support": { - "issues": "https://github.com/doctrine/lexer/issues", - "source": "https://github.com/doctrine/lexer/tree/2.1.1" + "issues": "https://github.com/igorw/evenement/issues", + "source": "https://github.com/igorw/evenement/tree/v3.0.2" }, - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Flexer", - "type": "tidelift" - } - ], - "time": "2024-02-05T11:35:39+00:00" + "time": "2023-08-08T05:53:35+00:00" }, { "name": "fakerphp/faker", @@ -1462,54 +1419,120 @@ }, "time": "2024-01-02T13:46:09+00:00" }, + { + "name": "fidry/cpu-core-counter", + "version": "1.2.0", + "source": { + "type": "git", + "url": "https://github.com/theofidry/cpu-core-counter.git", + "reference": "8520451a140d3f46ac33042715115e290cf5785f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/8520451a140d3f46ac33042715115e290cf5785f", + "reference": "8520451a140d3f46ac33042715115e290cf5785f", + "shasum": "" + }, + "require": { + "php": "^7.2 || ^8.0" + }, + "require-dev": { + "fidry/makefile": "^0.2.0", + "fidry/php-cs-fixer-config": "^1.1.2", + "phpstan/extension-installer": "^1.2.0", + "phpstan/phpstan": "^1.9.2", + "phpstan/phpstan-deprecation-rules": "^1.0.0", + "phpstan/phpstan-phpunit": "^1.2.2", + "phpstan/phpstan-strict-rules": "^1.4.4", + "phpunit/phpunit": "^8.5.31 || ^9.5.26", + "webmozarts/strict-phpunit": "^7.5" + }, + "type": "library", + "autoload": { + "psr-4": { + "Fidry\\CpuCoreCounter\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Théo FIDRY", + "email": "theo.fidry@gmail.com" + } + ], + "description": "Tiny utility to get the number of CPU cores.", + "keywords": [ + "CPU", + "core" + ], + "support": { + "issues": "https://github.com/theofidry/cpu-core-counter/issues", + "source": "https://github.com/theofidry/cpu-core-counter/tree/1.2.0" + }, + "funding": [ + { + "url": "https://github.com/theofidry", + "type": "github" + } + ], + "time": "2024-08-06T10:04:20+00:00" + }, { "name": "friendsofphp/php-cs-fixer", - "version": "v3.9.5", + "version": "v3.65.0", "source": { "type": "git", - "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", - "reference": "4465d70ba776806857a1ac2a6f877e582445ff36" + "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git", + "reference": "79d4f3e77b250a7d8043d76c6af8f0695e8a469f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/4465d70ba776806857a1ac2a6f877e582445ff36", - "reference": "4465d70ba776806857a1ac2a6f877e582445ff36", + "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/79d4f3e77b250a7d8043d76c6af8f0695e8a469f", + "reference": "79d4f3e77b250a7d8043d76c6af8f0695e8a469f", "shasum": "" }, "require": { - "composer/semver": "^3.2", + "clue/ndjson-react": "^1.0", + "composer/semver": "^3.4", "composer/xdebug-handler": "^3.0.3", - "doctrine/annotations": "^1.13", + "ext-filter": "*", "ext-json": "*", "ext-tokenizer": "*", + "fidry/cpu-core-counter": "^1.2", "php": "^7.4 || ^8.0", - "php-cs-fixer/diff": "^2.0", - "symfony/console": "^5.4 || ^6.0", - "symfony/event-dispatcher": "^5.4 || ^6.0", - "symfony/filesystem": "^5.4 || ^6.0", - "symfony/finder": "^5.4 || ^6.0", - "symfony/options-resolver": "^5.4 || ^6.0", - "symfony/polyfill-mbstring": "^1.23", - "symfony/polyfill-php80": "^1.25", - "symfony/polyfill-php81": "^1.25", - "symfony/process": "^5.4 || ^6.0", - "symfony/stopwatch": "^5.4 || ^6.0" + "react/child-process": "^0.6.5", + "react/event-loop": "^1.0", + "react/promise": "^2.0 || ^3.0", + "react/socket": "^1.0", + "react/stream": "^1.0", + "sebastian/diff": "^4.0 || ^5.0 || ^6.0", + "symfony/console": "^5.4 || ^6.0 || ^7.0", + "symfony/event-dispatcher": "^5.4 || ^6.0 || ^7.0", + "symfony/filesystem": "^5.4 || ^6.0 || ^7.0", + "symfony/finder": "^5.4 || ^6.0 || ^7.0", + "symfony/options-resolver": "^5.4 || ^6.0 || ^7.0", + "symfony/polyfill-mbstring": "^1.28", + "symfony/polyfill-php80": "^1.28", + "symfony/polyfill-php81": "^1.28", + "symfony/process": "^5.4 || ^6.0 || ^7.0", + "symfony/stopwatch": "^5.4 || ^6.0 || ^7.0" }, "require-dev": { - "justinrainbow/json-schema": "^5.2", - "keradus/cli-executor": "^1.5", - "mikey179/vfsstream": "^1.6.10", - "php-coveralls/php-coveralls": "^2.5.2", + "facile-it/paraunit": "^1.3.1 || ^2.4", + "infection/infection": "^0.29.8", + "justinrainbow/json-schema": "^5.3 || ^6.0", + "keradus/cli-executor": "^2.1", + "mikey179/vfsstream": "^1.6.12", + "php-coveralls/php-coveralls": "^2.7", "php-cs-fixer/accessible-object": "^1.1", - "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.2", - "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.2.1", - "phpspec/prophecy": "^1.15", - "phpspec/prophecy-phpunit": "^2.0", - "phpunit/phpunit": "^9.5", - "phpunitgoodpractices/polyfill": "^1.5", - "phpunitgoodpractices/traits": "^1.9.1", - "symfony/phpunit-bridge": "^6.0", - "symfony/yaml": "^5.4 || ^6.0" + "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.5", + "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.5", + "phpunit/phpunit": "^9.6.21 || ^10.5.38 || ^11.4.3", + "symfony/var-dumper": "^5.4.47 || ^6.4.15 || ^7.1.8", + "symfony/yaml": "^5.4.45 || ^6.4.13 || ^7.1.6" }, "suggest": { "ext-dom": "For handling output formats in XML", @@ -1522,7 +1545,10 @@ "autoload": { "psr-4": { "PhpCsFixer\\": "src/" - } + }, + "exclude-from-classmap": [ + "src/Fixer/Internal/*" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1539,9 +1565,15 @@ } ], "description": "A tool to automatically fix PHP code style", + "keywords": [ + "Static code analysis", + "fixer", + "standards", + "static analysis" + ], "support": { - "issues": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues", - "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v3.9.5" + "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues", + "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.65.0" }, "funding": [ { @@ -1549,7 +1581,7 @@ "type": "github" } ], - "time": "2022-07-22T08:43:51+00:00" + "time": "2024-11-25T00:39:24+00:00" }, { "name": "myclabs/deep-copy", @@ -1869,59 +1901,6 @@ }, "time": "2022-02-21T01:04:05+00:00" }, - { - "name": "php-cs-fixer/diff", - "version": "v2.0.2", - "source": { - "type": "git", - "url": "https://github.com/PHP-CS-Fixer/diff.git", - "reference": "29dc0d507e838c4580d018bd8b5cb412474f7ec3" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/29dc0d507e838c4580d018bd8b5cb412474f7ec3", - "reference": "29dc0d507e838c4580d018bd8b5cb412474f7ec3", - "shasum": "" - }, - "require": { - "php": "^5.6 || ^7.0 || ^8.0" - }, - "require-dev": { - "phpunit/phpunit": "^5.7.23 || ^6.4.3 || ^7.0", - "symfony/process": "^3.3" - }, - "type": "library", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - }, - { - "name": "Kore Nordmann", - "email": "mail@kore-nordmann.de" - } - ], - "description": "sebastian/diff v3 backport support for PHP 5.6+", - "homepage": "https://github.com/PHP-CS-Fixer", - "keywords": [ - "diff" - ], - "support": { - "issues": "https://github.com/PHP-CS-Fixer/diff/issues", - "source": "https://github.com/PHP-CS-Fixer/diff/tree/v2.0.2" - }, - "abandoned": true, - "time": "2020-10-14T08:32:19+00:00" - }, { "name": "phpdocumentor/reflection-common", "version": "2.2.0", @@ -1977,16 +1956,16 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "5.4.1", + "version": "5.5.1", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c" + "reference": "0c70d2c566e899666f367ab7b80986beb3581e6f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c", - "reference": "9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/0c70d2c566e899666f367ab7b80986beb3581e6f", + "reference": "0c70d2c566e899666f367ab7b80986beb3581e6f", "shasum": "" }, "require": { @@ -1999,13 +1978,13 @@ "webmozart/assert": "^1.9.1" }, "require-dev": { - "mockery/mockery": "~1.3.5", + "mockery/mockery": "~1.3.5 || ~1.6.0", "phpstan/extension-installer": "^1.1", "phpstan/phpstan": "^1.8", "phpstan/phpstan-mockery": "^1.1", "phpstan/phpstan-webmozart-assert": "^1.2", "phpunit/phpunit": "^9.5", - "vimeo/psalm": "^5.13" + "psalm/phar": "^5.26" }, "type": "library", "extra": { @@ -2035,29 +2014,29 @@ "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "support": { "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.4.1" + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.5.1" }, - "time": "2024-05-21T05:55:05+00:00" + "time": "2024-11-06T11:58:54+00:00" }, { "name": "phpdocumentor/type-resolver", - "version": "1.8.2", + "version": "1.10.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "153ae662783729388a584b4361f2545e4d841e3c" + "reference": "679e3ce485b99e84c775d28e2e96fade9a7fb50a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/153ae662783729388a584b4361f2545e4d841e3c", - "reference": "153ae662783729388a584b4361f2545e4d841e3c", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/679e3ce485b99e84c775d28e2e96fade9a7fb50a", + "reference": "679e3ce485b99e84c775d28e2e96fade9a7fb50a", "shasum": "" }, "require": { "doctrine/deprecations": "^1.0", "php": "^7.3 || ^8.0", "phpdocumentor/reflection-common": "^2.0", - "phpstan/phpdoc-parser": "^1.13" + "phpstan/phpdoc-parser": "^1.18|^2.0" }, "require-dev": { "ext-tokenizer": "*", @@ -2093,22 +2072,22 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.8.2" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.10.0" }, - "time": "2024-02-23T11:10:43+00:00" + "time": "2024-11-09T15:12:26+00:00" }, { "name": "phpstan/phpdoc-parser", - "version": "1.32.0", + "version": "1.33.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "6ca22b154efdd9e3c68c56f5d94670920a1c19a4" + "reference": "82a311fd3690fb2bf7b64d5c98f912b3dd746140" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/6ca22b154efdd9e3c68c56f5d94670920a1c19a4", - "reference": "6ca22b154efdd9e3c68c56f5d94670920a1c19a4", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/82a311fd3690fb2bf7b64d5c98f912b3dd746140", + "reference": "82a311fd3690fb2bf7b64d5c98f912b3dd746140", "shasum": "" }, "require": { @@ -2140,26 +2119,26 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.32.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.33.0" }, - "time": "2024-09-26T07:23:32+00:00" + "time": "2024-10-13T11:25:22+00:00" }, { "name": "phpstan/phpstan", - "version": "1.12.6", + "version": "2.0.3", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "dc4d2f145a88ea7141ae698effd64d9df46527ae" + "reference": "46b4d3529b12178112d9008337beda0cc2a1a6b4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/dc4d2f145a88ea7141ae698effd64d9df46527ae", - "reference": "dc4d2f145a88ea7141ae698effd64d9df46527ae", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/46b4d3529b12178112d9008337beda0cc2a1a6b4", + "reference": "46b4d3529b12178112d9008337beda0cc2a1a6b4", "shasum": "" }, "require": { - "php": "^7.2|^8.0" + "php": "^7.4|^8.0" }, "conflict": { "phpstan/phpstan-shim": "*" @@ -2200,7 +2179,7 @@ "type": "github" } ], - "time": "2024-10-06T15:03:59+00:00" + "time": "2024-11-28T22:19:37+00:00" }, { "name": "phpunit/php-code-coverage", @@ -2463,193 +2442,574 @@ "time": "2020-10-26T05:33:50+00:00" }, { - "name": "phpunit/php-timer", - "version": "5.0.3", + "name": "phpunit/php-timer", + "version": "5.0.3", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-timer.git", + "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2", + "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Utility class for timing", + "homepage": "https://github.com/sebastianbergmann/php-timer/", + "keywords": [ + "timer" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-timer/issues", + "source": "https://github.com/sebastianbergmann/php-timer/tree/5.0.3" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-10-26T13:16:10+00:00" + }, + { + "name": "phpunit/phpunit", + "version": "9.6.21", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/phpunit.git", + "reference": "de6abf3b6f8dd955fac3caad3af7a9504e8c2ffa" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/de6abf3b6f8dd955fac3caad3af7a9504e8c2ffa", + "reference": "de6abf3b6f8dd955fac3caad3af7a9504e8c2ffa", + "shasum": "" + }, + "require": { + "doctrine/instantiator": "^1.5.0 || ^2", + "ext-dom": "*", + "ext-json": "*", + "ext-libxml": "*", + "ext-mbstring": "*", + "ext-xml": "*", + "ext-xmlwriter": "*", + "myclabs/deep-copy": "^1.12.0", + "phar-io/manifest": "^2.0.4", + "phar-io/version": "^3.2.1", + "php": ">=7.3", + "phpunit/php-code-coverage": "^9.2.32", + "phpunit/php-file-iterator": "^3.0.6", + "phpunit/php-invoker": "^3.1.1", + "phpunit/php-text-template": "^2.0.4", + "phpunit/php-timer": "^5.0.3", + "sebastian/cli-parser": "^1.0.2", + "sebastian/code-unit": "^1.0.8", + "sebastian/comparator": "^4.0.8", + "sebastian/diff": "^4.0.6", + "sebastian/environment": "^5.1.5", + "sebastian/exporter": "^4.0.6", + "sebastian/global-state": "^5.0.7", + "sebastian/object-enumerator": "^4.0.4", + "sebastian/resource-operations": "^3.0.4", + "sebastian/type": "^3.2.1", + "sebastian/version": "^3.0.2" + }, + "suggest": { + "ext-soap": "To be able to generate mocks based on WSDL files", + "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage" + }, + "bin": [ + "phpunit" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "9.6-dev" + } + }, + "autoload": { + "files": [ + "src/Framework/Assert/Functions.php" + ], + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "The PHP Unit Testing framework.", + "homepage": "https://phpunit.de/", + "keywords": [ + "phpunit", + "testing", + "xunit" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/phpunit/issues", + "security": "https://github.com/sebastianbergmann/phpunit/security/policy", + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.21" + }, + "funding": [ + { + "url": "https://phpunit.de/sponsors.html", + "type": "custom" + }, + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit", + "type": "tidelift" + } + ], + "time": "2024-09-19T10:50:18+00:00" + }, + { + "name": "psr/container", + "version": "2.0.2", + "source": { + "type": "git", + "url": "https://github.com/php-fig/container.git", + "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963", + "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963", + "shasum": "" + }, + "require": { + "php": ">=7.4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Container\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common Container Interface (PHP FIG PSR-11)", + "homepage": "https://github.com/php-fig/container", + "keywords": [ + "PSR-11", + "container", + "container-interface", + "container-interop", + "psr" + ], + "support": { + "issues": "https://github.com/php-fig/container/issues", + "source": "https://github.com/php-fig/container/tree/2.0.2" + }, + "time": "2021-11-05T16:47:00+00:00" + }, + { + "name": "psr/event-dispatcher", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/event-dispatcher.git", + "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/event-dispatcher/zipball/dbefd12671e8a14ec7f180cab83036ed26714bb0", + "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0", + "shasum": "" + }, + "require": { + "php": ">=7.2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\EventDispatcher\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Standard interfaces for event handling.", + "keywords": [ + "events", + "psr", + "psr-14" + ], + "support": { + "issues": "https://github.com/php-fig/event-dispatcher/issues", + "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0" + }, + "time": "2019-01-08T18:20:26+00:00" + }, + { + "name": "psr/log", + "version": "1.1.4", + "source": { + "type": "git", + "url": "https://github.com/php-fig/log.git", + "reference": "d49695b909c3b7628b6289db5479a1c204601f11" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11", + "reference": "d49695b909c3b7628b6289db5479a1c204601f11", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Log\\": "Psr/Log/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common interface for logging libraries", + "homepage": "https://github.com/php-fig/log", + "keywords": [ + "log", + "psr", + "psr-3" + ], + "support": { + "source": "https://github.com/php-fig/log/tree/1.1.4" + }, + "time": "2021-05-03T11:20:27+00:00" + }, + { + "name": "react/cache", + "version": "v1.2.0", + "source": { + "type": "git", + "url": "https://github.com/reactphp/cache.git", + "reference": "d47c472b64aa5608225f47965a484b75c7817d5b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/reactphp/cache/zipball/d47c472b64aa5608225f47965a484b75c7817d5b", + "reference": "d47c472b64aa5608225f47965a484b75c7817d5b", + "shasum": "" + }, + "require": { + "php": ">=5.3.0", + "react/promise": "^3.0 || ^2.0 || ^1.1" + }, + "require-dev": { + "phpunit/phpunit": "^9.5 || ^5.7 || ^4.8.35" + }, + "type": "library", + "autoload": { + "psr-4": { + "React\\Cache\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Christian Lück", + "email": "christian@clue.engineering", + "homepage": "https://clue.engineering/" + }, + { + "name": "Cees-Jan Kiewiet", + "email": "reactphp@ceesjankiewiet.nl", + "homepage": "https://wyrihaximus.net/" + }, + { + "name": "Jan Sorgalla", + "email": "jsorgalla@gmail.com", + "homepage": "https://sorgalla.com/" + }, + { + "name": "Chris Boden", + "email": "cboden@gmail.com", + "homepage": "https://cboden.dev/" + } + ], + "description": "Async, Promise-based cache interface for ReactPHP", + "keywords": [ + "cache", + "caching", + "promise", + "reactphp" + ], + "support": { + "issues": "https://github.com/reactphp/cache/issues", + "source": "https://github.com/reactphp/cache/tree/v1.2.0" + }, + "funding": [ + { + "url": "https://opencollective.com/reactphp", + "type": "open_collective" + } + ], + "time": "2022-11-30T15:59:55+00:00" + }, + { + "name": "react/child-process", + "version": "v0.6.5", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2" + "url": "https://github.com/reactphp/child-process.git", + "reference": "e71eb1aa55f057c7a4a0d08d06b0b0a484bead43" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2", - "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2", + "url": "https://api.github.com/repos/reactphp/child-process/zipball/e71eb1aa55f057c7a4a0d08d06b0b0a484bead43", + "reference": "e71eb1aa55f057c7a4a0d08d06b0b0a484bead43", "shasum": "" }, "require": { - "php": ">=7.3" + "evenement/evenement": "^3.0 || ^2.0 || ^1.0", + "php": ">=5.3.0", + "react/event-loop": "^1.2", + "react/stream": "^1.2" }, "require-dev": { - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.35", + "react/socket": "^1.8", + "sebastian/environment": "^5.0 || ^3.0 || ^2.0 || ^1.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "5.0-dev" - } - }, "autoload": { - "classmap": [ - "src/" - ] + "psr-4": { + "React\\ChildProcess\\": "src" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" + "name": "Christian Lück", + "email": "christian@clue.engineering", + "homepage": "https://clue.engineering/" + }, + { + "name": "Cees-Jan Kiewiet", + "email": "reactphp@ceesjankiewiet.nl", + "homepage": "https://wyrihaximus.net/" + }, + { + "name": "Jan Sorgalla", + "email": "jsorgalla@gmail.com", + "homepage": "https://sorgalla.com/" + }, + { + "name": "Chris Boden", + "email": "cboden@gmail.com", + "homepage": "https://cboden.dev/" } ], - "description": "Utility class for timing", - "homepage": "https://github.com/sebastianbergmann/php-timer/", + "description": "Event-driven library for executing child processes with ReactPHP.", "keywords": [ - "timer" + "event-driven", + "process", + "reactphp" ], "support": { - "issues": "https://github.com/sebastianbergmann/php-timer/issues", - "source": "https://github.com/sebastianbergmann/php-timer/tree/5.0.3" + "issues": "https://github.com/reactphp/child-process/issues", + "source": "https://github.com/reactphp/child-process/tree/v0.6.5" }, "funding": [ { - "url": "https://github.com/sebastianbergmann", + "url": "https://github.com/WyriHaximus", + "type": "github" + }, + { + "url": "https://github.com/clue", "type": "github" } ], - "time": "2020-10-26T13:16:10+00:00" + "time": "2022-09-16T13:41:56+00:00" }, { - "name": "phpunit/phpunit", - "version": "9.6.21", + "name": "react/dns", + "version": "v1.13.0", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "de6abf3b6f8dd955fac3caad3af7a9504e8c2ffa" + "url": "https://github.com/reactphp/dns.git", + "reference": "eb8ae001b5a455665c89c1df97f6fb682f8fb0f5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/de6abf3b6f8dd955fac3caad3af7a9504e8c2ffa", - "reference": "de6abf3b6f8dd955fac3caad3af7a9504e8c2ffa", + "url": "https://api.github.com/repos/reactphp/dns/zipball/eb8ae001b5a455665c89c1df97f6fb682f8fb0f5", + "reference": "eb8ae001b5a455665c89c1df97f6fb682f8fb0f5", "shasum": "" }, "require": { - "doctrine/instantiator": "^1.5.0 || ^2", - "ext-dom": "*", - "ext-json": "*", - "ext-libxml": "*", - "ext-mbstring": "*", - "ext-xml": "*", - "ext-xmlwriter": "*", - "myclabs/deep-copy": "^1.12.0", - "phar-io/manifest": "^2.0.4", - "phar-io/version": "^3.2.1", - "php": ">=7.3", - "phpunit/php-code-coverage": "^9.2.32", - "phpunit/php-file-iterator": "^3.0.6", - "phpunit/php-invoker": "^3.1.1", - "phpunit/php-text-template": "^2.0.4", - "phpunit/php-timer": "^5.0.3", - "sebastian/cli-parser": "^1.0.2", - "sebastian/code-unit": "^1.0.8", - "sebastian/comparator": "^4.0.8", - "sebastian/diff": "^4.0.6", - "sebastian/environment": "^5.1.5", - "sebastian/exporter": "^4.0.6", - "sebastian/global-state": "^5.0.7", - "sebastian/object-enumerator": "^4.0.4", - "sebastian/resource-operations": "^3.0.4", - "sebastian/type": "^3.2.1", - "sebastian/version": "^3.0.2" + "php": ">=5.3.0", + "react/cache": "^1.0 || ^0.6 || ^0.5", + "react/event-loop": "^1.2", + "react/promise": "^3.2 || ^2.7 || ^1.2.1" }, - "suggest": { - "ext-soap": "To be able to generate mocks based on WSDL files", - "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage" + "require-dev": { + "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36", + "react/async": "^4.3 || ^3 || ^2", + "react/promise-timer": "^1.11" }, - "bin": [ - "phpunit" - ], "type": "library", - "extra": { - "branch-alias": { - "dev-master": "9.6-dev" - } - }, "autoload": { - "files": [ - "src/Framework/Assert/Functions.php" - ], - "classmap": [ - "src/" - ] + "psr-4": { + "React\\Dns\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" + "name": "Christian Lück", + "email": "christian@clue.engineering", + "homepage": "https://clue.engineering/" + }, + { + "name": "Cees-Jan Kiewiet", + "email": "reactphp@ceesjankiewiet.nl", + "homepage": "https://wyrihaximus.net/" + }, + { + "name": "Jan Sorgalla", + "email": "jsorgalla@gmail.com", + "homepage": "https://sorgalla.com/" + }, + { + "name": "Chris Boden", + "email": "cboden@gmail.com", + "homepage": "https://cboden.dev/" } ], - "description": "The PHP Unit Testing framework.", - "homepage": "https://phpunit.de/", + "description": "Async DNS resolver for ReactPHP", "keywords": [ - "phpunit", - "testing", - "xunit" + "async", + "dns", + "dns-resolver", + "reactphp" ], "support": { - "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.21" + "issues": "https://github.com/reactphp/dns/issues", + "source": "https://github.com/reactphp/dns/tree/v1.13.0" }, "funding": [ { - "url": "https://phpunit.de/sponsors.html", - "type": "custom" - }, - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit", - "type": "tidelift" + "url": "https://opencollective.com/reactphp", + "type": "open_collective" } ], - "time": "2024-09-19T10:50:18+00:00" + "time": "2024-06-13T14:18:03+00:00" }, { - "name": "psr/cache", - "version": "1.0.1", + "name": "react/event-loop", + "version": "v1.5.0", "source": { "type": "git", - "url": "https://github.com/php-fig/cache.git", - "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8" + "url": "https://github.com/reactphp/event-loop.git", + "reference": "bbe0bd8c51ffc05ee43f1729087ed3bdf7d53354" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/cache/zipball/d11b50ad223250cf17b86e38383413f5a6764bf8", - "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8", + "url": "https://api.github.com/repos/reactphp/event-loop/zipball/bbe0bd8c51ffc05ee43f1729087ed3bdf7d53354", + "reference": "bbe0bd8c51ffc05ee43f1729087ed3bdf7d53354", "shasum": "" }, "require": { "php": ">=5.3.0" }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } + "require-dev": { + "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36" }, + "suggest": { + "ext-pcntl": "For signal handling support when using the StreamSelectLoop" + }, + "type": "library", "autoload": { "psr-4": { - "Psr\\Cache\\": "src/" + "React\\EventLoop\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -2658,47 +3018,71 @@ ], "authors": [ { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "name": "Christian Lück", + "email": "christian@clue.engineering", + "homepage": "https://clue.engineering/" + }, + { + "name": "Cees-Jan Kiewiet", + "email": "reactphp@ceesjankiewiet.nl", + "homepage": "https://wyrihaximus.net/" + }, + { + "name": "Jan Sorgalla", + "email": "jsorgalla@gmail.com", + "homepage": "https://sorgalla.com/" + }, + { + "name": "Chris Boden", + "email": "cboden@gmail.com", + "homepage": "https://cboden.dev/" } ], - "description": "Common interface for caching libraries", + "description": "ReactPHP's core reactor event loop that libraries can use for evented I/O.", "keywords": [ - "cache", - "psr", - "psr-6" + "asynchronous", + "event-loop" ], "support": { - "source": "https://github.com/php-fig/cache/tree/master" + "issues": "https://github.com/reactphp/event-loop/issues", + "source": "https://github.com/reactphp/event-loop/tree/v1.5.0" }, - "time": "2016-08-06T20:24:11+00:00" + "funding": [ + { + "url": "https://opencollective.com/reactphp", + "type": "open_collective" + } + ], + "time": "2023-11-13T13:48:05+00:00" }, { - "name": "psr/container", - "version": "2.0.2", + "name": "react/promise", + "version": "v3.2.0", "source": { "type": "git", - "url": "https://github.com/php-fig/container.git", - "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963" + "url": "https://github.com/reactphp/promise.git", + "reference": "8a164643313c71354582dc850b42b33fa12a4b63" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963", - "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963", + "url": "https://api.github.com/repos/reactphp/promise/zipball/8a164643313c71354582dc850b42b33fa12a4b63", + "reference": "8a164643313c71354582dc850b42b33fa12a4b63", "shasum": "" }, "require": { - "php": ">=7.4.0" + "php": ">=7.1.0" }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0.x-dev" - } + "require-dev": { + "phpstan/phpstan": "1.10.39 || 1.4.10", + "phpunit/phpunit": "^9.6 || ^7.5" }, + "type": "library", "autoload": { + "files": [ + "src/functions_include.php" + ], "psr-4": { - "Psr\\Container\\": "src/" + "React\\Promise\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -2707,51 +3091,75 @@ ], "authors": [ { - "name": "PHP-FIG", - "homepage": "https://www.php-fig.org/" + "name": "Jan Sorgalla", + "email": "jsorgalla@gmail.com", + "homepage": "https://sorgalla.com/" + }, + { + "name": "Christian Lück", + "email": "christian@clue.engineering", + "homepage": "https://clue.engineering/" + }, + { + "name": "Cees-Jan Kiewiet", + "email": "reactphp@ceesjankiewiet.nl", + "homepage": "https://wyrihaximus.net/" + }, + { + "name": "Chris Boden", + "email": "cboden@gmail.com", + "homepage": "https://cboden.dev/" } ], - "description": "Common Container Interface (PHP FIG PSR-11)", - "homepage": "https://github.com/php-fig/container", + "description": "A lightweight implementation of CommonJS Promises/A for PHP", "keywords": [ - "PSR-11", - "container", - "container-interface", - "container-interop", - "psr" + "promise", + "promises" ], "support": { - "issues": "https://github.com/php-fig/container/issues", - "source": "https://github.com/php-fig/container/tree/2.0.2" + "issues": "https://github.com/reactphp/promise/issues", + "source": "https://github.com/reactphp/promise/tree/v3.2.0" }, - "time": "2021-11-05T16:47:00+00:00" + "funding": [ + { + "url": "https://opencollective.com/reactphp", + "type": "open_collective" + } + ], + "time": "2024-05-24T10:39:05+00:00" }, { - "name": "psr/event-dispatcher", - "version": "1.0.0", + "name": "react/socket", + "version": "v1.16.0", "source": { "type": "git", - "url": "https://github.com/php-fig/event-dispatcher.git", - "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0" + "url": "https://github.com/reactphp/socket.git", + "reference": "23e4ff33ea3e160d2d1f59a0e6050e4b0fb0eac1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/event-dispatcher/zipball/dbefd12671e8a14ec7f180cab83036ed26714bb0", - "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0", + "url": "https://api.github.com/repos/reactphp/socket/zipball/23e4ff33ea3e160d2d1f59a0e6050e4b0fb0eac1", + "reference": "23e4ff33ea3e160d2d1f59a0e6050e4b0fb0eac1", "shasum": "" }, "require": { - "php": ">=7.2.0" + "evenement/evenement": "^3.0 || ^2.0 || ^1.0", + "php": ">=5.3.0", + "react/dns": "^1.13", + "react/event-loop": "^1.2", + "react/promise": "^3.2 || ^2.6 || ^1.2.1", + "react/stream": "^1.4" }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } + "require-dev": { + "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36", + "react/async": "^4.3 || ^3.3 || ^2", + "react/promise-stream": "^1.4", + "react/promise-timer": "^1.11" }, + "type": "library", "autoload": { "psr-4": { - "Psr\\EventDispatcher\\": "src/" + "React\\Socket\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -2760,48 +3168,73 @@ ], "authors": [ { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "name": "Christian Lück", + "email": "christian@clue.engineering", + "homepage": "https://clue.engineering/" + }, + { + "name": "Cees-Jan Kiewiet", + "email": "reactphp@ceesjankiewiet.nl", + "homepage": "https://wyrihaximus.net/" + }, + { + "name": "Jan Sorgalla", + "email": "jsorgalla@gmail.com", + "homepage": "https://sorgalla.com/" + }, + { + "name": "Chris Boden", + "email": "cboden@gmail.com", + "homepage": "https://cboden.dev/" } ], - "description": "Standard interfaces for event handling.", + "description": "Async, streaming plaintext TCP/IP and secure TLS socket server and client connections for ReactPHP", "keywords": [ - "events", - "psr", - "psr-14" + "Connection", + "Socket", + "async", + "reactphp", + "stream" ], "support": { - "issues": "https://github.com/php-fig/event-dispatcher/issues", - "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0" + "issues": "https://github.com/reactphp/socket/issues", + "source": "https://github.com/reactphp/socket/tree/v1.16.0" }, - "time": "2019-01-08T18:20:26+00:00" + "funding": [ + { + "url": "https://opencollective.com/reactphp", + "type": "open_collective" + } + ], + "time": "2024-07-26T10:38:09+00:00" }, { - "name": "psr/log", - "version": "1.1.4", + "name": "react/stream", + "version": "v1.4.0", "source": { "type": "git", - "url": "https://github.com/php-fig/log.git", - "reference": "d49695b909c3b7628b6289db5479a1c204601f11" + "url": "https://github.com/reactphp/stream.git", + "reference": "1e5b0acb8fe55143b5b426817155190eb6f5b18d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11", - "reference": "d49695b909c3b7628b6289db5479a1c204601f11", + "url": "https://api.github.com/repos/reactphp/stream/zipball/1e5b0acb8fe55143b5b426817155190eb6f5b18d", + "reference": "1e5b0acb8fe55143b5b426817155190eb6f5b18d", "shasum": "" }, "require": { - "php": ">=5.3.0" + "evenement/evenement": "^3.0 || ^2.0 || ^1.0", + "php": ">=5.3.8", + "react/event-loop": "^1.2" }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.1.x-dev" - } + "require-dev": { + "clue/stream-filter": "~1.2", + "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36" }, + "type": "library", "autoload": { "psr-4": { - "Psr\\Log\\": "Psr/Log/" + "React\\Stream\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -2810,21 +3243,48 @@ ], "authors": [ { - "name": "PHP-FIG", - "homepage": "https://www.php-fig.org/" + "name": "Christian Lück", + "email": "christian@clue.engineering", + "homepage": "https://clue.engineering/" + }, + { + "name": "Cees-Jan Kiewiet", + "email": "reactphp@ceesjankiewiet.nl", + "homepage": "https://wyrihaximus.net/" + }, + { + "name": "Jan Sorgalla", + "email": "jsorgalla@gmail.com", + "homepage": "https://sorgalla.com/" + }, + { + "name": "Chris Boden", + "email": "cboden@gmail.com", + "homepage": "https://cboden.dev/" } ], - "description": "Common interface for logging libraries", - "homepage": "https://github.com/php-fig/log", + "description": "Event-driven readable and writable streams for non-blocking I/O in ReactPHP", "keywords": [ - "log", - "psr", - "psr-3" + "event-driven", + "io", + "non-blocking", + "pipe", + "reactphp", + "readable", + "stream", + "writable" ], "support": { - "source": "https://github.com/php-fig/log/tree/1.1.4" + "issues": "https://github.com/reactphp/stream/issues", + "source": "https://github.com/reactphp/stream/tree/v1.4.0" }, - "time": "2021-05-03T11:20:27+00:00" + "funding": [ + { + "url": "https://opencollective.com/reactphp", + "type": "open_collective" + } + ], + "time": "2024-06-11T12:45:25+00:00" }, { "name": "sebastian/cli-parser", @@ -3791,16 +4251,16 @@ }, { "name": "symfony/console", - "version": "v5.4.44", + "version": "v5.4.47", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "5b5a0aa66e3296e303e22490f90f521551835a83" + "reference": "c4ba980ca61a9eb18ee6bcc73f28e475852bb1ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/5b5a0aa66e3296e303e22490f90f521551835a83", - "reference": "5b5a0aa66e3296e303e22490f90f521551835a83", + "url": "https://api.github.com/repos/symfony/console/zipball/c4ba980ca61a9eb18ee6bcc73f28e475852bb1ed", + "reference": "c4ba980ca61a9eb18ee6bcc73f28e475852bb1ed", "shasum": "" }, "require": { @@ -3870,7 +4330,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.4.44" + "source": "https://github.com/symfony/console/tree/v5.4.47" }, "funding": [ { @@ -3886,7 +4346,7 @@ "type": "tidelift" } ], - "time": "2024-09-20T07:56:40+00:00" + "time": "2024-11-06T11:30:55+00:00" }, { "name": "symfony/deprecation-contracts", @@ -3957,16 +4417,16 @@ }, { "name": "symfony/event-dispatcher", - "version": "v5.4.40", + "version": "v5.4.45", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "a54e2a8a114065f31020d6a89ede83e34c3b27a4" + "reference": "72982eb416f61003e9bb6e91f8b3213600dcf9e9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/a54e2a8a114065f31020d6a89ede83e34c3b27a4", - "reference": "a54e2a8a114065f31020d6a89ede83e34c3b27a4", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/72982eb416f61003e9bb6e91f8b3213600dcf9e9", + "reference": "72982eb416f61003e9bb6e91f8b3213600dcf9e9", "shasum": "" }, "require": { @@ -4022,7 +4482,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.40" + "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.45" }, "funding": [ { @@ -4038,7 +4498,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:33:22+00:00" + "time": "2024-09-25T14:11:13+00:00" }, { "name": "symfony/event-dispatcher-contracts", @@ -4121,16 +4581,16 @@ }, { "name": "symfony/filesystem", - "version": "v5.4.44", + "version": "v5.4.45", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "76c3818964e9d32be3862c9318ae3ba9aa280ddc" + "reference": "57c8294ed37d4a055b77057827c67f9558c95c54" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/76c3818964e9d32be3862c9318ae3ba9aa280ddc", - "reference": "76c3818964e9d32be3862c9318ae3ba9aa280ddc", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/57c8294ed37d4a055b77057827c67f9558c95c54", + "reference": "57c8294ed37d4a055b77057827c67f9558c95c54", "shasum": "" }, "require": { @@ -4168,7 +4628,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v5.4.44" + "source": "https://github.com/symfony/filesystem/tree/v5.4.45" }, "funding": [ { @@ -4184,20 +4644,20 @@ "type": "tidelift" } ], - "time": "2024-09-16T14:52:48+00:00" + "time": "2024-10-22T13:05:35+00:00" }, { "name": "symfony/finder", - "version": "v5.4.43", + "version": "v5.4.45", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "ae25a9145a900764158d439653d5630191155ca0" + "reference": "63741784cd7b9967975eec610b256eed3ede022b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/ae25a9145a900764158d439653d5630191155ca0", - "reference": "ae25a9145a900764158d439653d5630191155ca0", + "url": "https://api.github.com/repos/symfony/finder/zipball/63741784cd7b9967975eec610b256eed3ede022b", + "reference": "63741784cd7b9967975eec610b256eed3ede022b", "shasum": "" }, "require": { @@ -4231,7 +4691,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v5.4.43" + "source": "https://github.com/symfony/finder/tree/v5.4.45" }, "funding": [ { @@ -4247,20 +4707,20 @@ "type": "tidelift" } ], - "time": "2024-08-13T14:03:51+00:00" + "time": "2024-09-28T13:32:08+00:00" }, { "name": "symfony/options-resolver", - "version": "v5.4.40", + "version": "v5.4.45", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", - "reference": "bd1afbde6613a8d6b956115e0e14b196191fd0c4" + "reference": "74e5b6f0db3e8589e6cfd5efb317a1fc2bb52fb6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/bd1afbde6613a8d6b956115e0e14b196191fd0c4", - "reference": "bd1afbde6613a8d6b956115e0e14b196191fd0c4", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/74e5b6f0db3e8589e6cfd5efb317a1fc2bb52fb6", + "reference": "74e5b6f0db3e8589e6cfd5efb317a1fc2bb52fb6", "shasum": "" }, "require": { @@ -4300,7 +4760,7 @@ "options" ], "support": { - "source": "https://github.com/symfony/options-resolver/tree/v5.4.40" + "source": "https://github.com/symfony/options-resolver/tree/v5.4.45" }, "funding": [ { @@ -4316,7 +4776,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:33:22+00:00" + "time": "2024-09-25T14:11:13+00:00" }, { "name": "symfony/polyfill-ctype", @@ -4790,16 +5250,16 @@ }, { "name": "symfony/process", - "version": "v5.4.44", + "version": "v5.4.47", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "1b9fa82b5c62cd49da8c9e3952dd8531ada65096" + "reference": "5d1662fb32ebc94f17ddb8d635454a776066733d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/1b9fa82b5c62cd49da8c9e3952dd8531ada65096", - "reference": "1b9fa82b5c62cd49da8c9e3952dd8531ada65096", + "url": "https://api.github.com/repos/symfony/process/zipball/5d1662fb32ebc94f17ddb8d635454a776066733d", + "reference": "5d1662fb32ebc94f17ddb8d635454a776066733d", "shasum": "" }, "require": { @@ -4832,7 +5292,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v5.4.44" + "source": "https://github.com/symfony/process/tree/v5.4.47" }, "funding": [ { @@ -4848,7 +5308,7 @@ "type": "tidelift" } ], - "time": "2024-09-17T12:46:43+00:00" + "time": "2024-11-06T11:36:42+00:00" }, { "name": "symfony/service-contracts", @@ -4913,16 +5373,16 @@ }, { "name": "symfony/stopwatch", - "version": "v5.4.40", + "version": "v5.4.45", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", - "reference": "0e9daf3b7c805c747638b2cc48f1649e594f9625" + "reference": "fb2c199cf302eb207f8c23e7ee174c1c31a5c004" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/0e9daf3b7c805c747638b2cc48f1649e594f9625", - "reference": "0e9daf3b7c805c747638b2cc48f1649e594f9625", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/fb2c199cf302eb207f8c23e7ee174c1c31a5c004", + "reference": "fb2c199cf302eb207f8c23e7ee174c1c31a5c004", "shasum": "" }, "require": { @@ -4955,7 +5415,7 @@ "description": "Provides a way to profile code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/stopwatch/tree/v5.4.40" + "source": "https://github.com/symfony/stopwatch/tree/v5.4.45" }, "funding": [ { @@ -4971,20 +5431,20 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:33:22+00:00" + "time": "2024-09-25T14:11:13+00:00" }, { "name": "symfony/string", - "version": "v5.4.44", + "version": "v5.4.47", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "832caa16b6d9aac6bf11747315225f5aba384c24" + "reference": "136ca7d72f72b599f2631aca474a4f8e26719799" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/832caa16b6d9aac6bf11747315225f5aba384c24", - "reference": "832caa16b6d9aac6bf11747315225f5aba384c24", + "url": "https://api.github.com/repos/symfony/string/zipball/136ca7d72f72b599f2631aca474a4f8e26719799", + "reference": "136ca7d72f72b599f2631aca474a4f8e26719799", "shasum": "" }, "require": { @@ -5041,7 +5501,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v5.4.44" + "source": "https://github.com/symfony/string/tree/v5.4.47" }, "funding": [ { @@ -5057,7 +5517,7 @@ "type": "tidelift" } ], - "time": "2024-09-20T07:56:40+00:00" + "time": "2024-11-10T20:33:58+00:00" }, { "name": "symfony/yaml", diff --git a/data/Smarty/templates/admin/order/disp.tpl b/data/Smarty/templates/admin/order/disp.tpl index 4162d7d207..92bd3a45e5 100644 --- a/data/Smarty/templates/admin/order/disp.tpl +++ b/data/Smarty/templates/admin/order/disp.tpl @@ -184,7 +184,7 @@ 円
(税率%) - 円 + 円 diff --git a/data/Smarty/templates/admin/order/edit.tpl b/data/Smarty/templates/admin/order/edit.tpl index b1581c624e..a2c6a3eb65 100644 --- a/data/Smarty/templates/admin/order/edit.tpl +++ b/data/Smarty/templates/admin/order/edit.tpl @@ -434,7 +434,7 @@ 税率% - 円 + 円 diff --git a/data/Smarty/templates/default/mypage/history.tpl b/data/Smarty/templates/default/mypage/history.tpl index bef160fed3..68ae84fcee 100644 --- a/data/Smarty/templates/default/mypage/history.tpl +++ b/data/Smarty/templates/default/mypage/history.tpl @@ -101,7 +101,7 @@ - 円 + 円 diff --git a/data/Smarty/templates/mobile/mypage/history.tpl b/data/Smarty/templates/mobile/mypage/history.tpl index 1b309857af..dac2c285f3 100644 --- a/data/Smarty/templates/mobile/mypage/history.tpl +++ b/data/Smarty/templates/mobile/mypage/history.tpl @@ -65,7 +65,7 @@ 円
数量：
- 小計：円
+ 小計：円
小計：円
diff --git a/data/Smarty/templates/sphone/mypage/history.tpl b/data/Smarty/templates/sphone/mypage/history.tpl index 05a7c494de..2a276870e7 100644 --- a/data/Smarty/templates/sphone/mypage/history.tpl +++ b/data/Smarty/templates/sphone/mypage/history.tpl @@ -125,7 +125,7 @@ diff --git a/data/class/api/SC_Api_Operation.php b/data/class/api/SC_Api_Operation.php index 8053fac26b..ceef24d0e8 100644 --- a/data/class/api/SC_Api_Operation.php +++ b/data/class/api/SC_Api_Operation.php @@ -415,11 +415,17 @@ public static function doApiAction($arrPost) protected static function getOperationRequestEcho($arrParam, $start_time) { $arrRet = [ - 'HTTPHeaders' => ['Header' => ['_attributes' => ['Name' => 'UserAgent', - 'Value' => htmlspecialchars($_SERVER['HTTP_USER_AGENT']), ]]], - 'RequestId' => $start_time, - 'Arguments' => [], - ]; + 'HTTPHeaders' => [ + 'Header' => [ + '_attributes' => [ + 'Name' => 'UserAgent', + 'Value' => htmlspecialchars($_SERVER['HTTP_USER_AGENT']), + ], + ], + ], + 'RequestId' => $start_time, + 'Arguments' => [], + ]; foreach ($arrParam as $key => $val) { $arrRet['Arguments'][] = ['_attributes' => ['Name' => htmlentities($key, ENT_NOQUOTES, 'UTF-8'), 'Value' => htmlentities($val, ENT_NOQUOTES, 'UTF-8')]]; } diff --git a/data/class/api/SC_Api_Utils.php b/data/class/api/SC_Api_Utils.php index 6767a779ae..6d9a977353 100644 --- a/data/class/api/SC_Api_Utils.php +++ b/data/class/api/SC_Api_Utils.php @@ -234,8 +234,10 @@ public static function sendResponseXml($response_outer_name, &$arrResponse) 'addDecl' => true, 'encoding' => 'UTF-8', 'rootName' => $response_outer_name, - 'rootAttributes' => ['xmlns' => self::API_XMLNS.ECCUBE_VERSION, - 'xml:lang' => self::API_XML_LANG, ], + 'rootAttributes' => [ + 'xmlns' => self::API_XMLNS.ECCUBE_VERSION, + 'xml:lang' => self::API_XML_LANG, + ], 'defaultTagName' => 'Response', 'attributesArray' => '_attributes', ]; diff --git a/data/class/api/operations/CartAdd.php b/data/class/api/operations/CartAdd.php index 1703c8e64c..00ec189bbf 100644 --- a/data/class/api/operations/CartAdd.php +++ b/data/class/api/operations/CartAdd.php @@ -40,7 +40,8 @@ class API_CartAdd extends SC_Api_Abstract_Ex public function doAction($arrParam) { $this->arrResponse = [ - 'Version' => ECCUBE_VERSION, ]; + 'Version' => ECCUBE_VERSION, + ]; return true; } diff --git a/data/class/api/operations/CartClear.php b/data/class/api/operations/CartClear.php index fb1c0df218..4f0e695497 100644 --- a/data/class/api/operations/CartClear.php +++ b/data/class/api/operations/CartClear.php @@ -40,7 +40,8 @@ class API_CartClear extends SC_Api_Abstract_Ex public function doAction($arrParam) { $this->arrResponse = [ - 'Version' => ECCUBE_VERSION, ]; + 'Version' => ECCUBE_VERSION, + ]; return true; } diff --git a/data/class/api/operations/CartCreate.php b/data/class/api/operations/CartCreate.php index 3d8c1d9b7f..69002d9288 100644 --- a/data/class/api/operations/CartCreate.php +++ b/data/class/api/operations/CartCreate.php @@ -40,7 +40,8 @@ class API_CartCreate extends SC_Api_Abstract_Ex public function doAction($arrParam) { $this->arrResponse = [ - 'Version' => ECCUBE_VERSION, ]; + 'Version' => ECCUBE_VERSION, + ]; return true; } diff --git a/data/class/api/operations/CartGet.php b/data/class/api/operations/CartGet.php index a9c966d6a4..09e8a4bde4 100644 --- a/data/class/api/operations/CartGet.php +++ b/data/class/api/operations/CartGet.php @@ -40,7 +40,8 @@ class API_CartGet extends SC_Api_Abstract_Ex public function doAction($arrParam) { $this->arrResponse = [ - 'Version' => ECCUBE_VERSION, ]; + 'Version' => ECCUBE_VERSION, + ]; return true; } diff --git a/data/class/api/operations/CartModify.php b/data/class/api/operations/CartModify.php index 285a697b43..60c8700993 100644 --- a/data/class/api/operations/CartModify.php +++ b/data/class/api/operations/CartModify.php @@ -40,7 +40,8 @@ class API_CartModify extends SC_Api_Abstract_Ex public function doAction($arrParam) { $this->arrResponse = [ - 'Version' => ECCUBE_VERSION, ]; + 'Version' => ECCUBE_VERSION, + ]; return true; } diff --git a/data/class/api/operations/GetVersion.php b/data/class/api/operations/GetVersion.php index b25656ab52..e52d6ecfcb 100644 --- a/data/class/api/operations/GetVersion.php +++ b/data/class/api/operations/GetVersion.php @@ -40,7 +40,8 @@ class API_GetVersion extends SC_Api_Abstract_Ex public function doAction($arrParam) { $this->arrResponse = [ - 'Version' => ECCUBE_VERSION, ]; + 'Version' => ECCUBE_VERSION, + ]; return true; } diff --git a/data/class/db/SC_DB_MasterData.php b/data/class/db/SC_DB_MasterData.php index 5b232f9db6..d80f5eada1 100644 --- a/data/class/db/SC_DB_MasterData.php +++ b/data/class/db/SC_DB_MasterData.php @@ -108,9 +108,11 @@ public function registMasterData($name, $columns, $masterData, $autoCommit = tru } $i = 0; foreach ($masterData as $key => $val) { - $sqlVal = [$columns[0] => (string) $key, - $columns[1] => (string) $val, - $columns[2] => (string) $i, ]; + $sqlVal = [ + $columns[0] => (string) $key, + $columns[1] => (string) $val, + $columns[2] => (string) $i, + ]; $this->objQuery->insert($name, $sqlVal); $i++; } diff --git a/data/class/helper/SC_Helper_DB.php b/data/class/helper/SC_Helper_DB.php index 0f2d855b39..469ade5d0f 100644 --- a/data/class/helper/SC_Helper_DB.php +++ b/data/class/helper/SC_Helper_DB.php @@ -683,8 +683,10 @@ public function addProductBeforCategories($category_id, $product_id) { $objQuery = SC_Query_Ex::getSingletonInstance(); - $sqlval = ['category_id' => $category_id, - 'product_id' => $product_id, ]; + $sqlval = [ + 'category_id' => $category_id, + 'product_id' => $product_id, + ]; $arrSql = []; $arrSql['rank'] = '(SELECT COALESCE(MAX(rank), 0) FROM dtb_product_categories sub WHERE category_id = ?) + 1'; @@ -706,8 +708,10 @@ public function addProductBeforCategories($category_id, $product_id) */ public function addProductAfterCategories($category_id, $product_id) { - $sqlval = ['category_id' => $category_id, - 'product_id' => $product_id, ]; + $sqlval = [ + 'category_id' => $category_id, + 'product_id' => $product_id, + ]; $objQuery = SC_Query_Ex::getSingletonInstance(); diff --git a/data/class/helper/SC_Helper_TaxRule.php b/data/class/helper/SC_Helper_TaxRule.php index 8a9d42fe1c..ea4a1f6a46 100644 --- a/data/class/helper/SC_Helper_TaxRule.php +++ b/data/class/helper/SC_Helper_TaxRule.php @@ -243,10 +243,12 @@ public static function getTaxRule($product_id = 0, $product_class_id = 0, $pref_ $arrRet = []; // リクエストの配列化 - $arrRequest = ['product_id' => $product_id, - 'product_class_id' => $product_class_id, - 'pref_id' => $pref_id, - 'country_id' => $country_id, ]; + $arrRequest = [ + 'product_id' => $product_id, + 'product_class_id' => $product_class_id, + 'pref_id' => $pref_id, + 'country_id' => $country_id, + ]; // 地域設定を優先するが、システムパラメーターなどに設定を持っていくか // 後に書いてあるほど優先される、詳細後述MEMO参照 diff --git a/data/class/pages/admin/contents/LC_Page_Admin_Contents_FileManager.php b/data/class/pages/admin/contents/LC_Page_Admin_Contents_FileManager.php index 29349b03ea..69a8267ed1 100644 --- a/data/class/pages/admin/contents/LC_Page_Admin_Contents_FileManager.php +++ b/data/class/pages/admin/contents/LC_Page_Admin_Contents_FileManager.php @@ -129,6 +129,13 @@ public function action() $objFormParam->convParam(); $this->arrErr = $objFormParam->checkError(); $select_file = SC_Helper_FileManager_Ex::convertToAbsolutePath($objFormParam->getValue('select_file')); + if ($select_file === realpath(USER_REALDIR)) { + GC_Utils_Ex::gfPrintLog($select_file.' は削除できません.'); + $tpl_onload = "alert('user_dataは削除できません');"; + $this->setTplOnLoad($tpl_onload); + + break; + } $path_exists = SC_Utils::checkFileExistsWithInBasePath($select_file, USER_REALDIR); if (SC_Utils_Ex::isBlank($this->arrErr) && $path_exists) { SC_Helper_FileManager_Ex::deleteFile($select_file); diff --git a/data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php b/data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php index 52a8da9d96..b3598d1386 100644 --- a/data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php +++ b/data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php @@ -87,8 +87,11 @@ public function action() if ($objLayout->isEditablePage($this->device_type_id, $this->page_id)) { $objLayout->lfDelPageData($this->page_id, $this->device_type_id); - SC_Response_Ex::reload(['device_type_id' => $this->device_type_id, - 'msg' => 'on', ], true); + $arrQueryString = [ + 'device_type_id' => $this->device_type_id, + 'msg' => 'on', + ]; + SC_Response_Ex::reload($arrQueryString, true); SC_Response_Ex::actionExit(); } } diff --git a/data/class/pages/admin/design/LC_Page_Admin_Design_UpDown.php b/data/class/pages/admin/design/LC_Page_Admin_Design_UpDown.php index e02555a400..7c88611f55 100644 --- a/data/class/pages/admin/design/LC_Page_Admin_Design_UpDown.php +++ b/data/class/pages/admin/design/LC_Page_Admin_Design_UpDown.php @@ -148,10 +148,12 @@ public function lfCheckError(&$objFormParam, &$objUpFile) } // 登録不可の文字列チェック - $arrIgnoreCode = ['admin', - MOBILE_DEFAULT_TEMPLATE_NAME, - SMARTPHONE_DEFAULT_TEMPLATE_NAME, - DEFAULT_TEMPLATE_NAME, ]; + $arrIgnoreCode = [ + 'admin', + MOBILE_DEFAULT_TEMPLATE_NAME, + SMARTPHONE_DEFAULT_TEMPLATE_NAME, + DEFAULT_TEMPLATE_NAME, + ]; if (in_array($template_code, $arrIgnoreCode)) { $arrErr['template_code'] = '※ このテンプレートコードは使用できません。
'; } diff --git a/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php b/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php index e9183973c2..326f542baf 100644 --- a/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php +++ b/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php @@ -501,14 +501,16 @@ public function lfInitMultipleParam(&$objFormParam) */ public function setMultipleItemTo(&$objFormParam) { - $arrMultipleKey = ['multiple_shipping_id', - 'multiple_product_class_id', - 'multiple_product_name', - 'multiple_product_code', - 'multiple_classcategory_name1', - 'multiple_classcategory_name2', - 'multiple_price', - 'multiple_quantity', ]; + $arrMultipleKey = [ + 'multiple_shipping_id', + 'multiple_product_class_id', + 'multiple_product_name', + 'multiple_product_code', + 'multiple_classcategory_name1', + 'multiple_classcategory_name2', + 'multiple_price', + 'multiple_quantity', + ]; $arrMultipleParams = $objFormParam->getSwapArray($arrMultipleKey); /* @@ -682,9 +684,11 @@ public function lfCheckError(&$objFormParam) foreach ($arrValues['shipping_date_year'] as $key_index => $year) { $month = $arrValues['shipping_date_month'][$key_index]; $day = $arrValues['shipping_date_day'][$key_index]; - $objError = new SC_CheckError_Ex(['shipping_date_year' => $year, + $objError = new SC_CheckError_Ex([ + 'shipping_date_year' => $year, 'shipping_date_month' => $month, - 'shipping_date_day' => $day, ]); + 'shipping_date_day' => $day, + ]); $objError->doFunc(['お届け日', 'shipping_date_year', 'shipping_date_month', 'shipping_date_day'], ['CHECK_DATE']); $arrErrDate['shipping_date_year'][$key_index] = $objError->arrErr['shipping_date_year']; } @@ -694,9 +698,11 @@ public function lfCheckError(&$objFormParam) $year = $arrValues['order_birth_year']; $month = $arrValues['order_birth_month']; $day = $arrValues['order_birth_day']; - $objError = new SC_CheckError_Ex(['order_birth_year' => $year, - 'order_birth_month' => $month, - 'order_birth_day' => $day, ]); + $objError = new SC_CheckError_Ex([ + 'order_birth_year' => $year, + 'order_birth_month' => $month, + 'order_birth_day' => $day, + ]); $objError->doFunc(['生年月日', 'order_birth_year', 'order_birth_month', 'order_birth_day'], ['CHECK_BIRTHDAY']); $arrErrTemp['order_birth_year'] = $objError->arrErr['order_birth_year']; diff --git a/data/class/pages/admin/products/LC_Page_Admin_Products_Product.php b/data/class/pages/admin/products/LC_Page_Admin_Products_Product.php index afb5adb38a..9c02c75fbb 100644 --- a/data/class/pages/admin/products/LC_Page_Admin_Products_Product.php +++ b/data/class/pages/admin/products/LC_Page_Admin_Products_Product.php @@ -1049,11 +1049,7 @@ public function lfRegistProduct(&$objUpFile, &$objDownFile, $arrList) $objDb = new SC_Helper_DB_Ex(); // 配列の添字を定義 - $checkArray = ['name', 'status', - 'main_list_comment', 'main_comment', - 'deliv_fee', 'comment1', 'comment2', 'comment3', - 'comment4', 'comment5', 'comment6', - 'sale_limit', 'deliv_date_id', 'maker_id', 'note', ]; + $checkArray = ['name', 'status', 'main_list_comment', 'main_comment', 'deliv_fee', 'comment1', 'comment2', 'comment3', 'comment4', 'comment5', 'comment6', 'sale_limit', 'deliv_date_id', 'maker_id', 'note']; $arrList = SC_Utils_Ex::arrayDefineIndexes($arrList, $checkArray); // INSERTする値を作成する。 diff --git a/data/class/pages/admin/system/LC_Page_Admin_System_Bkup.php b/data/class/pages/admin/system/LC_Page_Admin_System_Bkup.php index 9a3efde2ea..bf8229f3cb 100644 --- a/data/class/pages/admin/system/LC_Page_Admin_System_Bkup.php +++ b/data/class/pages/admin/system/LC_Page_Admin_System_Bkup.php @@ -213,7 +213,7 @@ public function action() $arrBkupList = $this->lfGetBkupData('ORDER BY create_date DESC'); // テンプレートファイルに渡すデータをセット $this->arrErr = isset($arrErr) ? $arrErr : []; - $this->arrForm = isset($arrForm) ? $arrForm : []; + $this->arrForm = $arrForm; $this->arrBkupList = $arrBkupList; } diff --git a/data/class/pages/products/LC_Page_Products_Detail.php b/data/class/pages/products/LC_Page_Products_Detail.php index 807e064ccf..ea3afe3d46 100644 --- a/data/class/pages/products/LC_Page_Products_Detail.php +++ b/data/class/pages/products/LC_Page_Products_Detail.php @@ -21,9 +21,6 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -if (file_exists(MODULE_REALDIR.'mdl_gmopg/inc/function.php')) { - require_once MODULE_REALDIR.'mdl_gmopg/inc/function.php'; -} /** * 商品詳細 のページクラス. * diff --git a/data/class/util/SC_Utils.php b/data/class/util/SC_Utils.php index c604e9c61c..c58cafc6d5 100755 --- a/data/class/util/SC_Utils.php +++ b/data/class/util/SC_Utils.php @@ -906,7 +906,11 @@ public static function getHash2Array($hash, $requires = []) return $array; } - /* かけ算をする（Smarty用) */ + /** + * かけ算をする（Smarty用) + * + * @deprecated 本体で使用されていないため非推奨 + */ public static function sfMultiply($num1, $num2) { return $num1 * $num2; diff --git a/data/eccube.js b/data/eccube.js index 0a5ab31f8d..26d88bfd95 100644 --- a/data/eccube.js +++ b/data/eccube.js @@ -1,46 +1,42 @@ -const $ = require( "jquery" ); - -global.$ = global.jQuery = $; -require( "jquery-migrate" ); +import $ from "jquery"; +import "jquery-migrate"; /* 警告を無効にする */ -$( () => { - $.migrateMute = true; -} ); -require( "jquery-colorbox" ); -require( "jquery-colorbox/example2/colorbox.css" ); -require( "jquery-easing" ); +$.migrateMute = true; -require( "slick-carousel" ); -require( "slick-carousel/slick/slick.css" ); -require( "slick-carousel/slick/slick-theme.css" ); +import "jquery-colorbox"; +import "jquery-colorbox/example2/colorbox.css"; +import "jquery-easing"; -/* -* This file is part of EC-CUBE -* -* Copyright(c) EC-CUBE CO.,LTD. All Rights Reserved. -* -* http://www.ec-cube.co.jp/ -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -*/ - -( function( window, undefined ) { +import "slick-carousel"; +import "slick-carousel/slick/slick.css"; +import "slick-carousel/slick/slick-theme.css"; +/* + * This file is part of EC-CUBE + * + * Copyright(c) EC-CUBE CO.,LTD. All Rights Reserved. + * + * http://www.ec-cube.co.jp/ + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +(function (window, undefined) { // 名前空間の重複を防ぐ - if ( window.eccube === undefined ) { + if (window.eccube === undefined) { window.eccube = {}; } @@ -56,41 +52,36 @@ require( "slick-carousel/slick/slick-theme.css" ); directories: "no", status: "no", focus: true, - formTarget: "" - } + formTarget: "", + }, }; - eccube.openWindow = function( URL, name, width, height, option ) { + eccube.openWindow = function (URL, name, width, height, option) { let features = `width=${width},height=${height}`; - if ( option === undefined ) { + if (option === undefined) { option = eccube.defaults.windowFeatures; } else { - option = $.extend( eccube.defaults.windowFeatures, option ); - } - features = `${features},scrollbars=${option.scrollbars - },resizable=${option.resizable - },toolbar=${option.toolbar - },location=${option.location - },directories=${option.directories - },status=${option.status}`; - if ( option.hasOwnProperty( "menubar" ) ) { + option = $.extend(eccube.defaults.windowFeatures, option); + } + features = `${features},scrollbars=${option.scrollbars},resizable=${option.resizable},toolbar=${option.toolbar},location=${option.location},directories=${option.directories},status=${option.status}`; + if (option.hasOwnProperty("menubar")) { features = `${features},menubar=${option.menubar}`; } - const WIN = window.open( URL, name, features ); - if ( option.formTarget !== "" ) { - document.forms[ option.formTarget ].target = name; + const WIN = window.open(URL, name, features); + if (option.formTarget !== "") { + document.forms[option.formTarget].target = name; } - if ( option.focus ) { + if (option.focus) { WIN.focus(); } }; // 親ウィンドウの存在確認. - eccube.isOpener = function() { + eccube.isOpener = function () { const ua = navigator.userAgent; - if ( window.opener ) { - if ( ua.indexOf( "MSIE 4" ) !== -1 && ua.indexOf( "Win" ) !== -1 ) { - if ( window.opener.hasOwnProperty( "closed" ) ) { + if (window.opener) { + if (ua.indexOf("MSIE 4") !== -1 && ua.indexOf("Win") !== -1) { + if (window.opener.hasOwnProperty("closed")) { return !window.opener.closed; } return false; @@ -101,66 +92,82 @@ require( "slick-carousel/slick/slick-theme.css" ); }; // 郵便番号入力呼び出し. - eccube.getAddress = function( php_url, tagname1, tagname2, input1, input2 ) { - const zip1 = document.form1[ tagname1 ].value; - const zip2 = document.form1[ tagname2 ].value; + eccube.getAddress = function (php_url, tagname1, tagname2, input1, input2) { + const zip1 = document.form1[tagname1].value; + const zip2 = document.form1[tagname2].value; - if ( zip1.length === 3 && zip2.length === 4 ) { + if (zip1.length === 3 && zip2.length === 4) { $.get( php_url, { - zip1, zip2, input1, input2 + zip1, + zip2, + input1, + input2, }, - ( data ) => { - const arrData = data.split( "|" ); - if ( arrData.length > 1 ) { - eccube.putAddress( input1, input2, arrData[ 0 ], arrData[ 1 ], arrData[ 2 ] ); + (data) => { + const arrData = data.split("|"); + if (arrData.length > 1) { + eccube.putAddress( + input1, + input2, + arrData[0], + arrData[1], + arrData[2] + ); } else { - window.alert( data ); + window.alert(data); } - }, + } ); } else { - window.alert( "郵便番号を正しく入力して下さい。" ); + window.alert("郵便番号を正しく入力して下さい。"); } }; // 郵便番号から検索した住所を渡す. - eccube.putAddress = function( input1, input2, state, city, town ) { - if ( state !== "" ) { - + eccube.putAddress = function (input1, input2, state, city, town) { + if (state !== "") { // 項目に値を入力する. - document.form1[ input1 ].selectedIndex = state; - document.form1[ input2 ].value = city + town; + document.form1[input1].selectedIndex = state; + document.form1[input2].value = city + town; } }; - eccube.setFocus = function( name ) { - if ( document.form1.hasOwnProperty( name ) ) { - document.form1[ name ].focus(); + eccube.setFocus = function (name) { + if (document.form1.hasOwnProperty(name)) { + document.form1[name].focus(); } }; // モードとキーを指定してSUBMITを行う。 - eccube.setModeAndSubmit = function( mode, keyname, keyid ) { - switch ( mode ) { + eccube.setModeAndSubmit = function (mode, keyname, keyid) { + switch (mode) { case "delete_category": - if ( !window.confirm( "選択したカテゴリとカテゴリ内の全てのカテゴリを削除します" ) ) { + if ( + !window.confirm( + "選択したカテゴリとカテゴリ内の全てのカテゴリを削除します" + ) + ) { return; } break; case "delete": - if ( !window.confirm( "一度削除したデータは、元に戻せません。\n削除しても宜しいですか？" ) ) { + if ( + !window.confirm( + "一度削除したデータは、元に戻せません。\n削除しても宜しいですか？" + ) + ) { return; } break; case "confirm": - if ( !window.confirm( "登録しても宜しいですか" ) ) { + if (!window.confirm("登録しても宜しいですか")) { return; } break; case "delete_all": - if ( !window.confirm( "検索結果を全て削除しても宜しいですか" ) ) { + if (!window.confirm("検索結果を全て削除しても宜しいですか")) { return; } break; @@ -168,32 +175,41 @@ require( "slick-carousel/slick/slick-theme.css" ); break; } document.form1.mode.value = mode; - if ( keyname !== undefined && keyname !== "" && keyid !== undefined && keyid !== "" ) { - document.form1[ keyname ].value = keyid; + if ( + keyname !== undefined && + keyname !== "" && + keyid !== undefined && + keyid !== "" + ) { + document.form1[keyname].value = keyid; } document.form1.submit(); }; - eccube.fnFormModeSubmit = function( form, mode, keyname, keyid ) { - switch ( mode ) { + eccube.fnFormModeSubmit = function (form, mode, keyname, keyid) { + switch (mode) { case "delete": - if ( !window.confirm( "一度削除したデータは、元に戻せません。\n削除しても宜しいですか？" ) ) { + if ( + !window.confirm( + "一度削除したデータは、元に戻せません。\n削除しても宜しいですか？" + ) + ) { return; } break; case "cartDelete": - if ( !window.confirm( "カゴから商品を削除しても宜しいでしょうか？" ) ) { + if (!window.confirm("カゴから商品を削除しても宜しいでしょうか？")) { return; } mode = "delete"; break; case "confirm": - if ( !window.confirm( "登録しても宜しいですか" ) ) { + if (!window.confirm("登録しても宜しいですか")) { return; } break; case "regist": - if ( !window.confirm( "登録しても宜しいですか" ) ) { + if (!window.confirm("登録しても宜しいですか")) { return; } break; @@ -201,88 +217,93 @@ require( "slick-carousel/slick/slick-theme.css" ); break; } const values = { mode }; - if ( keyname !== undefined && keyname !== "" && keyid !== undefined && keyid !== "" ) { - values[ keyname ] = keyid; - } - eccube.submitForm( values, form ); + if ( + keyname !== undefined && + keyname !== "" && + keyid !== undefined && + keyid !== "" + ) { + values[keyname] = keyid; + } + eccube.submitForm(values, form); }; - eccube.setValueAndSubmit = function( form, key, val, msg ) { + eccube.setValueAndSubmit = function (form, key, val, msg) { let ret; - if ( msg !== undefined ) { - ret = window.confirm( msg ); + if (msg !== undefined) { + ret = window.confirm(msg); } else { ret = true; } - if ( ret ) { + if (ret) { const values = {}; - values[ key ] = val; - eccube.submitForm( values, form ); + values[key] = val; + eccube.submitForm(values, form); } return false; }; - eccube.setValue = function( key, val, form ) { - const formElement = eccube.getFormElement( form ); - formElement.find( `*[name=${key}]` ).val( val ); + eccube.setValue = function (key, val, form) { + const formElement = eccube.getFormElement(form); + formElement.find(`*[name=${key}]`).val(val); }; - eccube.changeAction = function( url, form ) { - const formElement = eccube.getFormElement( form ); - formElement.attr( "action", url ); + eccube.changeAction = function (url, form) { + const formElement = eccube.getFormElement(form); + formElement.attr("action", url); }; // ページナビで使用する。 - eccube.movePage = function( pageno, mode, form ) { + eccube.movePage = function (pageno, mode, form) { const values = { pageno }; - if ( mode !== undefined ) { + if (mode !== undefined) { values.mode = mode; } - eccube.submitForm( values, form ); + eccube.submitForm(values, form); }; /** - * フォームを送信する. - * - * @param values - * @param form - */ - eccube.submitForm = function( values, form ) { - const formElement = eccube.getFormElement( form ); - if ( values !== undefined && typeof values === "object" ) { - $.each( values, ( index, value ) => { - eccube.setValue( index, value, formElement ); - } ); + * フォームを送信する. + * + * @param values + * @param form + */ + eccube.submitForm = function (values, form) { + const formElement = eccube.getFormElement(form); + if (values !== undefined && typeof values === "object") { + $.each(values, (index, value) => { + eccube.setValue(index, value, formElement); + }); } formElement.submit(); }; /** - * フォームを特定してエレメントを返す. - * - * @param form - * @returns {*} - */ - eccube.getFormElement = function( form ) { + * フォームを特定してエレメントを返す. + * + * @param form + * @returns {*} + */ + eccube.getFormElement = function (form) { let formElement; - if ( form !== undefined && typeof form === "string" && form !== "" ) { - formElement = $( `form#${form}` ); - } else if ( form !== undefined && typeof form === "object" ) { + if (form !== undefined && typeof form === "string" && form !== "") { + formElement = $(`form#${form}`); + } else if (form !== undefined && typeof form === "object") { formElement = form; } else { - formElement = $( `form#${eccube.defaults.formId}` ); + formElement = $(`form#${eccube.defaults.formId}`); } return formElement; }; // ポイント入力制限。 - eccube.togglePointForm = function() { - if ( document.form1.point_check ) { - const list = [ "use_point" ]; + eccube.togglePointForm = function () { + if (document.form1.point_check) { + const list = ["use_point"]; let color; let flag; - if ( !document.form1.point_check[ 0 ].checked ) { + if (!document.form1.point_check[0].checked) { color = "#dddddd"; flag = true; } else { @@ -291,25 +312,29 @@ require( "slick-carousel/slick/slick-theme.css" ); } const len = list.length; - for ( let i = 0; i < len; i++ ) { - if ( document.form1[ list[ i ] ] ) { - const current_color = document.form1[ list[ i ] ].style.backgroundColor; - if ( color !== "#dddddd" && ( current_color === "#ffe8e8" || current_color === "rgb(255, 232, 232)" ) ) { + for (let i = 0; i < len; i++) { + if (document.form1[list[i]]) { + const current_color = document.form1[list[i]].style.backgroundColor; + if ( + color !== "#dddddd" && + (current_color === "#ffe8e8" || + current_color === "rgb(255, 232, 232)") + ) { continue; } - document.form1[ list[ i ] ].disabled = flag; - document.form1[ list[ i ] ].style.backgroundColor = color; + document.form1[list[i]].disabled = flag; + document.form1[list[i]].style.backgroundColor = color; } } } }; // 別のお届け先入力制限。 - eccube.toggleDeliveryForm = function() { - if ( !document.form1 ) { + eccube.toggleDeliveryForm = function () { + if (!document.form1) { return; } - if ( document.form1.deliv_check ) { + if (document.form1.deliv_check) { const list = [ "shipping_name01", "shipping_name02", @@ -328,13 +353,13 @@ require( "slick-carousel/slick/slick-theme.css" ); "shipping_zipcode", "shipping_fax01", "shipping_fax02", - "shipping_fax03" + "shipping_fax03", ]; - if ( !document.form1.deliv_check.checked ) { - eccube.changeDisabled( list, "#dddddd" ); + if (!document.form1.deliv_check.checked) { + eccube.changeDisabled(list, "#dddddd"); } else { - eccube.changeDisabled( list, "" ); + eccube.changeDisabled(list, ""); } } }; @@ -342,67 +367,66 @@ require( "slick-carousel/slick/slick-theme.css" ); // 最初に設定されていた色を保存しておく。 eccube.savedColor = []; - eccube.changeDisabled = function( list, color ) { + eccube.changeDisabled = function (list, color) { const len = list.length; - for ( let i = 0; i < len; i++ ) { - if ( document.form1[ list[ i ] ] ) { - if ( color === "" ) { - + for (let i = 0; i < len; i++) { + if (document.form1[list[i]]) { + if (color === "") { // 有効にする。 - document.form1[ list[ i ] ].removeAttribute( "disabled" ); - document.form1[ list[ i ] ].style.backgroundColor = eccube.savedColor[ list[ i ] ]; + document.form1[list[i]].removeAttribute("disabled"); + document.form1[list[i]].style.backgroundColor = + eccube.savedColor[list[i]]; } else { - // 無効にする。 - document.form1[ list[ i ] ].setAttribute( "disabled", "disabled" ); - eccube.savedColor[ list[ i ] ] = document.form1[ list[ i ] ].style.backgroundColor; - document.form1[ list[ i ] ].style.backgroundColor = color;// "#f0f0f0"; + document.form1[list[i]].setAttribute("disabled", "disabled"); + eccube.savedColor[list[i]] = + document.form1[list[i]].style.backgroundColor; + document.form1[list[i]].style.backgroundColor = color; // "#f0f0f0"; } } } }; // ログイン時の入力チェック - eccube.checkLoginFormInputted = function( form, emailKey, passKey ) { - const formElement = $( `form#${form}` ); + eccube.checkLoginFormInputted = function (form, emailKey, passKey) { + const formElement = $(`form#${form}`); const checkItems = []; - if ( typeof emailKey === "undefined" ) { - checkItems[ 0 ] = "login_email"; + if (typeof emailKey === "undefined") { + checkItems[0] = "login_email"; } else { - checkItems[ 0 ] = emailKey; + checkItems[0] = emailKey; } - if ( typeof passKey === "undefined" ) { - checkItems[ 1 ] = "login_pass"; + if (typeof passKey === "undefined") { + checkItems[1] = "login_pass"; } else { - checkItems[ 1 ] = passKey; + checkItems[1] = passKey; } const max = checkItems.length; let errorFlag = false; // 必須項目のチェック - for ( let cnt = 0; cnt < max; cnt++ ) { - if ( formElement.find( `input[name=${checkItems[ cnt ]}]` ).val() === "" ) { + for (let cnt = 0; cnt < max; cnt++) { + if (formElement.find(`input[name=${checkItems[cnt]}]`).val() === "") { errorFlag = true; break; } } // 必須項目が入力されていない場合 - if ( errorFlag === true ) { - window.alert( "メールアドレス/パスワードを入力して下さい。" ); + if (errorFlag === true) { + window.alert("メールアドレス/パスワードを入力して下さい。"); return false; } return true; }; // 親ウィンドウのページを変更する. - eccube.changeParentUrl = function( url ) { - + eccube.changeParentUrl = function (url) { // 親ウィンドウの存在確認 - if ( eccube.isOpener() ) { + if (eccube.isOpener()) { window.opener.location.href = url; } else { window.close(); @@ -413,96 +437,110 @@ require( "slick-carousel/slick/slick-theme.css" ); // 引数1：フォーム名称 // 引数2：文字数カウント対象 // 引数3：カウント結果格納対象 - eccube.countChars = function( form, sch, cnt ) { - const formElement = $( `form#${form}` ); - formElement.find( `input[name=${cnt}]` ).val( formElement.find( `*[name=${sch}]` ).val().length ); + eccube.countChars = function (form, sch, cnt) { + const formElement = $(`form#${form}`); + formElement + .find(`input[name=${cnt}]`) + .val(formElement.find(`*[name=${sch}]`).val().length); }; // テキストエリアのサイズを変更する. - eccube.toggleRows = function( buttonSelector, textAreaSelector, max, min ) { - if ( $( textAreaSelector ).attr( "rows" ) <= min ) { - $( textAreaSelector ).attr( "rows", max ); - $( buttonSelector ).text( "縮小" ); + eccube.toggleRows = function (buttonSelector, textAreaSelector, max, min) { + if ($(textAreaSelector).attr("rows") <= min) { + $(textAreaSelector).attr("rows", max); + $(buttonSelector).text("縮小"); } else { - $( textAreaSelector ).attr( "rows", min ); - $( buttonSelector ).text( "拡大" ); + $(textAreaSelector).attr("rows", min); + $(buttonSelector).text("拡大"); } }; /** - * 規格2のプルダウンを設定する. - */ - eccube.setClassCategories = function( $form, product_id, $sele1, $sele2, selected_id2 ) { - if ( $sele1 && $sele1.length ) { + * 規格2のプルダウンを設定する. + */ + eccube.setClassCategories = function ( + $form, + product_id, + $sele1, + $sele2, + selected_id2 + ) { + if ($sele1 && $sele1.length) { const classcat_id1 = $sele1.val() ? $sele1.val() : ""; - if ( $sele2 && $sele2.length ) { - + if ($sele2 && $sele2.length) { // 規格2の選択肢をクリア $sele2.children().remove(); let classcat2; // 商品一覧時 - if ( eccube.hasOwnProperty( "productsClassCategories" ) ) { - classcat2 = eccube.productsClassCategories[ product_id ][ classcat_id1 ]; + if (eccube.hasOwnProperty("productsClassCategories")) { + classcat2 = eccube.productsClassCategories[product_id][classcat_id1]; } else { - // 詳細表示時 - classcat2 = eccube.classCategories[ classcat_id1 ]; + classcat2 = eccube.classCategories[classcat_id1]; } // 規格2の要素を設定 - for ( const key in classcat2 ) { - if ( classcat2.hasOwnProperty( key ) ) { - const id = classcat2[ key ].classcategory_id2; - const { name } = classcat2[ key ]; - const option = $( "