Merge pull request #4 from AlexLisenkov/upgrade-dependencies

Upgrade dependencies
mnugter · Mar 5, 2020 · 90cb680 · 90cb680
2 parents 69f3489 + b72acf6
commit 90cb680
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+.idea
diff --git a/README.md b/README.md
@@ -1,3 +1,5 @@
+![https://packagist.org/packages/mnugter/jsonapi-rql-finder-bundle](https://img.shields.io/packagist/dt/mnugter/jsonapi-rql-finder-bundle)
+![https://github.com/mnugter/jsonapi-rql-finder-bundle](https://img.shields.io/github/license/mnugter/jsonapi-rql-finder-bundle)
 # jsonapi-bundle-rql-finder
 An RQL Finder for [paknahad/jsonapi-bundle][1].
 

diff --git a/composer.json b/composer.json
@@ -12,8 +12,8 @@
     ],
     "require": {
         "php": "^7.1",
-        "paknahad/jsonapi-bundle": ">=1.1",
-        "andreas-glaser/doctrine-rql": "^0.2"
+        "paknahad/jsonapi-bundle": "^3.0",
+        "andreas-glaser/doctrine-rql": "^0.3"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,

diff --git a/src/Finder/Rql.php b/src/Finder/Rql.php
@@ -50,7 +50,16 @@ public function setFieldManager(FieldManager $fieldManager): void
     public function filterQuery(): void {
         $rql = $this->request->get('rql');
 
-        ORMVisitorFactory::appendFiltersOnly($this->query, $rql);
+        if ($rql) {
+            ORMVisitorFactory::appendFiltersOnly($this->query, $rql);
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function sortQuery(): void
+    {
     }
 
     /**