Skip to content

[DO NOT MERGE][PREVIEW][CS] Aligned codebase with ibexa/code-style#18 #1755

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

Draft
Parent: [DO NOT MERGE][PREVIEW][CS] Bumped Ibexa Code Style to ^2.2.x-dev
wants to merge 2 commits into
base: upgrade-to-code-style-2.2.x-dev
Choose a base branch
from
Draft

[DO NOT MERGE][PREVIEW][CS] Aligned codebase with ibexa/code-style#18 #1755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
700e205
[TMP] Added dev dependency on ibexa/code-style#18
alongosz Oct 23, 2025
62a2b99
[CS] Aligned codebase with ibexa/code-style#18 changes
alongosz Oct 26, 2025
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 @@ -74,7 +74,7 @@
"matthiasnoback/symfony-dependency-injection-test": "^4.0",
"ibexa/doctrine-schema": "~4.6.0@dev",
"ibexa/http-cache": "~4.6.0@dev",
"ibexa/code-style": "^2.2.x-dev",
"ibexa/code-style": "dev-bump-php-cs-fixer-to-v3.89.0 as 2.2.x-dev",
"ibexa/notifications": "~4.6.0@dev",
"ibexa/phpstan": "~4.6.x-dev",
"ibexa/test-rest": "^0.1.x-dev",
Expand Down
2 changes: 0 additions & 2 deletions src/bundle/ControllerArgumentResolver/ContentTreeChildrenQueryArgumentResolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?php

Check warning on line 1 in src/bundle/ControllerArgumentResolver/ContentTreeChildrenQueryArgumentResolver.php

View workflow job for this annotation

GitHub Actions / Run code style check (8.3) 

Found violation(s) of type: blank_line_between_import_groups

/**
* @copyright Copyright (C) Ibexa AS. All rights reserved.
Expand All @@ -12,9 +12,7 @@
use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion;
use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\LogicalAnd;
use Ibexa\Contracts\Rest\Input\Parser\Query\Criterion\CriterionProcessorInterface;

use function Ibexa\PolyfillPhp82\iterator_to_array;

use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\Controller\ArgumentValueResolverInterface;
use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;
Expand Down
2 changes: 0 additions & 2 deletions src/lib/Form/Factory/FormFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?php

Check warning on line 1 in src/lib/Form/Factory/FormFactory.php

View workflow job for this annotation

GitHub Actions / Run code style check (8.3) 

Found violation(s) of type: blank_line_between_import_groups

/**
* @copyright Copyright (C) Ibexa AS. All rights reserved.
Expand Down Expand Up @@ -126,9 +126,7 @@
use Ibexa\AdminUi\Form\Type\User\UserEditType;
use Ibexa\AdminUi\Form\Type\Version\VersionRemoveType;
use Ibexa\Bundle\Search\Form\Data\SearchData;

use function is_string;

use Symfony\Component\Form\FormFactoryInterface;
use Symfony\Component\Form\FormInterface;
use Symfony\Component\Form\Util\StringUtil;
Expand Down
9 changes: 5 additions & 4 deletions src/lib/Tab/Dashboard/PagerLocationToDataMapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
use Ibexa\Contracts\Core\Repository\Values\Content\Language;
use Ibexa\Contracts\Core\Repository\Values\Content\Location;
use Ibexa\Contracts\Core\Repository\Values\Content\VersionInfo;
use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType;
use Ibexa\Contracts\Core\Repository\Values\User\User;
use Ibexa\Core\Repository\LocationResolver\LocationResolver;
use Pagerfanta\Pagerfanta;
Expand Down Expand Up @@ -50,11 +51,11 @@ public function __construct(
* 'name': string,
* 'type': ?string,
* 'language': string,
* 'available_enabled_translations': \Ibexa\Contracts\Core\Repository\Values\Content\Language[],
* 'contributor': ?\Ibexa\Contracts\Core\Repository\Values\User\User,
* 'content_type': \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType,
* 'available_enabled_translations': Language[],
* 'contributor': ?User,
* 'content_type': ContentType,
* 'modified': \DateTime,
* 'resolvedLocation': \Ibexa\Contracts\Core\Repository\Values\Content\Location
* 'resolvedLocation': Location
* }
* >
*
Expand Down
2 changes: 1 addition & 1 deletion tests/bundle/ControllerArgumentResolver/ContentTreeChildrenQueryArgumentResolverTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?php

Check warning on line 1 in tests/bundle/ControllerArgumentResolver/ContentTreeChildrenQueryArgumentResolverTest.php

View workflow job for this annotation

GitHub Actions / Run code style check (8.3) 

Found violation(s) of type: fully_qualified_strict_types

/**
* @copyright Copyright (C) Ibexa AS. All rights reserved.
Expand Down Expand Up @@ -66,7 +66,7 @@
/**
* @return iterable<array{
* bool,
* \Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata
* ArgumentMetadata
* }>
*/
public function provideDataForTestSupports(): iterable
Expand Down
2 changes: 1 addition & 1 deletion tests/lib/Form/Data/FormMapper/ContentTypeDraftMapperTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ private function createFieldDefinitionCollectionForMetaFieldDefinitionsData(): F
/**
* @param array<string, array{
* 'identifier': string,
* 'defaultValue': ?\Ibexa\Contracts\Core\Repository\Values\ValueObject,
* 'defaultValue': ?ValueObject,
* 'name': string,
* 'position': int,
* }> $fieldDefinitionsConfig
Expand Down
2 changes: 1 addition & 1 deletion tests/lib/Form/DataTransformer/LanguageTransformerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public function testReverseTransformWithNotFoundException(): void

/**
* @return array<string, array{
* \Ibexa\Contracts\Core\Repository\Values\Content\Language|null,
* Language|null,
* string|null,
* }>
*/
Expand Down
8 changes: 4 additions & 4 deletions tests/lib/Permission/LimitationResolverTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,10 @@ public function testGetLanguageLimitations(
* name: string,
* hasAccess: bool,
* }>,
* \Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo,
* \Ibexa\Contracts\Core\Repository\Values\Content\Location,
* \Ibexa\Contracts\Core\Repository\Values\User\LookupLimitationResult,
* iterable<\Ibexa\Contracts\Core\Repository\Values\Content\Language>
* ContentInfo,
* Location,
* LookupLimitationResult,
* iterable<Language>
* }>
*/
public function provideDataForTestGetLanguageLimitations(): iterable
Expand Down
Loading