Merge pull request #8 from DennisLammers/laravel-10

feat(platform): Update for Laravel 10.
koenhoeijmakers · Feb 27, 2023 · e996a03 · e996a03
2 parents f6448e1 + ac4fe42
commit e996a03
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 12 deletions.
diff --git a/.docker/php8.1-fpm/php.ini b/.docker/php8.1-fpm/php.ini
diff --git a/composer.json b/composer.json
@@ -3,11 +3,11 @@
     "description": "Explicit request filtering.",
     "require": {
         "php": ">=8.1",
-        "laravel/framework": "^9.0|^10.0"
+        "laravel/framework": "^10.0"
     },
     "require-dev": {
-        "orchestra/testbench": "^7.14",
-        "phpunit/phpunit": "^9.0"
+        "orchestra/testbench": "^8.0",
+        "phpunit/phpunit": "^10.0"
     },
     "type": "library",
     "license": "MIT",

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -11,7 +11,6 @@ services:
     container_name: app
     volumes:
       - ./:/var/www
-      - ./.docker/php8.1-fpm/php.ini:/usr/local/etc/php/conf.d/local.ini
 
 volumes:
   app:

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" bootstrap="vendor/autoload.php" cacheResult="false" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-  <coverage processUncoveredFiles="true">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" bootstrap="vendor/autoload.php" cacheResult="false" colors="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
+  <coverage>
     <include>
       <directory suffix=".php">./src</directory>
     </include>

diff --git a/src/FilterableServiceProvider.php b/src/FilterableServiceProvider.php
@@ -14,7 +14,7 @@ class FilterableServiceProvider extends ServiceProvider
      *
      * @return void
      */
-    public function register()
+    public function register():void
     {
         $this->app->bind(FilteringContract::class, Filtering::class);
     }
@@ -24,14 +24,15 @@ public function register()
      *
      * @return void
      */
-    public function boot()
+    public function boot():void
     {
         $this->publishes([
             $this->packageRootPath('config/filterable.php') => config_path('filterable.php'),
         ]);
 
         $this->mergeConfigFrom(
-            $this->packageRootPath('config/filterable.php'), 'filterable'
+            $this->packageRootPath('config/filterable.php'),
+            'filterable'
         );
     }
 
@@ -41,7 +42,7 @@ public function boot()
      * @param $path
      * @return string
      */
-    protected function packageRootPath($path)
+    protected function packageRootPath($path):string
     {
         return __DIR__ . '/../' . $path;
     }