Support customized local configuration files for PHPStan and PHPUnit …

…(#502)

* Support customized local configuration files for PHPStan and PHPUnit

* Optimize

* Fix return type declarations in Kafka and Log facades

* Refactor array and collection mixins

* Update type hint for process method in TaskHandleListener

* Update CacheInterface and Cache class

* Refactor ParameterParser class by removing unused code

* Refactor Etcd and Nacos drivers, and fix EnvWriter return statement

* Fix type hinting in exception handling functions

* Fix column value retrieval in FastPaginate.php

* Refactor validation rules in ValidationAspect.php

* Update helper functions and fix deprecated functions

* Refactor log writer to use null coalescing operator for default values

* Fix code formatting and remove unused code

* Update variable type in ResponseSequence class and fix factory function in Functions.php

* Fix code inconsistencies and improve code readability

* Update phpstan.neon.dist to include phpstan-baseline.neon

This commit updates the phpstan.neon.dist file to include the phpstan-baseline.neon file. The previous include statement for vendor/phpstan/phpstan-deprecation-rules/rules.neon has been commented out. This change ensures that the phpstan-baseline.neon file is included in the analysis performed by vendor/bin/phpstan.

* Update PHPStan configuration file

* Fix isInstanceCall method logic

* Refactor access log message formatting

---------

Co-authored-by: Deeka Wong <[email protected]>

src/Command/SubscribersCommand.php

@@ -16,7 +16,6 @@
 use FriendsOfHyperf\Trigger\Subscriber\TriggerSubscriber;
 use Hyperf\Command\Command as HyperfCommand;
 use Hyperf\Di\Annotation\AnnotationCollector;
-use Psr\Container\ContainerInterface;
 
 use function Hyperf\Collection\collect;
 
@@ -26,11 +25,6 @@ class SubscribersCommand extends HyperfCommand
 
     protected string $description = 'List all subscribers.';
 
-    public function __construct(ContainerInterface $container)
-    {
-        parent::__construct();
-    }
-
     public function handle()
     {
         $subscribers = AnnotationCollector::getClassesByAnnotation(Subscriber::class);

src/Command/TriggersCommand.php

@@ -14,7 +14,6 @@
 use FriendsOfHyperf\Trigger\Annotation\Trigger;
 use Hyperf\Command\Command as HyperfCommand;
 use Hyperf\Di\Annotation\AnnotationCollector;
-use Psr\Container\ContainerInterface;
 
 use function Hyperf\Collection\collect;
 use function Hyperf\Support\class_basename;
@@ -25,11 +24,6 @@ class TriggersCommand extends HyperfCommand
 
     protected string $description = 'List all triggers.';
 
-    public function __construct(ContainerInterface $container)
-    {
-        parent::__construct();
-    }
-
     public function handle()
     {
         $triggers = AnnotationCollector::getClassesByAnnotation(Trigger::class);

src/Consumer.php

@@ -45,7 +45,7 @@ class Consumer
     private bool $stopped = false;
 
     public function __construct(
-        protected subscriberManager $subscriberManager,
+        protected SubscriberManager $subscriberManager,
         protected TriggerManager $triggerManager,
         protected string $connection = 'default',
         protected array $options = [],
@@ -186,9 +186,9 @@ protected function makeReplication(): MySQLReplicationFactory
             fn (ConfigBuilder $builder) => $builder->withUser($config['user'] ?? 'root')
                 ->withHost($config['host'] ?? '127.0.0.1')
                 ->withPassword($config['password'] ?? 'root')
-                ->withPort((int) $config['port'] ?? 3306)
+                ->withPort((int) ($config['port'] ?? 3306))
                 ->withSlaveId(random_int(100, 999))
-                ->withHeartbeatPeriod((float) $config['heartbeat_period'] ?? 3)
+                ->withHeartbeatPeriod((float) ($config['heartbeat_period'] ?? 3))
                 ->withDatabasesOnly($databasesOnly)
                 ->withTablesOnly($tablesOnly)
         );

src/Monitor/HealthMonitor.php

@@ -50,7 +50,9 @@ public function __construct(protected ContainerInterface $container, protected C
         if ($container->has(StdoutLoggerInterface::class)) {
             $this->logger = $container->get(StdoutLoggerInterface::class);
         }
-        $this->timer = new Timer($this->logger);
+        $this->timer = new Timer(
+            $this->logger instanceof StdoutLoggerInterface ? $this->logger : null
+        );
     }
 
     public function process(): void

src/Mutex/RedisServerMutex.php

@@ -43,13 +43,13 @@ public function __construct(
         array $options = [],
         protected ?StdoutLoggerInterface $logger = null
     ) {
-        $this->expires = (int) $options['expires'] ?? 60;
-        $this->keepaliveInterval = (int) $options['keepalive_interval'] ?? 10;
+        $this->expires = (int) ($options['expires'] ?? 60);
+        $this->keepaliveInterval = (int) ($options['keepalive_interval'] ?? 10);
         $this->name = $name ?? sprintf('trigger:server:%s', $this->connection);
         $this->owner = $owner ?? Util::getInternalIp();
         $this->connection = $options['connection'];
         $this->timer = new Timer($logger);
-        $this->retryInterval = (int) $options['retry_interval'] ?? 10;
+        $this->retryInterval = (int) ($options['retry_interval'] ?? 10);
     }
 
     public function attempt(callable $callback = null): void

src/Mutex/ServerMutexInterface.php

@@ -13,7 +13,7 @@
 
 interface ServerMutexInterface
 {
-    public function attempt();
+    public function attempt(callable $callback = null);
 
     public function release(bool $force = false);
 }

src/Subscriber/TriggerSubscriber.php

@@ -37,7 +37,7 @@ public function __construct(
         protected ?StdoutLoggerInterface $logger = null
     ) {
         $this->concurrent = new Concurrent(
-            (int) $consumer->getOption('concurrent.limit') ?? 1
+            (int) ($consumer->getOption('concurrent.limit') ?? 1)
         );
     }
 

src/TriggerManager.php

@@ -41,9 +41,9 @@ public function register(): void
         }
 
         foreach ($queue as $value) {
+            /** @var Trigger $property */
             [$class, $property] = $value;
 
-            /** @var Trigger $property */
             foreach ($property->events as $eventType) {
                 $config = $this->config->get('trigger.connections.' . $property->connection);
                 $property->table ??= class_basename($class);