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.0 及び 4.1-core ブランチを 4.1 ブランチにマージ #4996

Closed
wants to merge 307 commits into from

Conversation

nanasess
Copy link
Contributor

@nanasess nanasess commented Apr 1, 2021

概要(Overview・Refs Issue)

4.1β2リリースにむけて、4.0 及び 4.1-core ブランチを 4.1 ブランチにマージ

composer update を実行

  • Removing ocramius/proxy-manager (2.1.1)
  • Removing php-coveralls/php-coveralls (v2.4.1)
  • Removing zendframework/zend-code (3.4.1)
  • Removing zendframework/zend-eventmanager (3.2.1)
  • Upgrading behat/gherkin (v4.6.2 => v4.7.3)
  • Upgrading codeception/codeception (4.1.18 => 4.1.19)
  • Upgrading codeception/stub (2.1.0 => 3.0.0)
  • Upgrading composer/ca-bundle (1.2.8 => 1.2.9)
  • Upgrading composer/composer (2.0.2 => 2.0.11)
  • Upgrading composer/package-versions-deprecated (1.11.99 => 1.11.99.1)
  • Upgrading composer/semver (3.2.1 => 3.2.4)
  • Upgrading composer/spdx-licenses (1.5.4 => 1.5.5)
  • Upgrading composer/xdebug-handler (1.4.3 => 1.4.6)
  • Upgrading doctrine/annotations (1.10.4 => 1.12.1)
  • Upgrading doctrine/dbal (v2.9.3 => 2.13.0)
  • Locking doctrine/deprecations (v0.5.3)
  • Upgrading doctrine/doctrine-bundle (1.12.10 => 1.12.13)
  • Upgrading doctrine/doctrine-fixtures-bundle (3.3.2 => 3.4.0)
  • Upgrading doctrine/instantiator (1.3.1 => 1.4.0)
  • Upgrading doctrine/orm (2.7.4 => 2.7.5)
  • Upgrading doctrine/reflection (1.2.1 => 1.2.2)
  • Upgrading egulias/email-validator (2.1.22 => 2.1.25)
  • Upgrading friendsofphp/php-cs-fixer (v2.18.2 => v2.18.4)
  • Locking friendsofphp/proxy-manager-lts (v1.0.3)
  • Upgrading fzaninotto/faker (v1.9.1 => v1.9.2)
  • Upgrading guzzlehttp/promises (1.4.0 => 1.4.1)
  • Upgrading guzzlehttp/psr7 (1.7.0 => 1.8.1)
  • Locking laminas/laminas-code (3.4.1)
  • Locking laminas/laminas-eventmanager (3.2.1)
  • Locking laminas/laminas-zendframework-bridge (1.1.1)
  • Upgrading mobiledetect/mobiledetectlib (2.8.34 => 2.8.37)
  • Upgrading monolog/monolog (1.25.5 => 1.26.0)
  • Upgrading php-cs-fixer/diff (v1.3.0 => v1.3.1)
  • Locking phpstan/phpstan (0.12.82)
  • Upgrading seld/jsonlint (1.8.2 => 1.8.3)
  • Upgrading setasign/fpdi (v2.3.4 => v2.3.6)
  • Upgrading swiftmailer/swiftmailer (v6.2.3 => v6.2.7)
  • Upgrading symfony/asset (v4.4.18 => v4.4.20)
  • Upgrading symfony/browser-kit (v4.4.18 => v4.4.20)
  • Upgrading symfony/cache (v4.4.18 => v4.4.21)
  • Upgrading symfony/config (v4.4.18 => v4.4.20)
  • Upgrading symfony/console (v4.4.18 => v4.4.21)
  • Upgrading symfony/css-selector (v4.4.18 => v4.4.20)
  • Upgrading symfony/debug (v4.4.18 => v4.4.20)
  • Upgrading symfony/debug-bundle (v4.4.18 => v4.4.20)
  • Upgrading symfony/dependency-injection (v4.4.18 => v4.4.21)
  • Upgrading symfony/doctrine-bridge (v4.4.18 => v4.4.21)
  • Upgrading symfony/dom-crawler (v4.4.18 => v4.4.20)
  • Upgrading symfony/dotenv (v4.4.18 => v4.4.20)
  • Upgrading symfony/error-handler (v4.4.18 => v4.4.21)
  • Upgrading symfony/event-dispatcher (v4.4.18 => v4.4.20)
  • Upgrading symfony/expression-language (v4.4.18 => v4.4.20)
  • Upgrading symfony/filesystem (v4.4.18 => v4.4.21)
  • Upgrading symfony/finder (v4.4.18 => v4.4.20)
  • Upgrading symfony/flex (v1.11.0 => v1.12.2)
  • Upgrading symfony/form (v4.4.18 => v4.4.21)
  • Upgrading symfony/framework-bundle (v4.4.18 => v4.4.21)
  • Upgrading symfony/http-foundation (v4.4.18 => v4.4.20)
  • Upgrading symfony/http-kernel (v4.4.18 => v4.4.21)
  • Upgrading symfony/inflector (v4.4.18 => v4.4.21)
  • Upgrading symfony/intl (v4.4.18 => v4.4.20)
  • Upgrading symfony/maker-bundle (v1.26.1 => v1.30.2)
  • Upgrading symfony/mime (v4.4.18 => v4.4.21)
  • Upgrading symfony/monolog-bridge (v4.4.18 => v4.4.21)
  • Upgrading symfony/monolog-bundle (v3.6.0 => v3.7.0)
  • Upgrading symfony/options-resolver (v4.4.18 => v4.4.20)
  • Upgrading symfony/phpunit-bridge (v4.4.18 => v4.4.21)
  • Upgrading symfony/polyfill-iconv (v1.20.0 => v1.22.1)
  • Upgrading symfony/polyfill-intl-icu (v1.20.0 => v1.22.1)
  • Upgrading symfony/polyfill-intl-idn (v1.20.0 => v1.22.1)
  • Upgrading symfony/polyfill-intl-normalizer (v1.20.0 => v1.22.1)
  • Upgrading symfony/polyfill-mbstring (v1.20.0 => v1.22.1)
  • Upgrading symfony/polyfill-php72 (v1.20.0 => v1.22.1)
  • Upgrading symfony/polyfill-php73 (v1.20.0 => v1.22.1)
  • Upgrading symfony/polyfill-php80 (v1.20.0 => v1.22.1)
  • Upgrading symfony/process (v4.4.18 => v4.4.20)
  • Upgrading symfony/property-access (v4.4.18 => v4.4.20)
  • Upgrading symfony/proxy-manager-bridge (v4.4.18 => v4.4.20)
  • Upgrading symfony/routing (v4.4.18 => v4.4.20)
  • Upgrading symfony/security (v4.4.18 => v4.4.21)
  • Upgrading symfony/security-bundle (v4.4.18 => v4.4.21)
  • Upgrading symfony/serializer (v4.4.18 => v4.4.20)
  • Upgrading symfony/stopwatch (v4.4.18 => v4.4.20)
  • Upgrading symfony/swiftmailer-bundle (v3.5.1 => v3.5.2)
  • Upgrading symfony/templating (v4.4.18 => v4.4.20)
  • Upgrading symfony/translation (v4.4.18 => v4.4.21)
  • Upgrading symfony/twig-bridge (v4.4.18 => v4.4.21)
  • Upgrading symfony/twig-bundle (v4.4.18 => v4.4.20)
  • Upgrading symfony/validator (v4.4.18 => v4.4.21)
  • Upgrading symfony/var-dumper (v4.4.18 => v4.4.21)
  • Upgrading symfony/var-exporter (v4.4.18 => v4.4.20)
  • Upgrading symfony/web-profiler-bundle (v4.4.18 => v4.4.21)
  • Upgrading symfony/web-server-bundle (v4.4.18 => v4.4.21)
  • Upgrading symfony/workflow (v4.4.18 => v4.4.20)
  • Upgrading symfony/yaml (v4.4.18 => v4.4.21)
  • Upgrading tecnickcom/tcpdf (6.3.5 => 6.4.1)

方針(Policy)

実装に関する補足(Appendix)

テスト(Test)

相談(Discussion)

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

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

レビュワー確認項目

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

Kiyotaka Oku and others added 30 commits November 4, 2020 11:34
ページ管理一覧画面でルート名、URL、ファイル名を表示するように対応
郵便番号、電話番号の入力形式をTelTypeに変更
動作確認環境をシステム要件と実態に合わせて更新
…n-entity-exists

プラグイン生成コマンドによって生成されるEntityでclass_existsをチェックするよう変更
…arch

受注のマルチ検索で、会社名はスペースを除去せず検索
…d-image

商品画像削除時、他の商品画像が参照するファイルは削除しないよう変更
購入手続き中でもPurchaseContextでユーザー情報を取得できるようにする
…age_order_search

Feature/EC-CUBE#4716 管理者ページ-受注一覧における検索条件の修正
特定のPDFテンプレートで表が正常に出力されない不具合を修正
okazy and others added 25 commits March 18, 2021 09:41
Hogeプラグインのcomposer.jsonを修正
Bump version from jQuery 3.3.1 to 3.5.1
Travis CI の実行内容は GitHub Actions に置き換え済みなので削除する
CSVインポートの時に文字列に含まれる改行コードを残すようにする
Badge を GitHub Actions に変更
codeception.sh を Travis CI 連携廃止に伴い削除
nginx.conf.sample に bin ディレクトリを追加
docker-compose ファイルを分割する
管理画面のお知らせのE2Eテストをリダイレクトに対応
…y18n-3.2.2

Bump y18n from 3.2.1 to 3.2.2
 - Removing ocramius/proxy-manager (2.1.1)
 - Removing php-coveralls/php-coveralls (v2.4.1)
 - Removing zendframework/zend-code (3.4.1)
 - Removing zendframework/zend-eventmanager (3.2.1)
 - Upgrading behat/gherkin (v4.6.2 => v4.7.3)
 - Upgrading codeception/codeception (4.1.18 => 4.1.19)
 - Upgrading codeception/stub (2.1.0 => 3.0.0)
 - Upgrading composer/ca-bundle (1.2.8 => 1.2.9)
 - Upgrading composer/composer (2.0.2 => 2.0.11)
 - Upgrading composer/package-versions-deprecated (1.11.99 => 1.11.99.1)
 - Upgrading composer/semver (3.2.1 => 3.2.4)
 - Upgrading composer/spdx-licenses (1.5.4 => 1.5.5)
 - Upgrading composer/xdebug-handler (1.4.3 => 1.4.6)
 - Upgrading doctrine/annotations (1.10.4 => 1.12.1)
 - Upgrading doctrine/dbal (v2.9.3 => 2.13.0)
 - Locking doctrine/deprecations (v0.5.3)
 - Upgrading doctrine/doctrine-bundle (1.12.10 => 1.12.13)
 - Upgrading doctrine/doctrine-fixtures-bundle (3.3.2 => 3.4.0)
 - Upgrading doctrine/instantiator (1.3.1 => 1.4.0)
 - Upgrading doctrine/orm (2.7.4 => 2.7.5)
 - Upgrading doctrine/reflection (1.2.1 => 1.2.2)
 - Upgrading egulias/email-validator (2.1.22 => 2.1.25)
 - Upgrading friendsofphp/php-cs-fixer (v2.18.2 => v2.18.4)
 - Locking friendsofphp/proxy-manager-lts (v1.0.3)
 - Upgrading fzaninotto/faker (v1.9.1 => v1.9.2)
 - Upgrading guzzlehttp/promises (1.4.0 => 1.4.1)
 - Upgrading guzzlehttp/psr7 (1.7.0 => 1.8.1)
 - Locking laminas/laminas-code (3.4.1)
 - Locking laminas/laminas-eventmanager (3.2.1)
 - Locking laminas/laminas-zendframework-bridge (1.1.1)
 - Upgrading mobiledetect/mobiledetectlib (2.8.34 => 2.8.37)
 - Upgrading monolog/monolog (1.25.5 => 1.26.0)
 - Upgrading php-cs-fixer/diff (v1.3.0 => v1.3.1)
 - Locking phpstan/phpstan (0.12.82)
 - Upgrading seld/jsonlint (1.8.2 => 1.8.3)
 - Upgrading setasign/fpdi (v2.3.4 => v2.3.6)
 - Upgrading swiftmailer/swiftmailer (v6.2.3 => v6.2.7)
 - Upgrading symfony/asset (v4.4.18 => v4.4.20)
 - Upgrading symfony/browser-kit (v4.4.18 => v4.4.20)
 - Upgrading symfony/cache (v4.4.18 => v4.4.21)
 - Upgrading symfony/config (v4.4.18 => v4.4.20)
 - Upgrading symfony/console (v4.4.18 => v4.4.21)
 - Upgrading symfony/css-selector (v4.4.18 => v4.4.20)
 - Upgrading symfony/debug (v4.4.18 => v4.4.20)
 - Upgrading symfony/debug-bundle (v4.4.18 => v4.4.20)
 - Upgrading symfony/dependency-injection (v4.4.18 => v4.4.21)
 - Upgrading symfony/doctrine-bridge (v4.4.18 => v4.4.21)
 - Upgrading symfony/dom-crawler (v4.4.18 => v4.4.20)
 - Upgrading symfony/dotenv (v4.4.18 => v4.4.20)
 - Upgrading symfony/error-handler (v4.4.18 => v4.4.21)
 - Upgrading symfony/event-dispatcher (v4.4.18 => v4.4.20)
 - Upgrading symfony/expression-language (v4.4.18 => v4.4.20)
 - Upgrading symfony/filesystem (v4.4.18 => v4.4.21)
 - Upgrading symfony/finder (v4.4.18 => v4.4.20)
 - Upgrading symfony/flex (v1.11.0 => v1.12.2)
 - Upgrading symfony/form (v4.4.18 => v4.4.21)
 - Upgrading symfony/framework-bundle (v4.4.18 => v4.4.21)
 - Upgrading symfony/http-foundation (v4.4.18 => v4.4.20)
 - Upgrading symfony/http-kernel (v4.4.18 => v4.4.21)
 - Upgrading symfony/inflector (v4.4.18 => v4.4.21)
 - Upgrading symfony/intl (v4.4.18 => v4.4.20)
 - Upgrading symfony/maker-bundle (v1.26.1 => v1.30.2)
 - Upgrading symfony/mime (v4.4.18 => v4.4.21)
 - Upgrading symfony/monolog-bridge (v4.4.18 => v4.4.21)
 - Upgrading symfony/monolog-bundle (v3.6.0 => v3.7.0)
 - Upgrading symfony/options-resolver (v4.4.18 => v4.4.20)
 - Upgrading symfony/phpunit-bridge (v4.4.18 => v4.4.21)
 - Upgrading symfony/polyfill-iconv (v1.20.0 => v1.22.1)
 - Upgrading symfony/polyfill-intl-icu (v1.20.0 => v1.22.1)
 - Upgrading symfony/polyfill-intl-idn (v1.20.0 => v1.22.1)
 - Upgrading symfony/polyfill-intl-normalizer (v1.20.0 => v1.22.1)
 - Upgrading symfony/polyfill-mbstring (v1.20.0 => v1.22.1)
 - Upgrading symfony/polyfill-php72 (v1.20.0 => v1.22.1)
 - Upgrading symfony/polyfill-php73 (v1.20.0 => v1.22.1)
 - Upgrading symfony/polyfill-php80 (v1.20.0 => v1.22.1)
 - Upgrading symfony/process (v4.4.18 => v4.4.20)
 - Upgrading symfony/property-access (v4.4.18 => v4.4.20)
 - Upgrading symfony/proxy-manager-bridge (v4.4.18 => v4.4.20)
 - Upgrading symfony/routing (v4.4.18 => v4.4.20)
 - Upgrading symfony/security (v4.4.18 => v4.4.21)
 - Upgrading symfony/security-bundle (v4.4.18 => v4.4.21)
 - Upgrading symfony/serializer (v4.4.18 => v4.4.20)
 - Upgrading symfony/stopwatch (v4.4.18 => v4.4.20)
 - Upgrading symfony/swiftmailer-bundle (v3.5.1 => v3.5.2)
 - Upgrading symfony/templating (v4.4.18 => v4.4.20)
 - Upgrading symfony/translation (v4.4.18 => v4.4.21)
 - Upgrading symfony/twig-bridge (v4.4.18 => v4.4.21)
 - Upgrading symfony/twig-bundle (v4.4.18 => v4.4.20)
 - Upgrading symfony/validator (v4.4.18 => v4.4.21)
 - Upgrading symfony/var-dumper (v4.4.18 => v4.4.21)
 - Upgrading symfony/var-exporter (v4.4.18 => v4.4.20)
 - Upgrading symfony/web-profiler-bundle (v4.4.18 => v4.4.21)
 - Upgrading symfony/web-server-bundle (v4.4.18 => v4.4.21)
 - Upgrading symfony/workflow (v4.4.18 => v4.4.20)
 - Upgrading symfony/yaml (v4.4.18 => v4.4.21)
 - Upgrading tecnickcom/tcpdf (6.3.5 => 6.4.1)
@okazy okazy added the improvement 機能改善 label Apr 2, 2021
@okazy okazy added this to the 4.1 milestone Apr 2, 2021
@nanasess
Copy link
Contributor Author

nanasess commented Apr 5, 2021

マージ方針変更のためクローズします
#4901 (comment)

@nanasess nanasess closed this Apr 5, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
improvement 機能改善
Projects
None yet
Development

Successfully merging this pull request may close these issues.