diff --git a/.htaccess b/.htaccess index 9a77b4d7e75..1ffc409041b 100644 --- a/.htaccess +++ b/.htaccess @@ -1,15 +1,22 @@ DirectoryIndex index.php index.html .ht + + order deny,allow + allow from all + + + + SetEnvIf Request_URI "/vendor/" deny_dir + Order allow,deny + Deny from env=deny_dir + Allow from all + + order allow,deny deny from all - - order deny,allow - allow from all - - # クリックジャッキング対策 Header always set X-Frame-Options SAMEORIGIN diff --git a/composer.lock b/composer.lock index a1f90f9cee0..7a1f580dd89 100644 --- a/composer.lock +++ b/composer.lock @@ -5385,6 +5385,7 @@ "type": "tidelift" } ], + "abandoned": "use `EnglishInflector` from the String component instead", "time": "2020-10-24T10:57:07+00:00" }, { @@ -5800,16 +5801,16 @@ }, { "name": "symfony/polyfill-apcu", - "version": "v1.22.1", + "version": "v1.23.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-apcu.git", - "reference": "bc9974e74f8c05f4ceb500b1e0603e36be7d8223" + "reference": "80f7fb64c5b64ebcba76f40215e63808a2062a18" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/bc9974e74f8c05f4ceb500b1e0603e36be7d8223", - "reference": "bc9974e74f8c05f4ceb500b1e0603e36be7d8223", + "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/80f7fb64c5b64ebcba76f40215e63808a2062a18", + "reference": "80f7fb64c5b64ebcba76f40215e63808a2062a18", "shasum": "" }, "require": { @@ -5818,7 +5819,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.23-dev" }, "thanks": { "name": "symfony/polyfill", @@ -5870,20 +5871,20 @@ "type": "tidelift" } ], - "time": "2021-01-22T09:19:47+00:00" + "time": "2021-02-19T12:13:01+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.22.1", + "version": "v1.23.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "c6c942b1ac76c82448322025e084cadc56048b4e" + "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/c6c942b1ac76c82448322025e084cadc56048b4e", - "reference": "c6c942b1ac76c82448322025e084cadc56048b4e", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/46cd95797e9df938fdd2b03693b5fca5e64b01ce", + "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce", "shasum": "" }, "require": { @@ -5895,7 +5896,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.23-dev" }, "thanks": { "name": "symfony/polyfill", @@ -5946,20 +5947,20 @@ "type": "tidelift" } ], - "time": "2021-01-07T16:49:33+00:00" + "time": "2021-02-19T12:13:01+00:00" }, { "name": "symfony/polyfill-iconv", - "version": "v1.22.1", + "version": "v1.23.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-iconv.git", - "reference": "06fb361659649bcfd6a208a0f1fcaf4e827ad342" + "reference": "63b5bb7db83e5673936d6e3b8b3e022ff6474933" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/06fb361659649bcfd6a208a0f1fcaf4e827ad342", - "reference": "06fb361659649bcfd6a208a0f1fcaf4e827ad342", + "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/63b5bb7db83e5673936d6e3b8b3e022ff6474933", + "reference": "63b5bb7db83e5673936d6e3b8b3e022ff6474933", "shasum": "" }, "require": { @@ -5971,7 +5972,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.23-dev" }, "thanks": { "name": "symfony/polyfill", @@ -6023,20 +6024,20 @@ "type": "tidelift" } ], - "time": "2021-01-22T09:19:47+00:00" + "time": "2021-05-27T09:27:20+00:00" }, { "name": "symfony/polyfill-intl-icu", - "version": "v1.22.1", + "version": "v1.23.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-icu.git", - "reference": "af1842919c7e7364aaaa2798b29839e3ba168588" + "reference": "4a80a521d6176870b6445cfb469c130f9cae1dda" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/af1842919c7e7364aaaa2798b29839e3ba168588", - "reference": "af1842919c7e7364aaaa2798b29839e3ba168588", + "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/4a80a521d6176870b6445cfb469c130f9cae1dda", + "reference": "4a80a521d6176870b6445cfb469c130f9cae1dda", "shasum": "" }, "require": { @@ -6048,7 +6049,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.23-dev" }, "thanks": { "name": "symfony/polyfill", @@ -6107,20 +6108,20 @@ "type": "tidelift" } ], - "time": "2021-01-22T09:19:47+00:00" + "time": "2021-05-24T10:04:56+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.22.1", + "version": "v1.23.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "2d63434d922daf7da8dd863e7907e67ee3031483" + "reference": "65bd267525e82759e7d8c4e8ceea44f398838e65" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/2d63434d922daf7da8dd863e7907e67ee3031483", - "reference": "2d63434d922daf7da8dd863e7907e67ee3031483", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/65bd267525e82759e7d8c4e8ceea44f398838e65", + "reference": "65bd267525e82759e7d8c4e8ceea44f398838e65", "shasum": "" }, "require": { @@ -6134,7 +6135,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.23-dev" }, "thanks": { "name": "symfony/polyfill", @@ -6191,20 +6192,20 @@ "type": "tidelift" } ], - "time": "2021-01-22T09:19:47+00:00" + "time": "2021-05-27T09:27:20+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.22.1", + "version": "v1.23.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "43a0283138253ed1d48d352ab6d0bdb3f809f248" + "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/43a0283138253ed1d48d352ab6d0bdb3f809f248", - "reference": "43a0283138253ed1d48d352ab6d0bdb3f809f248", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8590a5f561694770bdcd3f9b5c69dde6945028e8", + "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8", "shasum": "" }, "require": { @@ -6216,7 +6217,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.23-dev" }, "thanks": { "name": "symfony/polyfill", @@ -6272,20 +6273,20 @@ "type": "tidelift" } ], - "time": "2021-01-22T09:19:47+00:00" + "time": "2021-02-19T12:13:01+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.22.1", + "version": "v1.23.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "5232de97ee3b75b0360528dae24e73db49566ab1" + "reference": "2df51500adbaebdc4c38dea4c89a2e131c45c8a1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/5232de97ee3b75b0360528dae24e73db49566ab1", - "reference": "5232de97ee3b75b0360528dae24e73db49566ab1", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/2df51500adbaebdc4c38dea4c89a2e131c45c8a1", + "reference": "2df51500adbaebdc4c38dea4c89a2e131c45c8a1", "shasum": "" }, "require": { @@ -6297,7 +6298,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.23-dev" }, "thanks": { "name": "symfony/polyfill", @@ -6349,7 +6350,7 @@ "type": "tidelift" } ], - "time": "2021-01-22T09:19:47+00:00" + "time": "2021-05-27T09:27:20+00:00" }, { "name": "symfony/polyfill-php56", @@ -6483,16 +6484,16 @@ }, { "name": "symfony/polyfill-php72", - "version": "v1.22.1", + "version": "v1.23.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9" + "reference": "9a142215a36a3888e30d0a9eeea9766764e96976" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9", - "reference": "cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/9a142215a36a3888e30d0a9eeea9766764e96976", + "reference": "9a142215a36a3888e30d0a9eeea9766764e96976", "shasum": "" }, "require": { @@ -6501,7 +6502,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.23-dev" }, "thanks": { "name": "symfony/polyfill", @@ -6552,7 +6553,7 @@ "type": "tidelift" } ], - "time": "2021-01-07T16:49:33+00:00" + "time": "2021-05-27T09:17:38+00:00" }, { "name": "symfony/process", diff --git a/package.json b/package.json index f95515ee5e2..162e569353d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "eccube", - "version": "4.0.5", + "version": "4.0.6-p1", "description": "EC-CUBE EC open platform.", "main": "index.js", "directories": { diff --git a/src/Eccube/Common/Constant.php b/src/Eccube/Common/Constant.php index 501ea2b56f0..828dd06d138 100644 --- a/src/Eccube/Common/Constant.php +++ b/src/Eccube/Common/Constant.php @@ -18,7 +18,7 @@ class Constant /** * EC-CUBE VERSION. */ - const VERSION = '4.0.5'; + const VERSION = '4.0.6-p1'; /** * Enable value. diff --git a/src/Eccube/Resource/template/admin/Setting/Shop/payment_edit.twig b/src/Eccube/Resource/template/admin/Setting/Shop/payment_edit.twig index 4eafa76b889..a9894aee103 100644 --- a/src/Eccube/Resource/template/admin/Setting/Shop/payment_edit.twig +++ b/src/Eccube/Resource/template/admin/Setting/Shop/payment_edit.twig @@ -46,7 +46,7 @@ file that was distributed with this source code. } }; - var proto_img = '
' + + var proto_img = '
' + '' + '
'; var payment_image = $('#{{ form.payment_image.vars.id }}').val(); @@ -57,7 +57,7 @@ file that was distributed with this source code. } else { var path = '{{ asset('', 'temp_image') }}' + filename; } - var $img = $(proto_img.replace(/__path__/g, path)); + var $img = $(proto_img).css('background-image', 'url(' + path + ')'); $('#{{ form.payment_image.vars.id }}').val(filename); $('#thumb').append($img); @@ -73,7 +73,7 @@ file that was distributed with this source code. done: function(e, data) { $('.progress').hide(); var path = '{{ asset('', 'temp_image') }}/' + data.result.filename; - var $img = $(proto_img.replace(/__path__/g, path)); + var $img = $(proto_img).css('background-image', 'url(' + path + ')');; $('#{{ form.payment_image.vars.id }}').val(data.result.filename); $('#thumb').append($img); diff --git a/src/Eccube/Service/Composer/ComposerApiService.php b/src/Eccube/Service/Composer/ComposerApiService.php index ae818a58757..1f32617afa9 100644 --- a/src/Eccube/Service/Composer/ComposerApiService.php +++ b/src/Eccube/Service/Composer/ComposerApiService.php @@ -113,6 +113,7 @@ public function execRequire($packageName, $output = null) '--prefer-dist' => true, '--update-with-dependencies' => true, '--no-scripts' => true, + '--update-no-dev' => env('APP_ENV') === 'prod', ], $output); } @@ -141,6 +142,7 @@ public function execRemove($packageName, $output = null) '--no-interaction' => true, '--profile' => true, '--no-scripts' => true, + '--update-no-dev' => env('APP_ENV') === 'prod', ], $output); } @@ -162,6 +164,7 @@ public function execUpdate($dryRun, $output = null) '--profile' => true, '--no-scripts' => true, '--dry-run' => (bool) $dryRun, + '--no-dev' => env('APP_ENV') === 'prod', ], $output); } @@ -183,6 +186,7 @@ public function execInstall($dryRun, $output = null) '--profile' => true, '--no-scripts' => true, '--dry-run' => (bool) $dryRun, + '--no-dev' => env('APP_ENV') === 'prod', ], $output); } diff --git a/symfony.lock b/symfony.lock index 1148a1488af..79da07acd85 100644 --- a/symfony.lock +++ b/symfony.lock @@ -191,9 +191,6 @@ "ocramius/proxy-manager": { "version": "2.1.1" }, - "paragonie/random_compat": { - "version": "v2.0.11" - }, "phar-io/manifest": { "version": "1.0.1" },