Feature/reworked package

.github/workflows/tests.yml

@@ -14,8 +14,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: [ '8.1', '8.2', '8.3' ]
-        laravel-version: [ '^10.0' ]
+        php-version: [ '8.2', '8.3', '8.4' ]
+        laravel-version: [ '^11.0', '^12.0' ]
         database: [ 'sqlite', 'mysql', 'pgsql' ]
 
     name: Tests on PHP ${{ matrix.php-version }} with Laravel ${{ matrix.laravel-version }} and ${{ matrix.database }}

composer.json

@@ -10,14 +10,14 @@
     }
   ],
   "require": {
-    "php": "^8.1",
+    "php": "^8.2",
     "ext-json": "*",
-    "laravel/framework": "^10.0"
+    "laravel/framework": "^11.0|^12.0"
   },
   "require-dev": {
     "guzzlehttp/guzzle": "^6.0|^7.0",
-    "orchestra/testbench": "^8.5",
-    "phpunit/phpunit": "^8.0|^9.0|^10.0"
+    "orchestra/testbench": "^9|^10",
+    "phpunit/phpunit": "^11.0"
   },
   "autoload": {
     "psr-4": {

config/access-control.php

@@ -1,27 +1,14 @@
 <?php
 
 return [
-
-    /*
-    |--------------------------------------------------------------------------
-    | Access Control Perimeters
-    |--------------------------------------------------------------------------
-    |
-    |
-    */
-
-    'perimeters' => [
-        'path' => app_path('Access/Perimeters'),
-    ],
-
     /*
     |--------------------------------------------------------------------------
     | Access Control Queries
     |--------------------------------------------------------------------------
     |
-    |
     */
     'queries' => [
-        'enabled_by_default' => true,
+        'enabled_by_default' => false,
+        'isolated'           => true, // Isolate the control's logic by applying a parent where on the query
     ],
 ];

src/AccessServiceProvider.php

@@ -3,14 +3,11 @@
 namespace Lomkit\Access;
 
 use Illuminate\Support\ServiceProvider;
-use Lomkit\Access\Perimeters\Perimeters;
 
 class AccessServiceProvider extends ServiceProvider
 {
-    // @TODO: add the ability to remove control scope on certain conditions
-
     /**
-     * Register the service provider.
+     * Registers the service provider.
      *
      * @return void
      */
@@ -20,8 +17,6 @@ public function register()
             __DIR__.'/../config/access-control.php',
             'access-control'
         );
-
-        $this->registerServices();
     }
 
     /**
@@ -32,31 +27,6 @@ public function register()
     public function boot()
     {
         $this->registerPublishing();
-
-        $this->registerPerimeters();
-    }
-
-    /**
-     * Register Access's perimeters.
-     *
-     * @return void
-     */
-    protected function registerPerimeters()
-    {
-        $this->app->make(Perimeters::class)
-            ->perimetersIn(
-                config('access-control.perimeters.path', app_path('Access/Perimeters'))
-            );
-    }
-
-    /**
-     * Register Access's services in the container.
-     *
-     * @return void
-     */
-    protected function registerServices()
-    {
-        $this->app->singleton(Perimeters::class);
     }
 
     /**