diff --git a/composer.json b/composer.json index 79b09e1..8d685b8 100644 --- a/composer.json +++ b/composer.json @@ -9,24 +9,24 @@ "require": { "php": " >=8.3", "ext-json": "*", - "ibexa/admin-ui": "~5.0.x-dev", - "ibexa/core": "~5.0.x-dev", + "ibexa/admin-ui": "dev-ibx-8470-symfony-6 as 5.0.x-dev", + "ibexa/core": "dev-ibx-8470-symfony-6 as 5.0.x-dev", "zetacomponents/system-information": "^1.1.1" }, "require-dev": { - "ibexa/ci-scripts": "^0.2@dev", + "ibexa/ci-scripts": "dev-ibx-8470-symfony-6 as 5.0.x-dev", "ibexa/code-style": "~2.0.0", - "ibexa/content-forms": "~5.0.x-dev", - "ibexa/design-engine": "~5.0.x-dev", - "ibexa/doctrine-schema": "~5.0.x-dev", - "ibexa/fieldtype-richtext": "~5.0.x-dev", - "ibexa/http-cache": "~5.0.x-dev", - "ibexa/notifications": "~5.0.x-dev", - "ibexa/phpstan": "~5.0.x-dev", - "ibexa/rest": "~5.0.x-dev", - "ibexa/search": "~5.0.x-dev", - "ibexa/test-core": "~5.0.x-dev", - "ibexa/user": "~5.0.x-dev", + "ibexa/content-forms": "dev-ibx-8470-symfony-6 as 5.0.x-dev", + "ibexa/design-engine": "dev-ibx-8470-symfony-6 as 5.0.x-dev", + "ibexa/doctrine-schema": "dev-ibx-8470-symfony-6 as 5.0.x-dev", + "ibexa/fieldtype-richtext": "dev-ibx-8470-symfony-6 as 5.0.x-dev", + "ibexa/http-cache": "dev-ibx-8470-symfony-6 as 5.0.x-dev", + "ibexa/notifications": "dev-ibx-8470-symfony-6 as 5.0.x-dev", + "ibexa/phpstan": "5.0.x-dev", + "ibexa/rest": "dev-ibx-8470-symfony-6 as 5.0.x-dev", + "ibexa/search": "dev-ibx-8470-symfony-6 as 5.0.x-dev", + "ibexa/test-core": "dev-ibx-8470-symfony-6 as 5.0.x-dev", + "ibexa/user": "dev-ibx-8470-symfony-6 as 5.0.x-dev", "hautelook/templated-uri-bundle": "^3.4", "matthiasnoback/symfony-dependency-injection-test": "^4.0", "phpunit/phpunit": "^9.6", diff --git a/src/bundle/Resources/config/view.yaml b/src/bundle/Resources/config/view.yaml index 022b744..9a75498 100644 --- a/src/bundle/Resources/config/view.yaml +++ b/src/bundle/Resources/config/view.yaml @@ -2,6 +2,7 @@ services: Ibexa\Bundle\SystemInfo\Controller\SystemInfoController: parent: Ibexa\Contracts\AdminUi\Controller\Controller autowire: true + autoconfigure: true arguments: - '@Ibexa\Bundle\SystemInfo\SystemInfo\Registry\IdentifierBased' tags: diff --git a/src/bundle/View/SystemInfoViewBuilder.php b/src/bundle/View/SystemInfoViewBuilder.php index 0578b14..b365e3a 100644 --- a/src/bundle/View/SystemInfoViewBuilder.php +++ b/src/bundle/View/SystemInfoViewBuilder.php @@ -37,7 +37,7 @@ public function __construct(Configurator $viewConfigurator, SystemInfoCollectorR public function matches($argument): bool { - return $argument === 'ibexa.support_tools.view.controller:viewInfoAction'; + return $argument === 'ibexa.support_tools.view.controller::viewInfoAction'; } /** diff --git a/src/contracts/.gitkeep b/src/contracts/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/src/lib/Service/AggregateServiceProvider.php b/src/lib/Service/AggregateServiceProvider.php index ac609ad..297b249 100644 --- a/src/lib/Service/AggregateServiceProvider.php +++ b/src/lib/Service/AggregateServiceProvider.php @@ -17,8 +17,12 @@ */ final class AggregateServiceProvider implements ServiceProviderInterface { + /** @var \Symfony\Component\DependencyInjection\ServiceLocator<\Ibexa\SystemInfo\Service\ServiceInfo> */ private ServiceLocator $serviceLocator; + /** + * @param \Symfony\Component\DependencyInjection\ServiceLocator<\Ibexa\SystemInfo\Service\ServiceInfo> $service + */ public function __construct(ServiceLocator $service) { $this->serviceLocator = $service; diff --git a/src/lib/Storage/AggregateMetricsProvider.php b/src/lib/Storage/AggregateMetricsProvider.php index cb2ae4e..03d0d51 100644 --- a/src/lib/Storage/AggregateMetricsProvider.php +++ b/src/lib/Storage/AggregateMetricsProvider.php @@ -17,9 +17,12 @@ */ final class AggregateMetricsProvider implements MetricsProvider { - /** @var \Symfony\Component\DependencyInjection\ServiceLocator */ - private $metricsLocator; + /** @var \Symfony\Component\DependencyInjection\ServiceLocator<\Ibexa\SystemInfo\Storage\Metrics> */ + private ServiceLocator $metricsLocator; + /** + * @param \Symfony\Component\DependencyInjection\ServiceLocator<\Ibexa\SystemInfo\Storage\Metrics> $metrics + */ public function __construct(ServiceLocator $metrics) { $this->metricsLocator = $metrics; diff --git a/src/lib/Tab/SystemInfo/SystemInfoTab.php b/src/lib/Tab/SystemInfo/SystemInfoTab.php index d9024b8..200ba36 100644 --- a/src/lib/Tab/SystemInfo/SystemInfoTab.php +++ b/src/lib/Tab/SystemInfo/SystemInfoTab.php @@ -44,7 +44,7 @@ public function __construct( public function getControllerReference(array $parameters): ControllerReference { - return new ControllerReference('ibexa.support_tools.view.controller:viewInfoAction', [ + return new ControllerReference('ibexa.support_tools.view.controller::viewInfoAction', [ 'systemInfoIdentifier' => $this->collectorIdentifier, 'viewType' => 'pjax_tab', ]); diff --git a/tests/bundle/View/SystemInfoViewBuilderTest.php b/tests/bundle/View/SystemInfoViewBuilderTest.php index 1b6994d..03bb3c6 100644 --- a/tests/bundle/View/SystemInfoViewBuilderTest.php +++ b/tests/bundle/View/SystemInfoViewBuilderTest.php @@ -34,13 +34,13 @@ class SystemInfoViewBuilderTest extends TestCase public function testMatches(): void { $builder = new SystemInfoViewBuilder($this->getConfiguratorMock(), $this->getRegistryMock()); - self::assertTrue($builder->matches('ibexa.support_tools.view.controller:viewInfoAction')); + self::assertTrue($builder->matches('ibexa.support_tools.view.controller::viewInfoAction')); } public function testNotMatches(): void { $builder = new SystemInfoViewBuilder($this->getConfiguratorMock(), $this->getRegistryMock()); - self::assertFalse($builder->matches('service:someAction')); + self::assertFalse($builder->matches('service::someAction')); } public function testBuildView(): void