diff --git a/.docs/README.md b/.docs/README.md index bb29bf4..68c1c0c 100755 --- a/.docs/README.md +++ b/.docs/README.md @@ -51,17 +51,26 @@ Setup extra entity mapping. ```yaml extensions: - orm.annotations: Nettrine\ORM\DI\OrmAnnotationsExtension - -orm.annotations: - mapping: - # your app entities - App\Model\Database\Entity: %appDir%/Model/Database/Entity - # doctrine extensions entities - Gedmo\Translatable: %appDir%/../vendor/gedmo/doctrine-extensions/lib/Gedmo/Translatable/Entity - Gedmo\Loggable: %appDir%/../vendor/gedmo/doctrine-extensions/lib/Gedmo/Loggable/Entity - Gedmo\Tree: %appDir%/../vendor/gedmo/doctrine-extensions/lib/Gedmo/Tree/Entity - ... + nettrine.orm: Nettrine\ORM\DI\OrmExtension + + +nettrine.orm: + managers: + default: + mapping: + App: + directories: + - %appDir%/Model/Database/Entity + # doctrine extensions entities + Translatable: + directories: + - %appDir%/../vendor/gedmo/doctrine-extensions/src/Translatable/Entity + namespace: Gedmo\Translatable\Entity + Loggable: + directories: + - %appDir%/../vendor/gedmo/doctrine-extensions/src/Loggable/Entity + ... + ``` If you are using `nettrine/dbal` all listeners are registered automatically, otherwise you have to register them manually: diff --git a/.editorconfig b/.editorconfig index e147490..ded6667 100644 --- a/.editorconfig +++ b/.editorconfig @@ -13,4 +13,4 @@ tab_width = 4 [{*.json,*.yaml,*.yml,*.md}] indent_style = space -indent_size = 2 +indent_size = 4 diff --git a/composer.json b/composer.json index 259b575..6cb44e0 100644 --- a/composer.json +++ b/composer.json @@ -12,10 +12,9 @@ } ], "require": { - "php": ">=8.3", + "php": ">=8.2", "nette/di": "^3.0.0", "doctrine/orm": "^3.0", - "doctrine/annotations": "^2.0", "gedmo/doctrine-extensions": "^3.19" }, "require-dev": { diff --git a/src/DI/Atlantic18BehaviorExtension.php b/src/DI/Atlantic18BehaviorExtension.php index af9ab6a..5b42324 100644 --- a/src/DI/Atlantic18BehaviorExtension.php +++ b/src/DI/Atlantic18BehaviorExtension.php @@ -2,7 +2,6 @@ namespace Nettrine\Extensions\Atlantic18\DI; -use Doctrine\Common\Annotations\Reader; use Gedmo\Blameable\BlameableListener; use Gedmo\IpTraceable\IpTraceableListener; use Gedmo\Loggable\LoggableListener; @@ -13,11 +12,9 @@ use Gedmo\Translatable\TranslatableListener; use Gedmo\Tree\TreeListener; use Nette\DI\CompilerExtension; -use Nette\DI\Definitions\ServiceDefinition; use Nette\DI\Definitions\Statement; use Nette\Schema\Expect; use Nette\Schema\Schema; -use stdClass; /** * @property-read object{ @@ -136,17 +133,4 @@ public function loadConfiguration(): void } } - public function beforeCompile() - { - $builder = $this->getContainerBuilder(); - - if ($builder->getByType(Reader::class) !== null) { - foreach ($builder->findByTag(self::TAG_NAME) as $serviceName => $tagValue) { - /** @var ServiceDefinition $definition */ - $definition = $builder->getDefinition($serviceName); - $definition->addSetup('setAnnotationReader', ['@' . Reader::class]); - } - } - } - }