Supports Hyperf 3.0

Author: gokure

.github/workflows/tests.yml

@@ -15,8 +15,8 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest ]
-        php: [ '8.1', '8.0', '7.4' ]
-        hyperf: [ '^2.0' ]
+        php: [ '8.2', '8.1', '8.0' ]
+        hyperf: [ '^3.0' ]
         dependency-version: [prefer-lowest, prefer-stable]
       fail-fast: false
 

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+## v2.0.0 (2023/1/6)
+
+## Added
+- Support Hyperf 3.0
+
 ## v1.1.0 (2023/1/6)
 
 ### Added

README.md

@@ -102,3 +102,10 @@ php bin/hyperf.php tinker
      ],
    }
 ```
+
+## Supported Versions
+
+| Version | Hyperf Version | Php Version       | Status                 |
+| ------- | -------------- | ----------------- | ---------------------- |
+| 2.x     | ^3.0           | >=8.0             | Mainstream support     |
+| 1.x     | ^1.0\|^2.0     | <=7.2\|^8.0\|^8.1 | Security fixes support |

composer.json

@@ -11,21 +11,19 @@
         }
     ],
     "require": {
-        "php": ">=7.2",
-        "ext-swoole": ">=4.4",
-        "hyperf/contract": "^1.0|^2.0",
-        "hyperf/di": "^1.0|^2.0",
-        "hyperf/command": "^1.0|^2.0",
+        "php": ">=8.0",
+        "ext-swoole": ">=4.5",
+        "hyperf/contract": "^3.0",
+        "hyperf/di": "^3.0",
+        "hyperf/command": "^3.0",
         "psy/psysh": "^0.10.6"
     },
     "require-dev": {
-        "hyperf/database": "^1.0|^2.0",
-        "hyperf/testing": "^1.0|^2.0",
+        "friendsofphp/php-cs-fixer": "^3.6",
+        "hyperf/database": "^3.0",
+        "hyperf/testing": "^3.0",
         "mockery/mockery": "^1.4"
     },
-    "suggest": {
-        "hyperf/database": "The Hypyerf Database package (^1.0|^2.0)."
-    },
     "autoload": {
         "psr-4": {
             "Gokure\\HyperfTinker\\": "src/"
@@ -40,7 +38,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.x-dev"
+            "dev-master": "2.x-dev"
         },
         "hyperf": {
             "config": "Gokure\\HyperfTinker\\ConfigProvider"

src/TinkerCommand.php

@@ -112,6 +112,6 @@ protected function getCasters()
 
         $config = $this->container->get(ConfigInterface::class);
 
-        return array_merge($casters, (array) $config->get('tinker.casters', []));
+        return array_merge($casters, (array)$config->get('tinker.casters', []));
     }
 }

tests/TinkerCasterTest.php

@@ -3,8 +3,8 @@
 namespace Gokure\HyperfTinker\Tests;
 
 use App\Model\User;
-use Hyperf\Utils\Collection;
 use Gokure\HyperfTinker\TinkerCaster;
+use Hyperf\Utils\Collection;
 use PHPUnit\Framework\TestCase;
 
 class TinkerCasterTest extends TestCase

tests/fixtures/app/Model/User.php

@@ -6,23 +6,18 @@
 
 class User extends Model
 {
-    protected $attributes = [
-        'first_name' => '',
-        'last_name' => '',
-        'secret' => '',
-    ];
-
-    protected $guarded = [];
+    protected array $guarded = [];
 
-    protected $appends = [
+    protected array $appends = [
         'full_name',
     ];
 
-    protected $hidden = [
+    protected array $hidden = [
         'secret',
     ];
 
-    public function getFullNameAttribute() {
+    public function getFullNameAttribute()
+    {
         return $this->first_name . ' ' . $this->last_name;
     }
 }

tests/fixtures/vendor/composer/autoload_classmap.php

@@ -1,6 +1,6 @@
 <?php
 
-$vendorDir = dirname(dirname(__FILE__));
+$vendorDir = dirname(__FILE__, 2);
 $baseDir = dirname($vendorDir);
 
 return [