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

4.1ブランチへ統合 #5080

Merged
merged 444 commits into from
Jul 5, 2021
Merged

4.1ブランチへ統合 #5080

merged 444 commits into from
Jul 5, 2021

Conversation

nanasess
Copy link
Contributor

@nanasess nanasess commented Jul 1, 2021

概要(Overview・Refs Issue)

以下を 4.1ブランチへマージ

  • 4.1-core
  • 4.1-feature
  • 4.1-beta2
  • 4.0

方針(Policy)

4.1リリースに向けてブランチを統合する

実装に関する補足(Appendix)

  • docker build が失敗するため、以下2点を修正
    • file_put_contents(./composer.json): failed to open stream: Permission denied になるのを修正
    • Symfony Flex によって不要なファイル(App\DataFixtures\AppFixtures)が生成されるのを修正

テスト(Test)

GitHub Actions が通るのを確認

相談(Discussion)

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

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

レビュワー確認項目

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

nanasess and others added 30 commits February 12, 2021 13:48
…s_error

ファイル管理で名前の重複するディレクトリを作ろうとした時にエラーメッセージを出す
PHPStan を require-dev に入れる
…ose_cancel

カート追加時モーダル枠の白い部分をクリックした時は何も反応させない
E2Eテストが落ちる問題の修正
ご注文手続き画面で商品種別が入れ替わる問題の修正
利用条件の判定を、自身の手数料を考慮して計算するように修正
Revert "利用条件の判定を、自身の手数料を考慮して計算するように修正"
okazy and others added 13 commits June 23, 2021 17:55
4.0.6 / 4.0.6-p1 の変更(EC-CUBE#5071 / EC-CUBE#5078)の取り込み
  - Upgrading symfony/asset (v4.4.20 => v4.4.25)
  - Upgrading symfony/browser-kit (v4.4.20 => v4.4.25)
  - Upgrading symfony/cache (v4.4.21 => v4.4.26)
  - Upgrading symfony/config (v4.4.20 => v4.4.26)
  - Upgrading symfony/console (v4.4.21 => v4.4.26)
  - Upgrading symfony/css-selector (v4.4.20 => v4.4.25)
  - Upgrading symfony/debug (v4.4.20 => v4.4.25)
  - Upgrading symfony/dependency-injection (v4.4.21 => v4.4.26)
  - Upgrading symfony/deprecation-contracts (v2.2.0 => v2.4.0)
  - Upgrading symfony/doctrine-bridge (v4.4.21 => v4.4.25)
  - Upgrading symfony/dom-crawler (v4.4.20 => v4.4.25)
  - Upgrading symfony/dotenv (v4.4.20 => v4.4.25)
  - Upgrading symfony/error-handler (v4.4.21 => v4.4.26)
  - Upgrading symfony/event-dispatcher (v4.4.20 => v4.4.25)
  - Upgrading symfony/expression-language (v4.4.20 => v4.4.25)
  - Upgrading symfony/filesystem (v4.4.21 => v4.4.26)
  - Upgrading symfony/finder (v4.4.20 => v4.4.25)
  - Upgrading symfony/flex (v1.12.2 => v1.13.3)
  - Upgrading symfony/form (v4.4.21 => v4.4.26)
  - Upgrading symfony/framework-bundle (v4.4.21 => v4.4.26)
  - Upgrading symfony/http-foundation (v4.4.20 => v4.4.26)
  - Upgrading symfony/http-kernel (v4.4.21 => v4.4.26)
  - Upgrading symfony/inflector (v4.4.21 => v4.4.25)
  - Upgrading symfony/intl (v4.4.20 => v4.4.25)
  - Upgrading symfony/maker-bundle (v1.30.2 => v1.33.0)
  - Upgrading symfony/mime (v4.4.21 => v4.4.26)
  - Upgrading symfony/monolog-bridge (v4.4.21 => v4.4.26)
  - Upgrading symfony/options-resolver (v4.4.20 => v4.4.25)
  - Upgrading symfony/phpunit-bridge (v4.4.21 => v4.4.26)
  - Upgrading symfony/polyfill-ctype (v1.22.1 => v1.23.0)
  - Upgrading symfony/polyfill-iconv (v1.22.1 => v1.23.0)
  - Upgrading symfony/polyfill-intl-icu (v1.22.1 => v1.23.0)
  - Upgrading symfony/polyfill-intl-idn (v1.22.1 => v1.23.0)
  - Upgrading symfony/polyfill-intl-normalizer (v1.22.1 => v1.23.0)
  - Upgrading symfony/polyfill-mbstring (v1.22.1 => v1.23.0)
  - Upgrading symfony/polyfill-php72 (v1.22.1 => v1.23.0)
  - Upgrading symfony/polyfill-php73 (v1.22.1 => v1.23.0)
  - Upgrading symfony/polyfill-php80 (v1.22.1 => v1.23.0)
  - Locking symfony/polyfill-php81 (v1.23.0)
  - Upgrading symfony/process (v4.4.20 => v4.4.26)
  - Upgrading symfony/property-access (v4.4.20 => v4.4.25)
  - Upgrading symfony/proxy-manager-bridge (v4.4.20 => v4.4.25)
  - Upgrading symfony/routing (v4.4.20 => v4.4.25)
  - Upgrading symfony/security (v4.4.21 => v4.4.26)
  - Upgrading symfony/security-bundle (v4.4.21 => v4.4.26)
  - Upgrading symfony/serializer (v4.4.20 => v4.4.26)
  - Upgrading symfony/stopwatch (v4.4.20 => v4.4.25)
  - Upgrading symfony/templating (v4.4.20 => v4.4.25)
  - Upgrading symfony/translation (v4.4.21 => v4.4.26)
  - Upgrading symfony/twig-bridge (v4.4.21 => v4.4.26)
  - Upgrading symfony/twig-bundle (v4.4.20 => v4.4.26)
  - Upgrading symfony/validator (v4.4.21 => v4.4.26)
  - Upgrading symfony/var-dumper (v4.4.21 => v4.4.26)
  - Upgrading symfony/var-exporter (v4.4.20 => v4.4.26)
  - Upgrading symfony/web-profiler-bundle (v4.4.21 => v4.4.26)
  - Upgrading symfony/web-server-bundle (v4.4.21 => v4.4.26)
  - Upgrading symfony/workflow (v4.4.20 => v4.4.25)
  - Upgrading symfony/yaml (v4.4.21 => v4.4.26)
@codecov-commenter
Copy link

codecov-commenter commented Jul 1, 2021

Codecov Report

❗ No coverage uploaded for pull request base (4.1@fbbdd18). Click here to learn what that means.
The diff coverage is n/a.

Impacted file tree graph

@@          Coverage Diff           @@
##             4.1    #5080   +/-   ##
======================================
  Coverage       ?   75.95%           
  Complexity     ?     5946           
======================================
  Files          ?      449           
  Lines          ?    20922           
  Branches       ?        0           
======================================
  Hits           ?    15891           
  Misses         ?     5031           
  Partials       ?        0           
Flag Coverage Δ
tests 75.95% <0.00%> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.


Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update fbbdd18...a3ca9e9. Read the comment docs.

chihiro-adachi and others added 5 commits July 2, 2021 09:04
…-data

商品詳細ページに構造化データを追加
商品一覧・商品詳細ページの商品画像 imgタグに、alt属性を追加
> PHP Fatal error:  Cannot declare class App\DataFixtures\AppFixtures, because the name is already in use in /var/www/html/src/Eccube/DataFixtures/AppFixtures.php on line 17
@nanasess nanasess changed the title [WIP]4.1ブランチへ統合 4.1ブランチへ統合 Jul 2, 2021
@nanasess nanasess marked this pull request as ready for review July 2, 2021 08:43
@nanasess
Copy link
Contributor Author

nanasess commented Jul 2, 2021

テスト通りましたので WIP 外しました

@okazy okazy added the enhancement 機能追加 label Jul 5, 2021
@okazy okazy added this to the 4.1 milestone Jul 5, 2021
@okazy okazy merged commit 8c3ae69 into EC-CUBE:4.1 Jul 5, 2021
@okazy
Copy link
Contributor

okazy commented Jul 5, 2021

ありがとうございます。マージしました。

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement 機能追加
Projects
None yet
Development

Successfully merging this pull request may close these issues.