Update: print config table

Author: Яценко Андрей

src/Commands/ClearCommand.php

@@ -5,12 +5,16 @@
 use Illuminate\Console\Command;
 use LaravelOpcacheFacade\OpcacheFacade;
 
+/**
+ * Class ClearCommand
+ * @package LaravelOpcacheFacade\Commands
+ */
 class ClearCommand extends Command
 {
-    /** @var string The console command name.*/
+    /** @var string The console command name. */
     protected $signature = 'opcache:clear';
 
-    /** @var string The console command description.*/
+    /** @var string The console command description. */
     protected $description = 'Resets the contents of the opcode cache';
 
     /** @return mixed Execute the console command. */

src/Commands/ConfigCommand.php

@@ -4,52 +4,35 @@
 
 use Illuminate\Console\Command;
 use LaravelOpcacheFacade\OpcacheFacade;
+use LaravelOpcacheFacade\utils\CommandUtil;
 
+/**
+ * Class ConfigCommand
+ * @package LaravelOpcacheFacade\Commands
+ */
 class ConfigCommand extends Command
 {
-    /** @var string The console command name.*/
+    /** @var string The console command name. */
     protected $signature = 'opcache:config';
 
-    /** @var string The console command description.*/
+    /** @var string The console command description. */
     protected $description = 'Show configuration information about the cache';
 
     /** @return mixed Execute the console command. */
     public function handle()
     {
         $config = OpcacheFacade::getConfig();
         if ($config) {
+            $header = ['key', 'value'];
+
             $this->info('Version info:');
-            $this->table(
-                ['key', 'value'],
-                $this->prepareTable($config['version']),
-                'box-double'
-            );
+            $this->table($header, CommandUtil::prepareTable($config['version']), 'box-double');
 
             $this->info('Configuration info:');
-            $this->table(
-                ['key', 'value'],
-                $this->prepareTable($config['directives']),
-                'box-double'
-            );
+            $this->table($header, CommandUtil::prepareTable($config['directives']), 'box-double');
         } else {
             $this->error('An error occurred while get config opcache');
             exit(2);
         }
     }
-
-    /**
-     * @param $data
-     *
-     * @return array|array[]
-     */
-    protected function prepareTable($data)
-    {
-        $prepareRowTable = static function ($key, $value) {
-            return [
-                'key' => $key,
-                'value' => $value,
-            ];
-        };
-        return array_map($prepareRowTable, array_keys($data), $data);
-    }
 }

src/Commands/StatusCommand.php

@@ -4,21 +4,47 @@
 
 use Illuminate\Console\Command;
 use LaravelOpcacheFacade\OpcacheFacade;
+use LaravelOpcacheFacade\utils\CommandUtil;
 
+/**
+ * Class StatusCommand
+ * @package LaravelOpcacheFacade\Commands
+ */
 class StatusCommand extends Command
 {
-    /** @var string The console command name.*/
+    /** @var string The console command name. */
     protected $signature = 'opcache:status';
 
-    /** @var string The console command description.*/
+    /** @var string The console command description. */
     protected $description = 'Get status information about the cache';
 
     /** @return mixed Execute the console command. */
     public function handle()
     {
         $info = OpcacheFacade::getStatus();
+        $base = $info;
+        unset($base['memory_usage'], $base['interned_strings_usage'], $base['opcache_statistics']);
+
         if ($info) {
+            $header = ['key', 'value'];
+
+            $this->info('Base info:');
+            $this->table($header, CommandUtil::prepareTable($base), 'box-double');
+
+            if (isset($info['memory_usage'])) {
+                $this->info('Memory usage:');
+                $this->table($header, CommandUtil::prepareTable($info['memory_usage']), 'box-double');
+            }
+
+            if (isset($info['interned_strings_usage'])) {
+                $this->info('Interned strings usage:');
+                $this->table($header, CommandUtil::prepareTable($info['interned_strings_usage']), 'box-double');
+            }
 
+            if (isset($info['opcache_statistics'])) {
+                $this->info('OPcache statistics:');
+                $this->table($header, CommandUtil::prepareTable($info['opcache_statistics']), 'box-double');
+            }
         } else {
             $this->error('An error occurred while get status opcache');
             exit(2);

src/ServiceProvider.php

@@ -2,6 +2,10 @@
 
 namespace LaravelOpcacheFacade;
 
+/**
+ * Class ServiceProvider
+ * @package LaravelOpcacheFacade
+ */
 class ServiceProvider extends \Illuminate\Support\ServiceProvider
 {
     /**

src/utils/CommandUtil.php

@@ -0,0 +1,55 @@
+<?php
+
+
+namespace LaravelOpcacheFacade\utils;
+
+
+/**
+ * Class CommandUtil
+ * @package LaravelOpcacheFacade\utils
+ */
+class CommandUtil
+{
+    /**
+     * @param $data
+     * @return array|array[]
+     */
+    public static function prepareTable($data): array
+    {
+        $prepareRowTable = static function ($key, $value) {
+            return [
+                'key' => $key,
+                'value' => self::prepareValue($key, $value),
+            ];
+        };
+        return array_map($prepareRowTable, array_keys($data), $data);
+    }
+
+    /**
+     * @param $key
+     * @param $value
+     * @return false|string
+     */
+    public static function prepareValue($key, $value){
+        if (strpos($key, 'memory') !== false || strpos($key, 'size') !== false) {
+            return self::formatBytes($value);
+        }
+        if (strpos($key, 'time') !== false) {
+            return date('Y-m-d H:i:s', $value);
+        }
+        if (is_bool($value)) {
+            return $value ? 'true' : 'false';
+        }
+        return $value;
+    }
+
+    /**
+     * @param $bytes
+     * @return string
+     */
+    public static function formatBytes($bytes): string
+    {
+        $unit = ['b', 'kb', 'mb', 'gb', 'tb', 'pb'];
+        return @round($bytes / pow(1024, ($i = floor(log($bytes, 1024)))), 2) . ' ' . $unit[$i];
+    }
+}