Upgrade dependencies

.github/workflows/tests.yml

@@ -14,10 +14,12 @@ jobs:
     strategy:
       matrix:
         php-version: ['8.1', '8.2']
-        symfony-require: ['5.0.*', '5.4.*', '6.0.*', '6.4.*']
+        symfony-require: ['6.0.*', '6.4.*']
         include:
           - php-version: '8.3'
             symfony-require: '7.0.*'
+          - php-version: '8.3'
+            symfony-require: '7.1.*'
 
     steps:
       - name: 'Setup PHP'

.gitignore

@@ -1,3 +1,4 @@
+/.phpunit.cache/
 /.task/
 /docker/
 /var/

composer.json

@@ -15,24 +15,24 @@
         "ext-intl": "*",
         "doctrine/collections": "^1.0|^2.0",
         "doctrine/inflector": "^2.0",
-        "symfony/expression-language": "^5.0|^6.0|^7.0",
-        "zenstruck/foundry": "^1.0"
+        "symfony/expression-language": "^6.0|^7.0",
+        "zenstruck/foundry": "^2.0"
     },
     "require-dev": {
         "ext-pdo_sqlite": "*",
-        "behat/behat": "^3.13",
-        "doctrine/doctrine-bundle": "^2.9",
-        "doctrine/orm": "^2.15",
-        "phpstan/phpstan": "^1.10",
-        "phpunit/phpunit": "^9.6",
-        "squizlabs/php_codesniffer": "^3.7",
-        "symfony/console": "^5.0|^6.0|^7.0",
-        "symfony/dotenv": "^5.0|^6.0|^7.0",
-        "symfony/framework-bundle": "^5.0|^6.0|^7.0",
-        "symfony/phpunit-bridge": "^5.0|^6.0|^7.0",
-        "symfony/runtime": "^5.0|^6.0|^7.0",
-        "symfony/var-dumper": "^5.0|^6.0|^7.0",
-        "symfony/yaml": "^5.0|^6.0|^7.0"
+        "behat/behat": "^3.14",
+        "doctrine/doctrine-bundle": "^2.12",
+        "doctrine/orm": "^3.2.1",
+        "phpstan/phpstan": "^1.11",
+        "phpunit/phpunit": "^10.5|^11.3",
+        "squizlabs/php_codesniffer": "^3.10",
+        "symfony/console": "^6.0|^7.0",
+        "symfony/dotenv": "^6.0|^7.0",
+        "symfony/framework-bundle": "^6.0|^7.0",
+        "symfony/phpunit-bridge": "^6.0|^7.0",
+        "symfony/runtime": "^6.0|^7.0",
+        "symfony/var-dumper": "^6.0|^7.0",
+        "symfony/yaml": "^6.0|^7.0"
     },
     "autoload": {
         "psr-4": {

phpunit.xml.dist

@@ -2,8 +2,9 @@
 
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
-         colors="true"
          bootstrap="tests/bootstrap.php"
+         cacheDirectory=".phpunit.cache"
+         colors="true"
          testdox="true"
 >
     <php>
@@ -25,16 +26,12 @@
         </testsuite>
     </testsuites>
 
-    <coverage processUncoveredFiles="true">
+    <source>
         <include>
-            <directory suffix=".php">src</directory>
+            <directory>src</directory>
         </include>
         <exclude>
             <directory>src/ExpressionLanguage/Compiler</directory>
         </exclude>
-    </coverage>
-
-    <listeners>
-        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>
-    </listeners>
+    </source>
 </phpunit>

src/ExpressionLanguage/Evaluator/FactoryEvaluator.php

@@ -12,7 +12,7 @@
 use Presta\BehatEvaluator\ExpressionLanguage\ArgumentGuesser\Factory\MinArgumentGuesser;
 use Presta\BehatEvaluator\Foundry\FactoryClassFactory;
 use Symfony\Component\PropertyAccess\PropertyAccess;
-use Zenstruck\Foundry\Proxy;
+use Zenstruck\Foundry\Persistence\Proxy;
 
 final class FactoryEvaluator
 {
@@ -77,18 +77,18 @@ public function __invoke(
                 throw new UnexpectedTypeException($value, Proxy::class);
             }
 
-            $value->disableAutoRefresh();
+            $value->_disableAutoRefresh();
 
-            return PropertyAccess::createPropertyAccessor()->getValue($value->object(), $accessor);
+            return PropertyAccess::createPropertyAccessor()->getValue($value->_real(), $accessor);
         }
 
         switch (true) {
             case \is_array($value):
-                $value = new ArrayCollection(array_map(static fn (Proxy $proxy): object => $proxy->object(), $value));
+                $value = new ArrayCollection(array_map(static fn (Proxy $proxy): object => $proxy->_real(), $value));
                 break;
 
             case $value instanceof Proxy:
-                $value->disableAutoRefresh();
+                $value->_disableAutoRefresh();
                 break;
         }
 

src/Foundry/FactoryClassFactory.php

@@ -5,7 +5,7 @@
 namespace Presta\BehatEvaluator\Foundry;
 
 use Doctrine\Inflector\Inflector;
-use Zenstruck\Foundry\ModelFactory;
+use Zenstruck\Foundry\Persistence\PersistentProxyObjectFactory;
 
 final class FactoryClassFactory
 {
@@ -22,10 +22,10 @@ public function __construct(string $namespace, private readonly Inflector $infle
 
     public function fromName(string $name): string
     {
-        $name = implode('\\', array_map([$this->inflector, 'classify'], explode('/', $name)));
+        $name = implode('\\', array_map($this->inflector->classify(...), explode('/', $name)));
 
         $factoryClass = "$this->namespace{$name}Factory";
-        if (!\is_a($factoryClass, ModelFactory::class, true)) {
+        if (!\is_a($factoryClass, PersistentProxyObjectFactory::class, true)) {
             throw new \InvalidArgumentException('You must define a valid factory class.');
         }
 

tests/Application/config/packages/doctrine.yaml

@@ -2,12 +2,15 @@ when@test:
   doctrine:
     dbal:
       url: 'pdo-sqlite:///:memory:'
+      use_savepoints: true
       logging: false
     orm:
       auto_generate_proxy_classes: true
       enable_lazy_ghost_objects: true
       naming_strategy: 'doctrine.orm.naming_strategy.underscore_number_aware'
       auto_mapping: true
+      controller_resolver:
+        auto_mapping: false
       mappings:
         Application:
           is_bundle: false

tests/Application/config/packages/zenstruck_foundry.yaml

@@ -1,3 +1,2 @@
 when@test:
   zenstruck_foundry:
-    auto_refresh_proxies: true

tests/Application/src/Entity/User.php

@@ -7,7 +7,7 @@
 use Doctrine\ORM\Mapping as ORM;
 
 #[ORM\Entity]
-final class User
+class User
 {
     #[ORM\Column]
     #[ORM\Id]

tests/Application/src/Foundry/Factory/UserFactory.php

@@ -5,19 +5,19 @@
 namespace Presta\BehatEvaluator\Tests\Application\Foundry\Factory;
 
 use Presta\BehatEvaluator\Tests\Application\Entity\User;
-use Zenstruck\Foundry\ModelFactory;
+use Zenstruck\Foundry\Persistence\PersistentProxyObjectFactory;
 
 /**
- * @extends ModelFactory<User>
+ * @extends PersistentProxyObjectFactory<User>
  */
-final class UserFactory extends ModelFactory
+final class UserFactory extends PersistentProxyObjectFactory
 {
-    protected static function getClass(): string
+    public static function class(): string
     {
         return User::class;
     }
 
-    protected function getDefaults(): array
+    protected function defaults(): array|callable
     {
         return [
             'firstname' => self::faker()->firstName(),

tests/Integration/Adapter/FactoryAdapterTest.php

@@ -5,24 +5,23 @@
 namespace Presta\BehatEvaluator\Tests\Integration\Adapter;
 
 use Doctrine\Common\Collections\ArrayCollection;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Presta\BehatEvaluator\Adapter\FactoryAdapter;
 use Presta\BehatEvaluator\Exception\UnexpectedTypeException;
 use Presta\BehatEvaluator\Tests\Application\Entity\User;
 use Presta\BehatEvaluator\Tests\Application\Foundry\Factory\UserFactory;
 use Presta\BehatEvaluator\Tests\Integration\KernelTestCase;
 use Presta\BehatEvaluator\Tests\Resources\ExpressionLanguageFactory;
 use Presta\BehatEvaluator\Tests\Resources\UnsupportedValuesProvider;
-use Zenstruck\Foundry\Proxy;
+use Zenstruck\Foundry\Persistence\Proxy;
 use Zenstruck\Foundry\Test\Factories;
 
 final class FactoryAdapterTest extends KernelTestCase
 {
     use Factories;
     use UnsupportedValuesProvider;
 
-    /**
-     * @dataProvider values
-     */
+    #[DataProvider('values')]
     public function testInvokingTheAdapter(mixed $expected, mixed $value): void
     {
         if ($expected instanceof \Throwable) {
@@ -61,11 +60,11 @@ public function testInvokingTheAdapter(mixed $expected, mixed $value): void
     /**
      * @return iterable<string, array{mixed, mixed}>
      */
-    public function values(): iterable
+    public static function values(): iterable
     {
         yield 'a string containing only a factory expression with a factory name and an array of attributes'
             . ' should find and return the relevant object proxy' => [
-            static fn () => UserFactory::find(['firstname' => 'John'])->disableAutoRefresh(),
+            static fn () => UserFactory::find(['firstname' => 'John'])->_disableAutoRefresh(),
             '<factory("user", {"firstname": "John"})>',
         ];
         yield 'a string containing only a factory expression'
@@ -79,7 +78,7 @@ public function values(): iterable
             . ' should find and return the relevant object proxy(s)' => [
             static fn () => new ArrayCollection(
                 array_map(
-                    static fn (Proxy $proxy): object => $proxy->object(),
+                    static fn (Proxy $proxy): object => $proxy->_real(),
                     UserFactory::findBy(['lastname' => 'Doe']),
                 ),
             ),
@@ -94,7 +93,7 @@ public function values(): iterable
             . ' and an integer as third parameter should return the relevant object proxy(s)' => [
             static fn () => new ArrayCollection(
                 array_map(
-                    static fn (Proxy $proxy): object => $proxy->object(),
+                    static fn (Proxy $proxy): object => $proxy->_real(),
                     UserFactory::all(),
                 ),
             ),
@@ -105,7 +104,7 @@ public function values(): iterable
             . ' should return the relevant object proxy(s)' => [
             static fn () => new ArrayCollection(
                 array_map(
-                    static fn (Proxy $proxy): object => $proxy->object(),
+                    static fn (Proxy $proxy): object => $proxy->_real(),
                     UserFactory::findBy(['firstname' => 'John']),
                 ),
             ),

tests/Integration/EvaluatorTest.php

@@ -4,6 +4,7 @@
 
 namespace Integration;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use Presta\BehatEvaluator\Evaluator;
 use Presta\BehatEvaluator\EvaluatorBuilder;
 use Presta\BehatEvaluator\Tests\Application\Foundry\Factory\UserFactory;
@@ -14,9 +15,7 @@ final class EvaluatorTest extends KernelTestCase
 {
     use Factories;
 
-    /**
-     * @dataProvider values
-     */
+    #[DataProvider('values')]
     public function testRegisteringTheAdapterBeforeCallingTheStaticHelpers(mixed $expected, mixed $value): void
     {
         UserFactory::createOne(['firstname' => 'John', 'lastname' => 'Doe']);
@@ -30,7 +29,7 @@ public function testRegisteringTheAdapterBeforeCallingTheStaticHelpers(mixed $ex
     /**
      * @return iterable<string, array{mixed, mixed}>
      */
-    public function values(): iterable
+    public static function values(): iterable
     {
         yield 'a constant expression should not be necessary' => [
             ARRAY_FILTER_USE_KEY,

tests/Resources/FactoryClassFactory/Foo/BarFactory.php

@@ -4,22 +4,19 @@
 
 namespace Presta\BehatEvaluator\Tests\Resources\FactoryClassFactory\Foo;
 
-use Zenstruck\Foundry\ModelFactory;
+use Zenstruck\Foundry\Persistence\PersistentProxyObjectFactory;
 
 /**
- * @extends ModelFactory<Bar>
+ * @extends PersistentProxyObjectFactory<Bar>
  */
-final class BarFactory extends ModelFactory
+final class BarFactory extends PersistentProxyObjectFactory
 {
-    protected static function getClass(): string
+    public static function class(): string
     {
         return Bar::class;
     }
 
-    /**
-     * @return array<mixed>
-     */
-    protected function getDefaults(): array
+    protected function defaults(): array|callable
     {
         return [];
     }

tests/Resources/FactoryClassFactory/FooBarFactory.php

@@ -4,22 +4,19 @@
 
 namespace Presta\BehatEvaluator\Tests\Resources\FactoryClassFactory;
 
-use Zenstruck\Foundry\ModelFactory;
+use Zenstruck\Foundry\Persistence\PersistentProxyObjectFactory;
 
 /**
- * @extends ModelFactory<FooBar>
+ * @extends PersistentProxyObjectFactory<FooBar>
  */
-final class FooBarFactory extends ModelFactory
+final class FooBarFactory extends PersistentProxyObjectFactory
 {
-    protected static function getClass(): string
+    public static function class(): string
     {
         return FooBar::class;
     }
 
-    /**
-     * @return array<mixed>
-     */
-    protected function getDefaults(): array
+    protected function defaults(): array|callable
     {
         return [];
     }

tests/Resources/FactoryClassFactory/FooFactory.php

@@ -4,22 +4,19 @@
 
 namespace Presta\BehatEvaluator\Tests\Resources\FactoryClassFactory;
 
-use Zenstruck\Foundry\ModelFactory;
+use Zenstruck\Foundry\Persistence\PersistentProxyObjectFactory;
 
 /**
- * @extends ModelFactory<Foo>
+ * @extends PersistentProxyObjectFactory<Foo>
  */
-final class FooFactory extends ModelFactory
+final class FooFactory extends PersistentProxyObjectFactory
 {
-    protected static function getClass(): string
+    public static function class(): string
     {
         return Foo::class;
     }
 
-    /**
-     * @return array<mixed>
-     */
-    protected function getDefaults(): array
+    protected function defaults(): array|callable
     {
         return [];
     }