More compatibilty fixes.. Now works on _both_ 3.2.x and 3.3.

Author: bobdenotter

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();
@@ -102,8 +105,7 @@ public static function build(
             }
 
             //Must NOT be a repeater
-            if (!isset($repeatingFieldCollection) || !$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,17 +22,26 @@ 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 ($contentQuery->hasParameter('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) {