chore(behat): make tests phpunit pass

nikophil · nikophil · commit 54545ef2e123 · 2026-02-05T10:44:11.000+01:00
diff --git a/src/Test/Behat/.env b/src/Test/Behat/.env
@@ -0,0 +1,4 @@
+DATABASE_URL="sqlite:///%kernel.project_dir%/var/data.db"
+MONGO_URL=""
+USE_DAMA_DOCTRINE_TEST_BUNDLE="1"
+USE_PHP_84_LAZY_OBJECTS="1"
diff --git a/src/Test/Behat/.env.test b/src/Test/Behat/.env.test
diff --git a/src/Test/Behat/.gitignore b/src/Test/Behat/.gitignore
@@ -2,18 +2,5 @@
 /vendor/
 /var/
 /.env.local
-
-###> symfony/framework-bundle ###
-/.env.local
-/.env.local.php
-/.env.*.local
-/config/secrets/prod/prod.decrypt.private.php
-/public/bundles/
-/var/
-/vendor/
-###< symfony/framework-bundle ###
-
-###> phpunit/phpunit ###
-/phpunit.xml
 /.phpunit.cache/
-###< phpunit/phpunit ###
+/config/reference.php
diff --git a/src/Test/Behat/behat.yml b/src/Test/Behat/behat.yml
@@ -21,10 +21,10 @@ default:
 
     suites:
         main:
-            paths: [tests/behatFeatures/main]
+            paths: [features/main]
             contexts: &common_contexts
                 - Behat\MinkExtension\Context\MinkContext
-                - Zenstruck\Foundry\Tests\Fixture\Behat\TestFoundryContext
+                - Zenstruck\Foundry\Test\Behat\Tests\Fixture\TestFoundryContext
 
 main-no-dama:
     extensions:
@@ -35,7 +35,7 @@ main-no-dama:
     suites:
         main: false
         main-no-dama:
-            paths: [tests/behatFeatures/main]
+            paths: [features/main]
             contexts: *common_contexts
 
 main-native-dama:
@@ -48,7 +48,7 @@ main-native-dama:
     suites:
         main: false
         main-native-dama:
-            paths: [tests/behatFeatures/main]
+            paths: [features/main]
             contexts: *common_contexts
 
 reset-manual:
@@ -60,7 +60,7 @@ reset-manual:
     suites:
         main: false
         reset-manual:
-            paths: [tests/behatFeatures/reset-manual]
+            paths: [features/reset-manual]
             contexts: *common_contexts
 
 reset-manual-dama:
@@ -72,7 +72,7 @@ reset-manual-dama:
     suites:
         main: false
         reset-manual-dama:
-            paths: [tests/behatFeatures/reset-manual]
+            paths: [features/reset-manual]
             contexts: *common_contexts
 
 reset-feature:
@@ -84,7 +84,7 @@ reset-feature:
     suites:
         main: false
         reset-feature:
-            paths: [tests/behatFeatures/reset-feature]
+            paths: [features/reset-feature]
             contexts: *common_contexts
 
 
@@ -97,7 +97,7 @@ reset-feature-dama:
     suites:
         main: false
         reset-feature-dama:
-            paths: [tests/behatFeatures/reset-feature]
+            paths: [features/reset-feature]
             contexts: *common_contexts
 
 reset-disabled:
@@ -109,8 +109,8 @@ reset-disabled:
     suites:
         main: false
         reset-disabled:
-            paths: [tests/behatFeatures/reset-disabled]
+            paths: [features/reset-disabled]
             contexts:
                 - Behat\MinkExtension\Context\MinkContext
-                - Zenstruck\Foundry\Tests\Fixture\Behat\TestFoundryContext
-                - Zenstruck\Foundry\Tests\Fixture\Behat\ResetDisabledTestContext
+                - Zenstruck\Foundry\Test\Behat\Tests\Fixture\TestFoundryContext
+                - Zenstruck\Foundry\Test\Behat\Tests\Fixture\ResetDisabledTestContext
diff --git a/src/Test/Behat/bin/phpunit b/src/Test/Behat/bin/phpunit
diff --git a/src/Test/Behat/composer.json b/src/Test/Behat/composer.json
@@ -29,14 +29,15 @@
     "symfony/polyfill-php84": "^1.33",
     "symfony/polyfill-php85": "^1.33",
     "symfony/string": "^6.4|^7.0",
-    "zenstruck/foundry": "^2.9"
+    "zenstruck/foundry": "dev-behat-extension"
   },
   "require-dev": {
     "behat/mink-browserkit-driver": "^2.0",
     "doctrine/orm": "^2.16|^3.0",
     "doctrine/common": "^3.2.2",
     "doctrine/doctrine-bundle": "^2.10|^3.0",
     "friends-of-behat/mink-extension": "^2.0",
+    "symfony/dotenv": "^6.4|^7.0",
     "symfony/flex": "^2.10",
     "symfony/framework-bundle": "^6.4|^7.0",
     "symfony/uid": "^6.4|^7.0",
@@ -57,9 +58,7 @@
     }
   },
   "scripts": {
-    "auto-scripts": {
-      "cache:clear": "symfony-cmd",
-      "assets:install %PUBLIC_DIR%": "symfony-cmd"
-    }
+    "post-install-cmd": ["./symlink-vendor.sh"],
+    "post-update-cmd": ["./symlink-vendor.sh"]
   }
 }
diff --git a/src/Test/Behat/config/behat.php b/src/Test/Behat/config/behat.php
diff --git a/src/Test/Behat/phpunit.dist.xml b/src/Test/Behat/phpunit.dist.xml
@@ -16,10 +16,6 @@
         <server name="APP_ENV" value="test" force="true" />
         <server name="SHELL_VERBOSITY" value="-1" />
         <server name="KERNEL_CLASS" value="Zenstruck\Foundry\Test\Behat\Tests\Fixture\BehatTestKernel"/>
-        <env name="DATABASE_URL" value="sqlite:///%kernel.project_dir%/var/data.db"/>
-        <env name="USE_DAMA_DOCTRINE_TEST_BUNDLE" value="1"/>
-        <env name="USE_PHP_84_LAZY_OBJECTS" value="1"/>
-        <env name="MONGO_URL" value=""/>
     </php>
 
     <testsuites>
@@ -45,6 +41,7 @@
     </source>
 
     <extensions>
+        <bootstrap class="DAMA\DoctrineTestBundle\PHPUnit\PHPUnitExtension"/>
         <bootstrap class="Zenstruck\Foundry\PHPUnit\FoundryExtension">
             <parameter name="enabled-auto-reset" value="true"/>
         </bootstrap>
diff --git a/src/Test/Behat/src/DependencyInjection/BehatServicesCompilerPass.php b/src/Test/Behat/src/DependencyInjection/BehatServicesCompilerPass.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ * This file is part of the zenstruck/foundry package.
+ *
+ * (c) Kevin Bond <kevinbond@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Zenstruck\Foundry\Test\Behat\DependencyInjection;
+
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
+
+/**
+ * @internal
+ * @author Nicolas PHILIPPE <nikophil@gmail.com>
+ */
+final class BehatServicesCompilerPass implements CompilerPassInterface
+{
+    public function process(ContainerBuilder $container): void
+    {
+        if (!$container->has('behat.service_container')) {
+            // we're not in a Behat context
+            return;
+        }
+
+        $loader = new PhpFileLoader($container, new FileLocator(dirname(__DIR__, 2).'/config'));
+        $loader->load('behat.php');
+    }
+}
diff --git a/src/Test/Behat/src/Listener/DatabaseResetListener.php b/src/Test/Behat/src/Listener/DatabaseResetListener.php
@@ -82,6 +82,10 @@ public function resetBeforeSuite(): void
         }
 
         ResetDatabaseManager::resetBeforeFirstTest($this->symfonyKernel);
+
+//        if ($this->damaSupportEnabled) {
+//            StaticDriver::beginTransaction();
+//        }
     }
 
     public function disableStaticConnection(): void
diff --git a/src/Test/Behat/symlink-vendor.sh b/src/Test/Behat/symlink-vendor.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+ROOT_SRC="$(cd "${SCRIPT_DIR}/../../.." && pwd)/src"
+VENDOR_SRC="${SCRIPT_DIR}/vendor/zenstruck/foundry/src"
+
+if [ ! -d "${VENDOR_SRC}" ]; then
+    echo "Directory vendor/zenstruck/foundry/src does not exist yet."
+    exit 1
+fi
+
+for item in "${ROOT_SRC}"/*; do
+    name=$(basename "$item")
+
+    if [ "$name" = "Test" ]; then
+        continue
+    fi
+
+    target="${VENDOR_SRC}/${name}"
+
+    rm -rf "$target"
+
+    ln -s "$item" "$target"
+done
+
+echo -e "\nSymlinks created in ${VENDOR_SRC}\n"
diff --git a/src/Test/Behat/tests/Fixture/BehatTestKernel.php b/src/Test/Behat/tests/Fixture/BehatTestKernel.php
@@ -48,10 +48,12 @@ protected function configureContainer(ContainerConfigurator $configurator, Loade
         $c->register(UpdateGenericModel::class)->setAutowired(true)->setAutoconfigured(true)->addTag('controller.service_arguments');
         $c->register(ResetDisabledTestContext::class)->setAutowired(true)->setAutoconfigured(true);
         $c->register(TestFoundryContext::class)
+            ->setArguments([
+                new Reference('.zenstruck_foundry.behat.factory_resolver'),
+                new Reference('.zenstruck_foundry.behat.object_registry'),
+            ])
             ->setAutowired(true)
-            ->setAutoconfigured(true)
-            ->setArguments([new Reference('.zenstruck_foundry.behat.factory_resolver'), new Reference('.zenstruck_foundry.behat.object_registry')])
-        ;
+            ->setAutoconfigured(true);
 
         $configurator->services()
             ->load('Zenstruck\\Foundry\\Test\\Behat\\Tests\\Fixture\\Factories\\', __DIR__.'/Factories')
@@ -67,15 +69,6 @@ protected function configureContainer(ContainerConfigurator $configurator, Loade
             ->load('Zenstruck\\Foundry\\Test\\Behat\\Tests\\Fixture\\Stories\\', __DIR__.'/Stories')
             ->autowire()
             ->autoconfigure();
-
-        if (!self::runsWithBehat()) {
-            $c->register('behat.service_container', \stdClass::class);
-        }
-    }
-
-    private static function runsWithBehat(): bool
-    {
-        return \str_contains($_SERVER['SCRIPT_NAME'], 'behat');
     }
 
     protected function baseFixturePath(): string
diff --git a/src/Test/Behat/tests/Unit/FactoryResolverTest.php b/src/Test/Behat/tests/Unit/FactoryResolverTest.php
@@ -12,16 +12,13 @@
 namespace Zenstruck\Foundry\Test\Behat\Tests\Unit\Test\Behat;
 
 use PHPUnit\Framework\Attributes\DataProvider;
-use PHPUnit\Framework\Attributes\RequiresPhp;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use Zenstruck\Foundry\Attribute\FactoryShortName;
 use Zenstruck\Foundry\ObjectFactory;
 use Zenstruck\Foundry\Test\Behat\Exception\FactoryNotResolvable;
 use Zenstruck\Foundry\Test\Behat\FactoryShortNameResolver;
 
-/** @requires PHP 9 */
-#[RequiresPhp('9')]
 final class FactoryResolverTest extends TestCase
 {
     public static function factoriesWithConflictingShortNames(): iterable
diff --git a/src/Test/Behat/tests/Unit/FoundryCallFilterTest.php b/src/Test/Behat/tests/Unit/FoundryCallFilterTest.php
@@ -20,7 +20,6 @@
 use Behat\Testwork\Call\Call;
 use Behat\Testwork\Environment\Environment;
 use PHPUnit\Framework\Attributes\DataProvider;
-use PHPUnit\Framework\Attributes\RequiresPhp;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -35,8 +34,6 @@
 use Zenstruck\Foundry\Test\Behat\FoundryTableNode;
 use Zenstruck\Foundry\Test\Behat\ObjectRegistry;
 
-/** @requires PHP 9 */
-#[RequiresPhp('9')]
 final class FoundryCallFilterTest extends TestCase
 {
     private FoundryCallFilter $filter;
diff --git a/src/Test/Behat/tests/Unit/FoundryTableNodeTest.php b/src/Test/Behat/tests/Unit/FoundryTableNodeTest.php
@@ -12,7 +12,6 @@
 namespace Zenstruck\Foundry\Test\Behat\Tests\Unit\Test\Behat;
 
 use PHPUnit\Framework\Attributes\DataProvider;
-use PHPUnit\Framework\Attributes\RequiresPhp;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use Zenstruck\Foundry\Attribute\FactoryShortName;
@@ -22,8 +21,6 @@
 use Zenstruck\Foundry\Test\Behat\FoundryTableNode;
 use Zenstruck\Foundry\Test\Behat\ObjectRegistry;
 
-/** @requires PHP 9 */
-#[RequiresPhp('9')]
 final class FoundryTableNodeTest extends TestCase
 {
     private FactoryShortNameResolver $factoryResolver;
diff --git a/src/Test/Behat/tests/Unit/ObjectRegistryTest.php b/src/Test/Behat/tests/Unit/ObjectRegistryTest.php
@@ -11,7 +11,6 @@
 
 namespace Zenstruck\Foundry\Test\Behat\Tests\Unit\Test\Behat;
 
-use PHPUnit\Framework\Attributes\RequiresPhp;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use Zenstruck\Foundry\ObjectFactory;
@@ -24,8 +23,6 @@
 use Zenstruck\Foundry\Test\Behat\FactoryShortNameResolver;
 use Zenstruck\Foundry\Test\Behat\ObjectRegistry;
 
-/** @requires PHP 9 */
-#[RequiresPhp('9')]
 final class ObjectRegistryTest extends TestCase
 {
     private ObjectRegistry $registry;
@@ -66,7 +63,7 @@ public function it_throws_when_storing_duplicate_object_name(): void
         $this->registry->store($user1, 'john');
 
         $this->expectException(ObjectAlreadyRegistered::class);
-        $this->expectExceptionMessage('Object "john" is already registered for class "Zenstruck\Foundry\Tests\Unit\Test\Behat\User".');
+        $this->expectExceptionMessage('Object "john" is already registered for class "Zenstruck\Foundry\Test\Behat\Tests\Unit\Test\Behat\User".');
 
         $this->registry->store($user2, 'john');
     }
@@ -110,7 +107,7 @@ public function it_gets_stored_object(): void
     public function it_throws_when_getting_non_existent_object(): void
     {
         $this->expectException(ObjectNotFound::class);
-        $this->expectExceptionMessage('Object of class "Zenstruck\Foundry\Tests\Unit\Test\Behat\User" with name "john" was not found.');
+        $this->expectExceptionMessage('Object of class "Zenstruck\Foundry\Test\Behat\Tests\Unit\Test\Behat\User" with name "john" was not found.');
 
         $this->registry->getByObjectClass(User::class, 'john');
     }
@@ -208,7 +205,7 @@ public function it_throws_when_storing_duplicate_from_story_event(): void
         $this->registry->storeAfterStateAddedToStory($event1);
 
         $this->expectException(ObjectAlreadyRegistered::class);
-        $this->expectExceptionMessage('Object "duplicate" is already registered for class "Zenstruck\Foundry\Tests\Unit\Test\Behat\User".');
+        $this->expectExceptionMessage('Object "duplicate" is already registered for class "Zenstruck\Foundry\Test\Behat\Tests\Unit\Test\Behat\User".');
 
         $this->registry->storeAfterStateAddedToStory($event2);
     }
diff --git a/src/Test/Behat/tests/bootstrap.php b/src/Test/Behat/tests/bootstrap.php
@@ -9,6 +9,7 @@
  * file that was distributed with this source code.
  */
 
+use Symfony\Component\Dotenv\Dotenv;
 use Symfony\Component\Filesystem\Filesystem;
 
 $command = \implode(' ', $_SERVER['argv']);
@@ -18,3 +19,5 @@
 $fs = new Filesystem();
 
 $fs->remove(__DIR__.'/../var/cache');
+
+(new Dotenv())->usePutenv()->loadEnv(__DIR__.'/../.env', testEnvs: []);
diff --git a/src/ZenstruckFoundryBundle.php b/src/ZenstruckFoundryBundle.php

Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,10 @@ public function resetBeforeSuite(): void`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`ResetDatabaseManager::resetBeforeFirstTest($this->symfonyKernel);`
	`85`	`+`
	`86`	`+// if ($this->damaSupportEnabled) {`
	`87`	`+// StaticDriver::beginTransaction();`
	`88`	`+// }`
`85`	`89`	`}`
`86`	`90`
`87`	`91`	`public function disableStaticConnection(): void`