Merge pull request #59 from bobdenotter/master

Compatibility fixes for Bolt 3.3

Author: xiaohutai

src/Parser/Field/FieldFactory.php

@@ -43,6 +43,9 @@ public static function build(
             $fieldCollection = new FieldCollection([]);
         }
 
+        $repeatingFieldCollection = null;
+        $repeatingCollection = null;
+
         foreach ($fields as $label => $field) {
             if ($fieldCollection instanceof RepeatingFieldCollection) {
                 $data = $field->getValue();
@@ -51,7 +54,7 @@ public static function build(
             } else {
                 $data = $item->get($field);
                 if (isset($metadata['fields'])) {
-                    if (isset($metadata['fields'][$field])) {
+                    if (isset($metadata['fields'][$field]) && isset($metadata['fields'][$field]['data']['type'])) {
                         $fieldType = $metadata['fields'][$field]['data']['type'];
                     }
                 }
@@ -102,8 +105,7 @@ public static function build(
             }
 
             //Must NOT be a repeater
-            if (! $repeatingFieldCollection) {
-                $repeatingFieldCollection = null;
+            if (!$repeatingFieldCollection) {
                 $fieldCollection->add($type);
             }
         }

src/Parser/Field/Type/Taxonomy.php

@@ -9,6 +9,8 @@ public function render()
         /** @var \Bolt\Storage\Collection\Taxonomy $taxonomies */
         $taxonomies = $this->getValue();
 
+        $attributes = [];
+
         foreach ($taxonomies as $taxonomy) {
             $type = $taxonomy->getTaxonomytype();
             $slug = $taxonomy->getSlug();

src/Storage/Query/Handler/PagingHandler.php

@@ -6,6 +6,7 @@
 use Bolt\Extension\Bolt\JsonApi\Storage\Query\PagingResultSet;
 use Bolt\Storage\Query\ContentQueryParser;
 use Bolt\Storage\Query\SearchQuery;
+use Bolt\Version;
 use Doctrine\DBAL\Query\QueryBuilder;
 
 /**
@@ -21,21 +22,30 @@ public function __invoke(ContentQueryParser $contentQuery)
         $cleanSearchQuery = $contentQuery->getService('search');
 
         foreach ($contentQuery->getContentTypes() as $contenttype) {
+            $parameters = $contentQuery->getParameters();
+
             //Find out if we are searching or just doing a simple query
-            if ($searchParam = $contentQuery->getParameter('filter')) {
+            if (array_key_exists('filter', $parameters)) {
                 $query = clone $cleanSearchQuery;
             } else {
                 $query = $contentQuery->getService('select');
             }
 
             $repo = $contentQuery->getEntityManager()->getRepository($contenttype);
-            $query->setQueryBuilder($repo->createQueryBuilder($contenttype));
+
+            if (Version::compare('3.3', '<=')) {
+                // Only for Bolt version 3.3 and up.
+                $query->setQueryBuilder($repo->createQueryBuilder('_' . $contenttype));
+            } else {
+                // Only for Bolt versions up to 3.2.x.
+                $query->setQueryBuilder($repo->createQueryBuilder($contenttype));
+            }
             $query->setContentType($contenttype);
-            $query->setParameters($contentQuery->getParameters());
+            $query->setParameters($parameters);
 
             //Set the search parameter if searching
             if ($query instanceof SearchQuery) {
-                $query->setSearch($searchParam);
+                $query->setSearch($contentQuery->getParameter('filter'));
             }
 
             //Get Page from the new directive handler that allows pagination
@@ -57,15 +67,18 @@ public function __invoke(ContentQueryParser $contentQuery)
             /** @var QueryBuilder $qb */
             $qb = clone $query->getQueryBuilder();
 
+            // Get an intersection of current keys, and the ones we need to remove
+            $removeparts = array_intersect(array_keys($query2->getQueryParts()), ['maxResults', 'firstResult', 'orderBy']);
+
             $query2
-                ->resetQueryParts(['maxResults', 'firstResult', 'orderBy'])
+                ->resetQueryParts($removeparts)
                 ->setFirstResult(null)
                 ->setMaxResults(null)
                 ->select('COUNT(*) as total');
 
-            $totalItems = count($repo->findResults($query2));
+            $totalItems = count($query2->execute()->fetchAll());
 
-            $result = $repo->findResults($qb);
+            $result = $repo->queryWithLoaded($qb);
             if ($result) {
                 $set->add($result, $contenttype);
                 $set->setTotalResults((int) $totalItems);

src/Storage/Repository.php

@@ -34,20 +34,20 @@ public function getQueryBuilderAfterMappings(QueryInterface $query)
     }
 
     /**
-     * Since the queries are built already, we don't need to run all of the other mappings
-     * before. Now we can just fetch the results of the query instead of running everything else.
+     *  This method is used to run the query without loading the mappings again
      *
      * @param QueryBuilder $query
      *
-     * @return bool|mixed
+     * @return array
      */
-    public function findResults(QueryBuilder $query)
+    public function queryWithLoaded(QueryBuilder $query)
     {
         $result = $query->execute()->fetchAll();
         if ($result) {
             return $this->hydrateAll($result, $query);
-        } else {
-            return false;
         }
+
+        return [];
     }
+
 }