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

[fix] refs #113 dtb_baseinfo のキャッシュが不完全 #385

Merged
merged 7 commits into from
Jan 24, 2024

Conversation

seasoftjapan
Copy link
Contributor

@seasoftjapan seasoftjapan commented May 4, 2020

fixed #113

Copy link
Contributor

@nobuhiko nobuhiko left a comment

Choose a reason for hiding this comment

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

修正したテストが落ちてますし、なにか目的の挙動と違うことになっているような?

SC_Helper_DB::registerBasisData() での更新時に、キャッシュデータファイルを生成する。
@okazy okazy added this to the 2.17.1 milestone Jun 23, 2020
@ryo-endo ryo-endo modified the milestones: 2.17.1, 2.17.2 Jun 29, 2020
@nanasess nanasess modified the milestones: 2.17.2, 2.17.3 Nov 12, 2021
@nanasess
Copy link
Contributor

@seasoftjapan コンフリクト解消できますでしょうか?

@nanasess
Copy link
Contributor

@seasoftjapan こちらのコンフリクト解消できたりしますでしょうか?

@codecov-commenter
Copy link

Codecov Report

Merging #385 (ad8e9be) into master (ac42946) will increase coverage by 0.01%.
The diff coverage is 95.00%.

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

@@            Coverage Diff             @@
##           master     #385      +/-   ##
==========================================
+ Coverage   55.33%   55.35%   +0.01%     
==========================================
  Files          75       75              
  Lines        8902     8908       +6     
==========================================
+ Hits         4926     4931       +5     
- Misses       3976     3977       +1     
Flag Coverage Δ
tests 55.35% <95.00%> (+0.01%) ⬆️

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

Files Coverage Δ
data/class/helper/SC_Helper_DB.php 95.29% <95.00%> (-0.15%) ⬇️

@seasoftjapan
Copy link
Contributor Author

@nanasess

@seasoftjapan こちらのコンフリクト解消できたりしますでしょうか?

コミット追加しました。

@nanasess
Copy link
Contributor

nanasess commented Nov 3, 2023

@seasoftjapan ありがとうございます。順次マージしていただけますので、もうしばらくお待ちください🙇‍♂️

@ji-eunsoo ji-eunsoo merged commit 93abd50 into EC-CUBE:master Jan 24, 2024
15 of 54 checks passed
seasoftjapan added a commit that referenced this pull request Jan 28, 2024
- #385 で追加した店舗基本情報をDBから取得する関数と比較する。
- 前項に伴い、Mock を使う必要がなくなり、削除した。
- Mock のデータが旧バージョンのカラムだったので見逃されていた不整合を修正した。
shinya added a commit that referenced this pull request Jan 31, 2024
#385 のPHP8対応、PHP5対応、軽微な修正、テスト調整
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.

dtb_baseinfo のキャッシュが不完全
8 participants