diff --git a/composer.json b/composer.json index ba34165ff7..3e3f3f7f41 100644 --- a/composer.json +++ b/composer.json @@ -10,16 +10,19 @@ "support": { "issues": "https://github.com/EC-CUBE/ec-cube/issues" }, - "minimum-stability": "RC", "prefer-stable": true, "require": { "php": "^8.2", "ext-curl": "*", + "ext-filter": "*", "ext-intl": "*", "ext-json": "*", "ext-mbstring": "*", "ext-openssl": "*", + "ext-tokenizer": "*", + "ext-xml": "*", "ext-zip": "*", + "ext-zlib": "*", "composer/ca-bundle": "^1.1", "composer/composer": "^2.9", "doctrine/collections": "^2.1", @@ -37,13 +40,16 @@ "ec-cube/plugin-installer": "^2.0", "egulias/email-validator": "^4.0", "exercise/htmlpurifier-bundle": "^5.0", + "ezyang/htmlpurifier": "^4.14", "friendsofphp/php-cs-fixer": "^3.75", "guzzlehttp/guzzle": "^7.4.5", + "justinrainbow/json-schema": "^6.5", "knplabs/knp-paginator-bundle": "^6.8", "mobiledetect/mobiledetectlib": "^2.8", "monolog/monolog": "^3.0", "nanasess/bcmath-polyfill": "^1.0", "nesbot/carbon": "^3", + "phpseclib/phpseclib": "^3.0", "psr/cache": "^3.0", "psr/container": "^2.0", "psr/http-message": "^1.0 || ^2.0", @@ -51,7 +57,6 @@ "psr/simple-cache": "^3.0", "robthree/twofactorauth": "^3.0", "setasign/fpdi": "^2.2", - "skorp/detect-incompatible-samesite-useragents": "^1.0", "softcreatr/jsonpath": "^0.8", "symfony/asset": "^7.4", "symfony/cache": "^7.4", @@ -167,19 +172,13 @@ ] }, "conflict": { - "symfony/symfony": "*", - "easycorp/easy-log-handler": "1.0.4|1.0.5" + "symfony/symfony": "*" }, "extra": { "symfony": { "id": "01C0Q71D54BCVSB8ZWR3VECDRD", "allow-contrib": false - }, - "symfony-web-dir": ".", - "bin-dir": "bin", - "src-dir": "src/Eccube", - "config-dir": "app/config/eccube", - "public-dir": "." + } }, "config": { "platform": { @@ -193,7 +192,6 @@ "sort-packages": true, "allow-plugins": { "composer/*": true, - "kylekatarnls/update-helper": true, "ec-cube/plugin-installer": true, "phpstan/extension-installer": true, "symfony/flex": true diff --git a/composer.lock b/composer.lock index 515acc5ff0..7935561a6c 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": "b609f33937ec3f4694c1dc84c1f135f3", + "content-hash": "24ff6ea2484f4f8eef6753e72d0f6220", "packages": [ { "name": "carbonphp/carbon-doctrine-types", @@ -5339,54 +5339,6 @@ ], "time": "2026-05-13T10:16:22+00:00" }, - { - "name": "skorp/detect-incompatible-samesite-useragents", - "version": "1.0.1", - "source": { - "type": "git", - "url": "https://github.com/skorp/detect-incompatible-samesite-useragents.git", - "reference": "e3277efe3c12ac618af4536ba1bdb55c33c1ef80" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/skorp/detect-incompatible-samesite-useragents/zipball/e3277efe3c12ac618af4536ba1bdb55c33c1ef80", - "reference": "e3277efe3c12ac618af4536ba1bdb55c33c1ef80", - "shasum": "" - }, - "require": { - "php": "^7.0 || ^8.0" - }, - "require-dev": { - "phpunit/phpunit": "^8.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Skorp\\Dissua\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Kadir Ă–zdemir" - } - ], - "description": "Determine if UserAgent is incompatible with SameSite=None", - "keywords": [ - "cookies", - "safari", - "samesite", - "samesite cookie" - ], - "support": { - "issues": "https://github.com/skorp/detect-incompatible-samesite-useragents/issues", - "source": "https://github.com/skorp/detect-incompatible-samesite-useragents/tree/1.0.1" - }, - "time": "2021-06-25T07:29:16+00:00" - }, { "name": "softcreatr/jsonpath", "version": "0.8.3", @@ -15290,18 +15242,22 @@ } ], "aliases": [], - "minimum-stability": "RC", + "minimum-stability": "stable", "stability-flags": {}, "prefer-stable": true, "prefer-lowest": false, "platform": { "php": "^8.2", "ext-curl": "*", + "ext-filter": "*", "ext-intl": "*", "ext-json": "*", "ext-mbstring": "*", "ext-openssl": "*", - "ext-zip": "*" + "ext-tokenizer": "*", + "ext-xml": "*", + "ext-zip": "*", + "ext-zlib": "*" }, "platform-dev": {}, "platform-overrides": { diff --git a/symfony.lock b/symfony.lock index 0280880177..d203d3c456 100644 --- a/symfony.lock +++ b/symfony.lock @@ -26,9 +26,6 @@ "codeception/module-webdriver": { "version": "1.2.0" }, - "codeception/phpunit-wrapper": { - "version": "6.0.9" - }, "codeception/stub": { "version": "1.0.2" }, @@ -65,9 +62,6 @@ "app/config/eccube/packages/test/dama_doctrine_test_bundle.yaml" ] }, - "doctrine/cache": { - "version": "v1.7.1" - }, "doctrine/collections": { "version": "v1.5.0" }, @@ -132,15 +126,6 @@ "doctrine/sql-formatter": { "version": "1.1.1" }, - "easycorp/easy-log-handler": { - "version": "1.0", - "recipe": { - "repo": "github.com/symfony/recipes", - "branch": "master", - "version": "1.0", - "ref": "70062abc2cd58794d2a90274502f81b55cd9951b" - } - }, "ec-cube/plugin-installer": { "version": "0.0.3" }, @@ -213,24 +198,9 @@ "phar-io/version": { "version": "1.0.1" }, - "php-cs-fixer/diff": { - "version": "v1.2.0" - }, "php-webdriver/webdriver": { "version": "1.10.0" }, - "phpdocumentor/reflection-common": { - "version": "1.0.1" - }, - "phpdocumentor/reflection-docblock": { - "version": "4.3.0" - }, - "phpdocumentor/type-resolver": { - "version": "0.4.0" - }, - "phpspec/prophecy": { - "version": "1.7.5" - }, "phpstan/phpstan": { "version": "0.12.70" }, @@ -344,12 +314,6 @@ "setasign/fpdi": { "version": "v2.0.3" }, - "setasign/fpdi-tcpdf": { - "version": "v2.0.0" - }, - "skorp/detect-incompatible-samesite-useragents": { - "version": "1.0.0" - }, "softcreatr/jsonpath": { "version": "0.7.5" }, @@ -443,9 +407,6 @@ "symfony/http-kernel": { "version": "v3.4.1" }, - "symfony/inflector": { - "version": "v3.4.1" - }, "symfony/intl": { "version": "v3.4.1" }, @@ -533,9 +494,6 @@ "symfony/polyfill-mbstring": { "version": "v1.6.0" }, - "symfony/polyfill-php72": { - "version": "v1.6.0" - }, "symfony/polyfill-php73": { "version": "v1.13.0" }, @@ -581,9 +539,6 @@ "symfony/security-csrf": { "version": "v3.4.1" }, - "symfony/security-guard": { - "version": "v5.4.3" - }, "symfony/security-http": { "version": "v5.4.5" }, @@ -668,9 +623,6 @@ "twig/twig": { "version": "v2.4.4" }, - "webmozart/assert": { - "version": "1.3.0" - }, "zbateson/mail-mime-parser": { "version": "1.3.3" },