Merge pull request #37 from bavix/10.x

add laravel-wallet:^10.0
bavix · Jul 8, 2023 · 75fd381 · 75fd381
2 parents d0ca0dc + 35654fc
commit 75fd381
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 76 deletions.
diff --git a/.github/workflows/code-style.yaml b/.github/workflows/code-style.yaml
@@ -17,7 +17,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.0
+          php-version: 8.1
 
       - name: Validate composer.json and composer.lock
         run: composer validate --strict

diff --git a/.github/workflows/phpstan.yaml b/.github/workflows/phpstan.yaml
@@ -17,7 +17,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.0
+          php-version: 8.1
 
       - name: Validate composer.json and composer.lock
         run: composer validate --strict

diff --git a/.github/workflows/phpunits.yaml b/.github/workflows/phpunits.yaml
@@ -12,7 +12,7 @@ jobs:
 
     strategy:
       matrix:
-        php-versions: [8.0, 8.1]
+        php-versions: [8.1, 8.2]
 
     steps:
       - name: Checkout

diff --git a/.github/workflows/psalm.yaml b/.github/workflows/psalm.yaml
diff --git a/.github/workflows/rector.yaml b/.github/workflows/rector.yaml
@@ -17,7 +17,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.0
+          php-version: 8.1
 
       - name: Validate composer.json and composer.lock
         run: composer validate --strict

diff --git a/composer.json b/composer.json
@@ -22,18 +22,18 @@
     }
   ],
   "require": {
-    "php": "^8.0",
-    "bavix/laravel-wallet": "^9.0|^10.0"
+    "php": "^8.1",
+    "bavix/laravel-wallet": "^10.0"
   },
   "require-dev": {
+    "driftingly/rector-laravel": "^0.21",
     "ergebnis/phpstan-rules": "^1.0",
-    "infection/infection": "^0.26",
-    "orchestra/testbench": "^7.0",
-    "phpstan/phpstan": "^1.2",
-    "phpunit/phpunit": "^9.5",
-    "rector/rector": "^0.14",
-    "symplify/easy-coding-standard": "^11.0",
-    "vimeo/psalm": "^4.13"
+    "infection/infection": "^0.27",
+    "orchestra/testbench": "^8.5",
+    "phpstan/phpstan": "^1.10",
+    "phpunit/phpunit": "^10.2",
+    "rector/rector": "^0.17",
+    "symplify/easy-coding-standard": "^11.5"
   },
   "autoload": {
     "psr-4": {

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" 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.2/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
   <coverage>
-    <include>
-      <directory suffix=".php">src/</directory>
-    </include>
     <report>
       <clover outputFile="./build/logs/clover.xml"/>
       <html outputDirectory="./build/html/"/>
@@ -18,4 +15,9 @@
   <php>
     <env name="DB_CONNECTION" value="testing"/>
   </php>
+  <source>
+    <include>
+      <directory suffix=".php">src/</directory>
+    </include>
+  </source>
 </phpunit>
diff --git a/psalm.xml b/psalm.xml
diff --git a/rector.php b/rector.php
@@ -3,9 +3,8 @@
 declare(strict_types=1);
 
 use Rector\Config\RectorConfig;
-use Rector\Laravel\Set\LaravelSetList;
-use Rector\Php74\Rector\Property\TypedPropertyRector;
 use Rector\Set\ValueObject\SetList;
+use RectorLaravel\Set\LaravelSetList;
 
 return static function (RectorConfig $config): void {
     $config->parallel();
@@ -17,11 +16,5 @@
     // Define what rule sets will be applied
     $config->import(LaravelSetList::LARAVEL_90);
     $config->import(SetList::DEAD_CODE);
-    $config->import(SetList::PHP_80);
-
-    // get services (needed for register a single rule)
-    $services = $config->services();
-
-    // register a single rule
-    $services->set(TypedPropertyRector::class);
+    $config->import(SetList::PHP_81);
 };