Skip to content
Open
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
12 changes: 6 additions & 6 deletions .github/workflows/ci.yaml → .github/workflows/backend-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ jobs:
matrix:
php:
- '7.4'
- '8.0'
- '8.1'
- '8.3'
- '8.4'

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -95,8 +95,8 @@ jobs:
matrix:
php:
- '7.4'
- '8.0'
- '8.1'
- '8.3'
- '8.4'

steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -150,8 +150,8 @@ jobs:
matrix:
php:
- '7.4'
- '8.0'
- '8.1'
- '8.3'
- '8.4'

steps:
- uses: actions/checkout@v3
Expand Down
12 changes: 12 additions & 0 deletions phpstan-baseline-7.4.neon
Original file line number Diff line number Diff line change
Expand Up @@ -282,3 +282,15 @@ parameters:
identifier: argument.type
count: 1
path: src/bundle/Templating/Twig/UniversalDiscoveryExtension.php

-
message: '#^Call to method Ibexa\\AdminUi\\Form\\DataTransformer\\LanguageTransformer\:\:transform\(\) on a separate line has no effect\.$#'
identifier: method.resultUnused
count: 1
path: tests/lib/Form/DataTransformer/LanguageTransformerTest.php

-
message: '#^Call to method Ibexa\\AdminUi\\Form\\DataTransformer\\ContentInfoTransformer\:\:transform\(\) on a separate line has no effect\.$#'
identifier: method.resultUnused
count: 1
path: tests/lib/Form/DataTransformer/ContentInfoTransformerTest.php
Comment on lines +285 to +296
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did you remove

/** @phpstan-ignore method.resultUnused */

in favor of baseline entries?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The method.resultUnused error is not reported by PHPStan on PHP 8.4. With an inline @phpstan-ignore, PHPStan on 8.4 would complain about an unmatched ignored error.

Comment on lines +285 to +296
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can those entries be fixed since you touch it?

12 changes: 12 additions & 0 deletions phpstan-baseline-8.3.neon
Original file line number Diff line number Diff line change
Expand Up @@ -199,3 +199,15 @@ parameters:
message: "#^Deprecated in PHP 8\\.0\\: Required parameter \\$twig follows optional parameter \\$name\\.$#"
count: 1
path: tests/lib/Tab/TabRegistryTest.php

-
message: '#^Call to method Ibexa\\AdminUi\\Form\\DataTransformer\\LanguageTransformer\:\:transform\(\) on a separate line has no effect\.$#'
identifier: method.resultUnused
count: 1
path: tests/lib/Form/DataTransformer/LanguageTransformerTest.php

-
message: '#^Call to method Ibexa\\AdminUi\\Form\\DataTransformer\\ContentInfoTransformer\:\:transform\(\) on a separate line has no effect\.$#'
identifier: method.resultUnused
count: 1
path: tests/lib/Form/DataTransformer/ContentInfoTransformerTest.php
10 changes: 0 additions & 10 deletions phpstan-baseline-8.0.neon → phpstan-baseline-8.4.neon
Original file line number Diff line number Diff line change
Expand Up @@ -199,13 +199,3 @@ parameters:
message: "#^Deprecated in PHP 8\\.0\\: Required parameter \\$twig follows optional parameter \\$name\\.$#"
count: 1
path: tests/lib/Tab/TabRegistryTest.php

-
message: "#^Parameter \\#1 \\$iterator of function iterator_to_array expects Traversable, iterable\\<Ibexa\\\\Core\\\\MVC\\\\Symfony\\\\SiteAccess\\> given\\.$#"
count: 1
path: src/lib/Siteaccess/SiteaccessResolver.php

-
message: "#^Parameter \\#1 \\$iterator of function iterator_to_array expects Traversable, iterable\\<string, Ibexa\\\\AdminUi\\\\Form\\\\Data\\\\FieldDefinitionData\\> given\\.$#"
count: 1
path: tests/lib/Form/Data/ContentTypeDataTest.php
6 changes: 0 additions & 6 deletions phpstan-baseline.neon
Original file line number Diff line number Diff line change
Expand Up @@ -15370,12 +15370,6 @@ parameters:
count: 1
path: tests/lib/Form/DataMapper/SelectionUpdateMapperTest.php

-
message: '#^Call to method Ibexa\\AdminUi\\Form\\DataTransformer\\ContentInfoTransformer\:\:transform\(\) on a separate line has no effect\.$#'
identifier: method.resultUnused
count: 1
path: tests/lib/Form/DataTransformer/ContentInfoTransformerTest.php

-
message: '#^Method Ibexa\\Tests\\AdminUi\\Form\\DataTransformer\\ContentInfoTransformerTest\:\:reverseTransformDataProvider\(\) return type has no value type specified in iterable type array\.$#'
identifier: missingType.iterableValue
Expand Down
6 changes: 3 additions & 3 deletions phpstan-baseline.neon.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
$includes = [];
if (PHP_VERSION_ID < 80000) {
$includes[] = __DIR__ . '/phpstan-baseline-7.4.neon';
} elseif (PHP_VERSION_ID < 80300) {
$includes[] = __DIR__ . '/phpstan-baseline-8.0.neon';
} else {
} else if (PHP_VERSION_ID < 80400) {
$includes[] = __DIR__ . '/phpstan-baseline-8.3.neon';
} else {
$includes[] = __DIR__ . '/phpstan-baseline-8.4.neon';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need a separate baseline for 8.4?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have checked it and apparently yes

}

$config = [];
Expand Down
2 changes: 1 addition & 1 deletion src/lib/Form/Factory/FormFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -1071,7 +1071,7 @@ public function removeContentDraft(
* @return \Symfony\Component\Form\FormInterface<\Ibexa\AdminUi\Form\Data\Notification\NotificationSelectionData|null>
*/
public function deleteNotification(
NotificationSelectionData $data = null,
?NotificationSelectionData $data = null,
?string $name = null
): FormInterface {
$name = $name ?: StringUtil::fqcnToBlockPrefix(NotificationSelectionType::class);
Expand Down
1 change: 0 additions & 1 deletion tests/lib/Form/DataTransformer/LanguageTransformerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ public function testTransformWithInvalidInput($value): void
$this->expectException(TransformationFailedException::class);
$this->expectExceptionMessage('Expected a ' . Language::class . ' object.');

/** @phpstan-ignore method.resultUnused */
$transformer->transform($value);
}

Expand Down
Loading