Remove support for old PHP and Laravel

Author: axlon

.github/workflows/phpunit.yml

@@ -9,37 +9,9 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        laravel: [ 5.5.*, 5.6.*, 5.7.*, 5.8.*, 6.*, 7.* ]
-        php: [ 7.2 ]
+        laravel: [ 10.* ]
+        php: [ 8.1 ]
         include:
-          - laravel: 6.*
-            php: 7.3
-          - laravel: 6.*
-            php: 7.4
-          - laravel: 6.*
-            php: 8.0
-          - laravel: 7.*
-            php: 7.3
-          - laravel: 7.*
-            php: 7.4
-          - laravel: 7.*
-            php: 8.0
-          - laravel: 8.*
-            php: 7.3
-          - laravel: 8.*
-            php: 7.4
-          - laravel: 8.*
-            php: 8.0
-          - laravel: 8.*
-            php: 8.1
-          - laravel: 9.*
-            php: 8.0
-          - laravel: 9.*
-            php: 8.1
-          - laravel: 9.*
-            php: 8.2
-          - laravel: 10.*
-            php: 8.1
           - laravel: 10.*
             php: 8.2
           - laravel: 10.*
@@ -48,10 +20,14 @@ jobs:
             php: 8.2
           - laravel: 11.*
             php: 8.3
+          - laravel: 11.*
+            php: 8.4
           - laravel: 12.*
             php: 8.2
           - laravel: 12.*
             php: 8.3
+          - laravel: 12.*
+            php: 8.4
     name: PHPUnit on Laravel ${{ matrix.laravel }} / PHP ${{ matrix.php }}
     steps:
       - name: Checkout code

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 
 ## 4.0.0
 
+### Changed
+
+- Minimum Laravel version is now 10.0
+- Minimum PHP version is now 8.1
+
 ### Removed
 
 - Lumen is no longer supported

README.md

@@ -32,10 +32,8 @@ Worldwide postal code validation for Laravel, based on Google's Address Data Ser
 
 ## Requirements
 
-This package has the following requirements:
-
-- PHP 7.2 or greater
-- Laravel 5.5 or greater
+This package supports Laravel 10 or greater, for older versions of Laravel please check out older versions of this
+package.
 
 ## Installation
 

composer.json

@@ -17,16 +17,15 @@
         }
     ],
     "require": {
-        "php": "^7.2 || ^8.0",
-        "illuminate/contracts": "^5.5 || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0 || ^11.0 || ^12.0",
-        "illuminate/support": "^5.5 || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0 || ^11.0 || ^12.0",
-        "illuminate/validation": "^5.5 || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0 || ^11.0 || ^12.0"
+        "php": ">=8.1",
+        "illuminate/support": "^10.0 || ^11.0 || ^12.0",
+        "illuminate/validation": "^10.0 || ^11.0 || ^12.0"
     },
     "require-dev": {
         "guzzlehttp/guzzle": "^7.8",
-        "orchestra/testbench": "^3.5 || ^4.18 || ^5.20 || ^6.47 || ^7.53 || ^8.34 || ^9.12 || ^10.1",
-        "phpunit/phpunit": "^6.5 || ^7.5 || ^8.5 || ^9.6 || ^10.5 || ^11.5",
-        "symfony/var-exporter": "^4.0 || ^5.0 || ^6.0 || ^7.0"
+        "orchestra/testbench": "^8.34 || ^9.12 || ^10.1",
+        "phpunit/phpunit": "^10.5 || ^11.5",
+        "symfony/var-exporter": "^6.4 || ^7.0"
     },
     "autoload": {
         "psr-4": {
@@ -39,10 +38,7 @@
         }
     },
     "config": {
-        "sort-packages": true,
-        "allow-plugins": {
-            "kylekatarnls/update-helper": false
-        }
+        "sort-packages": true
     },
     "extra": {
         "laravel": {

phpunit.xml.dist

@@ -5,14 +5,9 @@
          colors="true"
          processIsolation="false"
          stopOnFailure="false"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
-         cacheDirectory=".phpunit.cache"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" cacheDirectory=".phpunit.cache"
          backupStaticProperties="false">
-    <coverage>
-        <include>
-            <directory suffix=".php">./src</directory>
-        </include>
-    </coverage>
+    <coverage/>
     <testsuites>
         <testsuite name="Integration">
             <directory suffix="Test.php">./tests/Integration</directory>
@@ -21,4 +16,9 @@
             <directory suffix="Test.php">./tests/Unit</directory>
         </testsuite>
     </testsuites>
+    <source>
+        <include>
+            <directory suffix=".php">./src</directory>
+        </include>
+    </source>
 </phpunit>

src/ValidationServiceProvider.php

@@ -2,10 +2,10 @@
 
 namespace Axlon\PostalCodeValidation;
 
-use Illuminate\Contracts\Validation\Factory;
 use Illuminate\Support\ServiceProvider;
+use Illuminate\Validation\Factory;
 
-class ValidationServiceProvider extends ServiceProvider
+final class ValidationServiceProvider extends ServiceProvider
 {
     /**
      * Register postal code validation services.
@@ -14,13 +14,7 @@ class ValidationServiceProvider extends ServiceProvider
      */
     public function register(): void
     {
-        if ($this->app->resolved('validator')) {
-            $this->registerRules($this->app['validator']);
-        } else {
-            $this->app->resolving('validator', function (Factory $validator) {
-                $this->registerRules($validator);
-            });
-        }
+        $this->callAfterResolving('validator', self::registerRules(...));
 
         $this->app->singleton('postal_codes', function () {
             return new PostalCodeValidator(require __DIR__ . '/../resources/patterns.php');
@@ -32,10 +26,10 @@ public function register(): void
     /**
      * Register the postal code validation rules with the validator.
      *
-     * @param \Illuminate\Contracts\Validation\Factory $validator
+     * @param \Illuminate\Validation\Factory $validator
      * @return void
      */
-    public function registerRules(Factory $validator): void
+    private static function registerRules(Factory $validator): void
     {
         $validator->extend('postal_code', 'Axlon\PostalCodeValidation\Extensions\PostalCode@validate');
         $validator->replacer('postal_code', 'Axlon\PostalCodeValidation\Extensions\PostalCode@replace');

tests/Unit/PostalCodeValidatorTest.php

@@ -4,6 +4,7 @@
 
 use Axlon\PostalCodeValidation\PostalCodeValidator;
 use Illuminate\Support\Collection;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
 class PostalCodeValidatorTest extends TestCase
@@ -53,8 +54,8 @@ public function testCanaryIslands(): void
      * @param string $country
      * @param string $example
      * @return void
-     * @dataProvider provideExamples
      */
+    #[DataProvider('provideExamples')]
     public function testExamplesAreValidPatterns(string $country, string $example): void
     {
         $this->assertTrue($this->validator->passes($country, $example));