Merge pull request #6 from Lukeboy25/master

AlexLisenkov · web-flow · commit 471d95895f4b · 2022-03-21T14:19:31.000+01:00
Support for PHP 8
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();
     }

Original file line number	Diff line number	Diff line change
`@@ -61,11 +61,4 @@ public function filterQuery(): void {`
`61`	`61`	`public function sortQuery(): void`
`62`	`62`	`{`
`63`	`63`	`}`
`64`		`-`
`65`		`- /**`
`66`		`- * {@inheritDoc}`
`67`		`- */`
`68`		`- public function sortQuery(): void`
`69`		`- {`
`70`		`- }`
`71`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,12 +3,12 @@`
`3`	`3`	`namespace Mnugter\JsonApiRqlFinderBundle;`
`4`	`4`
`5`	`5`	`use Mnugter\JsonApiRqlFinderBundle\DependencyInjection\JsonApiRqlFinderExtension;`
`6`		`-use Symfony\Component\DependencyInjection\ContainerBuilder;`
	`6`	`+use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;`
`7`	`7`	`use Symfony\Component\HttpKernel\Bundle\Bundle;`
`8`	`8`
`9`	`9`	`class MnugterJsonApiRqlFilterBundle extends Bundle`
`10`	`10`	`{`
`11`		`- public function getContainerExtension()`
	`11`	`+ public function getContainerExtension(): ?ExtensionInterface`
`12`	`12`	`{`
`13`	`13`	`return new JsonApiRqlFinderExtension();`
`14`	`14`	`}`