Merge pull request KnpLabs#534 from uginroot/master

Sympony bandle name conventions

README.md

@@ -22,18 +22,6 @@ It currently handles:
 composer require knplabs/doctrine-behaviors
 ```
 
-Register bundle in `config/bundles.php`:
-
-```php
-<?php
-
-return [
-    // ...
-    Knp\DoctrineBehaviors\Bundle\DoctrineBehaviorsBundle::class => ['all' => true],
-    // ...
-];
-```
-
 ## Usage
 
 All you have to do is to define a Doctrine entity:

config/services.yaml

@@ -17,4 +17,6 @@ services:
         resource: "../src"
         exclude:
             - "../src/Bundle/*"
+            - "../src/DoctrineBehaviorsBundle.php"
             - "../src/Exception/*"
+            - "../src/PHPStan/*"

phpstan.neon

@@ -41,4 +41,4 @@ parameters:
         - '#Cannot call method addChildNode\(\) on Knp\\DoctrineBehaviors\\Contract\\Entity\\TreeNodeInterface\|null#'
 
         - '#Property Knp\\DoctrineBehaviors\\Provider\\LocaleProvider\:\:\$translator has no typehint specified#'
-        - '#PHPDoc tag @var has invalid value \(TranslatorInterface&LocaleAwareInterface\|null\)\: Unexpected token "\|", expected TOKEN_OTHER at offset 56#'
+        - '#PHPDoc tag @var has invalid value \(TranslatorInterface&LocaleAwareInterface\|null\)\: Unexpected token "\|", expected TOKEN_OTHER at offset \d+#'

src/Bundle/DoctrineBehaviorsBundle.php → src/DoctrineBehaviorsBundle.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Knp\DoctrineBehaviors\Bundle;
+namespace Knp\DoctrineBehaviors;
 
 use Knp\DoctrineBehaviors\Bundle\DependencyInjection\DoctrineBehaviorsExtension;
 use Symfony\Component\DependencyInjection\Extension\Extension;

tests/HttpKernel/DoctrineBehaviorsKernel.php

@@ -5,7 +5,7 @@
 namespace Knp\DoctrineBehaviors\Tests\HttpKernel;
 
 use Doctrine\Bundle\DoctrineBundle\DoctrineBundle;
-use Knp\DoctrineBehaviors\Bundle\DoctrineBehaviorsBundle;
+use Knp\DoctrineBehaviors\DoctrineBehaviorsBundle;
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\HttpKernel\Bundle\BundleInterface;

tests/ORM/UuidableTest.php

@@ -4,7 +4,7 @@
 
 namespace Knp\DoctrineBehaviors\Tests\ORM;
 
-use Knp\DoctrineBehaviors\Model\Uuidable\UuidableTrait;
+use Knp\DoctrineBehaviors\Contract\Entity\UuidableInterface;
 use Knp\DoctrineBehaviors\Tests\AbstractBehaviorTestCase;
 use Knp\DoctrineBehaviors\Tests\Fixtures\Entity\UuidableEntity;
 use Ramsey\Uuid\UuidInterface;
@@ -26,7 +26,7 @@ public function testUuidLoading(): void
 
         $uuidableRepository = $this->entityManager->getRepository(UuidableEntity::class);
 
-        /** @var UuidableTrait $entity */
+        /** @var UuidableInterface $entity */
         $entity = $uuidableRepository->find($id);
 
         $this->assertNotNull($entity);