Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PHPStan のエラーを修正 #493

Merged
merged 3 commits into from
Nov 16, 2021
Merged

PHPStan のエラーを修正 #493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
111d586
PHPStan のエラーを修正
nanasess Nov 10, 2021
1ed7795
Fix ignoreError pattern
nanasess Nov 10, 2021
1e8e94f
Remove mailcatcher on windows
nanasess Nov 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 0 additions & 7 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion data/class/pages/upgrade/helper/LC_Upgrade_Helper_Json.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion data/class/util/SC_Utils.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
8 changes: 4 additions & 4 deletions phpstan.neon.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down