Merge pull request #218 from kmvan/dev

Dev
kmvan · Jul 27, 2024 · 4319b6c · 4319b6c · yiji2 · Aug 16, 2024
2 parents ae4b71a + 7d4803d
commit 4319b6c
Show file tree

Hide file tree

Showing 9 changed files with 441 additions and 80 deletions.
diff --git a/.php-cs-fixer54.php → .php-cs-fixer54 b/.php-cs-fixer54.php → .php-cs-fixer54
@@ -1,14 +1,12 @@
 <?php
 
 declare(strict_types=1);
-
 $finder = PhpCsFixer\Finder::create()
     ->exclude(__DIR__ . '/dist')
     ->exclude(__DIR__ . '/.tmp')
     ->exclude(__DIR__ . '/node_modules')
     ->notPath(__DIR__ . '/functions.php')
     ->in(__DIR__);
-
 return (new PhpCsFixer\Config())
     ->setIndent('    ')
     ->setRiskyAllowed(true)
@@ -140,7 +138,7 @@
         'simple_to_complex_string_variable'                => true,
         'simplified_null_return'                           => true,
         'single_blank_line_at_eof'                         => true,
-        'single_blank_line_before_namespace'               => true,
+        // 'single_blank_line_before_namespace'               => true,
         'single_import_per_statement'                      => true,
         'single_line_after_imports'                        => true,
         'single_line_comment_style'                        => true,

diff --git a/AppConfig.json b/AppConfig.json
@@ -1,5 +1,5 @@
 {
-  "APP_VERSION": "8.17",
+  "APP_VERSION": "8.18",
   "APP_NAME": "X Prober",
   "APP_URL": "https://github.com/kmvan/x-prober",
   "AUTHOR_URL": "https://inn-studio.com/prober",

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,12 +2,22 @@
 
 All Notable changes to `X-Prober` will be documented in this file
 
+## 8.18.0 - 2024-07-27
+
+### Add
+
+- Add ARM CPU detection
+
+### Optimize
+
+- Optimize disk usage detection
+
 ## 8.17.0 - 2023-12-31
 
 ### Add
 
 - Add detail disk usage
--
+
 ### Optimize
 
 - Optimize style

diff --git a/compiler/Compiler.php b/compiler/Compiler.php
@@ -32,7 +32,7 @@ public function __construct(string $dir)
 
         $code = '';
 
-        if ( ! $this->isDev()) {
+        if (! $this->isDev()) {
             foreach ($this->yieldFiles($this->COMPONENTS_DIR) as $filePath) {
                 if (is_dir($filePath) || false === strpos($filePath, '.php')) {
                     continue;
@@ -63,12 +63,12 @@ public function __construct(string $dir)
                 'distFilePath'  => $this->COMPILE_FILE_PATH,
             ));
 
-            if ( ! $this->isDev()) {
-                if ($this->isDebug()) {
-                    $this->writeFile(file_get_contents($this->COMPILE_FILE_PATH));
-                } else {
-                    $this->writeFile(php_strip_whitespace($this->COMPILE_FILE_PATH));
-                }
+            if (! $this->isDev()) {
+                // if ($this->isDebug()) {
+                $this->writeFile(file_get_contents($this->COMPILE_FILE_PATH));
+                // } else {
+                //     $this->writeFile(php_strip_whitespace($this->COMPILE_FILE_PATH));
+                // }
             }
 
             echo 'Compiled!';
@@ -165,7 +165,7 @@ private function loader(): string
     {
         $dirs = glob($this->COMPONENTS_DIR . '/*');
 
-        if ( ! $dirs) {
+        if (! $dirs) {
             return '';
         }
 
@@ -175,7 +175,7 @@ private function loader(): string
             $basename = basename($dir);
             $filePath = "{$dir}/{$basename}.php";
 
-            if ( ! is_file($filePath)) {
+            if (! is_file($filePath)) {
                 continue;
             }
 
@@ -193,7 +193,7 @@ private function loader(): string
 
     private function genVendorCode(): string
     {
-        if ( ! $this->isDev()) {
+        if (! $this->isDev()) {
             return '';
         }
 
@@ -207,7 +207,7 @@ private function yieldFiles(string $dir): Iterator
         if (is_dir($dir)) {
             $dh = opendir($dir);
 
-            if ( ! $dh) {
+            if (! $dh) {
                 yield false;
             }
 
@@ -237,7 +237,7 @@ private function writeFile(string $data): bool
     {
         $dir = \dirname($this->COMPILE_FILE_PATH);
 
-        if ( ! is_dir($dir)) {
+        if (! is_dir($dir)) {
             mkdir($dir, 0755, true);
         }
 

diff --git a/dist/prober.php b/dist/prober.php
diff --git a/package.json b/package.json
@@ -7,11 +7,11 @@
   "scripts": {
     "lang": "node ./tools/lang-builder.mjs",
     "dev": "webpack --config webpack.config.mjs",
-    "dev:php": "php ./Make.php dev; php -S localhost:8000 -t .tmp",
+    "dev:php": "php ./Make.php dev && php -S localhost:8000 -t .tmp",
     "build": "webpack --config webpack.config.prod.mjs",
-    "build:php": "php-cs-fixer fix ./src --config=.php-cs-fixer54.php; php ./Make.php build; echo '\nPlease access via http://localhost:8001/prober.php'; php -S localhost:8001 -t dist",
-    "build:php-debug": "php ./Make.php build debug; echo '\nPlease access via http://localhost:8001/prober.php'; php -S localhost:8001 -t dist",
-    "php-cs-fixer-54": "php-cs-fixer fix ./src --config=.php-cs-fixer54.php"
+    "build:php": "php-cs-fixer fix ./src --config=.php-cs-fixer54 && php ./Make.php build; echo '\nPlease access via http://localhost:8001/prober.php' && php -S localhost:8001 -t dist",
+    "build:php-debug": "php ./Make.php build debug && echo '\nPlease access via http://localhost:8001/prober.php' && php -S localhost:8001 -t dist",
+    "php-cs-fixer-54": "php-cs-fixer fix ./src --config=.php-cs-fixer54"
   },
   "browserslist": [
     "defaults"

diff --git a/src/Components/Config/ConfigApi.php b/src/Components/Config/ConfigApi.php
@@ -7,7 +7,7 @@
 
 class ConfigApi
 {
-    public static $APP_VERSION                  = '8.17';
+    public static $APP_VERSION                  = '8.18';
     public static $APP_NAME                     = 'X Prober';
     public static $APP_URL                      = 'https://github.com/kmvan/x-prober';
     public static $APP_CONFIG_URLS              = array('https://raw.githubusercontent.com/kmvan/x-prober/master/AppConfig.json', 'https://api.inn-studio.com/download/?id=xprober-config');