diff --git a/Dockerfile b/Dockerfile index bff7982e1c..4d2840343b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,7 +36,7 @@ RUN apt-get update \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -RUN docker-php-ext-configure gd ${GD_OPTIONS} && docker-php-ext-install ${EXT_INSTALL_ARGS} +RUN docker-php-ext-configure gd ${GD_OPTIONS} && docker-php-ext-install -j$(nproc) ${EXT_INSTALL_ARGS} RUN if [[ ${APCU} ]]; then pecl install ${APCU} && docker-php-ext-enable apcu; fi # composer diff --git a/composer.lock b/composer.lock index dfeaebf5e5..ac158fee2a 100644 --- a/composer.lock +++ b/composer.lock @@ -1645,16 +1645,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.11.10", + "version": "1.11.11", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "640410b32995914bde3eed26fa89552f9c2c082f" + "reference": "707c2aed5d8d0075666e673a5e71440c1d01a5a3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/640410b32995914bde3eed26fa89552f9c2c082f", - "reference": "640410b32995914bde3eed26fa89552f9c2c082f", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/707c2aed5d8d0075666e673a5e71440c1d01a5a3", + "reference": "707c2aed5d8d0075666e673a5e71440c1d01a5a3", "shasum": "" }, "require": { @@ -1699,7 +1699,7 @@ "type": "github" } ], - "time": "2024-08-08T09:02:50+00:00" + "time": "2024-08-19T14:37:29+00:00" }, { "name": "phpunit/php-code-coverage", diff --git a/data/Smarty/templates/default/entry/kiyaku.tpl b/data/Smarty/templates/default/entry/kiyaku.tpl index 1707b6b561..16cab8ea07 100644 --- a/data/Smarty/templates/default/entry/kiyaku.tpl +++ b/data/Smarty/templates/default/entry/kiyaku.tpl @@ -40,7 +40,7 @@
  • - + 同意して会員登録へ
  • diff --git a/data/Smarty/templates/sphone/abouts/index.tpl b/data/Smarty/templates/sphone/abouts/index.tpl index bcd3e76dfb..3f134a11bf 100644 --- a/data/Smarty/templates/sphone/abouts/index.tpl +++ b/data/Smarty/templates/sphone/abouts/index.tpl @@ -55,7 +55,7 @@
    メールアドレス
    -
    +
    diff --git a/data/Smarty/templates/sphone/cart/index.tpl b/data/Smarty/templates/sphone/cart/index.tpl index 349ccac4dd..df0f48573a 100644 --- a/data/Smarty/templates/sphone/cart/index.tpl +++ b/data/Smarty/templates/sphone/cart/index.tpl @@ -65,7 +65,7 @@
    -

    +

    あと「」で送料無料!! @@ -157,7 +157,7 @@

    ※ 現在カート内に商品はございません。

    -

    お買い物を続ける

    +

    お買い物を続ける

    diff --git a/data/Smarty/templates/sphone/entry/complete.tpl b/data/Smarty/templates/sphone/entry/complete.tpl index 9cb1cfc239..f1063374ef 100644 --- a/data/Smarty/templates/sphone/entry/complete.tpl +++ b/data/Smarty/templates/sphone/entry/complete.tpl @@ -32,7 +32,7 @@

    今後ともご愛顧賜りますよう、よろしくお願い申し上げます。

    - トップページへ + トップページへ
    diff --git a/data/Smarty/templates/sphone/entry/kiyaku.tpl b/data/Smarty/templates/sphone/entry/kiyaku.tpl index 7bd6b341d7..b402e9d34b 100644 --- a/data/Smarty/templates/sphone/entry/kiyaku.tpl +++ b/data/Smarty/templates/sphone/entry/kiyaku.tpl @@ -30,8 +30,8 @@
    @@ -39,8 +39,8 @@
    diff --git a/data/Smarty/templates/sphone/footer.tpl b/data/Smarty/templates/sphone/footer.tpl index 5eb68905e4..2d0742ee8a 100644 --- a/data/Smarty/templates/sphone/footer.tpl +++ b/data/Smarty/templates/sphone/footer.tpl @@ -25,10 +25,10 @@ diff --git a/data/Smarty/templates/sphone/forgot/complete.tpl b/data/Smarty/templates/sphone/forgot/complete.tpl index 91281847aa..c070f4028f 100644 --- a/data/Smarty/templates/sphone/forgot/complete.tpl +++ b/data/Smarty/templates/sphone/forgot/complete.tpl @@ -39,7 +39,7 @@
    -

    ログイン画面へ

    +

    ログイン画面へ

    diff --git a/data/Smarty/templates/sphone/frontparts/bloc/category_tree_fork.tpl b/data/Smarty/templates/sphone/frontparts/bloc/category_tree_fork.tpl index 55660b2c02..42ce606a0e 100644 --- a/data/Smarty/templates/sphone/frontparts/bloc/category_tree_fork.tpl +++ b/data/Smarty/templates/sphone/frontparts/bloc/category_tree_fork.tpl @@ -23,7 +23,7 @@