diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index eb928d8c46..1892b04cab 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -198,13 +198,6 @@ jobs: - name: Install to Composer run: composer install --no-interaction -o - - name: Setup MailCatcher - run: gem install -N mailcatcher -v 0.6.5 - shell: bash - - name: Run to MailCatcher - run: mailcatcher & - shell: bash - - name: Setup to database run: | choco install -y mysql --version 5.7.18 diff --git a/data/class/pages/upgrade/helper/LC_Upgrade_Helper_Json.php b/data/class/pages/upgrade/helper/LC_Upgrade_Helper_Json.php index 8eb64a914b..a01202c120 100644 --- a/data/class/pages/upgrade/helper/LC_Upgrade_Helper_Json.php +++ b/data/class/pages/upgrade/helper/LC_Upgrade_Helper_Json.php @@ -87,7 +87,7 @@ public function display() * そのため5.2.0以上の場合は組み込み関数のjson_decode()を使用する. * * @param string $str - * @return StdClass + * @return mixed * @see SC_Utils_Ex::jsonDecode */ public function decode($str) diff --git a/data/class/util/SC_Utils.php b/data/class/util/SC_Utils.php index 212f88f6ee..e50f79b174 100755 --- a/data/class/util/SC_Utils.php +++ b/data/class/util/SC_Utils.php @@ -1896,7 +1896,7 @@ public static function copyDirectory($source_path, $dest_path) if (is_dir($cur_path)) { // ディレクトリの場合 // コピー先に無いディレクトリの場合、ディレクトリ作成. - if (!empty($filename) && !file_exists($dest_file_path)) mkdir($dest_file_path); + if ($filename !== false && !file_exists($dest_file_path)) mkdir($dest_file_path); SC_Utils_Ex::copyDirectory($cur_path . '/', $dest_file_path . '/'); } else { if (file_exists($dest_file_path)) unlink($dest_file_path); diff --git a/phpstan.neon.dist b/phpstan.neon.dist index b63e31e6fb..b8e705d855 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -30,14 +30,14 @@ parameters: - message: "#^Call to static method dayOfWeek\\(\\) on an unknown class Date_Calc\\.#" path: data/module/Calendar/Util/Textual.php - - - message: "#^Constant SMARTY_PLUGINS_DIR not found\\.$#" - path: data/smarty_extends/* + # - + # message: "#^Constant SMARTY_PLUGINS_DIR not found\\.$#" + # path: data/smarty_extends/* - message: "#^Function smarty_function_escape_special_chars not found\\.$#" path: data/smarty_extends/* - - message: "#^Variable \\$values in isset\\(\\) is always null\\.$#" + message: "#^Variable \\$values in isset\\(\\) always exists and is always null\\.$#" paths: - data/smarty_extends/function.html_radios_ex.php - data/smarty_extends/function.html_checkboxes_ex.php