winforms-php / VoidStudio

bin/qero-packages/winforms-php/VoidBuilder/build.php

Indentation +5 added lines, -5 removed lines

@@ -13,10 +13,10 @@ 
 
 if (!isset ($argv))
 {
-	$params = json_decode (file_get_contents (__DIR__ .'/params.json'), true);
-	$oargv = [__FILE__];
+    $params = json_decode (file_get_contents (__DIR__ .'/params.json'), true);
+    $oargv = [__FILE__];
 	
-	unlink (__DIR__ .'/params.json');
+    unlink (__DIR__ .'/params.json');
 	
     foreach ($params as $name => $param)
     {
@@ -37,11 +37,11 @@ 
     if (!defined ('VoidBuilder\CORE_DIR'))
         define ('VoidBuilder\CORE_DIR', dirname (ENGINE_DIR) .'/core');
     
-	define ('VoidEngine\CORE_DIR', dirname (ENGINE_DIR) .'/core');
+    define ('VoidEngine\CORE_DIR', dirname (ENGINE_DIR) .'/core');
     
     require $params['--engine-dir'] .'/VoidEngine.php';
 	
-	$argv = $oargv;
+    $argv = $oargv;
 }
 
 try

Spacing +43 added lines, -43 removed lines

@@ -13,103 +13,103 @@
 
 if (!isset ($argv))
 {
-	$params = json_decode (file_get_contents (__DIR__ .'/params.json'), true);
+	$params = json_decode(file_get_contents(__DIR__.'/params.json'), true);
 	$oargv = [__FILE__];
 	
-	unlink (__DIR__ .'/params.json');
+	unlink(__DIR__.'/params.json');
 	
     foreach ($params as $name => $param)
     {
-        if (!is_array ($param))
+        if (!is_array($param))
             $param = [$param];
         
         foreach ($param as $arg)
-            if (strlen ($arg) > 0)
+            if (strlen($arg) > 0)
             {
                 $oargv[] = $name;
                 $oargv[] = $arg;
             }
     }
     
-    if (!defined ('VoidBuilder\ENGINE_DIR'))
-        define ('VoidBuilder\ENGINE_DIR', $params['--engine-dir']);
+    if (!defined('VoidBuilder\ENGINE_DIR'))
+        define('VoidBuilder\ENGINE_DIR', $params['--engine-dir']);
 
-    if (!defined ('VoidBuilder\CORE_DIR'))
-        define ('VoidBuilder\CORE_DIR', dirname (ENGINE_DIR) .'/core');
+    if (!defined('VoidBuilder\CORE_DIR'))
+        define('VoidBuilder\CORE_DIR', dirname(ENGINE_DIR).'/core');
     
-	define ('VoidEngine\CORE_DIR', dirname (ENGINE_DIR) .'/core');
+	define('VoidEngine\CORE_DIR', dirname(ENGINE_DIR).'/core');
     
-    require $params['--engine-dir'] .'/VoidEngine.php';
+    require $params['--engine-dir'].'/VoidEngine.php';
 	
 	$argv = $oargv;
 }
 
 try
 {
-    (new Manager ([], (new DefaultCommand (function ($args, $params)
+    (new Manager([], (new DefaultCommand(function($args, $params)
     {
         foreach (['--app-dir', '--output-dir', '--icon-path'] as $param)
-            if (is_array ($params[$param]))
-                $params[$param] = end ($params[$param]);
+            if (is_array($params[$param]))
+                $params[$param] = end($params[$param]);
 
-        if (!file_exists (dirname ($params['--app-dir']) .'/qero-packages/winforms-php/VoidFramework/core/VoidCore.exe'))
+        if (!file_exists(dirname($params['--app-dir']).'/qero-packages/winforms-php/VoidFramework/core/VoidCore.exe'))
             die ("\n Incorrect VoidFramework app path\n");
 
-        if (class_exists ('VoidEngine\WFObject'))
+        if (class_exists('VoidEngine\WFObject'))
         {
-            $errors = (new Builder ($params['--app-dir']))
-                ->build ($params['--output-dir'], $params['--icon-path'], !$params['--no-compress']);
+            $errors = (new Builder($params['--app-dir']))
+                ->build($params['--output-dir'], $params['--icon-path'], !$params['--no-compress']);
 
-            if (sizeof ($errors) > 0)
-                print_r ($errors);
+            if (sizeof($errors) > 0)
+                print_r($errors);
         }
 
         else
         {
             echo PHP_EOL;
-            echo ' Building ['. dirname (str_replace (dirname ($params['--app-dir'], 2) .'\\', '', $params['--app-dir'])) .']...'. PHP_EOL . PHP_EOL;
+            echo ' Building ['.dirname(str_replace(dirname($params['--app-dir'], 2).'\\', '', $params['--app-dir'])).']...'.PHP_EOL.PHP_EOL;
 
-            $begin = microtime (true);
+            $begin = microtime(true);
 
-            $params['--engine-dir'] = dirname ($params['--app-dir']) .'/qero-packages/winforms-php/VoidFramework/engine';
-            file_put_contents ('params.json', json_encode ($params, JSON_PRETTY_PRINT));
+            $params['--engine-dir'] = dirname($params['--app-dir']).'/qero-packages/winforms-php/VoidFramework/engine';
+            file_put_contents('params.json', json_encode($params, JSON_PRETTY_PRINT));
 
-            shell_exec ('"'. dirname ($params['--app-dir']) .'/qero-packages/winforms-php/VoidFramework/core/VoidCore.exe" "'. __FILE__ .'"');
+            shell_exec('"'.dirname($params['--app-dir']).'/qero-packages/winforms-php/VoidFramework/core/VoidCore.exe" "'.__FILE__.'"');
 
-            echo ' Building completed after '. round (microtime (true) - $begin, 6) .' seconds'. PHP_EOL;
-            echo '   Saved at '. $params['--output-dir'] .'/build'. PHP_EOL . PHP_EOL;
+            echo ' Building completed after '.round(microtime(true) - $begin, 6).' seconds'.PHP_EOL;
+            echo '   Saved at '.$params['--output-dir'].'/build'.PHP_EOL.PHP_EOL;
 
             if (isset ($params['--join']))
             {
-                if (!is_array ($params['--join']))
+                if (!is_array($params['--join']))
                     $params['--join'] = [$params['--join']];
 
-                if (($size = sizeof ($params['--join'])) > 0)
+                if (($size = sizeof($params['--join'])) > 0)
                 {
-                    echo ' Union '. $size .' files...'. PHP_EOL;
+                    echo ' Union '.$size.' files...'.PHP_EOL;
 
-                    $begin  = microtime (true);
-                    $joiner = new Joiner ($params['--output-dir'] .'/build/app.exe', $params['--output-dir'] .'/app.exe');
+                    $begin  = microtime(true);
+                    $joiner = new Joiner($params['--output-dir'].'/build/app.exe', $params['--output-dir'].'/app.exe');
                     
                     foreach ($params['--join'] as $file)
-                        $joiner->add (file_exists ($file) ? $file : $params['--output-dir'] .'/build/'. $file);
+                        $joiner->add(file_exists($file) ? $file : $params['--output-dir'].'/build/'.$file);
 
-                    echo str_replace ("\n", "\n ", $joiner->join ()) . PHP_EOL;
-                    echo ' Union completed after '. round (microtime (true) - $begin, 6) .' seconds'. PHP_EOL;
-                    echo '   Saved at '. $params['--output-dir'] . PHP_EOL;
+                    echo str_replace("\n", "\n ", $joiner->join()).PHP_EOL;
+                    echo ' Union completed after '.round(microtime(true) - $begin, 6).' seconds'.PHP_EOL;
+                    echo '   Saved at '.$params['--output-dir'].PHP_EOL;
                 }
             }
         }
-    }))->addParams ([
-        (new Param ('--app-dir', null, true))->addAliase ('-d'),
-        (new Param ('--output-dir', __DIR__ .'/build'))->addAliase ('-o'),
-        (new Param ('--icon-path', __DIR__ .'/system/Icon.ico'))->addAliase ('-i'),
-        (new Param ('--join'))->addAliase ('-j'),
-        (new Flag ('--no-compress'))->addAliase ('-nc')
-    ])))->execute ($argv);
+    }))->addParams([
+        (new Param('--app-dir', null, true))->addAliase('-d'),
+        (new Param('--output-dir', __DIR__.'/build'))->addAliase('-o'),
+        (new Param('--icon-path', __DIR__.'/system/Icon.ico'))->addAliase('-i'),
+        (new Param('--join'))->addAliase('-j'),
+        (new Flag('--no-compress'))->addAliase('-nc')
+    ])))->execute($argv);
 }
 
 catch (\Exception $e)
 {
-    die ("\n ". $e->getMessage () ."\n");
+    die ("\n ".$e->getMessage()."\n");
 }

Braces +29 added lines, -24 removed lines

@@ -20,22 +20,26 @@ 
 	
     foreach ($params as $name => $param)
     {
-        if (!is_array ($param))
-            $param = [$param];
+        if (!is_array ($param)) {
+                    $param = [$param];
+        }
         
-        foreach ($param as $arg)
-            if (strlen ($arg) > 0)
+        foreach ($param as $arg) {
+                    if (strlen ($arg) > 0)
             {
                 $oargv[] = $name;
+        }
                 $oargv[] = $arg;
             }
     }
     
-    if (!defined ('VoidBuilder\ENGINE_DIR'))
-        define ('VoidBuilder\ENGINE_DIR', $params['--engine-dir']);
+    if (!defined ('VoidBuilder\ENGINE_DIR')) {
+            define ('VoidBuilder\ENGINE_DIR', $params['--engine-dir']);
+    }
 
-    if (!defined ('VoidBuilder\CORE_DIR'))
-        define ('VoidBuilder\CORE_DIR', dirname (ENGINE_DIR) .'/core');
+    if (!defined ('VoidBuilder\CORE_DIR')) {
+            define ('VoidBuilder\CORE_DIR', dirname (ENGINE_DIR) .'/core');
+    }
     
 	define ('VoidEngine\CORE_DIR', dirname (ENGINE_DIR) .'/core');
     
@@ -48,23 +52,24 @@ 
 {
     (new Manager ([], (new DefaultCommand (function ($args, $params)
     {
-        foreach (['--app-dir', '--output-dir', '--icon-path'] as $param)
-            if (is_array ($params[$param]))
+        foreach (['--app-dir', '--output-dir', '--icon-path'] as $param) {
+                    if (is_array ($params[$param]))
                 $params[$param] = end ($params[$param]);
+        }
 
-        if (!file_exists (dirname ($params['--app-dir']) .'/qero-packages/winforms-php/VoidFramework/core/VoidCore.exe'))
-            die ("\n Incorrect VoidFramework app path\n");
+        if (!file_exists (dirname ($params['--app-dir']) .'/qero-packages/winforms-php/VoidFramework/core/VoidCore.exe')) {
+                    die ("\n Incorrect VoidFramework app path\n");
+        }
 
         if (class_exists ('VoidEngine\WFObject'))
         {
             $errors = (new Builder ($params['--app-dir']))
                 ->build ($params['--output-dir'], $params['--icon-path'], !$params['--no-compress']);
 
-            if (sizeof ($errors) > 0)
-                print_r ($errors);
-        }
-
-        else
+            if (sizeof ($errors) > 0) {
+                            print_r ($errors);
+            }
+        } else
         {
             echo PHP_EOL;
             echo ' Building ['. dirname (str_replace (dirname ($params['--app-dir'], 2) .'\\', '', $params['--app-dir'])) .']...'. PHP_EOL . PHP_EOL;
@@ -81,8 +86,9 @@ 
 
             if (isset ($params['--join']))
             {
-                if (!is_array ($params['--join']))
-                    $params['--join'] = [$params['--join']];
+                if (!is_array ($params['--join'])) {
+                                    $params['--join'] = [$params['--join']];
+                }
 
                 if (($size = sizeof ($params['--join'])) > 0)
                 {
@@ -91,8 +97,9 @@ 
                     $begin  = microtime (true);
                     $joiner = new Joiner ($params['--output-dir'] .'/build/app.exe', $params['--output-dir'] .'/app.exe');
                     
-                    foreach ($params['--join'] as $file)
-                        $joiner->add (file_exists ($file) ? $file : $params['--output-dir'] .'/build/'. $file);
+                    foreach ($params['--join'] as $file) {
+                                            $joiner->add (file_exists ($file) ? $file : $params['--output-dir'] .'/build/'. $file);
+                    }
 
                     echo str_replace ("\n", "\n ", $joiner->join ()) . PHP_EOL;
                     echo ' Union completed after '. round (microtime (true) - $begin, 6) .' seconds'. PHP_EOL;
@@ -107,9 +114,7 @@ 
         (new Param ('--join'))->addAliase ('-j'),
         (new Flag ('--no-compress'))->addAliase ('-nc')
     ])))->execute ($argv);
-}
-
-catch (\Exception $e)
+} catch (\Exception $e)
 {
     die ("\n ". $e->getMessage () ."\n");
 }

bin/qero-packages/winforms-php/VoidBuilder/php/Builder.php

Spacing +44 added lines, -44 removed lines

@@ -2,65 +2,65 @@ 
 
 namespace VoidBuilder;
 
-if (!defined ('VoidBuilder\ENGINE_DIR') && defined ('VoidEngine\ENGINE_DIR'))
-    define ('VoidBuilder\ENGINE_DIR', \VoidEngine\ENGINE_DIR);
+if (!defined('VoidBuilder\ENGINE_DIR') && defined('VoidEngine\ENGINE_DIR'))
+    define('VoidBuilder\ENGINE_DIR', \VoidEngine\ENGINE_DIR);
 
 class Builder
 {
     public $appDir;
 
-    public function __construct (string $appDir)
+    public function __construct(string $appDir)
     {
-        if (!is_dir ($appDir))
-            throw new \Exception ('Wrong $appDir param');
+        if (!is_dir($appDir))
+            throw new \Exception('Wrong $appDir param');
 
         $this->appDir = $appDir;
     }
 
-    public function build (string $outputDir, string $iconPath = null, bool $union = true): array
+    public function build(string $outputDir, string $iconPath = null, bool $union = true): array
     {
-        \VoidEngine\dir_clean ($outputDir .'/build');
-        \VoidEngine\dir_copy (CORE_DIR, $outputDir .'/build');
+        \VoidEngine\dir_clean($outputDir.'/build');
+        \VoidEngine\dir_copy(CORE_DIR, $outputDir.'/build');
 
-        unlink ($outputDir .'/build/script.php');
-        unlink ($outputDir .'/build/VoidCore.exe');
+        unlink($outputDir.'/build/script.php');
+        unlink($outputDir.'/build/VoidCore.exe');
         
-        \VoidEngine\dir_clean ($outputDir .'/build/qero-packages');
-        \VoidEngine\dir_copy (dirname ($this->appDir) .'/qero-packages', $outputDir .'/build/qero-packages');
-        \VoidEngine\dir_delete ($outputDir .'/build/qero-packages/winforms-php/VoidFramework');
+        \VoidEngine\dir_clean($outputDir.'/build/qero-packages');
+        \VoidEngine\dir_copy(dirname($this->appDir).'/qero-packages', $outputDir.'/build/qero-packages');
+        \VoidEngine\dir_delete($outputDir.'/build/qero-packages/winforms-php/VoidFramework');
 
-        return \VoidEngine\EngineAdditions::compile ($outputDir .'/build/app.exe', $iconPath ?? dirname (__DIR__) .'/system/Icon.ico', self::optimizeCode (\VoidEngine\str_replace_assoc (file_get_contents (dirname (__DIR__) .'/system/preset.php'), [
-            '%VoidEngine%' => self::generateCode (self::getReferences (ENGINE_DIR .'/VoidEngine.php')),
-            '%APP%'        => base64_encode (gzdeflate (serialize ($union ? self::getFiles ($this->appDir) : []), 9))
+        return \VoidEngine\EngineAdditions::compile($outputDir.'/build/app.exe', $iconPath ?? dirname(__DIR__).'/system/Icon.ico', self::optimizeCode(\VoidEngine\str_replace_assoc(file_get_contents(dirname(__DIR__).'/system/preset.php'), [
+            '%VoidEngine%' => self::generateCode(self::getReferences(ENGINE_DIR.'/VoidEngine.php')),
+            '%APP%'        => base64_encode(gzdeflate(serialize($union ? self::getFiles($this->appDir) : []), 9))
         ]))/*, null, null, null, null, null, '', '', null, null*/);
     }
 
-    public static function generateCode (array $references, bool $removeNamespaces = true): string
+    public static function generateCode(array $references, bool $removeNamespaces = true): string
     {
-        $code = "/*\n\n\t". join ("\n\t", explode ("\n", file_get_contents (dirname (ENGINE_DIR) .'/license.txt'))) ."\n\n*/\n\n";
+        $code = "/*\n\n\t".join("\n\t", explode("\n", file_get_contents(dirname(ENGINE_DIR).'/license.txt')))."\n\n*/\n\n";
 
         foreach ($references as $path)
-            $code .= join (array_slice (array_map (function ($line)
+            $code .= join(array_slice(array_map(function($line)
             {
-                return substr ($line, 0, 7) != 'require' ? $line : '';
-            }, file ($path)), 1));
+                return substr($line, 0, 7) != 'require' ? $line : '';
+            }, file($path)), 1));
 
         return $removeNamespaces ?
-            preg_replace ('/'. "\n" .'namespace [a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*;'. "\n" .'/', "\n\n", $code) : $code;
+            preg_replace ('/'."\n".'namespace [a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*;'."\n".'/', "\n\n", $code) : $code;
     }
 
-    public static function getReferences (string $file, bool $parseExtensions = true): array
+    public static function getReferences(string $file, bool $parseExtensions = true): array
     {
         $references = [];
 
-        foreach (file ($file) as $line)
-            if (substr ($line, 0, 7) == 'require')
+        foreach (file($file) as $line)
+            if (substr($line, 0, 7) == 'require')
                 try
                 {
-                    $begin = strpos ($line, "'");
-                    $end   = strrpos ($line, "'") - $begin + 1;
+                    $begin = strpos($line, "'");
+                    $end   = strrpos($line, "'") - $begin + 1;
 
-                    $references = array_merge ($references, self::getReferences (dirname ($file) .'/'. eval ('namespace VoidEngine; return '. substr ($line, $begin, $end) .';'), false));
+                    $references = array_merge($references, self::getReferences(dirname($file).'/'.eval ('namespace VoidEngine; return '.substr($line, $begin, $end).';'), false));
                 }
 
                 catch (\Throwable $e)
@@ -69,42 +69,42 @@ 
                 }
 
         if ($parseExtensions)
-            if (is_dir (ENGINE_DIR .'/extensions') && is_array ($exts = scandir (ENGINE_DIR .'/extensions')))
+            if (is_dir(ENGINE_DIR.'/extensions') && is_array($exts = scandir(ENGINE_DIR.'/extensions')))
                 foreach ($exts as $ext)
-                    if (is_dir (ENGINE_DIR .'/extensions/'. $ext) && file_exists ($ext = ENGINE_DIR .'/extensions/'. $ext .'/main.php'))
-                        $references = array_merge ($references, self::getReferences ($ext, false));
+                    if (is_dir(ENGINE_DIR.'/extensions/'.$ext) && file_exists($ext = ENGINE_DIR.'/extensions/'.$ext.'/main.php'))
+                        $references = array_merge($references, self::getReferences($ext, false));
 
         $references[] = $file;
 
         return $references;
     }
 
-    public static function getFiles (string $path, string $prefixBlacklist = null, array $files = [], int $originalPathLength = -1): array
+    public static function getFiles(string $path, string $prefixBlacklist = null, array $files = [], int $originalPathLength = -1): array
     {
         if ($originalPathLength == -1)
-            $originalPathLength = strlen (dirname ($path)) + 1;
+            $originalPathLength = strlen(dirname($path)) + 1;
 
-        $len = strlen ($prefixBlacklist);
+        $len = strlen($prefixBlacklist);
         
-        foreach (array_slice (scandir ($path), 2) as $name)
-            if ($prefixBlacklist === null || substr ($path .'/'. $name, $originalPathLength, $len) != $prefixBlacklist)
+        foreach (array_slice(scandir($path), 2) as $name)
+            if ($prefixBlacklist === null || substr($path.'/'.$name, $originalPathLength, $len) != $prefixBlacklist)
             {
-                if (is_dir ($file = $path .'/'. $name))
-                    $files = self::getFiles ($file, $prefixBlacklist, $files, $originalPathLength);
+                if (is_dir($file = $path.'/'.$name))
+                    $files = self::getFiles($file, $prefixBlacklist, $files, $originalPathLength);
 
-                else $files[substr ($file, $originalPathLength)] = file_get_contents ($file);
+                else $files[substr($file, $originalPathLength)] = file_get_contents($file);
             }
 
         return $files;
     }
 
-    public static function optimizeCode (string $code): string
+    public static function optimizeCode(string $code): string
     {
-        $tokens = token_get_all ('<?php '. $code);
+        $tokens = token_get_all('<?php '.$code);
         $return = '';
 
         foreach ($tokens as $id => $token)
-            if (is_string ($token))
+            if (is_string($token))
                 $return .= $token;
 
             else
@@ -118,7 +118,7 @@ 
                         break;
 
                     case T_WHITESPACE:
-                        if (!isset ($tokens[$id + 1]) || !is_array ($tokens[$id + 1]) || $tokens[$id + 1][0] != T_WHITESPACE)
+                        if (!isset ($tokens[$id + 1]) || !is_array($tokens[$id + 1]) || $tokens[$id + 1][0] != T_WHITESPACE)
                             $return .= ' ';
 
                         break;
@@ -130,6 +130,6 @@ 
                 }
             }
 
-        return substr ($return, 6);
+        return substr($return, 6);
     }
 }

Braces +30 added lines, -21 removed lines

@@ -2,8 +2,9 @@ 
 
 namespace VoidBuilder;
 
-if (!defined ('VoidBuilder\ENGINE_DIR') && defined ('VoidEngine\ENGINE_DIR'))
+if (!defined ('VoidBuilder\ENGINE_DIR') && defined ('VoidEngine\ENGINE_DIR')) {
     define ('VoidBuilder\ENGINE_DIR', \VoidEngine\ENGINE_DIR);
+}
 
 class Builder
 {
@@ -11,8 +12,9 @@ 
 
     public function __construct (string $appDir)
     {
-        if (!is_dir ($appDir))
-            throw new \Exception ('Wrong $appDir param');
+        if (!is_dir ($appDir)) {
+                    throw new \Exception ('Wrong $appDir param');
+        }
 
         $this->appDir = $appDir;
     }
@@ -39,10 +41,11 @@ 
     {
         $code = "/*\n\n\t". join ("\n\t", explode ("\n", file_get_contents (dirname (ENGINE_DIR) .'/license.txt'))) ."\n\n*/\n\n";
 
-        foreach ($references as $path)
-            $code .= join (array_slice (array_map (function ($line)
+        foreach ($references as $path) {
+                    $code .= join (array_slice (array_map (function ($line)
             {
                 return substr ($line, 0, 7) != 'require' ? $line : '';
+        }
             }, file ($path)), 1));
 
         return $removeNamespaces ?
@@ -53,26 +56,26 @@ 
     {
         $references = [];
 
-        foreach (file ($file) as $line)
-            if (substr ($line, 0, 7) == 'require')
+        foreach (file ($file) as $line) {
+                    if (substr ($line, 0, 7) == 'require')
                 try
                 {
                     $begin = strpos ($line, "'");
+        }
                     $end   = strrpos ($line, "'") - $begin + 1;
 
                     $references = array_merge ($references, self::getReferences (dirname ($file) .'/'. eval ('namespace VoidEngine; return '. substr ($line, $begin, $end) .';'), false));
-                }
-
-                catch (\Throwable $e)
+                } catch (\Throwable $e)
                 {
                     continue;
                 }
 
-        if ($parseExtensions)
-            if (is_dir (ENGINE_DIR .'/extensions') && is_array ($exts = scandir (ENGINE_DIR .'/extensions')))
+        if ($parseExtensions) {
+                    if (is_dir (ENGINE_DIR .'/extensions') && is_array ($exts = scandir (ENGINE_DIR .'/extensions')))
                 foreach ($exts as $ext)
                     if (is_dir (ENGINE_DIR .'/extensions/'. $ext) && file_exists ($ext = ENGINE_DIR .'/extensions/'. $ext .'/main.php'))
                         $references = array_merge ($references, self::getReferences ($ext, false));
+        }
 
         $references[] = $file;
 
@@ -81,18 +84,22 @@ 
 
     public static function getFiles (string $path, string $prefixBlacklist = null, array $files = [], int $originalPathLength = -1): array
     {
-        if ($originalPathLength == -1)
-            $originalPathLength = strlen (dirname ($path)) + 1;
+        if ($originalPathLength == -1) {
+                    $originalPathLength = strlen (dirname ($path)) + 1;
+        }
 
         $len = strlen ($prefixBlacklist);
         
-        foreach (array_slice (scandir ($path), 2) as $name)
-            if ($prefixBlacklist === null || substr ($path .'/'. $name, $originalPathLength, $len) != $prefixBlacklist)
+        foreach (array_slice (scandir ($path), 2) as $name) {
+                    if ($prefixBlacklist === null || substr ($path .'/'. $name, $originalPathLength, $len) != $prefixBlacklist)
             {
                 if (is_dir ($file = $path .'/'. $name))
                     $files = self::getFiles ($file, $prefixBlacklist, $files, $originalPathLength);
+        }
 
-                else $files[substr ($file, $originalPathLength)] = file_get_contents ($file);
+                else {
+                    $files[substr ($file, $originalPathLength)] = file_get_contents ($file);
+                }
             }
 
         return $files;
@@ -103,9 +110,10 @@ 
         $tokens = token_get_all ('<?php '. $code);
         $return = '';
 
-        foreach ($tokens as $id => $token)
-            if (is_string ($token))
+        foreach ($tokens as $id => $token) {
+                    if (is_string ($token))
                 $return .= $token;
+        }
 
             else
             {
@@ -118,8 +126,9 @@ 
                         break;
 
                     case T_WHITESPACE:
-                        if (!isset ($tokens[$id + 1]) || !is_array ($tokens[$id + 1]) || $tokens[$id + 1][0] != T_WHITESPACE)
-                            $return .= ' ';
+                        if (!isset ($tokens[$id + 1]) || !is_array ($tokens[$id + 1]) || $tokens[$id + 1][0] != T_WHITESPACE) {
+                                                    $return .= ' ';
+                        }
 
                         break;
 

bin/qero-packages/KRypt0nn/ConsoleArgs/php/Manager.php

Spacing +13 added lines, -13 removed lines

@@ -18,7 +18,7 @@ 
      * @param array $commands - список команд
      * [@param DefaultCommand $defaultCommand = null] - объект дефолтной команды
      */
-    public function __construct (array $commands, DefaultCommand $defaultCommand = null)
+    public function __construct(array $commands, DefaultCommand $defaultCommand = null)
     {
         $this->locale = new Locale;
         $this->defaultCommand = $defaultCommand;
@@ -27,7 +27,7 @@ 
             if ($command instanceof Command)
                 $this->commands[$command->name] = $command;
 
-            else throw new \Exception ($this->locale->command_type_exception);
+            else throw new \Exception($this->locale->command_type_exception);
     }
 
     /**
@@ -37,7 +37,7 @@ 
      * 
      * @return Manager - возвращает сам себя
      */
-    public function setLocale (Locale $locale): Manager
+    public function setLocale(Locale $locale): Manager
     {
         $this->locale = $locale;
 
@@ -51,7 +51,7 @@ 
      * 
      * @return Manager - возвращает сам себя
      */
-    public function setDefault (DefaultCommand $defaultCommand): Manager
+    public function setDefault(DefaultCommand $defaultCommand): Manager
     {
         $this->defaultCommand = $defaultCommand;
 
@@ -63,31 +63,31 @@ 
      * 
      * @param array $args - список аргументов консоли
      */
-    public function execute (array $args)
+    public function execute(array $args)
     {
-        $args = array_values ($args);
+        $args = array_values($args);
 
         if (!isset ($args[0]))
         {
             if ($this->defaultCommand !== null)
-                return $this->defaultCommand->execute ($args);
+                return $this->defaultCommand->execute($args);
 
-            else throw new \Exception ($this->locale->command_undefined_error);
+            else throw new \Exception($this->locale->command_undefined_error);
         }
 
         $name = $args[0];
-        $args = array_slice ($args, 1);
+        $args = array_slice($args, 1);
 
         if (!isset ($this->commands[$name]))
         {
             foreach ($this->commands as $command)
-                if (in_array ($name, $command->aliases))
-                    return $command->execute ($args);
+                if (in_array($name, $command->aliases))
+                    return $command->execute($args);
 
             return $this->defaultCommand !== null ?
-                $this->defaultCommand->execute ($args) : false;
+                $this->defaultCommand->execute($args) : false;
         }
 
-        return $this->commands[$name]->execute ($args);
+        return $this->commands[$name]->execute($args);
     }
 }

Braces +14 added lines, -9 removed lines

@@ -23,11 +23,14 @@ 
         $this->locale = new Locale;
         $this->defaultCommand = $defaultCommand;
 
-        foreach ($commands as $command)
-            if ($command instanceof Command)
+        foreach ($commands as $command) {
+                    if ($command instanceof Command)
                 $this->commands[$command->name] = $command;
+        }
 
-            else throw new \Exception ($this->locale->command_type_exception);
+            else {
+                throw new \Exception ($this->locale->command_type_exception);
+            }
     }
 
     /**
@@ -69,10 +72,11 @@ 
 
         if (!isset ($args[0]))
         {
-            if ($this->defaultCommand !== null)
-                return $this->defaultCommand->execute ($args);
-
-            else throw new \Exception ($this->locale->command_undefined_error);
+            if ($this->defaultCommand !== null) {
+                            return $this->defaultCommand->execute ($args);
+            } else {
+                throw new \Exception ($this->locale->command_undefined_error);
+            }
         }
 
         $name = $args[0];
@@ -80,9 +84,10 @@ 
 
         if (!isset ($this->commands[$name]))
         {
-            foreach ($this->commands as $command)
-                if (in_array ($name, $command->aliases))
+            foreach ($this->commands as $command) {
+                            if (in_array ($name, $command->aliases))
                     return $command->execute ($args);
+            }
 
             return $this->defaultCommand !== null ?
                 $this->defaultCommand->execute ($args) : false;

bin/qero-packages/KRypt0nn/ConsoleArgs/php/Parameter.php

Spacing +1 added lines, -1 removed lines

@@ -10,5 +10,5 @@
     /**
      * Парсер значений
      */
-    public function parse (array &$args);
+    public function parse(array &$args);
 }

bin/qero-packages/KRypt0nn/ConsoleArgs/php/Parameters/Flag.php

Spacing +10 added lines, -10 removed lines

@@ -16,7 +16,7 @@ 
      * 
      * @param string $name - имя флага
      */
-    public function __construct (string $name)
+    public function __construct(string $name)
     {
         $this->names = [$name];
     }
@@ -28,7 +28,7 @@ 
      * 
      * @return Flag - возвращает сам себя
      */
-    public function setLocale (Locale $locale): Param
+    public function setLocale(Locale $locale): Param
     {
         $this->locale = $locale;
 
@@ -42,10 +42,10 @@ 
      * 
      * @return Flag - возвращает сам себя
      */
-    public function addAliase (string $name)
+    public function addAliase(string $name)
     {
-        if (array_search ($name, $this->names) !== false)
-            throw new \Exception ($this->locale->aliase_exists_exception);
+        if (array_search($name, $this->names) !== false)
+            throw new \Exception($this->locale->aliase_exists_exception);
 
         $this->names[] = $name;
 
@@ -59,17 +59,17 @@ 
      * 
      * Возвращает состояние флага
      */
-    public function parse (array &$args)
+    public function parse(array &$args)
     {
-        $args = array_values ($args);
+        $args = array_values($args);
 
         foreach ($this->names as $name)
-            if (($key = array_search ($name, $args)) !== false)
+            if (($key = array_search($name, $args)) !== false)
             {
                 unset ($args[$key]);
-                $args = array_values ($args);
+                $args = array_values($args);
 
-                while ($this->parse ($args) !== false);
+                while ($this->parse($args) !== false);
                 
                 return true;
             }

Braces +6 added lines, -4 removed lines

@@ -44,8 +44,9 @@ 
      */
     public function addAliase (string $name)
     {
-        if (array_search ($name, $this->names) !== false)
-            throw new \Exception ($this->locale->aliase_exists_exception);
+        if (array_search ($name, $this->names) !== false) {
+                    throw new \Exception ($this->locale->aliase_exists_exception);
+        }
 
         $this->names[] = $name;
 
@@ -63,10 +64,11 @@ 
     {
         $args = array_values ($args);
 
-        foreach ($this->names as $name)
-            if (($key = array_search ($name, $args)) !== false)
+        foreach ($this->names as $name) {
+                    if (($key = array_search ($name, $args)) !== false)
             {
                 unset ($args[$key]);
+        }
                 $args = array_values ($args);
 
                 while ($this->parse ($args) !== false);

bin/qero-packages/KRypt0nn/ConsoleArgs/php/Parameters/Setter.php

Spacing +16 added lines, -16 removed lines

@@ -22,7 +22,7 @@ 
      * [@param string $defaultValue = null] - значение сеттера по умолчанию
      * [@param bool $required = false] - обязательно ли указание сеттера
      */
-    public function __construct (string $name, string $separator = '=', string $defaultValue = null, bool $required = false)
+    public function __construct(string $name, string $separator = '=', string $defaultValue = null, bool $required = false)
     {
         $this->names        = [$name];
         $this->separator    = $separator;
@@ -39,7 +39,7 @@ 
      * 
      * @return Param - возвращает сам себя
      */
-    public function setLocale (Locale $locale): Param
+    public function setLocale(Locale $locale): Param
     {
         $this->locale = $locale;
 
@@ -53,10 +53,10 @@ 
      * 
      * @return Param - возвращает сам себя
      */
-    public function addAliase (string $name)
+    public function addAliase(string $name)
     {
-        if (array_search ($name, $this->names) !== false)
-            throw new \Exception ($this->locale->aliase_exists_exception);
+        if (array_search($name, $this->names) !== false)
+            throw new \Exception($this->locale->aliase_exists_exception);
 
         $this->names[] = $name;
 
@@ -70,26 +70,26 @@ 
      * 
      * Возвращает найденый параметр или массив найдёных параметров, если их было указано несколько
      */
-    public function parse (array &$args)
+    public function parse(array &$args)
     {
-        $args = array_values ($args);
-        $l    = strlen ($this->separator);
+        $args = array_values($args);
+        $l    = strlen($this->separator);
 
         foreach ($this->names as $name)
             foreach ($args as $id => $arg)
-                if (substr ($arg, 0, ($pos = strlen ($name) + $l)) == $name . $this->separator)
+                if (substr($arg, 0, ($pos = strlen($name) + $l)) == $name.$this->separator)
                 {
-                    $param = [substr ($arg, $pos)];
+                    $param = [substr($arg, $pos)];
 
                     unset ($args[$id]);
-                    $args = array_values ($args);
+                    $args = array_values($args);
 
                     try
                     {
-                        while (($altParam = $this->parse ($args)) !== $this->defaultValue)
+                        while (($altParam = $this->parse($args)) !== $this->defaultValue)
                         {
-                            if (is_array ($altParam))
-                                $param = array_merge ($param, $altParam);
+                            if (is_array($altParam))
+                                $param = array_merge($param, $altParam);
     
                             else $param[] = $altParam;
                         }
@@ -97,12 +97,12 @@ 
 
                     catch (\Throwable $e) {}
                     
-                    return sizeof ($param) == 1 ?
+                    return sizeof($param) == 1 ?
                         $param[0] : $param;
                 }
 
         if ($this->required)
-            throw new \Exception (str_replace ('%param_name%', current ($this->names), $this->locale->undefined_param_exception));
+            throw new \Exception(str_replace('%param_name%', current($this->names), $this->locale->undefined_param_exception));
 
         return $this->defaultValue;
     }

Braces +15 added lines, -13 removed lines

@@ -55,8 +55,9 @@ 
      */
     public function addAliase (string $name)
     {
-        if (array_search ($name, $this->names) !== false)
-            throw new \Exception ($this->locale->aliase_exists_exception);
+        if (array_search ($name, $this->names) !== false) {
+                    throw new \Exception ($this->locale->aliase_exists_exception);
+        }
 
         $this->names[] = $name;
 
@@ -75,11 +76,12 @@ 
         $args = array_values ($args);
         $l    = strlen ($this->separator);
 
-        foreach ($this->names as $name)
-            foreach ($args as $id => $arg)
+        foreach ($this->names as $name) {
+                    foreach ($args as $id => $arg)
                 if (substr ($arg, 0, ($pos = strlen ($name) + $l)) == $name . $this->separator)
                 {
                     $param = [substr ($arg, $pos)];
+        }
 
                     unset ($args[$id]);
                     $args = array_values ($args);
@@ -88,21 +90,21 @@ 
                     {
                         while (($altParam = $this->parse ($args)) !== $this->defaultValue)
                         {
-                            if (is_array ($altParam))
-                                $param = array_merge ($param, $altParam);
-    
-                            else $param[] = $altParam;
+                            if (is_array ($altParam)) {
+                                                            $param = array_merge ($param, $altParam);
+                            } else {
+                                $param[] = $altParam;
+                            }
                         }
-                    }
-
-                    catch (\Throwable $e) {}
+                    } catch (\Throwable $e) {}
                     
                     return sizeof ($param) == 1 ?
                         $param[0] : $param;
                 }
 
-        if ($this->required)
-            throw new \Exception (str_replace ('%param_name%', current ($this->names), $this->locale->undefined_param_exception));
+        if ($this->required) {
+                    throw new \Exception (str_replace ('%param_name%', current ($this->names), $this->locale->undefined_param_exception));
+        }
 
         return $this->defaultValue;
     }

bin/qero-packages/KRypt0nn/ConsoleArgs/php/Parameters/Param.php

Spacing +15 added lines, -15 removed lines

@@ -20,7 +20,7 @@ 
      * [@param string $defaultValue = null] - значение параметра по умолчанию
      * [@param bool $required = false] - обязательно ли указание параметра
      */
-    public function __construct (string $name, string $defaultValue = null, bool $required = false)
+    public function __construct(string $name, string $defaultValue = null, bool $required = false)
     {
         $this->names        = [$name];
         $this->defaultValue = $defaultValue;
@@ -36,7 +36,7 @@ 
      * 
      * @return Param - возвращает сам себя
      */
-    public function setLocale (Locale $locale): Param
+    public function setLocale(Locale $locale): Param
     {
         $this->locale = $locale;
 
@@ -50,10 +50,10 @@ 
      * 
      * @return Param - возвращает сам себя
      */
-    public function addAliase (string $name)
+    public function addAliase(string $name)
     {
-        if (array_search ($name, $this->names) !== false)
-            throw new \Exception ($this->locale->aliase_exists_exception);
+        if (array_search($name, $this->names) !== false)
+            throw new \Exception($this->locale->aliase_exists_exception);
 
         $this->names[] = $name;
 
@@ -67,27 +67,27 @@ 
      * 
      * Возвращает найденый параметр или массив найдёных параметров, если их было указано несколько
      */
-    public function parse (array &$args)
+    public function parse(array &$args)
     {
-        $args = array_values ($args);
+        $args = array_values($args);
 
         foreach ($this->names as $name)
-            if (($key = array_search ($name, $args)) !== false)
+            if (($key = array_search($name, $args)) !== false)
             {
                 if (!isset ($args[$key + 1]))
-                    throw new \Exception ($this->locale->unselected_value_exception);
+                    throw new \Exception($this->locale->unselected_value_exception);
 
                 $param = [$args[$key + 1]];
 
                 unset ($args[$key], $args[$key + 1]);
-                $args = array_values ($args);
+                $args = array_values($args);
 
                 try
                 {
-                    while (($altParam = $this->parse ($args)) !== $this->defaultValue)
+                    while (($altParam = $this->parse($args)) !== $this->defaultValue)
                     {
-                        if (is_array ($altParam))
-                            $param = array_merge ($param, $altParam);
+                        if (is_array($altParam))
+                            $param = array_merge($param, $altParam);
 
                         else $param[] = $altParam;
                     }
@@ -95,12 +95,12 @@ 
 
                 catch (\Throwable $e) {}
                 
-                return sizeof ($param) == 1 ?
+                return sizeof($param) == 1 ?
                     $param[0] : $param;
             }
 
         if ($this->required)
-            throw new \Exception (str_replace ('%param_name%', current ($this->names), $this->locale->undefined_param_exception));
+            throw new \Exception(str_replace('%param_name%', current($this->names), $this->locale->undefined_param_exception));
 
         return $this->defaultValue;
     }

Braces +15 added lines, -13 removed lines

@@ -52,8 +52,9 @@ 
      */
     public function addAliase (string $name)
     {
-        if (array_search ($name, $this->names) !== false)
-            throw new \Exception ($this->locale->aliase_exists_exception);
+        if (array_search ($name, $this->names) !== false) {
+                    throw new \Exception ($this->locale->aliase_exists_exception);
+        }
 
         $this->names[] = $name;
 
@@ -71,11 +72,12 @@ 
     {
         $args = array_values ($args);
 
-        foreach ($this->names as $name)
-            if (($key = array_search ($name, $args)) !== false)
+        foreach ($this->names as $name) {
+                    if (($key = array_search ($name, $args)) !== false)
             {
                 if (!isset ($args[$key + 1]))
                     throw new \Exception ($this->locale->unselected_value_exception);
+        }
 
                 $param = [$args[$key + 1]];
 
@@ -86,21 +88,21 @@ 
                 {
                     while (($altParam = $this->parse ($args)) !== $this->defaultValue)
                     {
-                        if (is_array ($altParam))
-                            $param = array_merge ($param, $altParam);
-
-                        else $param[] = $altParam;
+                        if (is_array ($altParam)) {
+                                                    $param = array_merge ($param, $altParam);
+                        } else {
+                            $param[] = $altParam;
+                        }
                     }
-                }
-
-                catch (\Throwable $e) {}
+                } catch (\Throwable $e) {}
                 
                 return sizeof ($param) == 1 ?
                     $param[0] : $param;
             }
 
-        if ($this->required)
-            throw new \Exception (str_replace ('%param_name%', current ($this->names), $this->locale->undefined_param_exception));
+        if ($this->required) {
+                    throw new \Exception (str_replace ('%param_name%', current ($this->names), $this->locale->undefined_param_exception));
+        }
 
         return $this->defaultValue;
     }

bin/qero-packages/KRypt0nn/ConsoleArgs/php/Command.php

Spacing +15 added lines, -15 removed lines

@@ -21,7 +21,7 @@ 
      * @param string $name - имя команды
      * [@param \Closure $callable = null] - анонимная функция для выполнения
      */
-    public function __construct (string $name, \Closure $callable = null)
+    public function __construct(string $name, \Closure $callable = null)
     {
         $this->name   = $name;
         $this->locale = new Locale;
@@ -37,7 +37,7 @@ 
      * 
      * @return Command - возвращает сам себя
      */
-    public function setLocale (Locale $locale): Command
+    public function setLocale(Locale $locale): Command
     {
         $this->locale = $locale;
 
@@ -51,13 +51,13 @@ 
      * 
      * @return Command - возвращает сам себя
      */
-    public function addParams (array $params): Command
+    public function addParams(array $params): Command
     {
         foreach ($params as $param)
             if ($param instanceof Parameter)
-                $this->params[current ($param->names)] = $param;
+                $this->params[current($param->names)] = $param;
 
-            else throw new \Exception ($this->locale->param_type_exception);
+            else throw new \Exception($this->locale->param_type_exception);
 
         return $this;
     }
@@ -69,10 +69,10 @@ 
      * 
      * @return Command - возвращает сам себя
      */
-    public function addAliase (string $name)
+    public function addAliase(string $name)
     {
-        if (array_search ($name, $this->aliases) !== false)
-            throw new \Exception ($this->locale->aliase_exists_exception);
+        if (array_search($name, $this->aliases) !== false)
+            throw new \Exception($this->locale->aliase_exists_exception);
 
         $this->aliases[] = $name;
 
@@ -86,12 +86,12 @@ 
      * 
      * @return array - возвращает ассоциативный массив [параметр] => [значение]
      */
-    public function getParams (array &$args): array
+    public function getParams(array &$args): array
     {
-        $params = array_combine (array_keys ($this->params), array_fill (0, sizeof ($this->params), null));
+        $params = array_combine(array_keys($this->params), array_fill(0, sizeof($this->params), null));
 
         foreach ($this->params as $name => $param)
-            $params[$name] = $param->parse ($args);
+            $params[$name] = $param->parse($args);
 
         return $params;
     }
@@ -101,15 +101,15 @@ 
      * 
      * @param array &$args - аргументы команды
      */
-    public function execute (array &$args)
+    public function execute(array &$args)
     {
         if ($this->callable instanceof \Closure)
         {
-            $params = $this->getParams ($args);
+            $params = $this->getParams($args);
 
-            return $this->callable->call ($this, array_values ($args), $params);
+            return $this->callable->call($this, array_values($args), $params);
         }
 
-        throw new \Exception ($this->locale->execution_error);
+        throw new \Exception($this->locale->execution_error);
     }
 }

Braces +15 added lines, -9 removed lines

@@ -26,8 +26,9 @@ 
         $this->name   = $name;
         $this->locale = new Locale;
 
-        if ($callable !== null)
-            $this->callable = $callable;
+        if ($callable !== null) {
+                    $this->callable = $callable;
+        }
     }
 
     /**
@@ -53,11 +54,14 @@ 
      */
     public function addParams (array $params): Command
     {
-        foreach ($params as $param)
-            if ($param instanceof Parameter)
+        foreach ($params as $param) {
+                    if ($param instanceof Parameter)
                 $this->params[current ($param->names)] = $param;
+        }
 
-            else throw new \Exception ($this->locale->param_type_exception);
+            else {
+                throw new \Exception ($this->locale->param_type_exception);
+            }
 
         return $this;
     }
@@ -71,8 +75,9 @@ 
      */
     public function addAliase (string $name)
     {
-        if (array_search ($name, $this->aliases) !== false)
-            throw new \Exception ($this->locale->aliase_exists_exception);
+        if (array_search ($name, $this->aliases) !== false) {
+                    throw new \Exception ($this->locale->aliase_exists_exception);
+        }
 
         $this->aliases[] = $name;
 
@@ -90,8 +95,9 @@ 
     {
         $params = array_combine (array_keys ($this->params), array_fill (0, sizeof ($this->params), null));
 
-        foreach ($this->params as $name => $param)
-            $params[$name] = $param->parse ($args);
+        foreach ($this->params as $name => $param) {
+                    $params[$name] = $param->parse ($args);
+        }
 
         return $params;
     }

bin/qero-packages/KRypt0nn/ConsoleArgs/php/DefaultCommand.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
      * 
      * [@param \Closure $callable = null] - анонимная функция для выполнения
      */
-    public function __construct (\Closure $callable = null)
+    public function __construct(\Closure $callable = null)
     {
         if ($callable !== null)
             $this->callable = $callable;

Braces +3 added lines, -2 removed lines

@@ -15,7 +15,8 @@
      */
     public function __construct (\Closure $callable = null)
     {
-        if ($callable !== null)
-            $this->callable = $callable;
+        if ($callable !== null) {
+                    $this->callable = $callable;
+        }
     }
 }