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.

Sign up for GitHub

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

Jump to bottom

Symfony4.4対応 #4596

Merged
merged 9 commits into from
Jul 7, 2020
Merged

Symfony4.4対応 #4596

merged 9 commits into from
Jul 7, 2020

Conversation

chihiro-adachi
Copy link
Contributor

@chihiro-adachi chihiro-adachi commented Jun 26, 2020 •
edited
Loading

概要(Overview・Refs Issue)

#4409 Symfony4.4対応

※experimental/symfony4.4ブランチへのPullRequestです。

方針(Policy)

  • composer update
  • プラグインのインストーラが動作していなかったので修正
  • テストコードのコンテナ取得方法を変更
  • doctrine/doctrine-bundleに起因してテストが通らないため一時的にスキップ doctrine/doctrine-bundle 1.12.3 support #4592
  • オーナーズストア経由のプラグインインストールが失敗する問題を修正

実装に関する補足(Appendix)

テスト（Test)

相談（Discussion）

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

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

レビュワー確認項目

  • 動作確認
  • コードレビュー
  • E2E/Unit テスト確認(テストの追加・変更が必要かどうか)
  • 互換性が保持されているか
  • セキュリティ上の問題がないか

@chihiro-adachi
compoer update
0f243cd 
  - Updating symfony/flex (v1.5.3 => v1.8.4): Loading from cache
  - Updating kylekatarnls/update-helper (1.2.0 => 1.2.1): Loading from cache
  - Updating symfony/process (v4.4.1 => v4.4.10): Loading from cache
  - Updating symfony/finder (v4.4.1 => v4.4.10): Loading from cache
  - Updating symfony/polyfill-ctype (v1.13.1 => v1.17.1): Loading from cache
  - Updating symfony/filesystem (v4.4.1 => v4.4.10): Loading from cache
  - Updating symfony/polyfill-php73 (v1.13.1 => v1.17.1): Loading from cache
  - Updating symfony/polyfill-mbstring (v1.13.1 => v1.17.1): Loading from cache
  - Installing symfony/polyfill-php80 (v1.17.1): Loading from cache
  - Updating symfony/console (v4.4.1 => v4.4.10): Loading from cache
  - Updating seld/phar-utils (1.0.1 => 1.1.0): Loading from cache
  - Updating seld/jsonlint (1.7.2 => 1.8.0): Loading from cache
  - Updating psr/log (1.1.2 => 1.1.3): Loading from cache
  - Updating justinrainbow/json-schema (5.2.9 => 5.2.10): Loading from cache
  - Updating composer/xdebug-handler (1.4.0 => 1.4.2): Loading from cache
  - Updating composer/spdx-licenses (1.5.2 => 1.5.3): Loading from cache
  - Updating composer/semver (1.5.0 => 1.5.1): Loading from cache
  - Updating composer/ca-bundle (1.2.4 => 1.2.7): Loading from cache
  - Updating composer/composer (1.9.1 => 1.10.8): Loading from cache
  - Updating doctrine/annotations (v1.8.0 => 1.10.3): Loading from cache
  - Updating doctrine/reflection (v1.0.0 => 1.2.1): Loading from cache
  - Updating doctrine/collections (1.6.4 => 1.6.5): Loading from cache
  - Updating doctrine/cache (1.10.0 => 1.10.1): Loading from cache
  - Updating doctrine/persistence (1.2.0 => 1.3.7): Loading from cache
  - Updating doctrine/common (v2.11.0 => 2.13.3): Loading from cache
  - Updating symfony/polyfill-php72 (v1.13.1 => v1.17.0): Loading from cache
  - Updating symfony/polyfill-intl-idn (v1.13.1 => v1.17.1): Loading from cache
  - Updating symfony/mime (v4.4.1 => v4.4.10): Loading from cache
  - Updating symfony/http-foundation (v4.4.1 => v4.4.10): Loading from cache
  - Updating symfony/event-dispatcher (v4.4.1 => v4.4.10): Loading from cache
  - Updating symfony/var-dumper (v4.4.1 => v4.4.10): Loading from cache
  - Updating symfony/debug (v4.4.1 => v4.4.10): Loading from cache
  - Updating symfony/error-handler (v4.4.1 => v4.4.10): Loading from cache
  - Updating symfony/http-kernel (v4.4.1 => v4.4.10): Loading from cache
  - Updating symfony/doctrine-bridge (v4.4.1 => v4.4.10): Loading from cache
  - Updating symfony/dependency-injection (v4.4.1 => v4.4.10): Loading from cache
  - Updating symfony/config (v4.4.1 => v4.4.10): Loading from cache
  - Updating doctrine/instantiator (1.3.0 => 1.3.1): Loading from cache
  - Updating doctrine/orm (v2.7.0 => v2.7.3): Loading from cache
  - Updating symfony/routing (v4.4.1 => v4.4.10): Loading from cache
  - Updating symfony/var-exporter (v4.4.1 => v4.4.10): Loading from cache
  - Updating symfony/cache (v4.4.1 => v4.4.10): Loading from cache
  - Updating symfony/framework-bundle (v4.4.1 => v4.4.10): Loading from cache
  - Updating doctrine/doctrine-bundle (1.12.2 => 1.12.10): Loading from cache
  - Updating doctrine/doctrine-fixtures-bundle (3.3.0 => 3.3.1): Loading from cache
  - Updating egulias/email-validator (2.1.11 => 2.1.18): Loading from cache
  - Updating symfony/stopwatch (v4.4.1 => v4.4.10): Loading from cache
  - Updating symfony/polyfill-php70 (v1.13.1 => v1.17.1): Loading from cache
  - Updating symfony/options-resolver (v4.4.1 => v4.4.10): Loading from cache
  - Updating friendsofphp/php-cs-fixer (v2.16.1 => v2.16.3): Loading from cache
  - Updating guzzlehttp/guzzle (6.5.0 => 6.5.5): Loading from cache
  - Updating sensio/framework-extra-bundle (v5.5.1 => v5.5.6): Loading from cache
  - Updating setasign/fpdi (v2.2.0 => v2.3.3): Loading from cache
  - Updating tecnickcom/tcpdf (6.3.2 => 6.3.5): Loading from cache
  - Updating setasign/fpdi-tcpdf (v2.2.0 => v2.3.0): Loading from cache
  - Updating symfony/asset (v4.4.1 => v4.4.10): Loading from cache
  - Updating symfony/css-selector (v4.4.1 => v4.4.10): Loading from cache
  - Updating twig/twig (v2.12.2 => v2.12.5): Loading from cache
  - Updating symfony/twig-bridge (v4.4.1 => v4.4.10): Loading from cache
  - Updating symfony/twig-bundle (v4.4.1 => v4.4.10): Loading from cache
  - Updating symfony/web-profiler-bundle (v4.4.1 => v4.4.10): Loading from cache
  - Updating monolog/monolog (1.25.2 => 1.25.4): Loading from cache
  - Updating symfony/monolog-bridge (v4.4.1 => v4.4.10): Loading from cache
  - Updating symfony/debug-bundle (v4.4.1 => v4.4.10): Loading from cache
  - Updating symfony/debug-pack (v1.0.7 => v1.0.8): Loading from cache
  - Updating symfony/dotenv (v4.4.1 => v4.4.10): Loading from cache
  - Updating symfony/expression-language (v4.4.1 => v4.4.10): Loading from cache
  - Updating symfony/inflector (v4.4.1 => v4.4.10): Loading from cache
  - Updating symfony/property-access (v4.4.1 => v4.4.10): Loading from cache
  - Updating symfony/polyfill-intl-icu (v1.13.1 => v1.17.1): Loading from cache
  - Updating symfony/intl (v4.4.1 => v4.4.10): Loading from cache
  - Updating symfony/form (v4.4.1 => v4.4.10): Loading from cache
  - Updating nikic/php-parser (v4.3.0 => v4.5.0): Loading from cache
  - Updating symfony/maker-bundle (v1.14.3 => v1.19.0): Loading from cache
  - Updating symfony/orm-pack (v1.0.7 => v1.0.8): Loading from cache
  - Updating symfony/proxy-manager-bridge (v4.4.1 => v4.4.10): Loading from cache
  - Updating symfony/security (v4.4.1 => v4.4.10): Loading from cache
  - Updating symfony/security-bundle (v4.4.1 => v4.4.10): Loading from cache
  - Updating symfony/serializer (v4.4.1 => v4.4.10): Loading from cache
  - Updating symfony/templating (v4.4.1 => v4.4.10): Loading from cache
  - Updating symfony/translation (v4.4.1 => v4.4.10): Loading from cache
  - Updating symfony/validator (v4.4.1 => v4.4.10): Loading from cache
  - Updating symfony/web-server-bundle (v4.4.1 => v4.4.10): Loading from cache
  - Updating symfony/workflow (v4.4.1 => v4.4.10): Loading from cache
  - Updating symfony/yaml (v4.4.1 => v4.4.10): Loading from cache
  - Updating fzaninotto/faker (v1.9.0 => v1.9.1): Loading from cache
  - Updating webmozart/assert (1.6.0 => 1.9.0): Loading from cache
  - Updating phpdocumentor/reflection-common (2.0.0 => 2.1.0): Loading from cache
  - Updating phpdocumentor/reflection-docblock (4.3.2 => 4.3.4): Loading from cache
  - Updating phpspec/prophecy (1.9.0 => v1.10.3): Loading from cache
  - Updating symfony/polyfill-iconv (v1.13.1 => v1.17.1): Loading from cache
  - Updating symfony/dom-crawler (v4.4.1 => v4.4.10): Loading from cache
  - Updating symfony/browser-kit (v4.4.1 => v4.4.10): Loading from cache
  - Updating symfony/phpunit-bridge (v4.4.1 => v4.4.10): Loading from cache
  - Updating behat/gherkin (v4.6.0 => v4.6.2): Loading from cache
  - Updating myclabs/deep-copy (1.9.3 => 1.9.5): Loading from cache
  - Updating codeception/phpunit-wrapper (6.7.1 => 6.8.1): Loading from cache
@chihiro-adachi
プラグインのインストーラを動作するように修正
bf48a5c
@chihiro-adachi chihiro-adachi added this to the 4.1 milestone Jun 26, 2020
@okazy
Copy link
Contributor

okazy commented Jun 29, 2020 •
edited
Loading

ろーかるかんkyローカル環境にて起動ができました。

image

モンキーテストしてみましたが商品の購入、受注ステータスの変更など一通り動作していることを確認できました。

@chihiro-adachi
Copy link
Contributor Author

Unit/E2Eテストが一部不安定です。

非会員の購入テストが通ったり通らなかったり。シリアライズ周りの影響？

  • ShoppingControllerWithMultipleNonmemberTest
  • ShoppingControllerWithNonmemberTest

カテゴリ、レイアウト管理のテストが落ちる

  • EA03ProductCest: Ea0305-uc01-t01(& uc01-t02/uc02-t01/uc04-t01) カテゴリ登録/編集/削除
  • EA03ProductCest: Ea0307-uc01-t01(& uc01-t02) カテゴリcsv登録
  • EA06ContentsManagementCest: Ea0603-uc01-t01(& uc01-t02/uc01-t03/uc01-t04/uc01-t05) ページ管理

@chihiro-adachi
Copy link
Contributor Author

非会員の購入テストはこちらのコミットで対応 e711870

nanasess added a commit to nanasess/ec-cube that referenced this pull request Jun 30, 2020
@nanasess
Merge pull request EC-CUBE#4596 from chihiro-adachi/experimental-symf…
7d40196 
…ony4.4

Symfony4.4対応
@chihiro-adachi chihiro-adachi mentioned this pull request Jun 30, 2020
Closed
@chihiro-adachi
Copy link
Contributor Author

E2Eテストについては、手動での操作では再現しないため、#4604 に残タスクとしてissueを作成しました。

@chihiro-adachi
Copy link
Contributor Author

@okazy
E2Eテストの失敗については #4604 に切り出したので、こちらマージお願いしてもよいでしょうか。

@okazy
Copy link
Contributor

okazy commented Jul 3, 2020

@chihiro-adachi
Issueの作成ありがとうございます。
experimental ブランチということで柔軟にマージしていくのが良いかと思います。

experimental ブランチの運用指針ってどこにも記載していなかったかと思いましたので wiki に1行追加しておきました。
https://github.com/EC-CUBE/ec-cube/wiki

okazy
okazy approved these changes Jul 3, 2020
View reviewed changes
Copy link
Contributor

@okazy okazy left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

テストが落ちているますが experimental ブランチですので取り込んでも問題ないと思います。

@kiy0taka kiy0taka merged commit e73d74e into EC-CUBE:experimental/symfony4.4 Jul 7, 2020
@okazy okazy mentioned this pull request Jul 7, 2020
Open
@okazy okazy mentioned this pull request Nov 2, 2020
Closed
8 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@okazy okazy okazy approved these changes

Assignees
No one assigned
Labels
experimental Status: ready-for-merge
Projects
None yet
Milestone
4.1.0
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@chihiro-adachi @okazy @kiy0taka