Only support hyperf 3.0

Author: limingxinleo

.php-cs-fixer.php

@@ -65,6 +65,11 @@
         'constant_case' => [
             'case' => 'lower',
         ],
+        'global_namespace_import' => [
+            'import_classes' => true,
+            'import_constants' => true,
+            'import_functions' => true,
+        ],
         'class_attributes_separation' => true,
         'combine_consecutive_unsets' => true,
         'declare_strict_types' => true,

composer.json

@@ -20,9 +20,10 @@
         }
     },
     "require": {
-        "php": ">=7.4",
+        "php": ">=8.0",
         "doctrine/instantiator": "^1.0",
-        "hyperf/utils": "^2.2|^3.0",
+        "hyperf/context": "^3.0",
+        "hyperf/contract": "^3.0",
         "pimple/pimple": "^3.3"
     },
     "require-dev": {

src/Container.php

@@ -24,19 +24,13 @@
 
 class Container implements ContainerInterface
 {
-    /**
-     * @var Pimple\Container
-     */
-    protected $pimple;
-
     /**
      * @var ReflectionClass[]
      */
     protected $reflection = [];
 
-    public function __construct(Pimple\Container $pimple)
+    public function __construct(protected Pimple\Container $pimple)
     {
-        $this->pimple = $pimple;
         $this->pimple[ContainerInterface::class] = $this;
         $this->pimple[PsrContainerInterface::class] = $this;
     }

src/ContainerFactory.php

@@ -11,16 +11,13 @@
  */
 namespace Hyperf\Pimple;
 
-use Hyperf\Utils\ApplicationContext;
+use Hyperf\Context\ApplicationContext;
 use Pimple;
 
 class ContainerFactory
 {
-    protected $providers = [];
-
-    public function __construct(array $providers = [])
+    public function __construct(protected array $providers = [])
     {
-        $this->providers = $providers;
     }
 
     public function __invoke()

src/Exception/InvalidDefinitionException.php

@@ -11,8 +11,9 @@
  */
 namespace Hyperf\Pimple\Exception;
 
+use Exception;
 use Psr\Container\ContainerExceptionInterface;
 
-class InvalidDefinitionException extends \Exception implements ContainerExceptionInterface
+class InvalidDefinitionException extends Exception implements ContainerExceptionInterface
 {
 }

src/Exception/NotFoundException.php

@@ -12,7 +12,8 @@
 namespace Hyperf\Pimple\Exception;
 
 use Psr\Container\NotFoundExceptionInterface;
+use RuntimeException;
 
-class NotFoundException extends \RuntimeException implements NotFoundExceptionInterface
+class NotFoundException extends RuntimeException implements NotFoundExceptionInterface
 {
 }

src/Exception/NotSupportException.php

@@ -11,8 +11,9 @@
  */
 namespace Hyperf\Pimple\Exception;
 
+use Exception;
 use Psr\Container\ContainerExceptionInterface;
 
-class NotSupportException extends \Exception implements ContainerExceptionInterface
+class NotSupportException extends Exception implements ContainerExceptionInterface
 {
 }

tests/Cases/ContainerFactoryTest.php

@@ -16,6 +16,7 @@
 use Hyperf\Utils\ApplicationContext;
 use HyperfTest\Stub\BarProvider;
 use HyperfTest\Stub\Foo;
+use Mockery;
 use Psr\Container\ContainerInterface;
 
 /**
@@ -26,7 +27,7 @@ class ContainerFactoryTest extends AbstractTestCase
 {
     public function testContainerFactory()
     {
-        ApplicationContext::setContainer(\Mockery::mock(ContainerInterface::class));
+        ApplicationContext::setContainer(Mockery::mock(ContainerInterface::class));
 
         $container = (new ContainerFactory())();