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

Bump phpstan/phpstan from 1.12.7 to 2.0.3 #1085

Merged
merged 3 commits into from
Dec 17, 2024
Merged

Bump phpstan/phpstan from 1.12.7 to 2.0.3 #1085

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
c869b89
Bump phpstan/phpstan from 1.12.7 to 2.0.3
dependabot[bot] Dec 16, 2024
a6cb99d
Fix phpstan errors
nanasess Dec 17, 2024
4149789
Merge branch 'master' into dependabot/composer/phpstan/phpstan-2.0.3
nanasess Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"nanasess/ec-cube2-class-extends-stubs": "^1.0",
"nanasess/eccube2-fixture-generator": "^2.0",
"phpdocumentor/reflection-docblock": "~5.5.1",
"phpstan/phpstan": "^1.10",
"phpstan/phpstan": "^2.0",
"phpunit/phpunit": "^9.6",
"symfony/yaml": "^5.4 || ^6.4"
},
Expand Down
14 changes: 7 additions & 7 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion data/class/pages/admin/system/LC_Page_Admin_System_Bkup.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ public function action()
$arrBkupList = $this->lfGetBkupData('ORDER BY create_date DESC');
// テンプレートファイルに渡すデータをセット
$this->arrErr = isset($arrErr) ? $arrErr : [];
$this->arrForm = isset($arrForm) ? $arrForm : [];
$this->arrForm = $arrForm;
$this->arrBkupList = $arrBkupList;
}

Expand Down
3 changes: 0 additions & 3 deletions data/class/pages/products/LC_Page_Products_Detail.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/

if (file_exists(MODULE_REALDIR.'mdl_gmopg/inc/function.php')) {
require_once MODULE_REALDIR.'mdl_gmopg/inc/function.php';
}
/**
* 商品詳細 のページクラス.
*
Expand Down
24 changes: 0 additions & 24 deletions data/require_plugin.php
View file
Open in desktop

This file was deleted.

22 changes: 22 additions & 0 deletions phpstan.neon.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,25 @@ parameters:
-
message: "#^Inner named functions are not supported by PHPStan\\.#"
path: data/class/SC_Initial.php
-
message: '#^Path in include_once\(\) "Auth/SASL.php" is not a file or it does not exist.#'
path: data/module/Net/SMTP.php
-
message: '#^Path in require_once\(\) ".*\.php" is not a file or it does not exist\.$#'
paths:
- data/module/Calendar/Calendar.php
- data/module/Calendar/Day.php
- data/module/Calendar/Decorator/Textual.php
- data/module/Calendar/Decorator/Uri.php
- data/module/Calendar/Decorator/Weekday.php
- data/module/Calendar/Decorator/Wrapper.php
- data/module/Calendar/Factory.php
- data/module/Calendar/Hour.php
- data/module/Calendar/Minute.php
- data/module/Calendar/Month.php
- data/module/Calendar/Month/Weekdays.php
- data/module/Calendar/Month/Weeks.php
- data/module/Calendar/Second.php
- data/module/Calendar/Util/Textual.php
- data/module/Calendar/Week.php
- data/module/Calendar/Year.php
Loading