Merge pull request #5073 from okazy/dev/4.0.6

4.0.6 / 4.0.6-p1 の変更（#5071 / #5078）の取り込み

.htaccess

@@ -1,15 +1,22 @@
 DirectoryIndex index.php index.html .ht
 
+<Files ~ "/index.php">
+    order deny,allow
+    allow from all
+</Files>
+
+<FilesMatch "(?<!\.gif|\.png|\.jpg|\.jpeg|\.css|\.ico|\.js|\.svg|\.map)$">
+    SetEnvIf Request_URI "/vendor/" deny_dir
+    Order allow,deny
+    Deny from env=deny_dir
+    Allow from all
+</FilesMatch>
+
 <FilesMatch "^composer|^COPYING|^\.env|^\.maintenance|^Procfile|^app\.json|^gulpfile\.js|^package\.json|^package-lock\.json|web\.config|^Dockerfile|^\.editorconfig|\.(ini|lock|dist|git|sh|bak|swp|env|twig|yml|yaml|dockerignore|sample)$">
     order allow,deny
     deny from all
 </FilesMatch>
 
-<Files ~ "index.php">
-    order deny,allow
-    allow from all
-</Files>
-
 <IfModule mod_headers.c>
     # クリックジャッキング対策
     Header always set X-Frame-Options SAMEORIGIN

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": {

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.

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 = '<div class="c-form__fileUploadThumbnail" style="background-image:url(\'__path__\');">' +
+            var proto_img = '<div class="c-form__fileUploadThumbnail">' +
                 '<a class="delete-image"><i class="fa fa-times" aria-hidden="true"></i></a>' +
                 '</div>';
             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);

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);
     }