Merge pull request #78 from orkhanahmadov/patch-1

danharrin · web-flow · commit dbe721f789c5 · 2024-03-11T11:04:17.000Z
Laravel 11 compatibility
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -11,16 +11,22 @@ jobs:
             fail-fast: false
             matrix:
                 php: [8.2, 8.1, 8.0]
-                laravel: [10.*, 9.*, 8.*]
+                laravel: [11.*, 10.*, 9.*, 8.*]
                 dependency-version: [prefer-lowest, prefer-stable]
                 include:
+                    - laravel: 11.*
+                      testbench: 9.*
                     - laravel: 10.*
                       testbench: 8.*
                     - laravel: 9.*
                       testbench: 7.*
                     - laravel: 8.*
                       testbench: ^6.23
                 exclude:
+                    - laravel: 11.*
+                      php: 8.1
+                    - laravel: 11.*
+                      php: 8.0
                     - laravel: 10.*
                       php: 8.0
         name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
@@ -42,4 +48,4 @@ jobs:
                   composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
                   composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest
             - name: Execute tests
-              run: vendor/bin/phpunit --verbose
+              run: vendor/bin/phpunit
diff --git a/composer.json b/composer.json
@@ -13,14 +13,14 @@
     "require": {
         "akaunting/laravel-money": "^1.2|^2.1|^3.0|^4.0|^5.1",
         "ext-pdo_sqlite": "*",
-        "illuminate/contracts": "^8.0|^9.0|^10.0",
-        "illuminate/database": "^8.40|^9.0|^10.0",
-        "illuminate/support": "^8.0|^9.0|^10.0",
+        "illuminate/contracts": "^8.0|^9.0|^10.0|^11.0",
+        "illuminate/database": "^8.40|^9.0|^10.0|^11.0",
+        "illuminate/support": "^8.0|^9.0|^10.0|^11.0",
         "php": "^8.0"
     },
     "require-dev": {
-        "orchestra/testbench": "^6.23|^7.0|^8.0",
-        "phpunit/phpunit": "^9.4",
+        "orchestra/testbench": "^6.23|^7.0|^8.0|^9.0",
+        "phpunit/phpunit": "^9.4|^10.0",
         "symplify/monorepo-builder": "^9.4.21"
     },
     "autoload": {
diff --git a/monorepo-builder.php b/monorepo-builder.php
@@ -20,8 +20,8 @@
             ],
         ],
         'require-dev' => [
-            'orchestra/testbench' => '^6.23|^7.0|^8.0',
-            'phpunit/phpunit' => '^9.4',
+            'orchestra/testbench' => '^6.23|^7.0|^8.0|^9.0',
+            'phpunit/phpunit' => '^9.4|^10.0',
             'symplify/monorepo-builder' => '^9.4.21',
         ],
         'minimum-stability' => 'dev',
diff --git a/packages/airlines-en/composer.json b/packages/airlines-en/composer.json
@@ -18,7 +18,7 @@
     ],
     "require": {
         "php": "^8.0",
-        "illuminate/support": "^8.0|^9.0|^10.0",
+        "illuminate/support": "^8.0|^9.0|^10.0|^11.0",
         "squirephp/airlines": "self.version",
         "squirephp/repository": "self.version"
     },
diff --git a/packages/airlines/composer.json b/packages/airlines/composer.json
@@ -18,7 +18,7 @@
     ],
     "require": {
         "php": "^8.0",
-        "illuminate/support": "^8.0|^9.0|^10.0",
+        "illuminate/support": "^8.0|^9.0|^10.0|^11.0",
         "squirephp/model": "self.version",
         "squirephp/rule": "self.version"
     },
diff --git a/packages/airports-en/composer.json b/packages/airports-en/composer.json
@@ -18,7 +18,7 @@
     ],
     "require": {
         "php": "^8.0",
-        "illuminate/support": "^8.0|^9.0|^10.0",
+        "illuminate/support": "^8.0|^9.0|^10.0|^11.0",
         "squirephp/airports": "self.version",
         "squirephp/repository": "self.version"
     },
diff --git a/packages/airports/composer.json b/packages/airports/composer.json
@@ -18,7 +18,7 @@
     ],
     "require": {
         "php": "^8.0",
-        "illuminate/support": "^8.0|^9.0|^10.0",
+        "illuminate/support": "^8.0|^9.0|^10.0|^11.0",
         "squirephp/model": "self.version",
         "squirephp/rule": "self.version"
     },
diff --git a/packages/continents-de/composer.json b/packages/continents-de/composer.json
@@ -18,7 +18,7 @@
     ],
     "require": {
         "php": "^8.0",
-        "illuminate/support": "^8.0|^9.0|^10.0",
+        "illuminate/support": "^8.0|^9.0|^10.0|^11.0",
         "squirephp/continents": "self.version",
         "squirephp/repository": "self.version"
     },
diff --git a/packages/continents-en/composer.json b/packages/continents-en/composer.json
@@ -18,7 +18,7 @@
     ],
     "require": {
         "php": "^8.0",
-        "illuminate/support": "^8.0|^9.0|^10.0",
+        "illuminate/support": "^8.0|^9.0|^10.0|^11.0",
         "squirephp/continents": "self.version",
         "squirephp/repository": "self.version"
     },
diff --git a/packages/continents-pl/composer.json b/packages/continents-pl/composer.json
@@ -22,7 +22,7 @@
     ],
     "require": {
         "php": "^8.0",
-        "illuminate/support": "^8.0|^9.0|^10.0",
+        "illuminate/support": "^8.0|^9.0|^10.0|^11.0",
         "squirephp/continents": "self.version",
         "squirephp/repository": "self.version"
     },
diff --git a/packages/continents/composer.json b/packages/continents/composer.json
@@ -18,7 +18,7 @@
     ],
     "require": {
         "php": "^8.0",
-        "illuminate/support": "^8.0|^9.0|^10.0",
+        "illuminate/support": "^8.0|^9.0|^10.0|^11.0",
         "squirephp/model": "self.version",
         "squirephp/rule": "self.version"
     },
diff --git a/packages/countries-de/composer.json b/packages/countries-de/composer.json
@@ -18,7 +18,7 @@
     ],
     "require": {
         "php": "^8.0",
-        "illuminate/support": "^8.0|^9.0|^10.0",
+        "illuminate/support": "^8.0|^9.0|^10.0|^11.0",
         "squirephp/countries": "self.version",
         "squirephp/repository": "self.version"
     },
diff --git a/packages/countries-en/composer.json b/packages/countries-en/composer.json
@@ -18,7 +18,7 @@
     ],
     "require": {
         "php": "^8.0",
-        "illuminate/support": "^8.0|^9.0|^10.0",
+        "illuminate/support": "^8.0|^9.0|^10.0|^11.0",
         "squirephp/countries": "self.version",
         "squirephp/repository": "self.version"
     },
diff --git a/packages/countries-es/composer.json b/packages/countries-es/composer.json
@@ -18,7 +18,7 @@
     ],
     "require": {
         "php": "^8.0",
-        "illuminate/support": "^8.0|^9.0|^10.0",
+        "illuminate/support": "^8.0|^9.0|^10.0|^11.0",
         "squirephp/countries": "self.version",
         "squirephp/repository": "self.version"
     },
diff --git a/packages/countries-fr/composer.json b/packages/countries-fr/composer.json
@@ -18,7 +18,7 @@
     ],
     "require": {
         "php": "^8.0",
-        "illuminate/support": "^8.0|^9.0|^10.0",
+        "illuminate/support": "^8.0|^9.0|^10.0|^11.0",
         "squirephp/countries": "self.version",
         "squirephp/repository": "self.version"
     },
diff --git a/packages/countries-pl/composer.json b/packages/countries-pl/composer.json
@@ -22,7 +22,7 @@
     ],
     "require": {
         "php": "^8.0",
-        "illuminate/support": "^8.0|^9.0|^10.0",
+        "illuminate/support": "^8.0|^9.0|^10.0|^11.0",
         "squirephp/countries": "self.version",
         "squirephp/repository": "self.version"
     },
diff --git a/packages/countries/composer.json b/packages/countries/composer.json
@@ -18,7 +18,7 @@
     ],
     "require": {
         "php": "^8.0",
-        "illuminate/support": "^8.0|^9.0|^10.0",
+        "illuminate/support": "^8.0|^9.0|^10.0|^11.0",
         "squirephp/model": "self.version",
         "squirephp/rule": "self.version"
     },
diff --git a/packages/currencies-en/composer.json b/packages/currencies-en/composer.json
@@ -18,7 +18,7 @@
     ],
     "require": {
         "php": "^8.0",
-        "illuminate/support": "^8.0|^9.0|^10.0",
+        "illuminate/support": "^8.0|^9.0|^10.0|^11.0",
         "squirephp/currencies": "self.version",
         "squirephp/repository": "self.version"
     },
diff --git a/packages/currencies/composer.json b/packages/currencies/composer.json
@@ -19,7 +19,7 @@
     "require": {
         "php": "^8.0",
         "akaunting/laravel-money": "^1.2|^2.1|^3.0|^4.0|^5.1",
-        "illuminate/support": "^8.0|^9.0|^10.0",
+        "illuminate/support": "^8.0|^9.0|^10.0|^11.0",
         "squirephp/model": "self.version",
         "squirephp/rule": "self.version"
     },
diff --git a/packages/gb-counties-en/composer.json b/packages/gb-counties-en/composer.json
@@ -18,7 +18,7 @@
     ],
     "require": {
         "php": "^8.0",
-        "illuminate/support": "^8.0|^9.0|^10.0",
+        "illuminate/support": "^8.0|^9.0|^10.0|^11.0",
         "squirephp/gb-counties": "self.version",
         "squirephp/repository": "self.version"
     },
diff --git a/packages/gb-counties/composer.json b/packages/gb-counties/composer.json
@@ -18,7 +18,7 @@
     ],
     "require": {
         "php": "^8.0",
-        "illuminate/support": "^8.0|^9.0|^10.0",
+        "illuminate/support": "^8.0|^9.0|^10.0|^11.0",
         "squirephp/model": "self.version",
         "squirephp/rule": "self.version"
     },
diff --git a/packages/model/composer.json b/packages/model/composer.json
@@ -19,8 +19,8 @@
     "require": {
         "php": "^8.0",
         "ext-pdo_sqlite": "*",
-        "illuminate/database": "^8.40|^9.0|^10.0",
-        "illuminate/support": "^8.0|^9.0|^10.0"
+        "illuminate/database": "^8.40|^9.0|^10.0|^11.0",
+        "illuminate/support": "^8.0|^9.0|^10.0|^11.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/packages/regions-en/composer.json b/packages/regions-en/composer.json
@@ -18,7 +18,7 @@
     ],
     "require": {
         "php": "^8.0",
-        "illuminate/support": "^8.0|^9.0|^10.0",
+        "illuminate/support": "^8.0|^9.0|^10.0|^11.0",
         "squirephp/regions": "self.version",
         "squirephp/repository": "self.version"
     },
diff --git a/packages/regions/composer.json b/packages/regions/composer.json
@@ -18,7 +18,7 @@
     ],
     "require": {
         "php": "^8.0",
-        "illuminate/support": "^8.0|^9.0|^10.0",
+        "illuminate/support": "^8.0|^9.0|^10.0|^11.0",
         "squirephp/model": "self.version",
         "squirephp/rule": "self.version"
     },
diff --git a/packages/repository/composer.json b/packages/repository/composer.json
@@ -18,7 +18,7 @@
     ],
     "require": {
         "php": "^8.0",
-        "illuminate/support": "^8.0|^9.0|^10.0"
+        "illuminate/support": "^8.0|^9.0|^10.0|^11.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/packages/rule/composer.json b/packages/rule/composer.json
@@ -18,9 +18,9 @@
     ],
     "require": {
         "php": "^8.0",
-        "illuminate/contracts": "^8.0|^9.0|^10.0",
-        "illuminate/database":  "^8.40|^9.0|^10.0",
-        "illuminate/support": "^8.0|^9.0|^10.0"
+        "illuminate/contracts": "^8.0|^9.0|^10.0|^11.0",
+        "illuminate/database":  "^8.40|^9.0|^10.0|^11.0",
+        "illuminate/support": "^8.0|^9.0|^10.0|^11.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/packages/timezones-en/composer.json b/packages/timezones-en/composer.json
@@ -18,7 +18,7 @@
     ],
     "require": {
         "php": "^8.0",
-        "illuminate/support": "^8.0|^9.0|^10.0",
+        "illuminate/support": "^8.0|^9.0|^10.0|^11.0",
         "squirephp/repository": "self.version",
         "squirephp/timezones": "self.version"
     },
diff --git a/packages/timezones/composer.json b/packages/timezones/composer.json
@@ -18,7 +18,7 @@
     ],
     "require": {
         "php": "^8.0",
-        "illuminate/support": "^8.0|^9.0|^10.0",
+        "illuminate/support": "^8.0|^9.0|^10.0|^11.0",
         "squirephp/model": "self.version",
         "squirephp/rule": "self.version"
     },
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" bootstrap="vendor/autoload.php" executionOrder="depends,defects" colors="true" beStrictAboutOutputDuringTests="true" beStrictAboutTodoAnnotatedTests="true" verbose="true">
-  <coverage processUncoveredFiles="true">
-    <include>
-      <directory suffix=".php">packages</directory>
-    </include>
-  </coverage>
-
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" bootstrap="vendor/autoload.php" executionOrder="depends,defects" colors="true" beStrictAboutOutputDuringTests="true" cacheDirectory=".phpunit.cache">
   <testsuites>
     <testsuite name="default">
       <directory suffix="Test.php">tests</directory>
     </testsuite>
   </testsuites>
+  <source>
+    <include>
+      <directory suffix=".php">packages</directory>
+    </include>
+  </source>
 </phpunit>
