Merge pull request #614 from uwej711/fix_typehint

fix #613 for queries with join from is a source
doctrine · Mar 21, 2015 · 69cfbdc · 69cfbdc
2 parents 5205725 + d8862c4
commit 69cfbdc
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,13 @@
 Changelog
 =========
 
+1.3.0
+-----
+
+* **2015-03-19**: **BC break** changed the type hint of the second parameter of
+                  TranslationStrategyInterface::alterQueryForTranslation from
+                  SelectorInterface to SourceInterface to fix queries with joins
+
 1.2.0
 -----
 

diff --git a/lib/Doctrine/ODM/PHPCR/Translation/TranslationStrategy/AttributeTranslationStrategy.php b/lib/Doctrine/ODM/PHPCR/Translation/TranslationStrategy/AttributeTranslationStrategy.php
@@ -26,7 +26,7 @@
 use Doctrine\ODM\PHPCR\Translation\Translation;
 use PHPCR\Query\QOM\ConstraintInterface;
 use PHPCR\Query\QOM\QueryObjectModelFactoryInterface;
-use PHPCR\Query\QOM\SelectorInterface;
+use PHPCR\Query\QOM\SourceInterface;
 
 /**
  * Translation strategy that stores the translations in attributes of the same node.
@@ -203,7 +203,7 @@ public function getTranslatedPropertyPath($alias, $propertyName, $locale)
      */
     public function alterQueryForTranslation(
         QueryObjectModelFactoryInterface $qomf,
-        SelectorInterface &$selector,
+        SourceInterface &$selector,
         ConstraintInterface &$constraint = null,
         $alias,
         $locale

diff --git a/lib/Doctrine/ODM/PHPCR/Translation/TranslationStrategy/ChildTranslationStrategy.php b/lib/Doctrine/ODM/PHPCR/Translation/TranslationStrategy/ChildTranslationStrategy.php
@@ -25,7 +25,7 @@
 use PHPCR\Query\QOM\ConstraintInterface;
 use PHPCR\Query\QOM\QueryObjectModelConstantsInterface;
 use PHPCR\Query\QOM\QueryObjectModelFactoryInterface;
-use PHPCR\Query\QOM\SelectorInterface;
+use PHPCR\Query\QOM\SourceInterface;
 use PHPCR\SessionInterface;
 
 /**
@@ -154,7 +154,7 @@ public function getTranslatedPropertyPath($alias, $propertyName, $locale)
      */
     public function alterQueryForTranslation(
         QueryObjectModelFactoryInterface $qomf,
-        SelectorInterface &$selector,
+        SourceInterface &$selector,
         ConstraintInterface &$constraint = null,
         $alias,
         $locale

diff --git a/lib/Doctrine/ODM/PHPCR/Translation/TranslationStrategy/TranslationStrategyInterface.php b/lib/Doctrine/ODM/PHPCR/Translation/TranslationStrategy/TranslationStrategyInterface.php
@@ -23,7 +23,7 @@
 use PHPCR\NodeInterface;
 use PHPCR\Query\QOM\ConstraintInterface;
 use PHPCR\Query\QOM\QueryObjectModelFactoryInterface;
-use PHPCR\Query\QOM\SelectorInterface;
+use PHPCR\Query\QOM\SourceInterface;
 
 /**
  * Operations that a translation strategy must support.
@@ -113,7 +113,7 @@ public function getTranslatedPropertyPath($alias, $propertyName, $locale);
      * generate a different query.
      *
      * @param QueryObjectModelFactoryInterface $qomf       The PHPCR query factory.
-     * @param SelectorInterface                $selector   The current selector.
+     * @param SourceInterface                $selector   The current selector.
      * @param ConstraintInterface|null         $constraint The current constraint, may be empty.
      * @param string                           $alias      The selector alias of the main node.
      * @param string                           $locale     The language to use.
@@ -122,7 +122,7 @@ public function getTranslatedPropertyPath($alias, $propertyName, $locale);
      */
     public function alterQueryForTranslation(
         QueryObjectModelFactoryInterface $qomf,
-        SelectorInterface &$selector,
+        SourceInterface &$selector,
         ConstraintInterface &$constraint = null,
         $alias,
         $locale