From 4c0487c724dbe113aa63c0172bad1d1868b66d32 Mon Sep 17 00:00:00 2001 From: brianvarskonst Date: Fri, 19 Jun 2026 03:44:22 +0200 Subject: [PATCH 1/2] refactor: move bundle config into resources --- {config => Resources/config}/packages/framework.php | 0 {config => Resources/config}/services.php | 0 {config => Resources/config}/wordpress.php | 0 phpcs.xml.dist | 2 +- phpstan.neon.dist | 2 +- tests/Cache/FrameworkCacheConfigurationPassTest.php | 2 +- tests/Kernel/SymPressFrameworkBundleTest.php | 2 +- 7 files changed, 4 insertions(+), 4 deletions(-) rename {config => Resources/config}/packages/framework.php (100%) rename {config => Resources/config}/services.php (100%) rename {config => Resources/config}/wordpress.php (100%) diff --git a/config/packages/framework.php b/Resources/config/packages/framework.php similarity index 100% rename from config/packages/framework.php rename to Resources/config/packages/framework.php diff --git a/config/services.php b/Resources/config/services.php similarity index 100% rename from config/services.php rename to Resources/config/services.php diff --git a/config/wordpress.php b/Resources/config/wordpress.php similarity index 100% rename from config/wordpress.php rename to Resources/config/wordpress.php diff --git a/phpcs.xml.dist b/phpcs.xml.dist index 1cd4122..f46ebf9 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -12,7 +12,7 @@ src - config + Resources inc dropin diff --git a/phpstan.neon.dist b/phpstan.neon.dist index c223cb6..ee4bbab 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -3,7 +3,7 @@ parameters: treatPhpDocTypesAsCertain: false paths: - src - - config + - Resources - inc - dropin - tests diff --git a/tests/Cache/FrameworkCacheConfigurationPassTest.php b/tests/Cache/FrameworkCacheConfigurationPassTest.php index d6f289e..d1d3809 100644 --- a/tests/Cache/FrameworkCacheConfigurationPassTest.php +++ b/tests/Cache/FrameworkCacheConfigurationPassTest.php @@ -222,7 +222,7 @@ private function container(): ContainerBuilder $container->setParameter('kernel.environment', 'test'); $container->setParameter('wordpress.content_dir', null); - $loader = new PhpFileLoader($container, new FileLocator(dirname(__DIR__, 2) . '/config')); + $loader = new PhpFileLoader($container, new FileLocator(dirname(__DIR__, 2) . '/Resources/config')); $loader->load('services.php'); return $container; diff --git a/tests/Kernel/SymPressFrameworkBundleTest.php b/tests/Kernel/SymPressFrameworkBundleTest.php index 1721fdd..61ffaf3 100644 --- a/tests/Kernel/SymPressFrameworkBundleTest.php +++ b/tests/Kernel/SymPressFrameworkBundleTest.php @@ -42,7 +42,7 @@ public function testBuildsRuntimeContainerWithSymfonyFrameworkBundleServices(): $loaded = $kernel->configureContainer($container->builder(), $container, $registry); $kernel->createRuntimeContainer($container, $registry, $loaded); - self::assertContains($projectDir . '/config/packages/framework.php', $loaded); + self::assertContains($projectDir . '/Resources/config/packages/framework.php', $loaded); self::assertTrue($container->has('request_stack')); self::assertTrue($container->has('http_kernel')); self::assertTrue($container->has('cache.app')); From 005c2c94fc493f76d65fd9020cd76c65f0b6507a Mon Sep 17 00:00:00 2001 From: brianvarskonst Date: Fri, 19 Jun 2026 03:44:22 +0200 Subject: [PATCH 2/2] chore: adopt sympress qa tooling --- composer.json | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/composer.json b/composer.json index 71bdc4a..d0046e3 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ } ], "require": { - "php": ">=8.5", + "php": "^8.5", "psr/cache": "^3.0", "psr/simple-cache": "^3.0", "symfony/cache": "^8.1", @@ -31,10 +31,7 @@ }, "require-dev": { "brain/monkey": "^2.6", - "dealerdirect/phpcodesniffer-composer-installer": "^1.0", - "phpstan/phpstan": "^2.1", - "phpunit/phpunit": "^11.5", - "sympress/coding-standards": "dev-main" + "sympress/qa": "dev-main" }, "suggest": { "symfony/asset": "Enables FrameworkBundle asset package integration.", @@ -80,22 +77,22 @@ "scripts": { "cs": [ "Composer\\Config::disableProcessTimeout", - "phpcs --standard=phpcs.xml.dist" + "qa cs" ], "cs:fix": [ "Composer\\Config::disableProcessTimeout", - "phpcbf --standard=phpcs.xml.dist" + "qa cs:fix" ], "static-analysis": [ "Composer\\Config::disableProcessTimeout", - "phpstan analyse --memory-limit=1G --no-progress -c phpstan.neon.dist" - ], - "test": [ - "@tests" + "qa static-analysis" ], "tests": [ "Composer\\Config::disableProcessTimeout", - "phpunit --configuration phpunit.xml.dist --no-coverage" + "qa tests" + ], + "test": [ + "@tests" ], "qa": [ "@cs", @@ -107,7 +104,8 @@ "sort-packages": true, "optimize-autoloader": true, "allow-plugins": { - "dealerdirect/phpcodesniffer-composer-installer": true + "dealerdirect/phpcodesniffer-composer-installer": true, + "phpstan/extension-installer": true } }, "repositories": [ @@ -119,6 +117,6 @@ } } ], - "minimum-stability": "stable", + "minimum-stability": "dev", "prefer-stable": true }