minor #7113 A few minor improvements (bocharsky-bw)

This PR was merged into the 2.7 branch.

Discussion
----------

A few minor improvements

Commits
-------

0226bbc Rename 'Entity' to 'Repository' in namespaces for repository classes
68a6ff4 A few minor improvements

Author: wouterj

doctrine/associations.rst

@@ -316,7 +316,7 @@ You can also query in the other direction::
 
 In this case, the same things occur: you first query out for a single ``Category``
 object, and then Doctrine makes a second query to retrieve the related ``Product``
-objects, but only once/if you ask for them (i.e. when you call ``->getProducts()``).
+objects, but only once/if you ask for them (i.e. when you call ``getProducts()``).
 The ``$products`` variable is an array of all ``Product`` objects that relate
 to the given ``Category`` object via their ``category_id`` value.
 
@@ -365,7 +365,7 @@ Of course, if you know up front that you'll need to access both objects, you
 can avoid the second query by issuing a join in the original query. Add the
 following method to the ``ProductRepository`` class::
 
-    // src/AppBundle/Entity/ProductRepository.php
+    // src/AppBundle/Repository/ProductRepository.php
     public function findOneByIdJoinedToCategory($productId)
     {
         $query = $this->getEntityManager()
@@ -407,7 +407,7 @@ Doctrine's `Association Mapping Documentation`_.
 .. note::
 
     If you're using annotations, you'll need to prepend all annotations with
-    ``ORM\`` (e.g. ``ORM\OneToMany``), which is not reflected in Doctrine's
+    ``@ORM\`` (e.g. ``@ORM\OneToMany``), which is not reflected in Doctrine's
     documentation. You'll also need to include the ``use Doctrine\ORM\Mapping as ORM;``
     statement, which *imports* the ``ORM`` annotations prefix.
 

doctrine/repository.rst

@@ -21,7 +21,7 @@ To do this, add the repository class name to your entity's mapping definition:
         use Doctrine\ORM\Mapping as ORM;
 
         /**
-         * @ORM\Entity(repositoryClass="AppBundle\Entity\ProductRepository")
+         * @ORM\Entity(repositoryClass="AppBundle\Repository\ProductRepository")
          */
         class Product
         {
@@ -33,7 +33,7 @@ To do this, add the repository class name to your entity's mapping definition:
         # src/AppBundle/Resources/config/doctrine/Product.orm.yml
         AppBundle\Entity\Product:
             type: entity
-            repositoryClass: AppBundle\Entity\ProductRepository
+            repositoryClass: AppBundle\Repository\ProductRepository
             # ...
 
     .. code-block:: xml
@@ -47,7 +47,7 @@ To do this, add the repository class name to your entity's mapping definition:
 
             <entity
                 name="AppBundle\Entity\Product"
-                repository-class="AppBundle\Entity\ProductRepository">
+                repository-class="AppBundle\Repository\ProductRepository">
 
                 <!-- ... -->
             </entity>
@@ -72,8 +72,8 @@ entities, ordered alphabetically by name.
 
 .. code-block:: php
 
-    // src/AppBundle/Entity/ProductRepository.php
-    namespace AppBundle\Entity;
+    // src/AppBundle/Repository/ProductRepository.php
+    namespace AppBundle\Repository;
 
     use Doctrine\ORM\EntityRepository;
 

security/entity_provider.rst

@@ -50,7 +50,7 @@ For this entry, suppose that you already have a ``User`` entity inside an
 
     /**
      * @ORM\Table(name="app_users")
-     * @ORM\Entity(repositoryClass="AppBundle\Entity\UserRepository")
+     * @ORM\Entity(repositoryClass="AppBundle\Repository\UserRepository")
      */
     class User implements UserInterface, \Serializable
     {
@@ -428,8 +428,8 @@ To do this, make your ``UserRepository`` implement a special
 interface requires three methods: ``loadUserByUsername($username)``,
 ``refreshUser(UserInterface $user)``, and ``supportsClass($class)``::
 
-    // src/AppBundle/Entity/UserRepository.php
-    namespace AppBundle\Entity;
+    // src/AppBundle/Repository/UserRepository.php
+    namespace AppBundle\Repository;
 
     use Symfony\Component\Security\Core\User\UserInterface;
     use Symfony\Component\Security\Core\User\UserProviderInterface;

service_container/parent_services.rst

@@ -9,8 +9,8 @@ have related classes that share some of the same dependencies. For example,
 you may have multiple repository classes which need the
 ``doctrine.entity_manager`` service and an optional ``logger`` service::
 
-    // src/AppBundle/Doctrine/BaseDoctrineRepository.php
-    namespace AppBundle\Doctrine;
+    // src/AppBundle/Repository/BaseDoctrineRepository.php
+    namespace AppBundle\Repository;
 
     // ...
     abstract class BaseDoctrineRepository
@@ -48,12 +48,12 @@ duplicated service definitions:
                     - [setLogger, ['@logger']]
 
             app.user_repository:
-                class:  AppBundle\Doctrine\DoctrineUserRepository
+                class:  AppBundle\Repository\DoctrineUserRepository
                 # extend the app.base_doctrine_repository service
                 parent: app.base_doctrine_repository
 
             app.post_repository:
-                class:  AppBundle\Doctrine\DoctrinePostRepository
+                class:  AppBundle\Repository\DoctrinePostRepository
                 parent: app.base_doctrine_repository
 
             # ...
@@ -77,12 +77,12 @@ duplicated service definitions:
 
                 <!-- extends the app.base_doctrine_repository service -->
                 <service id="app.user_repository"
-                    class="AppBundle\Doctrine\DoctrineUserRepository"
+                    class="AppBundle\Repository\DoctrineUserRepository"
                     parent="app.base_doctrine_repository"
                 />
 
                 <service id="app.post_repository"
-                    class="AppBundle\Doctrine\DoctrineUserRepository"
+                    class="AppBundle\Repository\DoctrineUserRepository"
                     parent="app.base_doctrine_repository"
                 />
 
@@ -103,11 +103,11 @@ duplicated service definitions:
 
         // extend the app.base_doctrine_repository service
         $definition = new DefinitionDecorator('app.base_doctrine_repository');
-        $definition->setClass('AppBundle\Doctrine\DoctrineUserRepository');
+        $definition->setClass('AppBundle\Repository\DoctrineUserRepository');
         $container->setDefinition('app.user_repository', $definition);
 
         $definition = new DefinitionDecorator('app.base_doctrine_repository');
-        $definition->setClass('AppBundle\Doctrine\DoctrinePostRepository');
+        $definition->setClass('AppBundle\Repository\DoctrinePostRepository');
         $container->setDefinition('app.post_repository', $definition);
 
         // ...
@@ -144,7 +144,7 @@ in the child class:
             # ...
 
             app.user_repository:
-                class:  AppBundle\Doctrine\DoctrineUserRepository
+                class:  AppBundle\Repository\DoctrineUserRepository
                 parent: app.base_doctrine_repository
 
                 # overrides the public setting of the parent service
@@ -155,7 +155,7 @@ in the child class:
                 arguments: ['@app.username_checker']
 
             app.post_repository:
-                class:  AppBundle\Doctrine\DoctrinePostRepository
+                class:  AppBundle\Repository\DoctrinePostRepository
                 parent: app.base_doctrine_repository
 
                 # overrides the first argument (using the special index_N key)
@@ -174,7 +174,7 @@ in the child class:
 
                 <!-- overrides the public setting of the parent service -->
                 <service id="app.user_repository"
-                    class="AppBundle\Doctrine\DoctrineUserRepository"
+                    class="AppBundle\Repository\DoctrineUserRepository"
                     parent="app.base_doctrine_repository"
                     public="false"
                 >
@@ -184,7 +184,7 @@ in the child class:
                 </service>
 
                 <service id="app.post_repository"
-                    class="AppBundle\Doctrine\DoctrineUserRepository"
+                    class="AppBundle\Repository\DoctrineUserRepository"
                     parent="app.base_doctrine_repository"
                 >
                     <!-- overrides the first argument (using the index attribute) -->
@@ -202,15 +202,15 @@ in the child class:
         // ...
 
         $definition = new DefinitionDecorator('app.base_doctrine_repository');
-        $definition->setClass('AppBundle\Doctrine\DoctrineUserRepository');
+        $definition->setClass('AppBundle\Repository\DoctrineUserRepository');
         // overrides the public setting of the parent service
         $definition->setPublic(false);
         // appends the '@app.username_checker' argument to the parent argument list
         $definition->addArgument(new Reference('app.username_checker'));
         $container->setDefinition('app.user_repository', $definition);
 
         $definition = new DefinitionDecorator('app.base_doctrine_repository');
-        $definition->setClass('AppBundle\Doctrine\DoctrinePostRepository');
+        $definition->setClass('AppBundle\Repository\DoctrinePostRepository');
         // overrides the first argument
         $definition->replaceArgument(0, new Reference('doctrine.custom_entity_manager'));
         $container->setDefinition('app.post_repository', $definition);

testing/doctrine.rst

@@ -18,8 +18,8 @@ If you need to actually execute a query, you will need to boot the kernel
 to get a valid connection. In this case, you'll extend the ``KernelTestCase``,
 which makes all of this quite easy::
 
-    // src/AppBundle/Tests/Entity/ProductRepositoryFunctionalTest.php
-    namespace AppBundle\Tests\Entity;
+    // src/AppBundle/Tests/Repository/ProductRepositoryFunctionalTest.php
+    namespace AppBundle\Tests\Repository;
 
     use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;