Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Symfony5 support #5353

Merged
merged 152 commits into from
Jun 2, 2022
Merged

Symfony5 support #5353

merged 152 commits into from
Jun 2, 2022

Conversation

nanasess
Copy link
Contributor

@nanasess nanasess commented Apr 14, 2022

概要(Overview・Refs Issue)

  • Symfony5 へ composer update を実行し、影響範囲を調査する
  • その他の依存パッケージは php: "^7.4 || ^8.1" でサポートされる最新バージョンに可能な限りアップデートする
  • とり急ぎ、PHP7.4 及び PHP8.1 で TOP ページが表示されるところまで対応
  • FIXME が付与されているコミットログは、とり急ぎエラーが出ないようコメントアウト等の措置をしただけなので、修正が必要
  • [WIP] PHP8 support #5188
    • doctrine/persistence のバージョンアップに伴い、 Repository クラスで使用してる RegistryInterface の namespace 変更が必要
    • doctrine/migrations のバージョンアップに伴い、マイグレーション関連のコードの大幅な修正が必要
    • bheller/images-generator は PHP8 に対応していないため削除。 eccube:fixtures:generate コマンドの修正が必要
    • fzaninotto/faker が廃止。fakerphp/faker を利用するようになったため、テスト関連のコードの修正が必要かも-

削除されるパッケージ

  • symfony/security
  • symfony/web-server-bundle
  • symfony/debug
  • suncat/mobile-detect-bundle
  • pimple/pimple

メジャーバージョンアップするパッケージ

  • knplabs/knp-paginator-bundle
  • nesbot/carbon
  • phpunit/phpunit
  • vlucas/phpdotenv
  • sensio/framework-extra-bundle
  • monolog/monolog
  • guzzlehttp/guzzle
  • friendsofphp/php-cs-fixer
  • doctrine/inflector
  • doctrine/cache
  • doctrine/persistence
  • doctrine/dbal
  • doctrine/orm

上記の他、 swiftmailer を symfony/mailer に変更する必要がある

その他の懸念事項

  • twig/extensions が開発終了している
    • Twig Core Extra extensions に移行した
    • IntlExtension の変更が必要
  • twig/twig "^3.3" に更新するかどうか
    • プラグインやサンプルコードで使用している非推奨コードが無いかどうか精査 https://twig.symfony.com/doc/2.x/deprecated.html
    • Twig_* の class alias が廃止されるため、プラグインなどで使用している場合は変更が必要
  • doctrine/orm が friendsofphp/proxy-manager-lts 経由で依存している laminas/laminas-code のサポート期間が短く、 PHP8.2 がサポートされるか心配

方針(Policy)

実装に関する補足(Appendix)

  • Removing symfony/web-server-bundle (v4.4.27)
  • Removing symfony/security (v4.4.36)
  • Removing symfony/polyfill-php70 (v1.20.0)
  • Removing symfony/mime (v5.4.2)
  • Removing symfony/http-client-contracts (v2.5.0)
  • Removing symfony/debug (v4.4.36)
  • Removing suncat/mobile-detect-bundle (v1.1.1)
  • Removing pimple/pimple (v1.1.1)
  • Removing phpunit/php-token-stream (3.1.3)
  • Removing laminas/laminas-zendframework-bridge (1.4.1)
  • Removing laminas/laminas-eventmanager (3.4.0)
  • Removing kylekatarnls/update-helper (1.2.1)
  • Removing jdorn/sql-formatter (v1.2.17)
  • Removing fzaninotto/faker (v1.9.2)
  • Removing doctrine/reflection (1.2.2)
  • Removing doctrine/doctrine-cache-bundle (1.4.0)
  • Removing composer/package-versions-deprecated (1.11.99.4)
  • Removing bheller/images-generator (1.0.1)
  • Upgrading symfony/flex (v1.17.6 => v1.18.5): Extracting archive
  • Upgrading symfony/deprecation-contracts (v2.5.0 => v2.5.1): Extracting archive
  • Installing psr/http-client (1.0.1): Extracting archive
  • Installing psr/http-factory (1.0.1): Extracting archive
  • Upgrading guzzlehttp/psr7 (1.8.5 => 2.2.1): Extracting archive
  • Upgrading guzzlehttp/guzzle (6.5.5 => 7.4.2): Extracting archive
  • Upgrading sebastian/version (2.0.1 => 3.0.2): Extracting archive
  • Installing sebastian/type (3.0.0): Extracting archive
  • Upgrading sebastian/resource-operations (2.0.2 => 3.0.3): Extracting archive
  • Upgrading sebastian/recursion-context (3.0.1 => 4.0.4): Extracting archive
  • Upgrading sebastian/object-reflector (1.1.2 => 2.0.4): Extracting archive
  • Upgrading sebastian/object-enumerator (3.0.4 => 4.0.4): Extracting archive
  • Upgrading sebastian/global-state (2.0.0 => 5.0.5): Extracting archive
  • Upgrading sebastian/exporter (3.1.4 => 4.0.4): Extracting archive
  • Upgrading sebastian/environment (4.2.4 => 5.1.4): Extracting archive
  • Upgrading sebastian/diff (3.0.3 => 4.0.4): Extracting archive
  • Upgrading sebastian/comparator (3.0.3 => 4.0.6): Extracting archive
  • Installing sebastian/code-unit (1.0.8): Extracting archive
  • Installing sebastian/cli-parser (1.0.1): Extracting archive
  • Upgrading phpunit/php-timer (2.1.3 => 5.0.3): Extracting archive
  • Upgrading phpunit/php-text-template (1.2.1 => 2.0.4): Extracting archive
  • Installing phpunit/php-invoker (3.1.1): Extracting archive
  • Upgrading phpunit/php-file-iterator (2.0.5 => 3.0.6): Extracting archive
  • Installing sebastian/lines-of-code (1.0.3): Extracting archive
  • Installing sebastian/complexity (2.0.2): Extracting archive
  • Upgrading sebastian/code-unit-reverse-lookup (1.0.2 => 2.0.3): Extracting archive
  • Upgrading phpunit/php-code-coverage (6.1.4 => 9.2.15): Extracting archive
  • Upgrading symfony/polyfill-ctype (v1.24.0 => v1.25.0): Extracting archive
  • Upgrading phpdocumentor/type-resolver (1.6.0 => 1.6.1): Extracting archive
  • Upgrading doctrine/instantiator (1.4.0 => 1.4.1): Extracting archive
  • Upgrading phar-io/version (2.0.1 => 3.2.1): Extracting archive
  • Upgrading phar-io/manifest (1.0.3 => 2.0.3): Extracting archive
  • Upgrading myclabs/deep-copy (1.10.2 => 1.11.0): Extracting archive
  • Upgrading symfony/polyfill-mbstring (v1.24.0 => v1.25.0): Extracting archive
  • Upgrading phpunit/phpunit (7.5.20 => 9.5.20): Extracting archive
  • Upgrading codeception/phpunit-wrapper (7.8.2 => 9.0.7): Extracting archive
  • Upgrading symfony/yaml (v4.4.36 => v5.4.3): Extracting archive
  • Upgrading symfony/polyfill-php80 (v1.24.0 => v1.25.0): Extracting archive
  • Upgrading symfony/finder (v4.4.36 => v5.4.3): Extracting archive
  • Installing psr/event-dispatcher (1.0.0): Extracting archive
  • Upgrading symfony/event-dispatcher-contracts (v1.1.11 => v2.5.1): Extracting archive
  • Upgrading symfony/event-dispatcher (v4.4.34 => v5.4.3): Extracting archive
  • Upgrading symfony/css-selector (v4.4.27 => v5.4.3): Extracting archive
  • Upgrading symfony/polyfill-intl-normalizer (v1.24.0 => v1.25.0): Extracting archive
  • Installing symfony/polyfill-intl-grapheme (v1.25.0): Extracting archive
  • Installing symfony/string (v5.4.3): Extracting archive
  • Upgrading psr/container (1.1.1 => 1.1.2): Extracting archive
  • Upgrading symfony/service-contracts (v2.5.0 => v2.5.1): Extracting archive
  • Upgrading symfony/polyfill-php73 (v1.24.0 => v1.25.0): Extracting archive
  • Upgrading symfony/console (v4.4.36 => v5.4.7): Extracting archive
  • Upgrading codeception/stub (3.0.0 => 4.0.2): Extracting archive
  • Upgrading codeception/codeception (4.1.28 => 4.1.31): Extracting archive
  • Upgrading symfony/dom-crawler (v4.4.36 => v5.4.6): Extracting archive
  • Upgrading symfony/browser-kit (v4.4.27 => v5.4.3): Extracting archive
  • Upgrading justinrainbow/json-schema (5.2.11 => 5.2.12): Extracting archive
  • Upgrading symfony/process (v4.4.36 => v5.4.7): Extracting archive
  • Upgrading symfony/filesystem (v4.4.27 => v5.4.7): Extracting archive
  • Upgrading seld/jsonlint (1.8.3 => 1.9.0): Extracting archive
  • Upgrading react/promise (v2.8.0 => v2.9.0): Extracting archive
  • Upgrading composer/pcre (1.0.0 => 3.0.0): Extracting archive
  • Upgrading composer/xdebug-handler (2.0.4 => 3.0.3): Extracting archive
  • Upgrading composer/semver (3.2.7 => 3.3.2): Extracting archive
  • Upgrading composer/composer (2.2.4 => 2.3.5): Extracting archive
  • Upgrading symfony/routing (v4.4.34 => v5.4.3): Extracting archive
  • Upgrading symfony/polyfill-php81 (v1.24.0 => v1.25.0): Extracting archive
  • Upgrading symfony/http-foundation (v4.4.36 => v5.4.6): Extracting archive
  • Upgrading symfony/var-dumper (v4.4.36 => v5.4.6): Extracting archive
  • Upgrading symfony/error-handler (v4.4.36 => v5.4.7): Extracting archive
  • Upgrading symfony/http-kernel (v4.4.36 => v5.4.7): Extracting archive
  • Upgrading symfony/dependency-injection (v4.4.36 => v5.4.7): Extracting archive
  • Upgrading symfony/config (v4.4.36 => v5.4.7): Extracting archive
  • Upgrading symfony/var-exporter (v5.4.2 => v5.4.7): Extracting archive
  • Upgrading symfony/cache-contracts (v2.5.0 => v2.5.1): Extracting archive
  • Upgrading symfony/cache (v4.4.36 => v5.4.7): Extracting archive
  • Upgrading symfony/framework-bundle (v4.4.36 => v5.4.7): Extracting archive
  • Upgrading doctrine/cache (1.12.1 => 2.1.1): Extracting archive
  • Upgrading doctrine/persistence (1.3.8 => 2.5.0): Extracting archive
  • Upgrading symfony/doctrine-bridge (v4.4.36 => v5.4.7): Extracting archive
  • Installing doctrine/sql-formatter (1.1.2): Extracting archive
  • Upgrading doctrine/dbal (2.13.7 => 3.3.5): Extracting archive
  • Upgrading doctrine/lexer (1.2.2 => 1.2.3): Extracting archive
  • Upgrading doctrine/doctrine-bundle (1.12.13 => 2.6.2): Extracting archive
  • Upgrading dama/doctrine-test-bundle (v5.0.5 => v6.7.5): Extracting archive
  • Upgrading symfony/polyfill-php72 (v1.24.0 => v1.25.0): Extracting archive
  • Upgrading doctrine/inflector (1.3.1 => 2.0.4): Extracting archive
  • Upgrading doctrine/common (2.13.3 => 3.2.2): Extracting archive
  • Upgrading doctrine/orm (2.7.5 => 2.11.2): Extracting archive
  • Upgrading doctrine/data-fixtures (1.5.1 => 1.5.2): Extracting archive
  • Upgrading symfony/stopwatch (v4.4.27 => v5.4.5): Extracting archive
  • Upgrading laminas/laminas-code (3.4.1 => 4.5.1): Extracting archive
  • Upgrading friendsofphp/proxy-manager-lts (v1.0.5 => v1.0.7): Extracting archive
  • Upgrading doctrine/migrations (v1.8.1 => 3.5.0): Extracting archive
  • Upgrading doctrine/doctrine-migrations-bundle (v1.3.2 => 3.2.2): Extracting archive
  • Upgrading monolog/monolog (1.26.1 => 2.5.0): Extracting archive
  • Upgrading symfony/polyfill-intl-idn (v1.24.0 => v1.25.0): Extracting archive
  • Installing fakerphp/faker (v1.19.0): Extracting archive
  • Upgrading symfony/options-resolver (v4.4.30 => v5.4.3): Extracting archive
  • Upgrading php-cs-fixer/diff (v1.3.1 => v2.0.2): Extracting archive
  • Upgrading friendsofphp/php-cs-fixer (v2.19.3 => v3.8.0): Extracting archive
  • Upgrading twig/twig (v2.14.11 => v2.14.13): Extracting archive
  • Upgrading symfony/translation-contracts (v2.5.0 => v2.5.1): Extracting archive
  • Upgrading symfony/translation (v4.4.34 => v5.4.7): Extracting archive
  • Upgrading knplabs/knp-components (v1.3.10 => v3.5.0): Extracting archive
  • Upgrading knplabs/knp-paginator-bundle (v2.8.0 => v5.8.0): Extracting archive
  • Upgrading mobiledetect/mobiledetectlib (2.8.37 => 2.8.39): Extracting archive
  • Upgrading nesbot/carbon (1.39.1 => 2.57.0): Extracting archive
  • Upgrading robthree/twofactorauth (1.8.1 => 1.8.2): Extracting archive
  • Upgrading sensio/framework-extra-bundle (v5.6.1 => v6.2.6): Extracting archive
  • Upgrading symfony/asset (v4.4.27 => v5.4.7): Extracting archive
  • Upgrading symfony/twig-bridge (v4.4.36 => v5.4.7): Extracting archive
  • Upgrading symfony/debug-bundle (v4.4.36 => v5.4.3): Extracting archive
  • Upgrading symfony/dotenv (v4.4.36 => v5.4.5): Extracting archive
  • Upgrading symfony/expression-language (v4.4.34 => v5.4.7): Extracting archive
  • Installing symfony/property-info (v5.4.7): Extracting archive
  • Upgrading symfony/property-access (v4.4.36 => v5.4.7): Extracting archive
  • Upgrading symfony/polyfill-intl-icu (v1.24.0 => v1.25.0): Extracting archive
  • Upgrading symfony/form (v4.4.36 => v5.4.7): Extracting archive
  • Upgrading symfony/inflector (v4.4.34 => v5.4.3): Extracting archive
  • Upgrading symfony/intl (v4.4.36 => v5.4.5): Extracting archive
  • Upgrading symfony/maker-bundle (v1.36.4 => v1.38.0): Extracting archive
  • Upgrading symfony/monolog-bridge (v4.4.27 => v5.4.3): Extracting archive
  • Upgrading symfony/phpunit-bridge (v4.4.34 => v5.4.7): Extracting archive
  • Upgrading symfony/polyfill-iconv (v1.24.0 => v1.25.0): Extracting archive
  • Upgrading symfony/proxy-manager-bridge (v4.4.36 => v5.4.6): Extracting archive
  • Installing symfony/password-hasher (v5.4.3): Extracting archive
  • Installing symfony/security-core (v5.4.7): Extracting archive
  • Installing symfony/security-http (v5.4.5): Extracting archive
  • Installing symfony/security-guard (v5.4.3): Extracting archive
  • Installing symfony/security-csrf (v5.4.3): Extracting archive
  • Upgrading symfony/security-bundle (v4.4.36 => v5.4.5): Extracting archive
  • Upgrading symfony/serializer (v4.4.36 => v5.4.7): Extracting archive
  • Upgrading symfony/swiftmailer-bundle (v3.5.3 => v3.5.4): Extracting archive
  • Upgrading symfony/templating (v4.4.36 => v5.4.3): Extracting archive
  • Upgrading symfony/validator (v4.4.36 => v5.4.7): Extracting archive
  • Upgrading symfony/twig-bundle (v4.4.36 => v5.4.3): Extracting archive
  • Upgrading symfony/web-profiler-bundle (v4.4.31 => v5.4.6): Extracting archive
  • Upgrading symfony/workflow (v4.4.27 => v5.4.3): Extracting archive
  • Installing phpoption/phpoption (1.8.1): Extracting archive
  • Installing graham-campbell/result-type (v1.0.4): Extracting archive
  • Upgrading vlucas/phpdotenv (v2.4.0 => v5.4.0): Extracting archive

テスト(Test)

TODO

  • ReflectionException: Class Eccube\Twig\Extension\IgnoreRoutingNotFoundExtension does not exist
  • Error: Call to undefined method Doctrine\Bundle\DoctrineBundle\Mapping\MappingDriver::addDriver()
  • TypeError: Argument 1 passed to Symfony\Component\Serializer\Encoder\XmlEncoder::__construct() must be of the type array, string given
  • An exception occurred while executing a query: SQLSTATE[HY000]: General error: 1 near "FROM": syntax error
  • ArgumentCountError: Too few arguments to function Twig\Environment::loadTemplate()
  • LogicException: Booting the kernel before calling "Symfony\Bundle\FrameworkBundle\Test\WebTestCase::createClient()" is not supported, the kernel should only be booted once.
  • TypeError: Argument 5 passed to Symfony\Component\HttpFoundation\File\UploadedFile::__construct() must be of the type bool, null given
  • Error: Call to a member function authenticate() on null
  • TypeError: Argument 1 passed to Symfony\Bridge\Doctrine\Form\ChoiceList\IdReader::getIdValue() must be an object or null, int given
  • OrderStateMachine の仕様変更
  • SameSiteCookie テストケースの修正
  • SwiftMailer から SymfonyMailer への変更
  • その他 WebTestCase の修正
  • Codeception の修正
  • Doctrine Migrations の仕様変更
  • env() の仕様変更
  • ContainerAwareCommand の廃止
  • PasswordEncoderInterface の仕様変更
  • Carbon のバージョンアップ
  • EC-CUBE本体で非推奨にしているメソッドの廃止

相談(Discussion)

マイナーバージョン互換性保持のための制限事項チェックリスト

  • 既存機能の仕様変更はありません
  • フックポイントの呼び出しタイミングの変更はありません
  • フックポイントのパラメータの削除・データ型の変更はありません
  • twigファイルに渡しているパラメータの削除・データ型の変更はありません
  • Serviceクラスの公開関数の、引数の削除・データ型の変更はありません
  • 入出力ファイル(CSVなど)のフォーマット変更はありません

レビュワー確認項目

  • 動作確認
  • コードレビュー
  • E2E/Unit テスト確認(テストの追加・変更が必要かどうか)
  • 互換性が保持されているか
  • セキュリティ上の問題がないか
    • 権限を超えた操作が可能にならないか
    • 不要なファイルアップロードがないか
    • 外部へ公開されるファイルや機能の追加ではないか
    • テンプレートでのエスケープ漏れがないか

nanasess and others added 30 commits October 5, 2021 11:48
  - Removing bheller/images-generator (1.0.1)
  - Removing doctrine/doctrine-cache-bundle (1.4.0)
  - Removing doctrine/reflection (1.2.2)
  - Removing fzaninotto/faker (v1.9.2)
  - Removing jdorn/sql-formatter (v1.2.17)
  - Removing laminas/laminas-eventmanager (3.2.1)
  - Removing laminas/laminas-zendframework-bridge (1.1.1)
  - Removing phpunit/php-token-stream (3.1.2)
  - Removing symfony/debug-pack (v1.0.9)
  - Removing symfony/orm-pack (v1.0.8)
  - Removing symfony/profiler-pack (v1.0.5)
  - Upgrading behat/gherkin (v4.7.3 => v4.8.0)
  - Upgrading codeception/codeception (4.1.21 => 4.1.22)
  - Upgrading codeception/lib-innerbrowser (1.5.0 => 1.5.1)
  - Upgrading codeception/module-webdriver (1.2.1 => 1.4.0)
  - Upgrading codeception/phpunit-wrapper (7.8.2 => 9.0.6)
  - Upgrading codeception/stub (3.0.0 => 3.7.0)
  - Upgrading composer/ca-bundle (1.2.10 => 1.2.11)
  - Upgrading composer/composer (2.1.3 => 2.1.8)
  - Upgrading composer/package-versions-deprecated (1.11.99.2 => 1.11.99.4)
  - Upgrading composer/xdebug-handler (2.0.1 => 2.0.2)
  - Upgrading dama/doctrine-test-bundle (v5.0.5 => v6.6.0)
  - Upgrading doctrine/annotations (1.13.1 => 1.13.2)
  - Upgrading doctrine/collections (1.6.7 => 1.6.8)
  - Upgrading doctrine/common (2.13.3 => 3.1.2)
  - Upgrading doctrine/data-fixtures (1.3.3 => 1.5.1)
  - Upgrading doctrine/dbal (2.13.2 => 2.13.4)
  - Upgrading doctrine/doctrine-bundle (1.12.13 => 2.3.2)
  - Upgrading doctrine/doctrine-migrations-bundle (v1.3.2 => 3.1.1)
  - Upgrading doctrine/inflector (1.3.1 => 1.4.4)
  - Upgrading doctrine/lexer (1.0.2 => 1.2.1)
  - Upgrading doctrine/migrations (v1.8.1 => 3.2.1)
  - Upgrading doctrine/orm (2.7.5 => 2.8.5)
  - Upgrading doctrine/persistence (1.3.8 => 2.2.2)
  - Locking doctrine/sql-formatter (1.1.1)
  - Locking fakerphp/faker (v1.16.0)
  - Upgrading friendsofphp/php-cs-fixer (v2.19.0 => v2.19.2)
  - Upgrading justinrainbow/json-schema (5.2.10 => 5.2.11)
  - Upgrading laminas/laminas-code (3.4.1 => 4.4.3)
  - Upgrading mikey179/vfsstream (v1.6.9 => v1.6.10)
  - Upgrading nikic/php-parser (v4.11.0 => v4.13.0)
  - Upgrading phar-io/manifest (1.0.3 => 2.0.3)
  - Upgrading phar-io/version (2.0.1 => 3.1.0)
  - Upgrading phpdocumentor/reflection-common (2.1.0 => 2.2.0)
  - Upgrading phpdocumentor/reflection-docblock (4.3.4 => 5.2.2)
  - Upgrading phpdocumentor/type-resolver (1.0.1 => 1.5.1)
  - Upgrading phpspec/prophecy (v1.10.3 => 1.14.0)
  - Upgrading phpstan/phpstan (0.12.92 => 0.12.99)
  - Upgrading phpunit/php-code-coverage (6.1.4 => 9.2.7)
  - Upgrading phpunit/php-file-iterator (2.0.4 => 3.0.5)
  - Locking phpunit/php-invoker (3.1.1)
  - Upgrading phpunit/php-text-template (1.2.1 => 2.0.4)
  - Upgrading phpunit/php-timer (2.1.3 => 5.0.3)
  - Upgrading phpunit/phpunit (7.5.20 => 9.5.10)
  - Upgrading psr/container (1.0.0 => 1.1.1)
  - Locking sebastian/cli-parser (1.0.1)
  - Locking sebastian/code-unit (1.0.8)
  - Upgrading sebastian/code-unit-reverse-lookup (1.0.2 => 2.0.3)
  - Upgrading sebastian/comparator (3.0.3 => 4.0.6)
  - Locking sebastian/complexity (2.0.2)
  - Upgrading sebastian/diff (3.0.3 => 4.0.4)
  - Upgrading sebastian/environment (4.2.4 => 5.1.3)
  - Upgrading sebastian/exporter (3.1.3 => 4.0.3)
  - Upgrading sebastian/global-state (2.0.0 => 5.0.3)
  - Locking sebastian/lines-of-code (1.0.3)
  - Upgrading sebastian/object-enumerator (3.0.4 => 4.0.4)
  - Upgrading sebastian/object-reflector (1.1.2 => 2.0.4)
  - Upgrading sebastian/recursion-context (3.0.1 => 4.0.4)
  - Upgrading sebastian/resource-operations (2.0.2 => 3.0.3)
  - Locking sebastian/type (2.3.4)
  - Upgrading sebastian/version (2.0.1 => 3.0.2)
  - Upgrading seld/phar-utils (1.1.1 => 1.1.2)
  - Upgrading sensio/framework-extra-bundle (v5.5.7 => v5.6.1)
  - Upgrading symfony/asset (v4.4.25 => v4.4.27)
  - Upgrading symfony/browser-kit (v4.4.25 => v4.4.27)
  - Upgrading symfony/cache (v4.4.26 => v4.4.31)
  - Upgrading symfony/cache-contracts (v1.1.10 => v2.4.0)
  - Upgrading symfony/config (v4.4.26 => v4.4.30)
  - Upgrading symfony/console (v4.4.26 => v4.4.30)
  - Upgrading symfony/css-selector (v4.4.25 => v4.4.27)
  - Upgrading symfony/debug (v4.4.25 => v4.4.31)
  - Upgrading symfony/debug-bundle (v4.4.20 => v4.4.27)
  - Upgrading symfony/dependency-injection (v4.4.26 => v4.4.31)
  - Upgrading symfony/doctrine-bridge (v4.4.25 => v4.4.31)
  - Upgrading symfony/dom-crawler (v4.4.25 => v4.4.30)
  - Upgrading symfony/dotenv (v4.4.25 => v4.4.29)
  - Upgrading symfony/error-handler (v4.4.26 => v4.4.30)
  - Upgrading symfony/event-dispatcher (v4.4.25 => v4.4.30)
  - Upgrading symfony/expression-language (v4.4.25 => v4.4.30)
  - Upgrading symfony/filesystem (v4.4.26 => v4.4.27)
  - Upgrading symfony/finder (v4.4.25 => v4.4.30)
  - Upgrading symfony/flex (v1.13.3 => v1.16.3)
  - Upgrading symfony/form (v4.4.26 => v4.4.31)
  - Upgrading symfony/framework-bundle (v4.4.26 => v4.4.31)
  - Upgrading symfony/http-client-contracts (v1.1.10 => v2.4.0)
  - Upgrading symfony/http-foundation (v4.4.26 => v4.4.30)
  - Upgrading symfony/http-kernel (v4.4.26 => v4.4.32)
  - Upgrading symfony/inflector (v4.4.25 => v4.4.27)
  - Upgrading symfony/intl (v4.4.25 => v4.4.31)
  - Upgrading symfony/maker-bundle (v1.33.0 => v1.34.0)
  - Upgrading symfony/mime (v4.4.26 => v5.3.8)
  - Upgrading symfony/monolog-bridge (v4.4.26 => v4.4.27)
  - Upgrading symfony/options-resolver (v4.4.25 => v4.4.30)
  - Upgrading symfony/phpunit-bridge (v4.4.26 => v4.4.31)
  - Upgrading symfony/polyfill-mbstring (v1.23.0 => v1.23.1)
  - Upgrading symfony/polyfill-php80 (v1.23.0 => v1.23.1)
  - Upgrading symfony/process (v4.4.26 => v4.4.30)
  - Upgrading symfony/property-access (v4.4.25 => v4.4.30)
  - Upgrading symfony/proxy-manager-bridge (v4.4.25 => v4.4.27)
  - Upgrading symfony/routing (v4.4.25 => v4.4.30)
  - Upgrading symfony/security (v4.4.26 => v4.4.31)
  - Upgrading symfony/security-bundle (v4.4.26 => v4.4.27)
  - Upgrading symfony/serializer (v4.4.26 => v4.4.31)
  - Upgrading symfony/service-contracts (v1.1.9 => v2.4.0)
  - Upgrading symfony/stopwatch (v4.4.25 => v4.4.27)
  - Upgrading symfony/templating (v4.4.25 => v4.4.30)
  - Upgrading symfony/translation (v4.4.26 => v4.4.32)
  - Upgrading symfony/translation-contracts (v1.1.10 => v2.4.0)
  - Upgrading symfony/twig-bridge (v4.4.26 => v4.4.27)
  - Upgrading symfony/twig-bundle (v4.4.26 => v4.4.30)
  - Upgrading symfony/validator (v4.4.26 => v4.4.31)
  - Upgrading symfony/var-dumper (v4.4.26 => v4.4.31)
  - Upgrading symfony/var-exporter (v4.4.26 => v5.3.8)
  - Upgrading symfony/web-profiler-bundle (v4.4.26 => v4.4.31)
  - Upgrading symfony/web-server-bundle (v4.4.26 => v4.4.27)
  - Upgrading symfony/workflow (v4.4.25 => v4.4.27)
  - Upgrading symfony/yaml (v4.4.26 => v4.4.29)
  - Upgrading tecnickcom/tcpdf (6.4.1 => 6.4.2)
  - Upgrading theseer/tokenizer (1.1.3 => 1.2.1)
  - Upgrading twig/twig (v2.13.1 => v2.14.7)
  - Upgrading webmozart/assert (1.9.1 => 1.10.0)
  - Removing bheller/images-generator (1.0.1)
  - Removing doctrine/doctrine-cache-bundle (1.4.0)
  - Removing doctrine/reflection (1.2.2)
  - Removing fzaninotto/faker (v1.9.2)
  - Removing jdorn/sql-formatter (v1.2.17)
  - Removing kylekatarnls/update-helper (1.2.1)
  - Removing laminas/laminas-eventmanager (3.4.0)
  - Removing laminas/laminas-zendframework-bridge (1.4.1)
  - Removing phpunit/php-token-stream (3.1.3)
  - Removing suncat/mobile-detect-bundle (v1.1.1)
  - Removing symfony/debug (v4.4.36)
  - Removing symfony/http-client-contracts (v2.5.0)
  - Removing symfony/mime (v5.4.2)
  - Removing symfony/security (v4.4.36)
  - Removing symfony/web-server-bundle (v4.4.27)
  - Upgrading codeception/codeception (4.1.28 => 4.1.31)
  - Upgrading codeception/phpunit-wrapper (7.8.2 => 9.0.7)
  - Upgrading codeception/stub (3.0.0 => 4.0.2)
  - Upgrading composer/composer (2.2.4 => 2.3.5)
  - Upgrading composer/package-versions-deprecated (1.11.99.4 => 1.11.99.5)
  - Upgrading composer/pcre (1.0.0 => 3.0.0)
  - Upgrading composer/semver (3.2.7 => 3.3.2)
  - Downgrading composer/xdebug-handler (2.0.4 => 2.0.2)
  - Upgrading dama/doctrine-test-bundle (v5.0.5 => v6.7.5)
  - Upgrading doctrine/common (2.13.3 => 3.2.2)
  - Upgrading doctrine/data-fixtures (1.5.1 => 1.5.2)
  - Upgrading doctrine/dbal (2.13.7 => 2.13.8)
  - Upgrading doctrine/doctrine-bundle (1.12.13 => 2.3.2)
  - Upgrading doctrine/doctrine-migrations-bundle (v1.3.2 => 3.2.2)
  - Upgrading doctrine/inflector (1.3.1 => 1.4.4)
  - Upgrading doctrine/instantiator (1.4.0 => 1.4.1)
  - Upgrading doctrine/lexer (1.2.2 => 1.2.3)
  - Upgrading doctrine/migrations (v1.8.1 => 3.4.2)
  - Upgrading doctrine/orm (2.7.5 => 2.8.5)
  - Upgrading doctrine/persistence (1.3.8 => 2.5.0)
  - Locking doctrine/sql-formatter (1.1.2)
  - Locking fakerphp/faker (v1.19.0)
  - Upgrading friendsofphp/proxy-manager-lts (v1.0.5 => v1.0.7)
  - Upgrading justinrainbow/json-schema (5.2.11 => 5.2.12)
  - Upgrading knplabs/knp-components (v1.3.10 => v3.5.0)
  - Upgrading knplabs/knp-paginator-bundle (v2.8.0 => v5.8.0)
  - Upgrading laminas/laminas-code (3.4.1 => 4.5.1)
  - Upgrading mobiledetect/mobiledetectlib (2.8.37 => 2.8.39)
  - Upgrading monolog/monolog (1.26.1 => 1.27.0)
  - Upgrading myclabs/deep-copy (1.10.2 => 1.11.0)
  - Upgrading nesbot/carbon (1.39.1 => 2.57.0)
  - Upgrading phar-io/manifest (1.0.3 => 2.0.3)
  - Upgrading phar-io/version (2.0.1 => 3.2.1)
  - Upgrading phpdocumentor/type-resolver (1.6.0 => 1.6.1)
  - Upgrading phpunit/php-code-coverage (6.1.4 => 9.2.15)
  - Upgrading phpunit/php-file-iterator (2.0.5 => 3.0.6)
  - Locking phpunit/php-invoker (3.1.1)
  - Upgrading phpunit/php-text-template (1.2.1 => 2.0.4)
  - Upgrading phpunit/php-timer (2.1.3 => 5.0.3)
  - Upgrading phpunit/phpunit (7.5.20 => 9.5.20)
  - Upgrading psr/container (1.1.1 => 1.1.2)
  - Locking psr/event-dispatcher (1.0.0)
  - Upgrading react/promise (v2.8.0 => v2.9.0)
  - Upgrading robthree/twofactorauth (1.8.1 => 1.8.2)
  - Locking sebastian/cli-parser (1.0.1)
  - Locking sebastian/code-unit (1.0.8)
  - Upgrading sebastian/code-unit-reverse-lookup (1.0.2 => 2.0.3)
  - Upgrading sebastian/comparator (3.0.3 => 4.0.6)
  - Locking sebastian/complexity (2.0.2)
  - Upgrading sebastian/diff (3.0.3 => 4.0.4)
  - Upgrading sebastian/environment (4.2.4 => 5.1.4)
  - Upgrading sebastian/exporter (3.1.4 => 4.0.4)
  - Upgrading sebastian/global-state (2.0.0 => 5.0.5)
  - Locking sebastian/lines-of-code (1.0.3)
  - Upgrading sebastian/object-enumerator (3.0.4 => 4.0.4)
  - Upgrading sebastian/object-reflector (1.1.2 => 2.0.4)
  - Upgrading sebastian/recursion-context (3.0.1 => 4.0.4)
  - Upgrading sebastian/resource-operations (2.0.2 => 3.0.3)
  - Locking sebastian/type (3.0.0)
  - Upgrading sebastian/version (2.0.1 => 3.0.2)
  - Upgrading seld/jsonlint (1.8.3 => 1.9.0)
  - Upgrading symfony/asset (v4.4.27 => v5.4.7)
  - Upgrading symfony/browser-kit (v4.4.27 => v5.4.3)
  - Upgrading symfony/cache (v4.4.36 => v5.4.7)
  - Upgrading symfony/cache-contracts (v2.5.0 => v2.5.1)
  - Upgrading symfony/config (v4.4.36 => v5.4.7)
  - Upgrading symfony/console (v4.4.36 => v5.4.7)
  - Upgrading symfony/css-selector (v4.4.27 => v5.4.3)
  - Upgrading symfony/debug-bundle (v4.4.36 => v5.4.3)
  - Upgrading symfony/dependency-injection (v4.4.36 => v5.4.7)
  - Upgrading symfony/deprecation-contracts (v2.5.0 => v2.5.1)
  - Upgrading symfony/doctrine-bridge (v4.4.36 => v5.4.7)
  - Upgrading symfony/dom-crawler (v4.4.36 => v5.4.6)
  - Upgrading symfony/dotenv (v4.4.36 => v5.4.5)
  - Upgrading symfony/error-handler (v4.4.36 => v5.4.7)
  - Upgrading symfony/event-dispatcher (v4.4.34 => v5.4.3)
  - Upgrading symfony/event-dispatcher-contracts (v1.1.11 => v2.5.1)
  - Upgrading symfony/expression-language (v4.4.34 => v5.4.7)
  - Upgrading symfony/filesystem (v4.4.27 => v5.4.7)
  - Upgrading symfony/finder (v4.4.36 => v5.4.3)
  - Upgrading symfony/flex (v1.17.6 => v1.18.5)
  - Upgrading symfony/form (v4.4.36 => v5.4.7)
  - Upgrading symfony/framework-bundle (v4.4.36 => v5.4.7)
  - Upgrading symfony/http-foundation (v4.4.36 => v5.4.6)
  - Upgrading symfony/http-kernel (v4.4.36 => v5.4.7)
  - Upgrading symfony/inflector (v4.4.34 => v5.4.3)
  - Upgrading symfony/intl (v4.4.36 => v5.4.5)
  - Upgrading symfony/maker-bundle (v1.36.4 => v1.38.0)
  - Upgrading symfony/monolog-bridge (v4.4.27 => v5.4.3)
  - Upgrading symfony/options-resolver (v4.4.30 => v5.4.3)
  - Locking symfony/password-hasher (v5.4.3)
  - Upgrading symfony/phpunit-bridge (v4.4.34 => v5.4.7)
  - Upgrading symfony/polyfill-ctype (v1.24.0 => v1.25.0)
  - Upgrading symfony/polyfill-iconv (v1.24.0 => v1.25.0)
  - Locking symfony/polyfill-intl-grapheme (v1.25.0)
  - Upgrading symfony/polyfill-intl-icu (v1.24.0 => v1.25.0)
  - Upgrading symfony/polyfill-intl-idn (v1.24.0 => v1.25.0)
  - Upgrading symfony/polyfill-intl-normalizer (v1.24.0 => v1.25.0)
  - Upgrading symfony/polyfill-mbstring (v1.24.0 => v1.25.0)
  - Upgrading symfony/polyfill-php72 (v1.24.0 => v1.25.0)
  - Upgrading symfony/polyfill-php73 (v1.24.0 => v1.25.0)
  - Upgrading symfony/polyfill-php80 (v1.24.0 => v1.25.0)
  - Upgrading symfony/polyfill-php81 (v1.24.0 => v1.25.0)
  - Upgrading symfony/process (v4.4.36 => v5.4.7)
  - Upgrading symfony/property-access (v4.4.36 => v5.4.7)
  - Locking symfony/property-info (v5.4.7)
  - Upgrading symfony/proxy-manager-bridge (v4.4.36 => v5.4.6)
  - Upgrading symfony/routing (v4.4.34 => v5.4.3)
  - Upgrading symfony/security-bundle (v4.4.36 => v5.4.5)
  - Locking symfony/security-core (v5.4.7)
  - Locking symfony/security-csrf (v5.4.3)
  - Locking symfony/security-guard (v5.4.3)
  - Locking symfony/security-http (v5.4.5)
  - Upgrading symfony/serializer (v4.4.36 => v5.4.7)
  - Upgrading symfony/service-contracts (v2.5.0 => v2.5.1)
  - Upgrading symfony/stopwatch (v4.4.27 => v5.4.5)
  - Locking symfony/string (v5.4.3)
  - Upgrading symfony/swiftmailer-bundle (v3.5.3 => v3.5.4)
  - Upgrading symfony/templating (v4.4.36 => v5.4.3)
  - Upgrading symfony/translation (v4.4.34 => v5.4.7)
  - Upgrading symfony/translation-contracts (v2.5.0 => v2.5.1)
  - Upgrading symfony/twig-bridge (v4.4.36 => v5.4.7)
  - Upgrading symfony/twig-bundle (v4.4.36 => v5.4.3)
  - Upgrading symfony/validator (v4.4.36 => v5.4.7)
  - Upgrading symfony/var-dumper (v4.4.36 => v5.4.6)
  - Upgrading symfony/var-exporter (v5.4.2 => v5.4.7)
  - Upgrading symfony/web-profiler-bundle (v4.4.31 => v5.4.6)
  - Upgrading symfony/workflow (v4.4.27 => v5.4.3)
  - Upgrading symfony/yaml (v4.4.36 => v5.4.3)
  - Upgrading twig/twig (v2.14.11 => v2.14.13)
影響箇所を要修正
影響箇所を要修正
影響箇所を要修正
影響箇所を要修正
  - Removing composer/package-versions-deprecated (1.11.99.5)
  - Upgrading doctrine/doctrine-bundle (2.3.2 => 2.6.2)
  - Upgrading doctrine/orm (2.8.5 => 2.11.2)
  - Upgrading doctrine/dbal (2.13.8 => 3.3.5)
  - Upgrading doctrine/migrations (3.4.2 => 3.5.0)
 - Upgrading doctrine/cache (1.12.1 => 2.1.1)
- Upgrading doctrine/inflector (1.4.4 => 2.0.4)
  - Removing symfony/polyfill-php70 (v1.20.0)
  - Upgrading composer/xdebug-handler (2.0.2 => 3.0.3)
  - Upgrading friendsofphp/php-cs-fixer (v2.19.3 => v3.8.0)
  - Upgrading php-cs-fixer/diff (v1.3.1 => v2.0.2)
  - Upgrading guzzlehttp/guzzle (6.5.5 => 7.4.2)
  - Upgrading guzzlehttp/psr7 (1.8.5 => 2.2.1)
  - Locking psr/http-client (1.0.1)
  - Locking psr/http-factory (1.0.1)
nanasess added 2 commits May 27, 2022 19:25
- PHPStan のエラー修正
以下を削除
- 現状のロジックに影響のないメソッド
- スキーマ変更を伴わないもの
@nanasess nanasess force-pushed the improve/symfony5 branch from c8a3cb0 to 7cd9c2e Compare May 27, 2022 10:26
@nanasess nanasess force-pushed the improve/symfony5 branch from c9899b2 to 370b241 Compare May 28, 2022 18:09
@nanasess nanasess force-pushed the improve/symfony5 branch from 370b241 to aff1ca9 Compare May 29, 2022 14:04
nanasess added 3 commits May 30, 2022 00:40
リクエストをハンドリングするFormTypeと表示するFormTypeがわかれていると、
リクエストとは違う値が選択されてしまう.

ProductListMaxType, ProductListOrderBy は SearchProductType で一元管理
する必要がある
@nanasess nanasess force-pushed the improve/symfony5 branch from c6d540f to 5651d72 Compare May 30, 2022 04:31
@chihiro-adachi
Copy link
Contributor

@nanasess
こちらの修正確認しました。
759d406

内容問題ないかと思います。
ただ、パラメータの値が従来と変更になるので、仕様変更としてマイグレーションガイド等に記載必要そうですね。

4.0/4.1
/products/list?mode=&category_id=&name=&pageno=1&disp_number=[0, 1, 2]&orderby=[0, 1, 2]

4.2
/products/list?mode=&category_id=&name=&pageno=1&disp_number=[20, 40, 60]&orderby=[1, 2, 3]

Compile Error: Cannot declare class Eccube\Entity\Customer, because the name is already in use
@chihiro-adachi
Copy link
Contributor

@nanasess
プラグインインストール時に、proxyの読み込みでエラーとなるようで、prしています。
nanasess#57

proxyの読み込みタイミングを調整
@nanasess
Copy link
Contributor Author

nanasess commented Jun 1, 2022

@chihiro-adachi マージしました。ありがとうございます!

nanasess added 2 commits June 1, 2022 14:16
パラメータ `eccube_rfc_email_check` が false の場合, RFC違反のメールア
ドレスはメール送信する際に local part を "" で囲む.
true の場合は囲まない.
@nanasess nanasess changed the title [WIP] Symfony5 support Symfony5 support Jun 2, 2022
@nanasess nanasess marked this pull request as ready for review June 2, 2022 01:32
@nanasess
Copy link
Contributor Author

nanasess commented Jun 2, 2022

ユニットテスト、 E2Eテスト共にオールグリーンになりましたので WIP はずしました

@chihiro-adachi chihiro-adachi changed the base branch from 4.1 to 4.2 June 2, 2022 02:46
@chihiro-adachi chihiro-adachi merged commit 821502b into EC-CUBE:4.2 Jun 2, 2022
@chihiro-adachi
Copy link
Contributor

ありがとうございます。4.2ブランチへマージしました。

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants