Merge pull request rikbruil#19 from elt/repository_as_trait

SpecificationRepository as trait

Author: rikbruil

composer.json

@@ -15,7 +15,8 @@
     "psr-4": {"Rb\\Specification\\Doctrine\\": "src/"}
   },
   "autoload-dev": {
-    "psr-4": {"spec\\Rb\\Specification\\Doctrine\\": "spec/"}
+    "psr-4": {"spec\\Rb\\Specification\\Doctrine\\": "spec/"},
+    "files": ["spec/SpecificationRepositoryStub.php"]
   },
   "require": {
     "php": ">=5.5",

spec/SpecificationRepositorySpec.php

@@ -22,6 +22,7 @@ class SpecificationRepositorySpec extends ObjectBehavior
 
     public function let(EntityManager $entityManager, ClassMetadata $classMetadata)
     {
+        $this->beAnInstanceOf('Rb\Specification\Doctrine\SpecificationRepositoryStub');
         $this->beConstructedWith($entityManager, $classMetadata);
     }
 

spec/SpecificationRepositoryStub.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Rb\Specification\Doctrine;
+
+use Doctrine\ORM\EntityRepository;
+
+class SpecificationRepositoryStub extends EntityRepository implements SpecificationAware
+{
+    use SpecificationRepositoryTrait;
+}

src/SpecificationAware.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Rb\Specification\Doctrine;
+
+use Doctrine\ORM\Query;
+use Rb\Specification\Doctrine\Result\ModifierInterface;
+
+/**
+ * SpecificationAware can be used to implement custom repository.
+ */
+interface SpecificationAware
+{
+    /**
+     * Get the query after matching with given specification.
+     *
+     * @param SpecificationInterface $specification
+     * @param ModifierInterface      $modifier
+     *
+     * @return Query
+     */
+    public function match(SpecificationInterface $specification, ModifierInterface $modifier = null);
+}

src/SpecificationRepository.php src/SpecificationRepositoryTrait.phpsrc/SpecificationRepository.php renamed to src/SpecificationRepositoryTrait.php

@@ -2,31 +2,29 @@
 
 namespace Rb\Specification\Doctrine;
 
-use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
 use Doctrine\ORM\QueryBuilder;
 use Rb\Specification\Doctrine\Exception\LogicException;
 use Rb\Specification\Doctrine\Result\ModifierInterface;
 
 /**
- * Class SpecificationRepository.
+ * Class SpecificationRepositoryTrait.
  */
-class SpecificationRepository extends EntityRepository
+trait SpecificationRepositoryTrait
 {
     /**
      * @var string
      */
-    private $dqlAlias = 'e';
+    protected $dqlAlias = 'e';
 
     /**
-     * Get the query after matching with given specification.
+     * @see SpecificationAware::match()
      *
      * @param SpecificationInterface $specification
-     * @param ModifierInterface      $modifier
-     *
-     * @throws LogicException
+     * @param ModifierInterface|null $modifier
      *
      * @return Query
+     * @throws LogicException
      */
     public function match(SpecificationInterface $specification, ModifierInterface $modifier = null)
     {