Merge branch 'release/3.1.0'

.github/workflows/ci.yml

@@ -12,14 +12,18 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.0, 8.1]
+        php: [8.1, 8.2]
         stability: [prefer-lowest, prefer-stable]
 
     name: PHP ${{ matrix.php }} - ${{ matrix.stability }}
 
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
+        with:
+          # Fetch 10 commits or Scrutinizer will throw ("Failed to retrieve commit parents. If you use a shallow git checkout, please checkout at least a depth of one."), see: RepositoryIntrospector at scrutinizer-ci/ocular GitHub repository
+          # 10 commits is an arbitrary value that is more than 1 commit
+          fetch-depth: 10
 
       - name: Cache dependencies
         uses: actions/cache@v1
@@ -37,11 +41,11 @@ jobs:
         run: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-suggest
 
       - name: PHP Security Checker
-        uses: symfonycorp/security-checker-action@v2
+        uses: symfonycorp/security-checker-action@v5
         if: ${{ matrix.stability == 'prefer-stable' }}
 
       - name: Execute tests
         run: vendor/bin/phpunit --coverage-clover=coverage.clover --verbose
 
       - name: Upload Code Coverage
-        run: wget https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover coverage.clover
+        run: vendor/bin/ocular code-coverage:upload --format=php-clover coverage.clover

VERSION

@@ -1 +1 @@
-3.0.0
+3.1.0

composer.json

@@ -19,19 +19,19 @@
     }
   ],
   "require": {
-    "php": ">=8.0.2",
+    "php": ">=8.1",
     "ext-json": "*",
-    "illuminate/cache": "^9.19",
-    "illuminate/routing": "^9.19",
-    "illuminate/support": "^9.42",
+    "illuminate/cache": "^9.19|^10",
+    "illuminate/routing": "^9.19|^10",
+    "illuminate/support": "^9.42|^10",
     "mobiledetect/mobiledetectlib": "~2.8",
     "ua-parser/uap-php": "~3.9"
   },
   "require-dev": {
-    "illuminate/http": "^9.19",
+    "illuminate/http": "^9.19|^10",
     "laravel/pint": "^1.2",
     "mockery/mockery": "^1.5.1",
-    "phpunit/phpunit": "^9.5.26",
+    "phpunit/phpunit": "^9.6.5",
     "psy/psysh": "^0.11",
     "symfony/var-dumper": "^6.2"
   },

src/Filter.php

@@ -20,38 +20,28 @@ abstract class Filter
 {
     /**
      * Is this a block or allow filter?
-     *
-     * @var bool
      */
-    protected $block_filter = null;
+    protected ?bool $block_filter = null;
 
     /**
      * The client instance.
-     *
-     * @var Client
      */
-    protected $client;
+    protected Client $client;
 
     /**
      * Location of the config file.
-     *
-     * @var string
      */
-    protected $config_path = 'browserfilter.';
+    protected string $config_path = 'browserfilter.';
 
     /**
      * The path to redirect the user if client is blocked.
-     *
-     * @var string
      */
-    protected $redirect_route;
+    protected ?string $redirect_route = null;
 
     /**
      * The array of rules
-     *
-     * @var array
      */
-    protected $rules = [];
+    protected array $rules = [];
 
     /**
      * Create a new browser filter middleware instance.

src/FilterServiceProvider.php

@@ -11,10 +11,8 @@ class FilterServiceProvider extends ServiceProvider
 {
     /**
      * Location of the configuration file in the package
-     *
-     * @var string
      */
-    protected $config_file;
+    protected string $config_file;
 
     public function __construct($app)
     {

src/Route/AllowFilter.php

@@ -10,5 +10,5 @@ class AllowFilter extends RouteFilter
     /**
      * {@inheritDoc}
      */
-    protected $block_filter = false;
+    protected ?bool $block_filter = false;
 }

src/Route/BlockFilter.php

@@ -10,5 +10,5 @@ class BlockFilter extends RouteFilter
     /**
      * {@inheritDoc}
      */
-    protected $block_filter = true;
+    protected ?bool $block_filter = true;
 }

src/Stack/Filter.php

@@ -14,7 +14,7 @@ class Filter extends CoreFilter
     /**
      * {@inheritDoc}
      */
-    protected $block_filter = true;
+    protected ?bool $block_filter = true;
 
     /**
      * {@inheritDoc}