Merge pull request #6 from Lukeboy25/master

Support for PHP 8
mnugter · Mar 21, 2022 · 471d958 · 471d958
2 parents 90cb680 + 5165375
commit 471d958
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 .idea
+vendor
diff --git a/composer.json b/composer.json
@@ -11,9 +11,9 @@
         }
     ],
     "require": {
-        "php": "^7.1",
-        "paknahad/jsonapi-bundle": "^3.0",
-        "andreas-glaser/doctrine-rql": "^0.3"
+        "php": "^8.0",
+        "paknahad/jsonapi-bundle": "^5.0",
+        "andreas-glaser/doctrine-rql": "^0.4"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,

diff --git a/src/Finder/Rql.php b/src/Finder/Rql.php
@@ -61,11 +61,4 @@ public function filterQuery(): void {
     public function sortQuery(): void
     {
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function sortQuery(): void
-    {
-    }
 }
diff --git a/src/MnugterJsonApiRqlFilterBundle.php b/src/MnugterJsonApiRqlFilterBundle.php
@@ -3,12 +3,12 @@
 namespace Mnugter\JsonApiRqlFinderBundle;
 
 use Mnugter\JsonApiRqlFinderBundle\DependencyInjection\JsonApiRqlFinderExtension;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 class MnugterJsonApiRqlFilterBundle extends Bundle
 {
-    public function getContainerExtension()
+    public function getContainerExtension(): ?ExtensionInterface
     {
         return new JsonApiRqlFinderExtension();
     }