feature #57829 [FrameworkBundle] Finetune AboutCommand (JoppeDC)

fabpot · fabpot · commit 6864dbe5a6f5 · 2024-10-07T11:33:39.000+02:00
This PR was squashed before being merged into the 7.2 branch. Discussion ---------- [FrameworkBundle] Finetune `AboutCommand` | Q | A | ------------- | --- | Branch? | 7.2 | Bug fix? | no | New feature? | yes | Deprecations? | no | License | MIT - Make the AboutCommand show more details about the XDebug extension (Installed vs Enabled). - Show the same info about the OPcache and APCu extensions Commits ------- 3440aee [FrameworkBundle] Finetune `AboutCommand`
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/AboutCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/AboutCommand.php
@@ -25,6 +25,7 @@
  * A console command to display information about the current installation.
  *
  * @author Roland Franssen <franssen.roland@gmail.com>
+ * @author Joppe De Cuyper <hello@joppe.dev>
  *
  * @final
  */
@@ -57,6 +58,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             $buildDir = $kernel->getCacheDir();
         }
 
+        $xdebugMode = getenv('XDEBUG_MODE') ?: \ini_get('xdebug.mode');
+
         $rows = [
             ['<info>Symfony</>'],
             new TableSeparator(),
@@ -81,9 +84,9 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             ['Architecture', (\PHP_INT_SIZE * 8).' bits'],
             ['Intl locale', class_exists(\Locale::class, false) && \Locale::getDefault() ? \Locale::getDefault() : 'n/a'],
             ['Timezone', date_default_timezone_get().' (<comment>'.(new \DateTimeImmutable())->format(\DateTimeInterface::W3C).'</>)'],
-            ['OPcache', \extension_loaded('Zend OPcache') && filter_var(\ini_get('opcache.enable'), \FILTER_VALIDATE_BOOL) ? 'true' : 'false'],
-            ['APCu', \extension_loaded('apcu') && filter_var(\ini_get('apc.enabled'), \FILTER_VALIDATE_BOOL) ? 'true' : 'false'],
-            ['Xdebug', \extension_loaded('xdebug') ? 'true' : 'false'],
+            ['OPcache', \extension_loaded('Zend OPcache') ? (filter_var(\ini_get('opcache.enable'), FILTER_VALIDATE_BOOLEAN) ? 'Enabled' : 'Not enabled') : 'Not installed'],
+            ['APCu', \extension_loaded('apcu') ? (filter_var(\ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? 'Enabled' : 'Not enabled') : 'Not installed'],
+            ['Xdebug', \extension_loaded('xdebug') ? ($xdebugMode && $xdebugMode !== 'off' ? 'Enabled (' . $xdebugMode . ')' : 'Not enabled') : 'Not installed'],
         ];
 
         $io->table([], $rows);
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.html.twig
@@ -258,17 +258,17 @@
     <div class="metrics">
         <div class="metric-group">
             <div class="metric">
-                <span class="value value-is-icon {{ not collector.haszendopcache ? 'value-shows-no-color' }}">{{ source('@WebProfiler/Icon/' ~ (collector.haszendopcache ? 'yes' : 'no') ~ '.svg') }}</span>
+                <span class="value value-is-icon {{ not collector.haszendopcache ? 'value-shows-no-color' }}" title="{{ collector.zendopcachestatus|default('') }}">{{ source('@WebProfiler/Icon/' ~ (collector.haszendopcache ? 'yes' : 'no') ~ '.svg') }}</span>
                 <span class="label">OPcache</span>
             </div>
 
             <div class="metric">
-                <span class="value value-is-icon {{ not collector.hasapcu ? 'value-shows-no-color' }}">{{ source('@WebProfiler/Icon/' ~ (collector.hasapcu ? 'yes' : 'no') ~ '.svg') }}</span>
+                <span class="value value-is-icon {{ not collector.hasapcu ? 'value-shows-no-color' }}" title="{{ collector.apcustatus|default('') }}">{{ source('@WebProfiler/Icon/' ~ (collector.hasapcu ? 'yes' : 'no') ~ '.svg') }}</span>
                 <span class="label">APCu</span>
             </div>
 
             <div class="metric">
-                <span class="value value-is-icon {{ not collector.hasxdebug ? 'value-shows-no-color' }}">{{ source('@WebProfiler/Icon/' ~ (collector.hasxdebug ? 'yes' : 'no') ~ '.svg') }}</span>
+                <span class="value value-is-icon {{ not collector.hasxdebug ? 'value-shows-no-color' }}" title="{{ collector.xdebugstatus|default('') }}">{{ source('@WebProfiler/Icon/' ~ (collector.hasxdebug ? 'yes' : 'no') ~ '.svg') }}</span>
                 <span class="label">Xdebug</span>
             </div>
         </div>
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php
@@ -40,6 +40,8 @@ public function collect(Request $request, Response $response, ?\Throwable $excep
         $eom = \DateTimeImmutable::createFromFormat('d/m/Y', '01/'.Kernel::END_OF_MAINTENANCE);
         $eol = \DateTimeImmutable::createFromFormat('d/m/Y', '01/'.Kernel::END_OF_LIFE);
 
+        $xdebugMode = getenv('XDEBUG_MODE') ?: \ini_get('xdebug.mode');
+
         $this->data = [
             'token' => $response->headers->get('X-Debug-Token'),
             'symfony_version' => Kernel::VERSION,
@@ -55,8 +57,11 @@ public function collect(Request $request, Response $response, ?\Throwable $excep
             'php_intl_locale' => class_exists(\Locale::class, false) && \Locale::getDefault() ? \Locale::getDefault() : 'n/a',
             'php_timezone' => date_default_timezone_get(),
             'xdebug_enabled' => \extension_loaded('xdebug'),
+            'xdebug_status' => \extension_loaded('xdebug') ? ($xdebugMode && $xdebugMode !== 'off' ? 'Enabled (' . $xdebugMode . ')' : 'Not enabled') : 'Not installed',
             'apcu_enabled' => \extension_loaded('apcu') && filter_var(\ini_get('apc.enabled'), \FILTER_VALIDATE_BOOL),
+            'apcu_status' => \extension_loaded('apcu') ? (filter_var(\ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? 'Enabled' : 'Not enabled') : 'Not installed',
             'zend_opcache_enabled' => \extension_loaded('Zend OPcache') && filter_var(\ini_get('opcache.enable'), \FILTER_VALIDATE_BOOL),
+            'zend_opcache_status' => \extension_loaded('Zend OPcache') ? (filter_var(\ini_get('opcache.enable'), FILTER_VALIDATE_BOOLEAN) ? 'Enabled' : 'Not enabled') : 'Not installed',
             'bundles' => [],
             'sapi_name' => \PHP_SAPI,
         ];
@@ -192,6 +197,11 @@ public function hasXdebug(): bool
         return $this->data['xdebug_enabled'];
     }
 
+    public function getXdebugStatus(): string
+    {
+        return $this->data['xdebug_status'];
+    }
+
     /**
      * Returns true if the function xdebug_info is available.
      */
@@ -208,6 +218,11 @@ public function hasApcu(): bool
         return $this->data['apcu_enabled'];
     }
 
+    public function getApcuStatus(): string
+    {
+        return $this->data['apcu_status'];
+    }
+
     /**
      * Returns true if Zend OPcache is enabled.
      */
@@ -216,6 +231,11 @@ public function hasZendOpcache(): bool
         return $this->data['zend_opcache_enabled'];
     }
 
+    public function getZendOpcacheStatus(): string
+    {
+        return $this->data['zend_opcache_status'];
+    }
+
     public function getBundles(): array|Data
     {
         return $this->data['bundles'];
