Support Laravel 11

.github/workflows/tests.yml

@@ -13,12 +13,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ 8.0, 8.1, 8.2, 8.3 ]
-        laravel: [ 9, 10 ]
+        php: [ 8.1, 8.2, 8.3 ]
+        laravel: [ 10, 11 ]
         stability: [ prefer-lowest, prefer-stable ]
         exclude:
-          - php: 8.0
-            laravel: 10
+          - php: 8.1
+            laravel: 11
 
     name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} (${{ matrix.stability }})
 
@@ -46,7 +46,7 @@ jobs:
           composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress
 
       - name: Execute tests
-        run: vendor/bin/phpunit --verbose
+        run: vendor/bin/phpunit
 
       - name: Run phpstan
         run: vendor/bin/phpstan analyse --error-format=github

composer.json

@@ -15,17 +15,17 @@
         }
     ],
     "require": {
-        "php": "^8.0",
-        "illuminate/contracts": "^9.0|^10.0",
-        "illuminate/support": "^9.0|^10.0",
-        "illuminate/validation": "^9.0|^10.0",
+        "php": "^8.1",
+        "illuminate/contracts": "^10.0|^11.0",
+        "illuminate/support": "^10.0|^11.0",
+        "illuminate/validation": "^10.0|^11.0",
         "giggsey/libphonenumber-for-php": "^7.0|^8.0"
     },
     "require-dev": {
         "orchestra/testbench": "*",
-        "phpunit/phpunit": "^9.5.10",
-        "nunomaduro/larastan": "^2.4",
-        "laravel/pint": "^1.4"
+        "phpunit/phpunit": "^10.5",
+        "larastan/larastan": "^2.9",
+        "laravel/pint": "^1.14"
     },
     "autoload": {
         "psr-4": {

phpstan.neon

@@ -1,5 +1,5 @@
 includes:
-    - ./vendor/nunomaduro/larastan/extension.neon
+    - ./vendor/larastan/larastan/extension.neon
 
 parameters:
 

phpunit.xml.dist

@@ -1,21 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
          bootstrap="vendor/autoload.php"
          colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false">
+>
     <testsuites>
         <testsuite name="Package Test Suite">
-            <directory suffix=".php">./tests/</directory>
+            <directory suffix=".php">tests</directory>
+            <exclude>tests/TestCase.php</exclude>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist addUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./src</directory>
-        </whitelist>
-    </filter>
+    <source>
+        <include>
+            <directory>src</directory>
+        </include>
+    </source>
 </phpunit>

src/Concerns/PhoneNumberFormat.php

@@ -26,7 +26,7 @@ public static function isValidName($format): bool
         return ! is_null($format) && in_array(strtoupper($format), $formats, true);
     }
 
-    public static function getHumanReadableName($format): string|null
+    public static function getHumanReadableName($format): ?string
     {
         $name = array_search($format, static::all(), true);
 

src/Concerns/PhoneNumberType.php

@@ -26,7 +26,7 @@ public static function isValidName($type): bool
         return ! is_null($type) && in_array(strtoupper($type), $types, true);
     }
 
-    public static function getHumanReadableName($type): string|null
+    public static function getHumanReadableName($type): ?string
     {
         $name = array_search($type, static::all(), true);
 

src/PhoneNumber.php

@@ -34,7 +34,7 @@ public function __construct(?string $number, $country = [])
         $this->countries = Arr::wrap($country);
     }
 
-    public function getCountry(): string|null
+    public function getCountry(): ?string
     {
         // Try to detect the country first from the number itself.
         try {

src/Rules/Phone.php

@@ -9,8 +9,8 @@
 use libphonenumber\PhoneNumberType as libPhoneNumberType;
 use Propaganistas\LaravelPhone\Concerns\PhoneNumberCountry;
 use Propaganistas\LaravelPhone\Concerns\PhoneNumberType;
-use Propaganistas\LaravelPhone\Exceptions\NumberParseException;
 use Propaganistas\LaravelPhone\Exceptions\IncompatibleTypesException;
+use Propaganistas\LaravelPhone\Exceptions\NumberParseException;
 use Propaganistas\LaravelPhone\PhoneNumber;
 
 class Phone implements Rule, ValidatorAwareRule

tests/E164PhoneNumberCastTest.php

@@ -3,13 +3,14 @@
 namespace Propaganistas\LaravelPhone\Tests;
 
 use Illuminate\Database\Eloquent\Model;
+use PHPUnit\Framework\Attributes\Test;
 use Propaganistas\LaravelPhone\Casts\E164PhoneNumberCast;
 use Propaganistas\LaravelPhone\PhoneNumber;
 use UnexpectedValueException;
 
 class E164PhoneNumberCastTest extends TestCase
 {
-    /** @test */
+    #[Test]
     public function it_mutates_to_e164_number()
     {
         $model = new ModelWithE164Cast;
@@ -21,7 +22,7 @@ public function it_mutates_to_e164_number()
         $this->assertEquals('+3212345678', $model->getAttributes()['phone']);
     }
 
-    /** @test */
+    #[Test]
     public function it_mutates_to_e164_number_with_implicit_country_field()
     {
         $model = new ModelWithE164Cast;
@@ -35,7 +36,7 @@ public function it_mutates_to_e164_number_with_implicit_country_field()
         $this->assertEquals('+3212345678', $model->getAttributes()['phone']);
     }
 
-    /** @test */
+    #[Test]
     public function it_mutates_to_e164_number_with_explicit_country_field()
     {
         $model = new ModelWithE164CastAndCountryField;
@@ -49,7 +50,7 @@ public function it_mutates_to_e164_number_with_explicit_country_field()
         $this->assertEquals('+3212345678', $model->getAttributes()['phone']);
     }
 
-    /** @test */
+    #[Test]
     public function it_gets_phone_object()
     {
         $model = new ModelWithE164Cast;
@@ -58,7 +59,7 @@ public function it_gets_phone_object()
         $this->assertEquals(PhoneNumber::class, get_class($model->phone));
     }
 
-    /** @test */
+    #[Test]
     public function it_throws_when_accessing_non_international_value()
     {
         $model = new ModelWithE164Cast();
@@ -67,7 +68,7 @@ public function it_throws_when_accessing_non_international_value()
         $model->phone;
     }
 
-    /** @test */
+    #[Test]
     public function it_serializes()
     {
         $model = new ModelWithE164Cast();