improve

yiisoft · Jan 16, 2025 · c704b34 · c704b34
1 parent 00d8c53
commit c704b34
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/config/di-console.php b/config/di-console.php
@@ -7,7 +7,7 @@
 use Yiisoft\Yii\Debug\Debugger;
 use Yiisoft\Yii\Debug\StartupPolicy\Condition\CommandCondition;
 use Yiisoft\Yii\Debug\StartupPolicy\Condition\EnvironmentVariableCondition;
-use Yiisoft\Yii\Debug\StartupPolicy\StartupPreventionPolicy;
+use Yiisoft\Yii\Debug\StartupPolicy\StartupPolicy;
 
 if (!(bool)($params['yiisoft/yii-debug']['enabled'] ?? false)) {
     return [];
@@ -22,8 +22,8 @@
                     $params['yiisoft/yii-debug']['collectors.console'] ?? []
                 )
             ),
-            'startupPreventionPolicy' => DynamicReference::to(
-                static fn () => new StartupPreventionPolicy(
+            'startupPolicy' => DynamicReference::to(
+                static fn () => new StartupPolicy(
                     new EnvironmentVariableCondition('YII_DEBUG_IGNORE'),
                     new CommandCondition($params['yiisoft/yii-debug']['ignoredCommands'])
                 ),

diff --git a/config/di-web.php b/config/di-web.php
@@ -8,7 +8,7 @@
 use Yiisoft\Yii\Debug\StartupPolicy\Condition\EnvironmentVariableCondition;
 use Yiisoft\Yii\Debug\StartupPolicy\Condition\HeaderCondition;
 use Yiisoft\Yii\Debug\StartupPolicy\Condition\RequestCondition;
-use Yiisoft\Yii\Debug\StartupPolicy\StartupPreventionPolicy;
+use Yiisoft\Yii\Debug\StartupPolicy\StartupPolicy;
 
 if (!(bool)($params['yiisoft/yii-debug']['enabled'] ?? false)) {
     return [];
@@ -24,7 +24,7 @@
                 )
             ),
             'startupPreventionPolicy' => DynamicReference::to(
-                static fn () => new StartupPreventionPolicy(
+                static fn () => new StartupPolicy(
                     new EnvironmentVariableCondition('YII_DEBUG_IGNORE'),
                     new HeaderCondition('X-Debug-Ignore'),
                     new RequestCondition($params['yiisoft/yii-debug']['ignoredRequests'])

diff --git a/src/Debugger.php b/src/Debugger.php
@@ -8,7 +8,7 @@
 use Yiisoft\Yii\Debug\Collector\CollectorInterface;
 use Yiisoft\Yii\Debug\Collector\SummaryCollectorInterface;
 use Yiisoft\Yii\Debug\StartupPolicy\Collector\CollectorPolicyInterface;
-use Yiisoft\Yii\Debug\StartupPolicy\StartupPreventionPolicy;
+use Yiisoft\Yii\Debug\StartupPolicy\StartupPolicy;
 use Yiisoft\Yii\Debug\Storage\StorageInterface;
 
 /**
@@ -33,7 +33,7 @@ final class Debugger
     public function __construct(
         private readonly StorageInterface $storage,
         array $collectors,
-        private readonly ?StartupPreventionPolicy $startupPreventionPolicy = null,
+        private readonly ?StartupPolicy $startupPolicy = null,
         private readonly ?CollectorPolicyInterface $collectorPolicy = null,
         array $excludedClasses = [],
     ) {
@@ -60,7 +60,7 @@ public function getId(): string
 
     public function startup(object $event): void
     {
-        if ($this->startupPreventionPolicy?->shouldPrevent($event) === true) {
+        if ($this->startupPolicy?->shouldPrevent($event) === true) {
             return;
         }
 

diff --git a/...StartupPolicy/StartupPreventionPolicy.php → src/StartupPolicy/StartupPolicy.php b/...StartupPolicy/StartupPreventionPolicy.php → src/StartupPolicy/StartupPolicy.php
@@ -6,7 +6,7 @@
 
 use Yiisoft\Yii\Debug\StartupPolicy\Condition\ConditionInterface;
 
-final class StartupPreventionPolicy
+final class StartupPolicy
 {
     /**
      * @psalm-var list<ConditionInterface>

diff --git a/tests/Unit/DebuggerTest.php b/tests/Unit/DebuggerTest.php
@@ -10,7 +10,7 @@
 use Yiisoft\Yii\Debug\Collector\CollectorInterface;
 use Yiisoft\Yii\Debug\Debugger;
 use Yiisoft\Yii\Debug\StartupPolicy\Condition\PredefinedCondition;
-use Yiisoft\Yii\Debug\StartupPolicy\StartupPreventionPolicy;
+use Yiisoft\Yii\Debug\StartupPolicy\StartupPolicy;
 use Yiisoft\Yii\Debug\Storage\MemoryStorage;
 use Yiisoft\Yii\Debug\Storage\StorageInterface;
 use Yiisoft\Yii\Http\Event\BeforeRequest;
@@ -50,7 +50,7 @@ public function testShutdownWithStartupPrevention(): void
         $storage = $this->getMockBuilder(StorageInterface::class)->getMock();
         $storage->expects($this->never())->method('write');
 
-        $debugger = new Debugger($storage, [$collector], new StartupPreventionPolicy(new PredefinedCondition(true)));
+        $debugger = new Debugger($storage, [$collector], new StartupPolicy(new PredefinedCondition(true)));
         $debugger->startup(new BeforeRequest(new ServerRequest('GET', '/test')));
         $debugger->shutdown();
     }