[UC-22] Refactor migrations and test configurations for Sylius User.com integration

Author: tomkalon

.github/workflows/build.yml

@@ -145,16 +145,16 @@ jobs:
                 run: (cd tests/Application && yarn install)
 
             -
-                name: Prepare test application assets
+                name: Prepare test application database
                 run: |
-                    vendor/bin/console assets:install -vvv
-                    yarn --cwd vendor/sylius/test-application encore prod
+                    (cd tests/Application && bin/console doctrine:database:create -vvv)
+                    (cd tests/Application && bin/console doctrine:schema:create -vvv)
 
             -
-                name: Prepare test application database
+                name: Prepare test application assets
                 run: |
-                    vendor/bin/console doctrine:database:create -vvv
-                    vendor/bin/console doctrine:migrations:migrate --no-interaction -vvv
+                    (cd tests/Application && bin/console assets:install public -vvv)
+                    (cd tests/Application && yarn build:prod)
 
             -
                 name: Prepare test application cache
@@ -176,10 +176,6 @@ jobs:
                 name: Run PHPStan
                 run: vendor/bin/phpstan analyse -c phpstan.neon -l max src/
 
-            -
-                name: Run PHPSpec
-                run: vendor/bin/phpspec run --ansi -f progress --no-interaction
-
             -
                 name: Run PHPUnit
                 run: vendor/bin/phpunit --colors=always

behat.yml.dist

@@ -3,15 +3,8 @@ imports:
     - tests/Behat/Resources/suites.yml
 
 default:
-    formatters:
-        pretty:
-            verbose: true
-            paths: false
-            snippets: false
-
     extensions:
         DMore\ChromeExtension\Behat\ServiceContainer\ChromeExtension: ~
-        Robertfausk\Behat\PantherExtension: ~
 
         FriendsOfBehat\MinkDebugExtension:
             directory: etc/build
@@ -22,30 +15,14 @@ default:
             files_path: "%paths.base%/vendor/sylius/sylius/src/Sylius/Behat/Resources/fixtures/"
             base_url: "https://127.0.0.1:8080/"
             default_session: symfony
-            javascript_session: panther
+            javascript_session: chrome
             sessions:
                 symfony:
                     symfony: ~
-                chromedriver:
+                chrome:
                     chrome:
                         api_url: http://127.0.0.1:9222
                         validate_certificate: false
-                chrome_headless_second_session:
-                    chrome:
-                        api_url: http://127.0.0.1:9222
-                        validate_certificate: false
-                panther:
-                    panther:
-                        manager_options:
-                            connection_timeout_in_ms: 5000
-                            request_timeout_in_ms: 120000
-                            chromedriver_arguments:
-                                - --log-path=etc/build/chromedriver.log
-                                - --verbose
-                            capabilities:
-                                acceptSslCerts: true
-                                acceptInsecureCerts: true
-                                unexpectedAlertBehaviour: accept
             show_auto: false
 
         FriendsOfBehat\SymfonyExtension:
@@ -58,5 +35,3 @@ default:
         FriendsOfBehat\SuiteSettingsExtension:
             paths:
                 - "features"
-
-        SyliusLabs\SuiteTagsExtension: ~

src/Api/AbstractClient.php

@@ -107,7 +107,7 @@ protected function request(
     protected function getApiEndpointUrl(
         UserComApiAwareInterface $resource,
         string $endpoint,
-        string $query = null,
+        ?string $query = null,
     ): string {
         if (null === $resource->getUserComUrl()) {
             throw new \InvalidArgumentException('User.com API key is missing.');

src/DependencyInjection/BitBagSyliusUserComExtension.php

@@ -6,6 +6,7 @@
 
 use Sylius\Bundle\CoreBundle\DependencyInjection\PrependDoctrineMigrationsTrait;
 use Sylius\Bundle\ResourceBundle\DependencyInjection\Extension\AbstractResourceExtension;
+use Symfony\Component\Config\Definition\ConfigurationInterface;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
@@ -26,16 +27,19 @@ public function load(array $configs, ContainerBuilder $container): void
     public function prepend(ContainerBuilder $container): void
     {
         $this->prependDoctrineMigrations($container);
+
+        $config = $this->getCurrentConfiguration($container);
     }
 
     protected function getMigrationsNamespace(): string
     {
-        return 'DoctrineMigrations';
+        return 'Sylius\BitBagSyliusUserComPlugin\Migrations';
     }
 
+
     protected function getMigrationsDirectory(): string
     {
-        return '@BitBagSyliusUserComPlugin/migrations';
+        return '@BitBagSyliusUserComPlugin/src/Migrations';
     }
 
     protected function getNamespacesOfMigrationsExecutedBefore(): array
@@ -44,4 +48,15 @@ protected function getNamespacesOfMigrationsExecutedBefore(): array
             'Sylius\Bundle\CoreBundle\Migrations',
         ];
     }
+
+
+    private function getCurrentConfiguration(ContainerBuilder $container): array
+    {
+        /** @var ConfigurationInterface $configuration */
+        $configuration = $this->getConfiguration([], $container);
+
+        $configs = $container->getExtensionConfig($this->getAlias());
+
+        return $this->processConfiguration($configuration, $configs);
+    }
 }

migrations/.gitignore src/Migrations/.gitignoremigrations/.gitignore renamed to src/Migrations/.gitignore

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace DoctrineMigrations;
+namespace BitBag\SyliusUserComPlugin\Migrations;
 
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;

migrations/Version20250923061310.php src/Migrations/Version20250923061310.phpmigrations/Version20250923061310.php renamed to src/Migrations/Version20250923061310.php

@@ -4,7 +4,7 @@
 
 use Symfony\Component\Dotenv\Dotenv;
 
-require dirname(__DIR__).'../../../vendor/autoload.php';
+require dirname(__DIR__) . '../../../vendor/autoload.php';
 
 // Load cached env vars if the .env.local.php file exists
 // Run "composer dump-env prod" to create it (requires symfony/flex >=1.2)

tests/Application/config/bootstrap.php

@@ -69,6 +69,10 @@
     BitBag\SyliusUserComPlugin\BitBagSyliusUserComPlugin::class => ['all' => true],
 ];
 
+if (class_exists(FriendsOfBehat\SymfonyExtension\Bundle\FriendsOfBehatSymfonyExtensionBundle::class)) {
+    $bundles[FriendsOfBehat\SymfonyExtension\Bundle\FriendsOfBehatSymfonyExtensionBundle::class] = ['test' => true, 'test_cached' => true];
+}
+
 if (class_exists(winzou\Bundle\StateMachineBundle\winzouStateMachineBundle::class)) {
     $bundles[winzou\Bundle\StateMachineBundle\winzouStateMachineBundle::class] = ['all' => true];
 }

tests/Application/config/bundles.php

@@ -2,3 +2,5 @@ doctrine_migrations:
     storage:
         table_storage:
             table_name: sylius_migrations
+    migrations_paths:
+        'App\Migrations': '%kernel.project_dir%/../../src/Migrations/'

tests/Application/config/packages/doctrine_migrations.yaml

@@ -1,4 +1,4 @@
 framework:
     test: ~
     session:
-        storage_factory_id: session.storage.factory.mock_file
+        handler_id: ~