Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 5 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,20 @@ jobs:
- "--prefer-lowest"
steps:
- name: Checkout
uses: actions/checkout@v3.5.0
uses: actions/checkout@v6

- name: Validate composer.json and composer.lock
run: composer validate

- name: Set up PHP ${{ matrix.php-version }}
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php-version }}
tools: composer:v2
extensions: pcntl, posix
coverage: xdebug
ini-values: error_reporting=E_ALL

- name: Validate composer.json and composer.lock
run: composer validate

- name: Install dependencies
run: composer update
--prefer-dist
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"phpunit/phpunit": "^9.6.8",
"psalm/plugin-phpunit": "^0.18.4",
"squizlabs/php_codesniffer": "^3.7.2",
"vimeo/psalm": "^5.12"
"vimeo/psalm": "^5.17"
},
"autoload": {
"psr-4": {
Expand Down
3 changes: 2 additions & 1 deletion src/Model/JsonSerializableTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,9 @@ trait JsonSerializableTrait
*/
final public function jsonSerialize(): array
{
$thisObjectVars = get_object_vars($this);
$includedProperties = array_filter(
get_object_vars($this),
$thisObjectVars,
fn (string $key): bool => !in_array($key, $this->excludeFromSerialization(), true),
ARRAY_FILTER_USE_KEY,
);
Expand Down
3 changes: 0 additions & 3 deletions test/AllureLifecycleTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -875,7 +875,6 @@ public function testWriteContainer_ExcludedContainerWithNestedResults_RemovesNes
->with(
self::callback(
function (AttachmentResult $attachmentResult) use (&$removeAttachmentResults): bool {
/** @psalm-var list<AttachmentResult> $removeAttachmentResults */
$removeAttachmentResults[] = $attachmentResult;

return true;
Expand All @@ -889,7 +888,6 @@ function (AttachmentResult $attachmentResult) use (&$removeAttachmentResults): b
->with(
self::callback(
function (TestResult $testResult) use (&$removeTestResults): bool {
/** @psalm-var list<TestResult> $removeTestResults */
$removeTestResults[] = $testResult;

return true;
Expand Down Expand Up @@ -2752,7 +2750,6 @@ public function testWriteTest_ExcludedTestWithNestedResults_RemovesNestedResults
->with(
self::callback(
function (AttachmentResult $attachmentResult) use (&$removeAttachmentResults): bool {
/** @psalm-var list<AttachmentResult> $removeAttachmentResults */
$removeAttachmentResults[] = $attachmentResult;

return true;
Expand Down
4 changes: 2 additions & 2 deletions test/AllureTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ public function testRunStep_OnlyMethodDisplayNameAttributeProvided_StepHasMatchi
}

#[DisplayName('b')]
public function titledStep(): void
public function titledStep(StepContextInterface $_): void
{
}

Expand Down Expand Up @@ -293,7 +293,7 @@ public function testRunStep_MethodParameterAttributeProvided_StepHasMatchingPara
}

#[Parameter('b', 'c')]
public function parametrizedStep(): void
public function parametrizedStep(StepContextInterface $_): void
{
}

Expand Down
Loading