Merge pull request #150 from hekmatinasser/8.x

add laravel 10 support
hekmatinasser · Feb 17, 2023 · 775dcc4 · 775dcc4
2 parents 91cbf49 + 55c342a
commit 775dcc4
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 16 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -9,20 +9,20 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-latest]
-        php: [8.1, 8.0]
-        laravel: [8.*,9.*]
+        php: [8.2, 8.1, 8.0]
+        laravel: [8.*,9.*,10.*]
         dependency-version: [prefer-lowest, prefer-stable]
         include:
           -   laravel: 8.*
               testbench: ^6.23
           -   laravel: 9.*
               testbench: 7.*
+          -   laravel: 10.*
+              testbench: 8.*
 
         exclude:
-          -   laravel: 9.*
-              php: 7.3
-          -   laravel: 9.*
-              php: 7.4
+          -   laravel: 10.*
+              php: 8.0
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
 

diff --git a/README.md b/README.md
@@ -57,11 +57,15 @@ composer require hekmatinasser/verta
     <tbody>
     <tr>
         <td>8.0</td>
-        <td>8.x</td>
+        <td>8.0</td>
     </tr>
     <tr>
         <td>9.0</td>
-        <td>8.x</td>
+        <td>8.2</td>
+    </tr>
+    <tr>
+        <td>10.0</td>
+        <td>8.3</td>
     </tr>
     </tbody>
 </table>

diff --git a/composer.json b/composer.json
@@ -19,12 +19,12 @@
     ],
     "require": {
         "php": "^8.0",
-        "illuminate/support": "^8.0|^9.0",
-        "illuminate/validation": "^8.0|^9.0",
+        "illuminate/support": "^8.0|^9.0|^10.0",
+        "illuminate/validation": "^8.0|^9.0|^10.0",
         "hekmatinasser/jalali": "^8.2"
     },
     "require-dev": {
-        "orchestra/testbench": "^4.18|^5.20|^6.24|^7.0"
+        "orchestra/testbench": "^6.23|^7.0|^8.0"
     },
     "autoload": {
         "psr-4": {

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false" backupStaticAttributes="false" colors="true" verbose="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false" colors="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
   <coverage>
     <include>
       <directory suffix=".php">src/</directory>
@@ -11,6 +11,6 @@
     </testsuite>
   </testsuites>
   <php>
-    <env name="locale" value="en" />
+    <env name="locale" value="en"/>
   </php>
 </phpunit>
diff --git a/tests/Laravel/JalaliValidatorTest.php b/tests/Laravel/JalaliValidatorTest.php
@@ -80,7 +80,7 @@ public function validateDateNotEqual()
     /***
      * provider for tests
      */
-    public function correctDateFormatProvider()
+    public static function correctDateFormatProvider()
     {
         return [
             [
@@ -112,7 +112,7 @@ public function correctDateFormatProvider()
     /**
      * provider for tests
      */
-    public function incorrectDateFormatProvider()
+    public static function incorrectDateFormatProvider()
     {
         return [
             [
@@ -133,7 +133,7 @@ public function incorrectDateFormatProvider()
     /**
      * provider for tests
      */
-    public function jalaliValidatorMethods()
+    public static function jalaliValidatorMethods()
     {
         return [
             ["validateDate"],