Merge pull request #210 from phpcr/handle-literal-fulltext-search

fix fulltext search

Author: dbu

.github/workflows/test-application.yaml

@@ -4,7 +4,6 @@ on:
     pull_request:
     push:
         branches:
-            - 'master'
             - '[0-9]+.x'
             - '[0-9]+.[0-9]+'
             - '[0-9]+.[0-9]+.x'

CHANGELOG.md

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+1.8.0
+-----
+
+* Fixed handling of QOM fulltext search expression which should never be string but a `QOM\StaticOperandInterface`. 
+
 1.7.0
 -----
 

composer.json

@@ -47,10 +47,5 @@
             "PHPCR\\Util": "src"
         }
     },
-    "bin": ["bin/phpcr"],
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.x-dev"
-        }
-    }
+    "bin": ["bin/phpcr"]
 }

src/PHPCR/Util/QOM/BaseQomToSqlQueryConverter.php

@@ -4,6 +4,7 @@
 
 use InvalidArgumentException;
 use PHPCR\Query\QOM;
+use PHPCR\Query\QOM\StaticOperandInterface;
 
 /**
  * Common base class for the SQL(1) and SQL2 converters.
@@ -170,14 +171,23 @@ protected function convertFullTextSearch(QOM\FullTextSearchInterface $constraint
     /**
      * FullTextSearchExpression ::= BindVariable | ''' FullTextSearchLiteral '''.
      *
-     * @param string $expr
+     * @param string|QOM\StaticOperandInterface $expr
      *
      * @return string
      */
     protected function convertFullTextSearchExpression($expr)
     {
         if ($expr instanceof QOM\BindVariableValueInterface) {
-            return $this->convertBindVariable($expr);
+            return $this->convertBindVariable($expr->getBindVariableName());
+        }
+        if ($expr instanceof QOM\LiteralInterface) {
+            $literal = $expr->getLiteralValue();
+        } elseif (is_string($expr)) {
+            // this should not happen, the interface for full text search declares the return type to be StaticOperandInterface
+            // however, without type checks, jackalope 1.0 got this wrong and returned a string.
+            $literal = $expr;
+        } else {
+            throw new InvalidArgumentException('Unknown full text search expression type '.get_class($expr));
         }
 
         $expr = $this->generator->evalFullText($expr);