Add constructor for Query

cundd · Jan 6, 2019 · 2d4a403 · 2d4a403
1 parent e09455c
commit 2d4a403
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 5 deletions.
diff --git a/Classes/Authentication/UserProvider/FeUserProvider.php b/Classes/Authentication/UserProvider/FeUserProvider.php
@@ -5,6 +5,7 @@
 
 use Cundd\Rest\Authentication\UserProviderInterface;
 use Cundd\Rest\VirtualObject\Persistence\BackendFactory;
+use Cundd\Rest\VirtualObject\Persistence\Query;
 use Cundd\Rest\VirtualObject\Persistence\QueryInterface;
 
 /**
@@ -52,7 +53,7 @@ public function checkCredentials($username, $password)
             ],
         ];
 
-        return 0 < $backend->getObjectCountByQuery('fe_users', array_merge($query, $endtimeZero))
-            || 0 < $backend->getObjectCountByQuery('fe_users', array_merge($query, $endtimeGtNow));
+        return 0 < $backend->getObjectCountByQuery('fe_users', new Query(array_merge($query, $endtimeZero)))
+            || 0 < $backend->getObjectCountByQuery('fe_users', new Query(array_merge($query, $endtimeGtNow)));
     }
 }
diff --git a/Classes/VirtualObject/Persistence/Query.php b/Classes/VirtualObject/Persistence/Query.php
@@ -48,6 +48,32 @@ class Query implements QueryInterface
      */
     protected $statement;
 
+    /**
+     * Query constructor.
+     *
+     * @param array              $constraint
+     * @param array              $orderings
+     * @param int                $limit
+     * @param int                $offset
+     * @param string             $sourceIdentifier
+     * @param PersistenceManager $persistenceManager
+     */
+    public function __construct(
+        array $constraint = [],
+        array $orderings = [],
+        int $limit = 0,
+        int $offset = 0,
+        string $sourceIdentifier = '',
+        PersistenceManager $persistenceManager = null
+    ) {
+        $this->persistenceManager = $persistenceManager;
+        $this->constraint = $constraint;
+        $this->orderings = $orderings;
+        $this->limit = $limit;
+        $this->offset = $offset;
+        $this->sourceIdentifier = $sourceIdentifier;
+    }
+
     public function execute()
     {
         return $this->persistenceManager->getObjectDataByQuery($this);
@@ -148,6 +174,10 @@ public function setConfiguration($configuration)
 
     public function getConfiguration()
     {
+        if (!$this->persistenceManager) {
+            return null;
+        }
+
         return $this->persistenceManager->getConfiguration();
     }
 

diff --git a/Classes/VirtualObject/Persistence/QueryInterface.php b/Classes/VirtualObject/Persistence/QueryInterface.php
@@ -98,12 +98,12 @@ interface QueryInterface
     /**
      * Ascending ordering of results
      */
-    const ORDER_ASCENDING = \TYPO3\CMS\Extbase\Persistence\QueryInterface::ORDER_ASCENDING;
+    const ORDER_ASCENDING = 'ASC';
 
     /**
      * Descending ordering of results
      */
-    const ORDER_DESCENDING = \TYPO3\CMS\Extbase\Persistence\QueryInterface::ORDER_DESCENDING;
+    const ORDER_DESCENDING = 'DESC';
 
     /**
      * Executes the query and returns the result

diff --git a/Tests/Unit/VirtualObject/Backend/WhereClauseBuilderTest.php b/Tests/Unit/VirtualObject/Backend/WhereClauseBuilderTest.php
@@ -3,6 +3,7 @@
 
 namespace Cundd\Rest\VirtualObject\Persistence\Backend;
 
+use Cundd\Rest\VirtualObject\Persistence\Query;
 use Cundd\Rest\VirtualObject\Persistence\QueryInterface;
 use PHPUnit\Framework\TestCase;
 
@@ -136,7 +137,7 @@ public function testBuild()
             $where->getBoundVariables()
         );
 
-        $this->fixture->build([]);
+        $this->fixture->build(new Query());
         $this->assertEmptyWhere();
     }