Skip to content

Commit

Permalink
Merge branch 'feature-supported-php' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
stelgenhof committed Feb 16, 2025
2 parents 4a73f56 + 2bf10b5 commit 625e87d
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/coding-standard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
fail-fast: false
matrix:
operating-system: [ubuntu-latest, windows-latest]
php-versions: ["8.0", "8.1", "8.2", "8.3"]
php-versions: ["8.1", "8.2", "8.3", "8.4"]

steps:
- name: Set git to use LF
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
fail-fast: false
matrix:
operating-system: [ubuntu-latest, windows-latest]
php-versions: ["8.0", "8.1", "8.2", "8.3"]
php-versions: ["8.1", "8.2", "8.3", "8.4"]

steps:
- name: Set git to use LF
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
fail-fast: false
matrix:
operating-system: [ubuntu-latest, windows-latest]
php-versions: ["8.0", "8.1", "8.2", "8.3"]
php-versions: ["8.1", "8.2", "8.3", "8.4"]

steps:
- name: Set git to use LF
Expand Down
22 changes: 14 additions & 8 deletions .phan/config.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

use Phan\Issue;

/*
* This configuration file was automatically generated by 'phan --init --init-level=1'
/**
* This configuration file was automatically generated by 'phan --init --init-level=3'
*
* TODOs (added by 'phan --init'):
*
Expand Down Expand Up @@ -37,21 +37,22 @@
* '-d' flag.
*/
return [

// The PHP version that the codebase will be checked for compatibility against.
// For best results, the PHP binary used to run Phan should have the same PHP version.
// (Phan relies on Reflection for some types, param counts,
// and checks for undefined classes/methods/functions)
//
// Supported values: `'5.6'`, `'7.0'`, `'7.1'`, `'7.2'`, `'7.3'`, `'7.4'`,
// `'8.0'`, `'8.1'`, `null`.
// `'8.0'`, `'8.1'`, `'8.2'`, `'8.3'`, `null`.
// If this is set to `null`,
// then Phan assumes the PHP version which is closest to the minor version
// of the php executable used to execute Phan.
//
// Note that the **only** effect of choosing `'5.6'` is to infer that functions removed in php 7.0 exist.
// (See `backward_compatibility_checks` for additional options)
// Automatically inferred from composer.json requirement for "php" of "^7.4 || ^8.0"
'target_php_version' => '8.0',
// Automatically inferred from composer.json requirement for "php" of ">=8.1"
'target_php_version' => '8.1',

// If enabled, missing properties will be created when
// they are first seen. If false, we'll report an
Expand Down Expand Up @@ -162,7 +163,7 @@
// If true, check to make sure the return type declared
// in the doc-block (if any) matches the return type
// declared in the method signature.
'check_docblock_signature_return_type_match' => true,
'check_docblock_signature_return_type_match' => false,

// This setting maps case-insensitive strings to union types.
//
Expand Down Expand Up @@ -350,8 +351,13 @@
// Thus, both first-party and third-party code being used by
// your application should be included in this list.
'directory_list' => [
'src',
'examples'
'src/Yasumi',
'vendor/azuyalabs/php-cs-fixer-config/src',
'vendor/mikey179/vfsstream/src/main/php',
'vendor/phan/phan/src/Phan',
'vendor/phpstan/phpstan-deprecation-rules/src',
'vendor/phpunit/phpunit/src',
'vendor/vimeo/psalm/src/Psalm',
],

// A list of individual files to include in analysis
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
}
],
"require": {
"php": ">=8.0",
"php": ">=8.1",
"ext-json": "*"
},
"require-dev": {
Expand Down
7 changes: 4 additions & 3 deletions psalm.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@
</projectFiles>

<issueHandlers>
<MethodSignatureMismatch errorLevel="suppress" />
<MissingTemplateParam errorLevel="suppress" />
<InvalidArrayOffset errorLevel="suppress" />
<MissingTemplateParam errorLevel="info" />
<PossiblyUnusedMethod errorLevel="info" />
<UnusedClass errorLevel="info" />
<UnusedMethodCall errorLevel="info" />
</issueHandlers>

</psalm>
2 changes: 1 addition & 1 deletion rector.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
SetList::CODE_QUALITY,
SetList::DEAD_CODE,
SetList::EARLY_RETURN,
SetList::PHP_80,
SetList::PHP_81,
SetList::TYPE_DECLARATION,
]);
};

0 comments on commit 625e87d

Please sign in to comment.