Merge pull request #8 from stylers-llc/release/6.0

build!: update Laravel version from v9 to v10
stylers-llc · Jan 3, 2024 · c5f3f2d · c5f3f2d
2 parents d780a40 + 6dc8d5f
commit c5f3f2d
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 15 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php_versions: ['7.3', '7.4', '8.0']
+        php_versions: ['8.1']
 
     steps:
     - uses: actions/checkout@v2
@@ -26,7 +26,7 @@ jobs:
       run: composer install --prefer-dist --no-progress --no-suggest
 
     - name: Run test suite
-      run: ./vendor/bin/phpunit --testdox --verbose --coverage-clover=coverage.xml
+      run: ./vendor/bin/phpunit --testdox --coverage-clover=coverage.xml
 
     - name: Upload coverage
       env:

diff --git a/.gitignore b/.gitignore
@@ -4,5 +4,7 @@ vendor/*
 composer.lock
 .php_cs.cache
 
-!.gitignore
 .phpunit.result.cache
+.phpunit.cache
+
+!.gitignore
diff --git a/README.md b/README.md
@@ -14,6 +14,7 @@
 | 7.0             | 3.0             |
 | 8.0             | 4.0             |
 | 9.0             | 5.0             |
+| 10.0            | 6.0             |
 
 ## Requirements
 - PHP >= 8.0

diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
   "license": "MIT",
   "minimum-stability": "dev",
   "prefer-stable": true,
-  "version": "5.0.0",
+  "version": "6.0.0",
   "authors": [
     {
       "name": "Peter Vigh",
@@ -22,12 +22,12 @@
     }
   ],
   "require": {
-    "php": ">=8.0",
-    "illuminate/support": "^9"
+    "php": ">=8.1",
+    "illuminate/support": "^10"
   },
   "require-dev": {
     "friendsofphp/php-cs-fixer": "^2.18 || ^3.44",
-    "orchestra/testbench": "^7.0",
+    "orchestra/testbench": "^8.0",
     "phpmd/phpmd": "^2.15",
     "phpunit/phpunit": "^7.5.15 || ^8.4 || ^9.5.4 || ^10.0"
   },

diff --git a/phpunit.xml b/phpunit.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" bootstrap="vendor/autoload.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-  <coverage processUncoveredFiles="true">
-    <include>
-      <directory suffix=".php">src</directory>
-    </include>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" bootstrap="vendor/autoload.php" colors="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
+  <coverage>
     <report>
       <clover outputFile="build/phpunit/clover.xml"/>
       <html outputDirectory="build/phpunit/html"/>
@@ -25,4 +22,9 @@
     <env name="SESSION_DRIVER" value="array"/>
     <env name="QUEUE_DRIVER" value="sync"/>
   </php>
+  <source>
+    <include>
+      <directory suffix=".php">src</directory>
+    </include>
+  </source>
 </phpunit>
diff --git a/tests/Feature/Console/TaskManagerTest.php b/tests/Feature/Console/TaskManagerTest.php
@@ -102,7 +102,7 @@ public function it_can_function_is_time_to_execute_is_false_with_static_time_inp
         self::assertFalse($task->isTimeToExecute());
     }
 
-    public function processTimeDataProvider(): array
+    public static function processTimeDataProvider(): array
     {
         $currentMinute = Carbon::now()->minute;
         $beforeCurrentMinute = abs($currentMinute - 10);
@@ -172,7 +172,7 @@ private function assertMockTaskMethodHandleCalled(InvokedCount $times, int $minu
     {
         $mock = $this
             ->getMockBuilder(CommandTask::class)
-            ->setMethods(['handle'])
+            ->onlyMethods(['handle'])
             ->getMock();
 
         $mock->cron(sprintf('%d * * * *', $minutes));

diff --git a/tests/Unit/Traits/CronExpressionValidatorTest.php b/tests/Unit/Traits/CronExpressionValidatorTest.php
@@ -8,7 +8,7 @@
 
 class CronExpressionValidatorTest extends TestCase
 {
-    public function outOfIntervalValuesDataProvider(): array
+    public static function outOfIntervalValuesDataProvider(): array
     {
         $macroExceptionMsg = 'Macro doesn\'t exists: @non-exists-macro';
         $dayOfWeekExceptionMsg = 'Day of Week must be a number between 0 and 7 (Sunday=0 or 7) or "*", "/", "-", ",".';