diff --git a/Common/Constant.php b/Common/Constant.php index e93be4f..09546ed 100644 --- a/Common/Constant.php +++ b/Common/Constant.php @@ -16,6 +16,6 @@ class Constant { const FROM_VERSION = '4.0.5'; - const TO_VERSION = '4.0.6'; + const TO_VERSION = '4.0.6-p1'; const PLUGIN_CODE = 'EccubeUpdater405to406'; } diff --git a/Controller/Admin/ConfigController.php b/Controller/Admin/ConfigController.php index e29ad40..86671d8 100644 --- a/Controller/Admin/ConfigController.php +++ b/Controller/Admin/ConfigController.php @@ -112,9 +112,10 @@ public function __construct( $this->composerApiService = $composerApiService; $this->eccubeConfig = $eccubeConfig; - // 4.0.5 もしくは 4.0.5-p1を対象とする + // 4.0.5, 4.0.5-p1, 4.0.6 を対象とする if (version_compare(Constant::VERSION, UpdaterConstant::FROM_VERSION, '=') - || version_compare(Constant::VERSION, UpdaterConstant::FROM_VERSION.'-p1', '=')) { + || version_compare(Constant::VERSION, UpdaterConstant::FROM_VERSION.'-p1', '=') + || version_compare(Constant::VERSION, '4.0.6', '=')) { $this->supported = true; } else { $this->supported = false; @@ -142,13 +143,17 @@ public function index(Request $request) $this->addError('xdebugが有効になっています。無効にしてください。', 'admin'); } + $fs = new Filesystem(); + $dir = $this->eccubeConfig->get('plugin_realdir').'/'.UpdaterConstant::PLUGIN_CODE; // 4.0.5-p1の場合は、ハッシュファイル・アップデートファイルを差し替え if (version_compare(Constant::VERSION, UpdaterConstant::FROM_VERSION.'-p1', '=')) { - $fs = new Filesystem(); - $dir = $this->eccubeConfig->get('plugin_realdir').'/'.UpdaterConstant::PLUGIN_CODE; $fs->copy($dir.'/Resource/file_hash/405p1_file_hash.yaml', $dir.'/Resource/file_hash/file_hash.yaml', true); $fs->copy($dir.'/Resource/file_hash/405p1_file_hash_crlf.yaml', $dir.'/Resource/file_hash/file_hash_crlf.yaml', true); $fs->copy($dir.'/Resource/405p1_update_file.tar.gz', $dir.'/Resource/update_file.tar.gz', true); + } elseif (version_compare(Constant::VERSION, '4.0.6', '=')) { // 4.0.6の場合は、ハッシュファイル・アップデートファイルを差し替え + $fs->copy($dir.'/Resource/file_hash/406_file_hash.yaml', $dir.'/Resource/file_hash/file_hash.yaml', true); + $fs->copy($dir.'/Resource/file_hash/406_file_hash_crlf.yaml', $dir.'/Resource/file_hash/file_hash_crlf.yaml', true); + $fs->copy($dir.'/Resource/406_update_file.tar.gz', $dir.'/Resource/update_file.tar.gz', true); } return [ diff --git a/Resource/405p1_update_file.tar.gz b/Resource/405p1_update_file.tar.gz index 0f4eac6..182b918 100644 Binary files a/Resource/405p1_update_file.tar.gz and b/Resource/405p1_update_file.tar.gz differ diff --git a/Resource/406_update_file.tar.gz b/Resource/406_update_file.tar.gz new file mode 100644 index 0000000..860758f Binary files /dev/null and b/Resource/406_update_file.tar.gz differ diff --git a/Resource/file_hash/406_file_hash.yaml b/Resource/file_hash/406_file_hash.yaml new file mode 100644 index 0000000..de34681 --- /dev/null +++ b/Resource/file_hash/406_file_hash.yaml @@ -0,0 +1,3 @@ +.htaccess: ee08e572d233570c18a885774cd28ec4 +package.json: 06ad16495508c03ba038b2aeee2770b8 +src/Eccube/Common/Constant.php: 92779c491af74ea046211c1c11993ea1 diff --git a/Resource/file_hash/406_file_hash_crlf.yaml b/Resource/file_hash/406_file_hash_crlf.yaml new file mode 100644 index 0000000..6fd6721 --- /dev/null +++ b/Resource/file_hash/406_file_hash_crlf.yaml @@ -0,0 +1,3 @@ +.htaccess: 48631a26204927aa00aef615d777d04f +package.json: 61b84635f2cfee76e2b61580243aed03 +src/Eccube/Common/Constant.php: 539df6eab71d8afd0f07bd9bdbc94b06 diff --git a/Resource/template/admin/config.twig b/Resource/template/admin/config.twig index 9d4b666..91b77fc 100644 --- a/Resource/template/admin/config.twig +++ b/Resource/template/admin/config.twig @@ -38,12 +38,13 @@
  • XSS脆弱性の修正(JVN#97554111、JVN#95292458)
  • Symfonyライブラリのアップデート
  • プラグインのインストール時にrequire-devのライブラリが含まれていた不具合の修正
  • +
  • JVN#95292458 の修正不備に対応

  • リリースノート
    diff --git a/Resource/update_file.tar.gz b/Resource/update_file.tar.gz index 62ec6c6..def19c6 100644 Binary files a/Resource/update_file.tar.gz and b/Resource/update_file.tar.gz differ diff --git a/bin/update_file_hash.sh b/bin/update_file_hash.sh index 09a9e66..9bed25f 100755 --- a/bin/update_file_hash.sh +++ b/bin/update_file_hash.sh @@ -5,7 +5,7 @@ set -x BASE_DIR=$(pwd) WORK_DIR=${BASE_DIR}/work FROM=4.0.5 -TO=4.0.6 +TO=4.0.6-p1 # 差分チェックの対象外ファイルの一覧 # ここで指定したファイルは, プラグインの差分チェック時の対象外になります diff --git a/composer.json b/composer.json index 176168b..55c6708 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "ec-cube/EccubeUpdater405to406", - "version": "1.0.0", + "version": "1.0.1", "description": "EC-CUBEアップデートプラグイン", "type": "eccube-plugin", "require": {