Merge pull request #98 from ariaieboy/l11

denisdulici · web-flow · commit 36f4371d49a1 · 2024-03-19T21:10:34.000Z
Laravel 11 support
diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml
@@ -11,7 +11,7 @@ jobs:
     name: psalm
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -10,28 +10,36 @@ jobs:
 
     strategy:
       matrix:
-        php: ['8.0', '8.1', '8.2']
-        laravel: [9.*, 10.*]
+        php: ['8.0', '8.1', '8.2', '8.3']
+        laravel: [9.*, 10.*, 11.*]
         stability: [prefer-lowest, prefer-stable]
         include:
           - laravel: 9.*
             testbench: 7.*
           - laravel: 10.*
             testbench: 8.*
+          - laravel: 11.*
+            testbench: 9.*
         exclude:
+          - laravel: 9.*
+            php: 8.3
           - laravel: 10.*
             php: 8.0
+          - laravel: 11.*
+            php: 8.0
+          - laravel: 11.*
+            php: 8.1
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
           extensions: bcmath, ctype, dom, fileinfo, intl, gd, json, mbstring, pdo, pdo_sqlite, openssl, sqlite, xml, zip
-          coverage: none
+          coverage: xdebug
 
       - name: Install dependencies
         run: |
diff --git a/composer.json b/composer.json
@@ -19,16 +19,16 @@
    ],
    "require": {
       "php": "^8.0",
-      "illuminate/contracts": "^9.0|^10.0",
-      "illuminate/support": "^9.0|^10.0",
-      "illuminate/validation": "^9.0|^10.0",
-      "illuminate/view": "^9.0|^10.0",
+      "illuminate/contracts": "^9.0|^10.0|^11.0",
+      "illuminate/support": "^9.0|^10.0|^11.0",
+      "illuminate/validation": "^9.0|^10.0|^11.0",
+      "illuminate/view": "^9.0|^10.0|^11.0",
       "vlucas/phpdotenv": "^5.4.1"
    },
    "require-dev": {
-      "phpunit/phpunit": "^9.5|^10.0",
-      "orchestra/testbench": "^7.4|^8.0",
-      "vimeo/psalm": "^4.23"
+      "phpunit/phpunit": "^9.5|^10.0|^11.0",
+      "orchestra/testbench": "^7.4|^8.0|^9.0",
+      "vimeo/psalm": "^4.23|^5.1"
    },
    "autoload": {
       "psr-4": {
diff --git a/tests/Casts/CurrencyCastTest.php b/tests/Casts/CurrencyCastTest.php
@@ -10,38 +10,38 @@
 
 class CurrencyCastTest extends TestCase
 {
+    protected Model $model;
+    protected function setUp():void
+    {
+        $this->model = $model = $this->getMockBuilder(Model::class)->disableOriginalConstructor()->getMock();
+    }
     public function testItWillNotGetCurrencyFromNonStrings()
     {
         $this->expectException(UnexpectedValueException::class);
 
-        $model = $this->getMockBuilder(Model::class)->getMock();
-
-        (new CurrencyCast)->get($model, 'currency', 1, []);
+        (new CurrencyCast)->get($this->model, 'currency', 1, []);
     }
 
     public function testItWillNotSetCurrencyFromNonCurrencies()
     {
         $this->expectException(UnexpectedValueException::class);
 
-        $model = $this->getMockBuilder(Model::class)->getMock();
 
-        (new CurrencyCast)->set($model, 'currency', 'USD', []);
+        (new CurrencyCast)->set($this->model, 'currency', 'USD', []);
     }
 
     public function testItGetsCurrencyFromString()
     {
-        $model = $this->getMockBuilder(Model::class)->getMock();
 
-        $value = (new CurrencyCast)->get($model, 'currency', 'USD', []);
+        $value = (new CurrencyCast)->get($this->model, 'currency', 'USD', []);
 
         $this->assertEquals(Currency::USD(), $value);
     }
 
     public function testItSetsCurrencyAsString()
     {
-        $mock = $this->getMockBuilder(Model::class)->getMock();
 
-        $value = (new CurrencyCast)->set($mock, 'currency', Currency::USD(), []);
+        $value = (new CurrencyCast)->set($this->model, 'currency', Currency::USD(), []);
 
         $this->assertSame('USD', $value);
     }
diff --git a/tests/Casts/MoneyCastTest.php b/tests/Casts/MoneyCastTest.php
@@ -11,39 +11,41 @@
 
 class MoneyCastTest extends TestCase
 {
+    protected Model $model;
+    protected function setUp():void
+    {
+        $this->model = $model = $this->getMockBuilder(Model::class)->disableOriginalConstructor()->getMock();
+    }
+
     public function testItWillNotGetMoneyFromNonString()
     {
         $this->expectException(UnexpectedValueException::class);
 
-        $model = $this->getMockBuilder(Model::class)->getMock();
 
-        (new MoneyCast)->get($model, 'money', [], []);
+        (new MoneyCast)->get($this->model, 'money', [], []);
     }
 
     public function testItWillNotGetMoneyFromNonJson()
     {
         $this->expectException(UnexpectedValueException::class);
 
-        $model = $this->getMockBuilder(Model::class)->getMock();
 
-        (new MoneyCast)->get($model, 'money', 'testing', []);
+        (new MoneyCast)->get($this->model, 'money', 'testing', []);
     }
 
     public function testItWillNotGetMoneyFromIllFormedJson()
     {
         $this->expectException(UnexpectedValueException::class);
 
-        $model = $this->getMockBuilder(Model::class)->getMock();
 
-        (new MoneyCast)->get($model, 'money', '{"key":"value"}', []);
+        (new MoneyCast)->get($this->model, 'money', '{"key":"value"}', []);
     }
 
     public function testItGetsMoneyFromJson()
     {
-        $model = $this->getMockBuilder(Model::class)->getMock();
         $json = '{"amount":1000,"currency":"USD"}';
 
-        $value = (new MoneyCast)->get($model, 'money', $json, []);
+        $value = (new MoneyCast)->get($this->model, 'money', $json, []);
 
         $this->assertEquals(
             new Money('1000', new Currency('USD')),
@@ -55,17 +57,15 @@ public function testItWillNotSetNonMoneyAsJson()
     {
         $this->expectException(UnexpectedValueException::class);
 
-        $model = $this->getMockBuilder(Model::class)->getMock();
 
-        (new MoneyCast)->set($model, 'money', 1000, []);
+        (new MoneyCast)->set($this->model, 'money', 1000, []);
     }
 
     public function testItSetsMoneyAsJson()
     {
-        $model = $this->getMockBuilder(Model::class)->getMock();
         $money = new Money('1200', Currency::USD());
 
-        $value = (new MoneyCast)->set($model, 'money', $money, []);
+        $value = (new MoneyCast)->set($this->model, 'money', $money, []);
 
         $this->assertSame(
             '{"amount":1200,"currency":"USD"}',

Original file line number	Diff line number	Diff line change
`@@ -10,38 +10,38 @@`
`10`	`10`
`11`	`11`	`class CurrencyCastTest extends TestCase`
`12`	`12`	`{`
	`13`	`+ protected Model $model;`
	`14`	`+ protected function setUp():void`
	`15`	`+ {`
	`16`	`+ $this->model = $model = $this->getMockBuilder(Model::class)->disableOriginalConstructor()->getMock();`
	`17`	`+ }`
`13`	`18`	`public function testItWillNotGetCurrencyFromNonStrings()`
`14`	`19`	`{`
`15`	`20`	`$this->expectException(UnexpectedValueException::class);`
`16`	`21`
`17`		`- $model = $this->getMockBuilder(Model::class)->getMock();`
`18`		`-`
`19`		`- (new CurrencyCast)->get($model, 'currency', 1, []);`
	`22`	`+ (new CurrencyCast)->get($this->model, 'currency', 1, []);`
`20`	`23`	`}`
`21`	`24`
`22`	`25`	`public function testItWillNotSetCurrencyFromNonCurrencies()`
`23`	`26`	`{`
`24`	`27`	`$this->expectException(UnexpectedValueException::class);`
`25`	`28`
`26`		`- $model = $this->getMockBuilder(Model::class)->getMock();`
`27`	`29`
`28`		`- (new CurrencyCast)->set($model, 'currency', 'USD', []);`
	`30`	`+ (new CurrencyCast)->set($this->model, 'currency', 'USD', []);`
`29`	`31`	`}`
`30`	`32`
`31`	`33`	`public function testItGetsCurrencyFromString()`
`32`	`34`	`{`
`33`		`- $model = $this->getMockBuilder(Model::class)->getMock();`
`34`	`35`
`35`		`- $value = (new CurrencyCast)->get($model, 'currency', 'USD', []);`
	`36`	`+ $value = (new CurrencyCast)->get($this->model, 'currency', 'USD', []);`
`36`	`37`
`37`	`38`	`$this->assertEquals(Currency::USD(), $value);`
`38`	`39`	`}`
`39`	`40`
`40`	`41`	`public function testItSetsCurrencyAsString()`
`41`	`42`	`{`
`42`		`- $mock = $this->getMockBuilder(Model::class)->getMock();`
`43`	`43`
`44`		`- $value = (new CurrencyCast)->set($mock, 'currency', Currency::USD(), []);`
	`44`	`+ $value = (new CurrencyCast)->set($this->model, 'currency', Currency::USD(), []);`
`45`	`45`
`46`	`46`	`$this->assertSame('USD', $value);`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,39 +11,41 @@`
`11`	`11`
`12`	`12`	`class MoneyCastTest extends TestCase`
`13`	`13`	`{`
	`14`	`+ protected Model $model;`
	`15`	`+ protected function setUp():void`
	`16`	`+ {`
	`17`	`+ $this->model = $model = $this->getMockBuilder(Model::class)->disableOriginalConstructor()->getMock();`
	`18`	`+ }`
	`19`	`+`
`14`	`20`	`public function testItWillNotGetMoneyFromNonString()`
`15`	`21`	`{`
`16`	`22`	`$this->expectException(UnexpectedValueException::class);`
`17`	`23`
`18`		`- $model = $this->getMockBuilder(Model::class)->getMock();`
`19`	`24`
`20`		`- (new MoneyCast)->get($model, 'money', [], []);`
	`25`	`+ (new MoneyCast)->get($this->model, 'money', [], []);`
`21`	`26`	`}`
`22`	`27`
`23`	`28`	`public function testItWillNotGetMoneyFromNonJson()`
`24`	`29`	`{`
`25`	`30`	`$this->expectException(UnexpectedValueException::class);`
`26`	`31`
`27`		`- $model = $this->getMockBuilder(Model::class)->getMock();`
`28`	`32`
`29`		`- (new MoneyCast)->get($model, 'money', 'testing', []);`
	`33`	`+ (new MoneyCast)->get($this->model, 'money', 'testing', []);`
`30`	`34`	`}`
`31`	`35`
`32`	`36`	`public function testItWillNotGetMoneyFromIllFormedJson()`
`33`	`37`	`{`
`34`	`38`	`$this->expectException(UnexpectedValueException::class);`
`35`	`39`
`36`		`- $model = $this->getMockBuilder(Model::class)->getMock();`
`37`	`40`
`38`		`- (new MoneyCast)->get($model, 'money', '{"key":"value"}', []);`
	`41`	`+ (new MoneyCast)->get($this->model, 'money', '{"key":"value"}', []);`
`39`	`42`	`}`
`40`	`43`
`41`	`44`	`public function testItGetsMoneyFromJson()`
`42`	`45`	`{`
`43`		`- $model = $this->getMockBuilder(Model::class)->getMock();`
`44`	`46`	`$json = '{"amount":1000,"currency":"USD"}';`
`45`	`47`
`46`		`- $value = (new MoneyCast)->get($model, 'money', $json, []);`
	`48`	`+ $value = (new MoneyCast)->get($this->model, 'money', $json, []);`
`47`	`49`
`48`	`50`	`$this->assertEquals(`
`49`	`51`	`new Money('1000', new Currency('USD')),`
`@@ -55,17 +57,15 @@ public function testItWillNotSetNonMoneyAsJson()`
`55`	`57`	`{`
`56`	`58`	`$this->expectException(UnexpectedValueException::class);`
`57`	`59`
`58`		`- $model = $this->getMockBuilder(Model::class)->getMock();`
`59`	`60`
`60`		`- (new MoneyCast)->set($model, 'money', 1000, []);`
	`61`	`+ (new MoneyCast)->set($this->model, 'money', 1000, []);`
`61`	`62`	`}`
`62`	`63`
`63`	`64`	`public function testItSetsMoneyAsJson()`
`64`	`65`	`{`
`65`		`- $model = $this->getMockBuilder(Model::class)->getMock();`
`66`	`66`	`$money = new Money('1200', Currency::USD());`
`67`	`67`
`68`		`- $value = (new MoneyCast)->set($model, 'money', $money, []);`
	`68`	`+ $value = (new MoneyCast)->set($this->model, 'money', $money, []);`
`69`	`69`
`70`	`70`	`$this->assertSame(`
`71`	`71`	`'{"amount":1200,"currency":"USD"}',`