diff --git a/composer.json b/composer.json index 3d73a3c..87fda24 100644 --- a/composer.json +++ b/composer.json @@ -1,11 +1,11 @@ { - "name": "codeception/module-doctrine2", - "description": "Doctrine2 module for Codeception", + "name": "codeception/module-doctrine", + "description": "Doctrine module for Codeception", "license": "MIT", "type": "library", "keywords": [ "codeception", - "doctrine2" + "doctrine" ], "authors": [ { diff --git a/phpstan.neon b/phpstan.neon index 771f89c..1805e37 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -5,8 +5,8 @@ parameters: - tests excludePaths: analyse: - - tests/data/doctrine2_fixtures/TestFixture1.php - - tests/data/doctrine2_fixtures/TestFixture2.php + - tests/data/doctrine_fixtures/TestFixture1.php + - tests/data/doctrine_fixtures/TestFixture2.php - tests/_support/UnitTester.php checkMissingIterableValueType: false reportUnmatchedIgnoredErrors: true diff --git a/readme.md b/readme.md index af511a0..0c34bb6 100644 --- a/readme.md +++ b/readme.md @@ -1,11 +1,11 @@ -# Codeception Module Doctrine2 +# Codeception Module Doctrine A Doctrine 2 module for Codeception. -[![Actions Status](https://github.com/Codeception/module-doctrine2/workflows/CI/badge.svg)](https://github.com/Codeception/module-doctrine2/actions) -[![Latest Stable Version](https://poser.pugx.org/codeception/module-doctrine2/v/stable)](https://github.com/Codeception/module-doctrine2/releases) -[![Total Downloads](https://poser.pugx.org/codeception/module-doctrine2/downloads)](https://packagist.org/packages/codeception/module-doctrine2) -[![License](https://poser.pugx.org/codeception/module-doctrine2/license)](/LICENSE) +[![Actions Status](https://github.com/Codeception/module-doctrine/workflows/CI/badge.svg)](https://github.com/Codeception/module-doctrine/actions) +[![Latest Stable Version](https://poser.pugx.org/codeception/module-doctrine/v/stable)](https://github.com/Codeception/module-doctrine/releases) +[![Total Downloads](https://poser.pugx.org/codeception/module-doctrine/downloads)](https://packagist.org/packages/codeception/module-doctrine) +[![License](https://poser.pugx.org/codeception/module-doctrine/license)](/LICENSE) ## Requirements @@ -14,17 +14,17 @@ A Doctrine 2 module for Codeception. ## Installation ``` -composer require "codeception/module-doctrine2" --dev +composer require "codeception/module-doctrine" --dev ``` ## Documentation -See [the module documentation](https://codeception.com/docs/modules/Doctrine2). +See [the module documentation](https://codeception.com/docs/modules/Doctrine). -[Changelog](https://github.com/Codeception/module-doctrine2/releases) +[Changelog](https://github.com/Codeception/module-doctrine/releases) ## License -`Codeception Module Doctrine2` is open-sourced software licensed under the [MIT](/LICENSE) License. +`Codeception Module Doctrine` is open-sourced software licensed under the [MIT](/LICENSE) License. © Codeception PHP Testing Framework diff --git a/src/Codeception/Module/Doctrine2.php b/src/Codeception/Module/Doctrine.php similarity index 98% rename from src/Codeception/Module/Doctrine2.php rename to src/Codeception/Module/Doctrine.php index b699772..6a92475 100644 --- a/src/Codeception/Module/Doctrine2.php +++ b/src/Codeception/Module/Doctrine.php @@ -47,7 +47,7 @@ * modules: * enabled: * - Symfony # 'ZF2' or 'Symfony' - * - Doctrine2: + * - Doctrine: * depends: Symfony # Tells Doctrine to fetch the Entity Manager through Symfony * cleanup: true # All doctrine queries will be wrapped in a transaction, which will be rolled back at the end of each test * ``` @@ -57,7 +57,7 @@ * ```yaml * modules: * enabled: - * - Doctrine2: + * - Doctrine: * connection_callback: ['MyDb', 'createEntityManager'] # Call the static method `MyDb::createEntityManager()` to get the Entity Manager * ``` * @@ -65,14 +65,14 @@ * (this is controlled by the `cleanup` setting). * By doing this, tests will run much faster and will be isolated from each other. * - * To use the Doctrine2 Module in acceptance tests, set up your `acceptance.suite.yml` like this: + * To use the Doctrine Module in acceptance tests, set up your `acceptance.suite.yml` like this: * * ```yaml * modules: * enabled: * - Symfony: * part: SERVICES - * - Doctrine2: + * - Doctrine: * depends: Symfony * ``` * @@ -84,7 +84,7 @@ * ```yaml * modules: * enabled: - * - Doctrine2: + * - Doctrine: * purge_mode: 1 # 1: DELETE (=default), 2: TRUNCATE * ``` * @@ -146,7 +146,7 @@ * * Note that key is ignored, because actual field name is part of criteria and/or expression. */ -class Doctrine2 extends CodeceptionModule implements DependsOnModule, DataMapper +class Doctrine extends CodeceptionModule implements DependsOnModule, DataMapper { private ?DoctrineProvider $dependentModule = null; @@ -165,14 +165,14 @@ class Doctrine2 extends CodeceptionModule implements DependsOnModule, DataMapper modules: enabled: - - Doctrine2: + - Doctrine: connection_callback: [My\ConnectionClass, getEntityManager] Or set a dependent module, which can be either Symfony or ZF2 to get EM from service locator: modules: enabled: - - Doctrine2: + - Doctrine: depends: Symfony EOF; @@ -503,7 +503,7 @@ public function haveInRepository($classNameOrInstance, array $data = []) } elseif (is_string($classNameOrInstance)) { $instance = $this->instantiateAndPopulateEntity($classNameOrInstance, $data, $instances); } else { - throw new InvalidArgumentException(sprintf('Doctrine2::haveInRepository expects a class name or instance as first argument, got "%s" instead', gettype($classNameOrInstance))); + throw new InvalidArgumentException(sprintf('Doctrine::haveInRepository expects a class name or instance as first argument, got "%s" instead', gettype($classNameOrInstance))); } // Flush all changes to database and then refresh all entities. We need this because diff --git a/tests/data/doctrine2_entities/CircularRelations/A.php b/tests/data/doctrine_entities/CircularRelations/A.php similarity index 100% rename from tests/data/doctrine2_entities/CircularRelations/A.php rename to tests/data/doctrine_entities/CircularRelations/A.php diff --git a/tests/data/doctrine2_entities/CircularRelations/B.php b/tests/data/doctrine_entities/CircularRelations/B.php similarity index 100% rename from tests/data/doctrine2_entities/CircularRelations/B.php rename to tests/data/doctrine_entities/CircularRelations/B.php diff --git a/tests/data/doctrine2_entities/CircularRelations/C.php b/tests/data/doctrine_entities/CircularRelations/C.php similarity index 100% rename from tests/data/doctrine2_entities/CircularRelations/C.php rename to tests/data/doctrine_entities/CircularRelations/C.php diff --git a/tests/data/doctrine2_entities/CompositePrimaryKeyEntity.php b/tests/data/doctrine_entities/CompositePrimaryKeyEntity.php similarity index 100% rename from tests/data/doctrine2_entities/CompositePrimaryKeyEntity.php rename to tests/data/doctrine_entities/CompositePrimaryKeyEntity.php diff --git a/tests/data/doctrine2_entities/EntityWithConstructorParameters.php b/tests/data/doctrine_entities/EntityWithConstructorParameters.php similarity index 100% rename from tests/data/doctrine2_entities/EntityWithConstructorParameters.php rename to tests/data/doctrine_entities/EntityWithConstructorParameters.php diff --git a/tests/data/doctrine2_entities/EntityWithEmbeddable.php b/tests/data/doctrine_entities/EntityWithEmbeddable.php similarity index 100% rename from tests/data/doctrine2_entities/EntityWithEmbeddable.php rename to tests/data/doctrine_entities/EntityWithEmbeddable.php diff --git a/tests/data/doctrine2_entities/EntityWithUuid.php b/tests/data/doctrine_entities/EntityWithUuid.php similarity index 100% rename from tests/data/doctrine2_entities/EntityWithUuid.php rename to tests/data/doctrine_entities/EntityWithUuid.php diff --git a/tests/data/doctrine2_entities/JoinedEntity.php b/tests/data/doctrine_entities/JoinedEntity.php similarity index 100% rename from tests/data/doctrine2_entities/JoinedEntity.php rename to tests/data/doctrine_entities/JoinedEntity.php diff --git a/tests/data/doctrine2_entities/JoinedEntityBase.php b/tests/data/doctrine_entities/JoinedEntityBase.php similarity index 100% rename from tests/data/doctrine2_entities/JoinedEntityBase.php rename to tests/data/doctrine_entities/JoinedEntityBase.php diff --git a/tests/data/doctrine2_entities/MultilevelRelations/A.php b/tests/data/doctrine_entities/MultilevelRelations/A.php similarity index 100% rename from tests/data/doctrine2_entities/MultilevelRelations/A.php rename to tests/data/doctrine_entities/MultilevelRelations/A.php diff --git a/tests/data/doctrine2_entities/MultilevelRelations/B.php b/tests/data/doctrine_entities/MultilevelRelations/B.php similarity index 100% rename from tests/data/doctrine2_entities/MultilevelRelations/B.php rename to tests/data/doctrine_entities/MultilevelRelations/B.php diff --git a/tests/data/doctrine2_entities/MultilevelRelations/C.php b/tests/data/doctrine_entities/MultilevelRelations/C.php similarity index 100% rename from tests/data/doctrine2_entities/MultilevelRelations/C.php rename to tests/data/doctrine_entities/MultilevelRelations/C.php diff --git a/tests/data/doctrine2_entities/NonTypicalPrimaryKeyEntity.php b/tests/data/doctrine_entities/NonTypicalPrimaryKeyEntity.php similarity index 100% rename from tests/data/doctrine2_entities/NonTypicalPrimaryKeyEntity.php rename to tests/data/doctrine_entities/NonTypicalPrimaryKeyEntity.php diff --git a/tests/data/doctrine2_entities/PlainEntity.php b/tests/data/doctrine_entities/PlainEntity.php similarity index 100% rename from tests/data/doctrine2_entities/PlainEntity.php rename to tests/data/doctrine_entities/PlainEntity.php diff --git a/tests/data/doctrine2_entities/QuirkyFieldName/Association.php b/tests/data/doctrine_entities/QuirkyFieldName/Association.php similarity index 100% rename from tests/data/doctrine2_entities/QuirkyFieldName/Association.php rename to tests/data/doctrine_entities/QuirkyFieldName/Association.php diff --git a/tests/data/doctrine2_entities/QuirkyFieldName/AssociationHost.php b/tests/data/doctrine_entities/QuirkyFieldName/AssociationHost.php similarity index 100% rename from tests/data/doctrine2_entities/QuirkyFieldName/AssociationHost.php rename to tests/data/doctrine_entities/QuirkyFieldName/AssociationHost.php diff --git a/tests/data/doctrine2_entities/QuirkyFieldName/Embeddable.php b/tests/data/doctrine_entities/QuirkyFieldName/Embeddable.php similarity index 100% rename from tests/data/doctrine2_entities/QuirkyFieldName/Embeddable.php rename to tests/data/doctrine_entities/QuirkyFieldName/Embeddable.php diff --git a/tests/data/doctrine2_entities/QuirkyFieldName/EmbeddableHost.php b/tests/data/doctrine_entities/QuirkyFieldName/EmbeddableHost.php similarity index 100% rename from tests/data/doctrine2_entities/QuirkyFieldName/EmbeddableHost.php rename to tests/data/doctrine_entities/QuirkyFieldName/EmbeddableHost.php diff --git a/tests/data/doctrine2_entities/SampleEmbeddable.php b/tests/data/doctrine_entities/SampleEmbeddable.php similarity index 100% rename from tests/data/doctrine2_entities/SampleEmbeddable.php rename to tests/data/doctrine_entities/SampleEmbeddable.php diff --git a/tests/data/doctrine2_fixtures/TestFixture1.php b/tests/data/doctrine_fixtures/TestFixture1.php similarity index 100% rename from tests/data/doctrine2_fixtures/TestFixture1.php rename to tests/data/doctrine_fixtures/TestFixture1.php diff --git a/tests/data/doctrine2_fixtures/TestFixture2.php b/tests/data/doctrine_fixtures/TestFixture2.php similarity index 100% rename from tests/data/doctrine2_fixtures/TestFixture2.php rename to tests/data/doctrine_fixtures/TestFixture2.php diff --git a/tests/unit/Codeception/Module/Doctrine2Test.php b/tests/unit/Codeception/Module/Doctrine2Test.php index 45b8cf5..5ef84f5 100644 --- a/tests/unit/Codeception/Module/Doctrine2Test.php +++ b/tests/unit/Codeception/Module/Doctrine2Test.php @@ -5,7 +5,7 @@ use Composer\InstalledVersions; use Codeception\Exception\ModuleException; use Codeception\Lib\ModuleContainer; -use Codeception\Module\Doctrine2; +use Codeception\Module\Doctrine; use Codeception\Stub; use Codeception\Test\Unit; use Doctrine\Common\Collections\Criteria; @@ -28,11 +28,11 @@ use Symfony\Bridge\Doctrine\Types\UuidType; use Symfony\Component\Uid\Uuid; -final class Doctrine2Test extends Unit +final class DoctrineTest extends Unit { private ?EntityManager $em = null; - private ?Doctrine2 $module = null; + private ?Doctrine $module = null; protected static function _setUpBeforeClass() { @@ -50,7 +50,7 @@ protected function _setUp() $this->markTestSkipped('doctrine/orm is not installed'); } - $dir = __DIR__ . "/../../../data/doctrine2_entities"; + $dir = __DIR__ . "/../../../data/doctrine_entities"; require_once $dir . "/CompositePrimaryKeyEntity.php"; require_once $dir . "/PlainEntity.php"; @@ -108,7 +108,7 @@ protected function _setUp() ]); $container = Stub::make(ModuleContainer::class); - $this->module = new Doctrine2($container, [ + $this->module = new Doctrine($container, [ 'connection_callback' => fn(): EntityManager => $this->em, ]); @@ -124,7 +124,7 @@ private function _preloadFixtures() $this->markTestSkipped('doctrine/data-fixtures is not installed'); } - $dir = __DIR__ . "/../../../data/doctrine2_fixtures"; + $dir = __DIR__ . "/../../../data/doctrine_fixtures"; require_once $dir . "/TestFixture1.php"; require_once $dir . "/TestFixture2.php"; @@ -201,7 +201,7 @@ public function testEmbeddable() public function testQuirkyAssociationFieldNames() { // This test case demonstrates how quirky field names can interfere with parameter - // names generated within Doctrine2. Specifically, parameter name for entity's own field + // names generated within Doctrine. Specifically, parameter name for entity's own field // '_assoc_val' clashes with parameter name for field 'val' of relation 'assoc'. $this->module->dontSeeInRepository(AssociationHost::class, [