winforms-php / VoidStudio

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;
+        }
     }
 }

bin/app/php/Builder.php

Indentation +4 added lines, -4 removed lines

@@ -133,8 +133,8 @@
         return Builder::getReferences ($file, $parseExtensions);

     }

 	

-	public static function optimizeCode (string $code): string

-	{

-		return Builder::optimizeCode ($code);

-	}

+    public static function optimizeCode (string $code): string

+    {

+        return Builder::optimizeCode ($code);

+    }

 }

Spacing +52 added lines, -53 removed lines

@@ -6,23 +6,23 @@ 
 

 class VoidStudioBuilder

 {

-    public static function compileProject (string $save, string $enteringPoint, array $references, array $settings = [], bool $printSuccessCompile = false, bool $debug = false): array

+    public static function compileProject(string $save, string $enteringPoint, array $references, array $settings = [], bool $printSuccessCompile = false, bool $debug = false): array

     {

-        $savePath    = dirname ($save) .'/'. basenameNoExt ($save);

-        $globalCode  = file_get_contents (APP_DIR .'/system/presets/compile_parser_preset.cs') ."\n\n";

+        $savePath    = dirname($save).'/'.basenameNoExt($save);

+        $globalCode  = file_get_contents(APP_DIR.'/system/presets/compile_parser_preset.cs')."\n\n";

         $objectsCode = '';

         $forms       = [];

 

         for ($i = 0; $i < 5; ++$i)

-            if (!isset ($settings[$i]) || !strlen (trim ($settings[$i])))

+            if (!isset ($settings[$i]) || !strlen(trim($settings[$i])))

                 $settings[$i] = null;

 

-        $settings = array_slice ($settings, 0, 5);

+        $settings = array_slice($settings, 0, 5);

 

-        foreach (VoidStudioAPI::getObjects ('main')['Designer__FormsList']->items->names as $id => $item)

+        foreach (VoidStudioAPI::getObjects('main')['Designer__FormsList']->items->names as $id => $item)

         {

-            $designer    = VoidStudioAPI::getObjects ('main')['Designer__'. $item .'Designer'];

-            $globalCode .= self::appendDesignerData ($designer->getSharpCode ($item), $designer);

+            $designer    = VoidStudioAPI::getObjects('main')['Designer__'.$item.'Designer'];

+            $globalCode .= self::appendDesignerData($designer->getSharpCode($item), $designer);

 

             $forms[] = $item;

 

@@ -30,111 +30,110 @@ 
                 VoidStudioAPI::$events[$item] = "class $item extends Form\n{}\n";

 

             if (isset (VoidStudioAPI::$events[$item]))

-                $objectsCode .= ClassWorker::applyClass (VoidStudioAPI::$events[$item], $item, substr ($voidCode = $designer->getVoidCode ($item, false), $pos = strpos ($voidCode, '{') + 1, strrpos ($voidCode, '}') - $pos - 1) ."\n") ."\n\n";

+                $objectsCode .= ClassWorker::applyClass(VoidStudioAPI::$events[$item], $item, substr($voidCode = $designer->getVoidCode($item, false), $pos = strpos($voidCode, '{') + 1, strrpos($voidCode, '}') - $pos - 1)."\n")."\n\n";

         }

 

-        dir_clean ($savePath);

-        dir_copy (CORE_DIR, $savePath);

+        dir_clean($savePath);

+        dir_copy(CORE_DIR, $savePath);

         

-        unlink ($savePath .'/script.php');

-        unlink ($savePath .'/VoidCore.exe');

+        unlink($savePath.'/script.php');

+        unlink($savePath.'/VoidCore.exe');

 

-        $errors = EngineAdditions::compile ($savePath .'/'. basename ($save), APP_DIR .'/system/icons/Icon.ico', self::optimizeCode (str_replace_assoc (file_get_contents (APP_DIR .'/system/presets/compile_main_preset.php'), [

-            '%VoidEngine%' => self::generateCode ($references),

+        $errors = EngineAdditions::compile($savePath.'/'.basename($save), APP_DIR.'/system/icons/Icon.ico', self::optimizeCode(str_replace_assoc(file_get_contents(APP_DIR.'/system/presets/compile_main_preset.php'), [

+            '%VoidEngine%' => self::generateCode($references),

 

-            '%modules%' => (file_exists ($modulesFile = VoidStudioProjectManager::$projectPath .'/modules/Qero.json') && sizeof ($modules = json_decode (file_get_contents ($modulesFile))) ? "require 'qero-packages/autoload.php';\n\n" : "\n\n") . implode ("\n", array_map (function ($module)

+            '%modules%' => (file_exists($modulesFile = VoidStudioProjectManager::$projectPath.'/modules/Qero.json') && sizeof($modules = json_decode(file_get_contents($modulesFile))) ? "require 'qero-packages/autoload.php';\n\n" : "\n\n").implode("\n", array_map(function($module)

             {

-                $module = trim (file_get_contents ($module));

+                $module = trim(file_get_contents($module));

     

-                if (substr ($module, 0, 2) == '<?')

-                    $module = substr ($module, 2);

+                if (substr($module, 0, 2) == '<?')

+                    $module = substr($module, 2);

     

-                if (substr ($module, 0, 3) == 'php')

-                    $module = substr ($module, 3);

+                if (substr($module, 0, 3) == 'php')

+                    $module = substr($module, 3);

     

-                if (substr ($module, -2) == '?>')

-                    $module = substr ($module, 0, -2);

+                if (substr($module, -2) == '?>')

+                    $module = substr($module, 0, -2);

     

-                return "\$module = <<<'__MODULE'\n". self::optimizeCode ($module) ."\n__MODULE;\n\neval (\$module);";

-            }, array_merge (glob (VoidStudioProjectManager::$projectPath .'/modules/*.php'), $debug ? [APP_DIR .'/system/debug/DebugHook.php'] : []))),

+                return "\$module = <<<'__MODULE'\n".self::optimizeCode($module)."\n__MODULE;\n\neval (\$module);";

+            }, array_merge(glob(VoidStudioProjectManager::$projectPath.'/modules/*.php'), $debug ? [APP_DIR.'/system/debug/DebugHook.php'] : []))),

 

-            '%objects%'        => trim ($objectsCode),

-            '%forms%'          => join ('\', \'', $forms),

+            '%objects%'        => trim($objectsCode),

+            '%forms%'          => join('\', \'', $forms),

             '%entering_point%' => $enteringPoint,

-            '%author_id%'      => sha1 (shell_exec ('wmic csproduct'))

+            '%author_id%'      => sha1(shell_exec('wmic csproduct'))

         ])), $settings[0], $settings[1], $settings[2], $settings[3], $settings[4], /*str_replace_assoc (file_get_contents (APP_DIR .'/system/presets/compile_main_preset.cs'), [

             '%forms%' => join ('", "', $forms)

         ])*/'', $globalCode);

 

-        if (isset ($modules) && sizeof ($modules) > 0)

+        if (isset ($modules) && sizeof($modules) > 0)

         {

-            dir_delete (APP_DIR .'/Qero/qero-packages');

+            dir_delete(APP_DIR.'/Qero/qero-packages');

 

             $manager = new \Qero\PackagesManager\PackagesManager;

 

             foreach ($modules as $package)

-                $manager->installPackage ($package);

+                $manager->installPackage($package);

 

-            dir_copy (APP_DIR .'/Qero/qero-packages', $savePath .'/qero-packages');

-            dir_delete (APP_DIR .'/Qero/qero-packages');

+            dir_copy(APP_DIR.'/Qero/qero-packages', $savePath.'/qero-packages');

+            dir_delete(APP_DIR.'/Qero/qero-packages');

         }

 

         // pre ($errors);

         // pre ($globalCode->toString ());

 

-        $log = VoidStudioAPI::getObjects ('main')['ToolsPanel__LogList'];

-        $log->items->add ('Проект скомпилирован по пути "'. $save .'". '. (($errorsCount = sizeof ($errors)) > 0 ? ('Обнаружено '. $errorsCount .' ошибок') : 'Ошибок не обнаружено'));

+        $log = VoidStudioAPI::getObjects('main')['ToolsPanel__LogList'];

+        $log->items->add('Проект скомпилирован по пути "'.$save.'". '.(($errorsCount = sizeof($errors)) > 0 ? ('Обнаружено '.$errorsCount.' ошибок') : 'Ошибок не обнаружено'));

 

         if ($errorsCount > 0)

         {

-            $log->items->addRange (array_map (function ($error)

+            $log->items->addRange(array_map(function($error)

             {

-                return "\t". $error;

+                return "\t".$error;

             }, $errors));

 

-            messageBox ('Обнаружено '. $errorsCount .' ошибок', 'Ошибка компиляции', enum ('System.Windows.Forms.MessageBoxButtons.OK'), enum ('System.Windows.Forms.MessageBoxIcon.Error'));

+            messageBox('Обнаружено '.$errorsCount.' ошибок', 'Ошибка компиляции', enum('System.Windows.Forms.MessageBoxButtons.OK'), enum('System.Windows.Forms.MessageBoxIcon.Error'));

         }

 

         elseif ($printSuccessCompile)

-            messageBox ('Проект успешно скомпилирован', 'Успешная компиляция', enum ('System.Windows.Forms.MessageBoxButtons.OK'), enum ('System.Windows.Forms.MessageBoxIcon.Information'));

+            messageBox('Проект успешно скомпилирован', 'Успешная компиляция', enum('System.Windows.Forms.MessageBoxButtons.OK'), enum('System.Windows.Forms.MessageBoxIcon.Information'));

 

         return $errors;

     }

 

-    public static function appendDesignerData (string $code, VoidDesigner $designer): string

+    public static function appendDesignerData(string $code, VoidDesigner $designer): string

     {

         $offset = 0;

 

-        while (($pos = strpos ($code, ')(resources.GetObject("', $offset)) !== false)

+        while (($pos = strpos($code, ')(resources.GetObject("', $offset)) !== false)

         {

             $offset   = $pos + 23;

-            $property = explode ('.', substr ($code, $offset, ($end = strpos ($code, '")));', $offset)) - $offset));

+            $property = explode('.', substr($code, $offset, ($end = strpos($code, '")));', $offset)) - $offset));

 

             $object = $property[0] == '$this' ?

-                $designer->form->selector :

-                $designer->getComponentByName ($property[0]);

+                $designer->form->selector : $designer->getComponentByName($property[0]);

 

-            foreach (array_slice ($property, 1) as $path)

-                $object = \VoidCore::getProperty ($object, $path);

+            foreach (array_slice($property, 1) as $path)

+                $object = \VoidCore::getProperty($object, $path);

 

-            $code = str_replace (substr ($code, $pos + 2, $end - $pos), 'WinForms_PHP.ZendProgram.getResource ("'. \VoidCore::exportObject ($object) .'")', $code);

+            $code = str_replace(substr($code, $pos + 2, $end - $pos), 'WinForms_PHP.ZendProgram.getResource ("'.\VoidCore::exportObject($object).'")', $code);

         }

 

         return $code;

     }

 

-    public static function generateCode (array $references, bool $removeNamespaces = true): string

+    public static function generateCode(array $references, bool $removeNamespaces = true): string

     {

-        return Builder::generateCode ($references, $removeNamespaces);

+        return Builder::generateCode($references, $removeNamespaces);

     }

 

-    public static function getReferences (string $file, bool $parseExtensions = true): array

+    public static function getReferences(string $file, bool $parseExtensions = true): array

     {

-        return Builder::getReferences ($file, $parseExtensions);

+        return Builder::getReferences($file, $parseExtensions);

     }

 	

-	public static function optimizeCode (string $code): string

+	public static function optimizeCode(string $code): string

 	{

-		return Builder::optimizeCode ($code);

+		return Builder::optimizeCode($code);

 	}

 }

Braces +28 added lines, -21 removed lines

@@ -13,9 +13,10 @@ 
         $objectsCode = '';

         $forms       = [];

 

-        for ($i = 0; $i < 5; ++$i)

-            if (!isset ($settings[$i]) || !strlen (trim ($settings[$i])))

-                $settings[$i] = null;

+        for ($i = 0; $i < 5; ++$i) {
+                    if (!isset ($settings[$i]) || !strlen (trim ($settings[$i])))

+                $settings[$i] = null;
+        }
 

         $settings = array_slice ($settings, 0, 5);

 

@@ -26,11 +27,13 @@ 
 

             $forms[] = $item;

 

-            if (!isset (VoidStudioAPI::$events[$item]))

-                VoidStudioAPI::$events[$item] = "class $item extends Form\n{}\n";

+            if (!isset (VoidStudioAPI::$events[$item])) {
+                            VoidStudioAPI::$events[$item] = "class $item extends Form\n{}\n";
+            }
 

-            if (isset (VoidStudioAPI::$events[$item]))

-                $objectsCode .= ClassWorker::applyClass (VoidStudioAPI::$events[$item], $item, substr ($voidCode = $designer->getVoidCode ($item, false), $pos = strpos ($voidCode, '{') + 1, strrpos ($voidCode, '}') - $pos - 1) ."\n") ."\n\n";

+            if (isset (VoidStudioAPI::$events[$item])) {
+                            $objectsCode .= ClassWorker::applyClass (VoidStudioAPI::$events[$item], $item, substr ($voidCode = $designer->getVoidCode ($item, false), $pos = strpos ($voidCode, '{') + 1, strrpos ($voidCode, '}') - $pos - 1) ."\n") ."\n\n";
+            }
         }

 

         dir_clean ($savePath);

@@ -46,14 +49,17 @@ 
             {

                 $module = trim (file_get_contents ($module));

     

-                if (substr ($module, 0, 2) == '<?')

-                    $module = substr ($module, 2);

+                if (substr ($module, 0, 2) == '<?') {
+                                    $module = substr ($module, 2);
+                }
     

-                if (substr ($module, 0, 3) == 'php')

-                    $module = substr ($module, 3);

+                if (substr ($module, 0, 3) == 'php') {
+                                    $module = substr ($module, 3);
+                }
     

-                if (substr ($module, -2) == '?>')

-                    $module = substr ($module, 0, -2);

+                if (substr ($module, -2) == '?>') {
+                                    $module = substr ($module, 0, -2);
+                }
     

                 return "\$module = <<<'__MODULE'\n". self::optimizeCode ($module) ."\n__MODULE;\n\neval (\$module);";

             }, array_merge (glob (VoidStudioProjectManager::$projectPath .'/modules/*.php'), $debug ? [APP_DIR .'/system/debug/DebugHook.php'] : []))),

@@ -72,8 +78,9 @@ 
 

             $manager = new \Qero\PackagesManager\PackagesManager;

 

-            foreach ($modules as $package)

-                $manager->installPackage ($package);

+            foreach ($modules as $package) {
+                            $manager->installPackage ($package);
+            }
 

             dir_copy (APP_DIR .'/Qero/qero-packages', $savePath .'/qero-packages');

             dir_delete (APP_DIR .'/Qero/qero-packages');

@@ -93,10 +100,9 @@ 
             }, $errors));

 

             messageBox ('Обнаружено '. $errorsCount .' ошибок', 'Ошибка компиляции', enum ('System.Windows.Forms.MessageBoxButtons.OK'), enum ('System.Windows.Forms.MessageBoxIcon.Error'));

-        }

-

-        elseif ($printSuccessCompile)

-            messageBox ('Проект успешно скомпилирован', 'Успешная компиляция', enum ('System.Windows.Forms.MessageBoxButtons.OK'), enum ('System.Windows.Forms.MessageBoxIcon.Information'));

+        } elseif ($printSuccessCompile) {
+                    messageBox ('Проект успешно скомпилирован', 'Успешная компиляция', enum ('System.Windows.Forms.MessageBoxButtons.OK'), enum ('System.Windows.Forms.MessageBoxIcon.Information'));
+        }
 

         return $errors;

     }

@@ -114,8 +120,9 @@ 
                 $designer->form->selector :

                 $designer->getComponentByName ($property[0]);

 

-            foreach (array_slice ($property, 1) as $path)

-                $object = \VoidCore::getProperty ($object, $path);

+            foreach (array_slice ($property, 1) as $path) {
+                            $object = \VoidCore::getProperty ($object, $path);
+            }
 

             $code = str_replace (substr ($code, $pos + 2, $end - $pos), 'WinForms_PHP.ZendProgram.getResource ("'. \VoidCore::exportObject ($object) .'")', $code);

         }

bin/app/php/Designer.php

Indentation +24 added lines, -24 removed lines

@@ -78,40 +78,40 @@ 
     {

         $this->componentAddedEvent = function ($self, $args)

         {

-			if (!isset ($GLOBALS['new_component']))

-			{

+            if (!isset ($GLOBALS['new_component']))

+            {

                 $name = $args->component->getType ()->toString ();

 

                 // pre (\VoidCore::getProperty ($args->component->selector, 'Name'));

                 

-				$GLOBALS['new_component'] = [$this->getComponentName ($args->component->selector), [$name, substr ($name, 0, strrpos ($name, '.'))]];

-			}

+                $GLOBALS['new_component'] = [$this->getComponentName ($args->component->selector), [$name, substr ($name, 0, strrpos ($name, '.'))]];

+            }

 			

-			$this->setComponentToHistory ($GLOBALS['new_component'][1], $GLOBALS['new_component'][0]);

-			$components = VoidStudioAPI::getObjects ('main')['PropertiesPanel__SelectedComponent'];

+            $this->setComponentToHistory ($GLOBALS['new_component'][1], $GLOBALS['new_component'][0]);

+            $components = VoidStudioAPI::getObjects ('main')['PropertiesPanel__SelectedComponent'];

 

-			$components->items->clear ();

-			$components->items->addRange (array_keys ($this->objects));

+            $components->items->clear ();

+            $components->items->addRange (array_keys ($this->objects));

 

-			$components->selectedItem = $GLOBALS['new_component'][0];

-			$this->setSelectedComponents ($args->component);

+            $components->selectedItem = $GLOBALS['new_component'][0];

+            $this->setSelectedComponents ($args->component);

 

-			unset ($GLOBALS['new_component']);

+            unset ($GLOBALS['new_component']);

         };

 		

-		$this->componentRemovedEvent = function ($self, $args)

-		{

-			$name = $this->getComponentName ($args->component->selector);

-			unset ($this->objects[$name]);

+        $this->componentRemovedEvent = function ($self, $args)

+        {

+            $name = $this->getComponentName ($args->component->selector);

+            unset ($this->objects[$name]);

 

-			foreach ($this->objects as $objectName => $object)

-				if (!is_int ($this->getComponentByName ($objectName)))

-					unset ($this->objects[$objectName]);

+            foreach ($this->objects as $objectName => $object)

+                if (!is_int ($this->getComponentByName ($objectName)))

+                    unset ($this->objects[$objectName]);

 

-			$this->currentSelectedItem->items->clear ();

-			$this->currentSelectedItem->items->addRange (array_keys ($this->objects));

-			$this->currentSelectedItem->selectedItem = $this->getComponentName ($this->getPrimarySelection ()->selector);

-		};

+            $this->currentSelectedItem->items->clear ();

+            $this->currentSelectedItem->items->addRange (array_keys ($this->objects));

+            $this->currentSelectedItem->selectedItem = $this->getComponentName ($this->getPrimarySelection ()->selector);

+        };

 

         // ! Отредактировал что-то здесь?

         // ! Не забудь отредактировать и в main.vlf

@@ -203,12 +203,12 @@ 
             $menu->items->addRange (isset ($desItem) ? [

                 $selectAllItem, $copyItem, $pasteItem, $cutItem, $delItem, '-',

                 $toFrontItem, $toBackItem, $desItem, '-',

-				$undoItem, $redoItem, '-',

+                $undoItem, $redoItem, '-',

                 $infoItem

             ] : [

                 $selectAllItem, $copyItem, $pasteItem, $cutItem, $delItem, '-',

                 $toFrontItem, $toBackItem, '-',

-				$undoItem, $redoItem, '-',

+                $undoItem, $redoItem, '-',

                 $infoItem

             ]);

 

Spacing +129 added lines, -130 removed lines

@@ -12,20 +12,19 @@ 
     protected $currentSelectedItem;

     protected $formsList;

 

-    public function __construct (Component $parent, string $formName = 'form', PropertyGrid $propertyGrid, ComboBox $currentSelectedItem, TabControl $formsList, $form = null)

+    public function __construct(Component $parent, string $formName = 'form', PropertyGrid $propertyGrid, ComboBox $currentSelectedItem, TabControl $formsList, $form = null)

     {

-        $this->form = $form === null ? new Form :

-            EngineAdditions::coupleSelector ($form);

+        $this->form = $form === null ? new Form : EngineAdditions::coupleSelector($form);

 

-        if (!is_object ($this->form))

-            throw new \Exception ('$form param in "VoidEngine\VoidDesigner" constructor must be instance of "VoidEngine\WFObject" ("VoidEngine\Form") or be object selector');

+        if (!is_object($this->form))

+            throw new \Exception('$form param in "VoidEngine\VoidDesigner" constructor must be instance of "VoidEngine\WFObject" ("VoidEngine\Form") or be object selector');

 

         $this->propertyGrid        = $propertyGrid;

         $this->currentSelectedItem = $currentSelectedItem;

         $this->formsList           = $formsList;

 

-        $this->selector = \VoidCore::createObject ('WinForms_PHP.FormDesigner5', null, $this->form->selector, $formName);

-        Components::addComponent ($this->selector, $this);

+        $this->selector = \VoidCore::createObject('WinForms_PHP.FormDesigner5', null, $this->form->selector, $formName);

+        Components::addComponent($this->selector, $this);

 

         $this->form->name = $formName;

 

@@ -35,172 +34,172 @@ 
             $this->form->size = [400, 360];

         }

 

-        $this->control = $this->callMethod ('GetControl');

+        $this->control = $this->callMethod('GetControl');

         $this->objects[$formName] = ['System.Windows.Forms.Form', 'System.Windows.Forms'];

 

-        \VoidCore::setProperty ($this->control, 'Parent', $parent->selector);

+        \VoidCore::setProperty($this->control, 'Parent', $parent->selector);

 

-        $this->selectionChangedEvent = function ()

+        $this->selectionChangedEvent = function()

         {

-            $object = $this->getPrimarySelection ()->selector;

+            $object = $this->getPrimarySelection()->selector;

             

             $this->propertyGrid->selectedObject = $object;

-            $this->currentSelectedItem->selectedItem = $this->getComponentName ($object);

+            $this->currentSelectedItem->selectedItem = $this->getComponentName($object);

         };

 

-        $this->createUniqueMethodNameEvent = function ($self, $args)

+        $this->createUniqueMethodNameEvent = function($self, $args)

         {

-            return $this->getComponentName ($args->component->selector) . '_' . $args->eventDescriptor->Name;

+            return $this->getComponentName($args->component->selector).'_'.$args->eventDescriptor->Name;

         };

         

-        $this->getCompatibleMethodsEvent = function ()

+        $this->getCompatibleMethodsEvent = function()

         {

             $form = $this->formsList->selectedTab->text;

             

-            return getNetArray ('System.String', ClassWorker::getAvailableClassMethods (VoidStudioAPI::$events[$form] ?? '', $form))->selector;

+            return getNetArray('System.String', ClassWorker::getAvailableClassMethods(VoidStudioAPI::$events[$form] ?? '', $form))->selector;

         };

         

-        $this->showCodeEvent = function ($self, $args)

+        $this->showCodeEvent = function($self, $args)

         {

-            VoidStudioAPI::openEventEditor ($this->propertyGrid->selectedObject->selector, $args->methodName, $args->eventDescriptor, $form = c('Designer__FormsList')->selectedTab->text, VoidStudioAPI::getObjects ('main')['Designer__'. $form .'Designer']);

+            VoidStudioAPI::openEventEditor($this->propertyGrid->selectedObject->selector, $args->methodName, $args->eventDescriptor, $form = c('Designer__FormsList')->selectedTab->text, VoidStudioAPI::getObjects('main')['Designer__'.$form.'Designer']);

         };

 

-        $this->freeMethodEvent = function ($self, $args)

+        $this->freeMethodEvent = function($self, $args)

         {

             $object = $this->propertyGrid->selectedObject->selector;

 

-            Events::removeObjectEvent ($object, $method = $args->eventDescriptor->Name);

+            Events::removeObjectEvent($object, $method = $args->eventDescriptor->Name);

             unset (VoidStudioAPI::$events[$object][$method]);

         };

     }

 

-    public function initDesigner (): void

+    public function initDesigner(): void

     {

-        $this->componentAddedEvent = function ($self, $args)

+        $this->componentAddedEvent = function($self, $args)

         {

 			if (!isset ($GLOBALS['new_component']))

 			{

-                $name = $args->component->getType ()->toString ();

+                $name = $args->component->getType()->toString();

 

                 // pre (\VoidCore::getProperty ($args->component->selector, 'Name'));

                 

-				$GLOBALS['new_component'] = [$this->getComponentName ($args->component->selector), [$name, substr ($name, 0, strrpos ($name, '.'))]];

+				$GLOBALS['new_component'] = [$this->getComponentName($args->component->selector), [$name, substr($name, 0, strrpos($name, '.'))]];

 			}

 			

-			$this->setComponentToHistory ($GLOBALS['new_component'][1], $GLOBALS['new_component'][0]);

-			$components = VoidStudioAPI::getObjects ('main')['PropertiesPanel__SelectedComponent'];

+			$this->setComponentToHistory($GLOBALS['new_component'][1], $GLOBALS['new_component'][0]);

+			$components = VoidStudioAPI::getObjects('main')['PropertiesPanel__SelectedComponent'];

 

-			$components->items->clear ();

-			$components->items->addRange (array_keys ($this->objects));

+			$components->items->clear();

+			$components->items->addRange(array_keys($this->objects));

 

 			$components->selectedItem = $GLOBALS['new_component'][0];

-			$this->setSelectedComponents ($args->component);

+			$this->setSelectedComponents($args->component);

 

 			unset ($GLOBALS['new_component']);

         };

 		

-		$this->componentRemovedEvent = function ($self, $args)

+		$this->componentRemovedEvent = function($self, $args)

 		{

-			$name = $this->getComponentName ($args->component->selector);

+			$name = $this->getComponentName($args->component->selector);

 			unset ($this->objects[$name]);

 

 			foreach ($this->objects as $objectName => $object)

-				if (!is_int ($this->getComponentByName ($objectName)))

+				if (!is_int($this->getComponentByName($objectName)))

 					unset ($this->objects[$objectName]);

 

-			$this->currentSelectedItem->items->clear ();

-			$this->currentSelectedItem->items->addRange (array_keys ($this->objects));

-			$this->currentSelectedItem->selectedItem = $this->getComponentName ($this->getPrimarySelection ()->selector);

+			$this->currentSelectedItem->items->clear();

+			$this->currentSelectedItem->items->addRange(array_keys($this->objects));

+			$this->currentSelectedItem->selectedItem = $this->getComponentName($this->getPrimarySelection()->selector);

 		};

 

         // ! Отредактировал что-то здесь?

         // ! Не забудь отредактировать и в main.vlf

 

-        $this->rightClickEvent = function ($self, $args)

+        $this->rightClickEvent = function($self, $args)

         {

-            $delItem = new ToolStripMenuItem ('Удалить');

-            $delItem->image = (new Image)->loadFromFile (APP_DIR .'/system/icons/Delete_16x.png');

+            $delItem = new ToolStripMenuItem('Удалить');

+            $delItem->image = (new Image)->loadFromFile(APP_DIR.'/system/icons/Delete_16x.png');

             $delItem->shortcutKeys = 46;

-            $delItem->clickEvent   = fn () => $this->removeSelected ();

+            $delItem->clickEvent   = fn() => $this->removeSelected();

 

-            $toFrontItem = new ToolStripMenuItem ('На передний план');

-            $toFrontItem->image = (new Image)->loadFromFile (APP_DIR .'/system/icons/Front_16x.png');

+            $toFrontItem = new ToolStripMenuItem('На передний план');

+            $toFrontItem->image = (new Image)->loadFromFile(APP_DIR.'/system/icons/Front_16x.png');

             // $toFrontItem->shortcutKeys = 131142;

-            $toFrontItem->clickEvent = fn () => $self->doAction ('bringToFront');

+            $toFrontItem->clickEvent = fn() => $self->doAction('bringToFront');

 

-            $toBackItem = new ToolStripMenuItem ('На задний план');

-            $toBackItem->image = (new Image)->loadFromFile (APP_DIR .'/system/icons/Back_16x.png');

+            $toBackItem = new ToolStripMenuItem('На задний план');

+            $toBackItem->image = (new Image)->loadFromFile(APP_DIR.'/system/icons/Back_16x.png');

             // $toBackItem->shortcutKeys = 131138;

-            $toBackItem->clickEvent = fn () => $self->doAction ('sendToBack');

+            $toBackItem->clickEvent = fn() => $self->doAction('sendToBack');

 

-            if ((new WFObject (\VoidCore::typeof ('System.Windows.Forms.Control')))->isAssignableFrom ($this->propertyGrid->selectedObject->getType ()))

+            if ((new WFObject(\VoidCore::typeof('System.Windows.Forms.Control')))->isAssignableFrom($this->propertyGrid->selectedObject->getType()))

             {

-                $locked = ($locker = (new WFClass ('System.ComponentModel.TypeDescriptor', 'System'))

-                    ->getProperties ($object = $this->propertyGrid->selectedObject->selector)['Locked'])

-                    ->getValue ($object);

+                $locked = ($locker = (new WFClass('System.ComponentModel.TypeDescriptor', 'System'))

+                    ->getProperties($object = $this->propertyGrid->selectedObject->selector)['Locked'])

+                    ->getValue($object);

                 

-                $desItem = new ToolStripMenuItem ($locked ? 'Разблокировать' : 'Заблокировать');

-                $desItem->image = (new Image)->loadFromFile (APP_DIR .'/system/icons/'. ($locked ? 'Unlock' : 'Lock') .'_16x.png');

+                $desItem = new ToolStripMenuItem($locked ? 'Разблокировать' : 'Заблокировать');

+                $desItem->image = (new Image)->loadFromFile(APP_DIR.'/system/icons/'.($locked ? 'Unlock' : 'Lock').'_16x.png');

                 // $desItem->shortcutKeys = 131148;

-                $desItem->clickEvent = function () use ($object, $locker, $locked)

+                $desItem->clickEvent = function() use ($object, $locker, $locked)

                 {

-                    $locker->setValue ($object, !$locked);

+                    $locker->setValue($object, !$locked);

 

-                    $this->propertyGrid->refresh ();

+                    $this->propertyGrid->refresh();

                 };

             }

 

-            $selectAllItem = new ToolStripMenuItem ('Выделить всё');

-            $selectAllItem->image = (new Image)->loadFromFile (APP_DIR .'/system/icons/SelectAll_16x.png');

+            $selectAllItem = new ToolStripMenuItem('Выделить всё');

+            $selectAllItem->image = (new Image)->loadFromFile(APP_DIR.'/system/icons/SelectAll_16x.png');

             $selectAllItem->shortcutKeys = 131137;

-            $selectAllItem->clickEvent = fn () => $self->doAction ('selectAll');

+            $selectAllItem->clickEvent = fn() => $self->doAction('selectAll');

 			

-            $cutItem = new ToolStripMenuItem ('Вырезать');

-            $cutItem->image = (new Image)->loadFromFile (APP_DIR .'/system/icons/Cut_16x.png');

+            $cutItem = new ToolStripMenuItem('Вырезать');

+            $cutItem->image = (new Image)->loadFromFile(APP_DIR.'/system/icons/Cut_16x.png');

             $cutItem->shortcutKeys = 131160;

-            $cutItem->clickEvent   = fn () => $self->doAction ('cut');

+            $cutItem->clickEvent   = fn() => $self->doAction('cut');

 			

-            $copyItem = new ToolStripMenuItem ('Копировать');

-            $copyItem->image = (new Image)->loadFromFile (APP_DIR .'/system/icons/Copy_16x.png');

+            $copyItem = new ToolStripMenuItem('Копировать');

+            $copyItem->image = (new Image)->loadFromFile(APP_DIR.'/system/icons/Copy_16x.png');

             $copyItem->shortcutKeys = 131139;

-            $copyItem->clickEvent   = fn () => $self->doAction ('copy');

+            $copyItem->clickEvent   = fn() => $self->doAction('copy');

 			

-            $pasteItem = new ToolStripMenuItem ('Вставить');

-            $pasteItem->image = (new Image)->loadFromFile (APP_DIR .'/system/icons/Paste_16x.png');

+            $pasteItem = new ToolStripMenuItem('Вставить');

+            $pasteItem->image = (new Image)->loadFromFile(APP_DIR.'/system/icons/Paste_16x.png');

             $pasteItem->shortcutKeys = 131158;

-            $pasteItem->clickEvent   = fn () => $self->doAction('paste');

+            $pasteItem->clickEvent   = fn() => $self->doAction('paste');

 			

-            $undoItem = new ToolStripMenuItem ('Отменить');

-            $undoItem->image = (new Image)->loadFromFile (APP_DIR .'/system/icons/Undo_16x.png');

+            $undoItem = new ToolStripMenuItem('Отменить');

+            $undoItem->image = (new Image)->loadFromFile(APP_DIR.'/system/icons/Undo_16x.png');

             $undoItem->shortcutKeys = 131162;

-            $undoItem->clickEvent   = fn () => $self->undoEngine->undo ();

+            $undoItem->clickEvent   = fn() => $self->undoEngine->undo();

 			

-            $redoItem = new ToolStripMenuItem ('Повторить');

-            $redoItem->image = (new Image)->loadFromFile (APP_DIR .'/system/icons/Redo_16x.png');

+            $redoItem = new ToolStripMenuItem('Повторить');

+            $redoItem->image = (new Image)->loadFromFile(APP_DIR.'/system/icons/Redo_16x.png');

             $redoItem->shortcutKeys = 131161;

-            $redoItem->clickEvent   = fn () => $self->undoEngine->redo ();

+            $redoItem->clickEvent   = fn() => $self->undoEngine->redo();

 

-            $infoItem = new ToolStripMenuItem ('Отладочная информация');

-            $infoItem->image = (new Image)->loadFromFile (APP_DIR .'/system/icons/Debug_16x.png');

-            $infoItem->clickEvent = function () use ($self)

+            $infoItem = new ToolStripMenuItem('Отладочная информация');

+            $infoItem->image = (new Image)->loadFromFile(APP_DIR.'/system/icons/Debug_16x.png');

+            $infoItem->clickEvent = function() use ($self)

             {

-                $self->getSelectedComponents ()->foreach (function ($value) use ($self)

+                $self->getSelectedComponents()->foreach(function($value) use ($self)

                 {

-                    pre ($value instanceof Component ? $value : $value->toString () ."\nSelector: ". $value->selector);

+                    pre($value instanceof Component ? $value : $value->toString()."\nSelector: ".$value->selector);

 

-                    if ((new WFObject (\VoidCore::typeof ('System.Windows.Forms.Form')))->isAssignableFrom ($value->getType ()))

+                    if ((new WFObject(\VoidCore::typeof('System.Windows.Forms.Form')))->isAssignableFrom($value->getType()))

                     {

-                        $code = $self->getVoidCode ($self->form->name, false);

+                        $code = $self->getVoidCode($self->form->name, false);

 

-                        pre ($self->getSharpCode ($self->form->name));

-                        pre ('namespace VoidEngine;'. "\n\n" .'return new class' . substr ($code, 38) . ';');

+                        pre($self->getSharpCode($self->form->name));

+                        pre('namespace VoidEngine;'."\n\n".'return new class'.substr($code, 38).';');

                     }

                 });

             };

 

             $menu = new ContextMenuStrip;

 

-            $menu->items->addRange (isset ($desItem) ? [

+            $menu->items->addRange(isset ($desItem) ? [

                 $selectAllItem, $copyItem, $pasteItem, $cutItem, $delItem, '-',

                 $toFrontItem, $toBackItem, $desItem, '-',

 				$undoItem, $redoItem, '-',

@@ -212,91 +211,91 @@ 
                 $infoItem

             ]);

 

-            $menu->show ($self->form, $self->form->pointToClient (\VoidCore::createObject ('System.Drawing.Point', false, $args->x, $args->y)));

+            $menu->show($self->form, $self->form->pointToClient(\VoidCore::createObject('System.Drawing.Point', false, $args->x, $args->y)));

         };

 

-        VoidStudioAPI::addObjects ('main', ['Designer__'. $this->form->name .'Designer' => $this]);

+        VoidStudioAPI::addObjects('main', ['Designer__'.$this->form->name.'Designer' => $this]);

     }

 

-    public function focus (): void

+    public function focus(): void

     {

-        $this->form->focus ();

+        $this->form->focus();

     }

 

-    public function getSharpCode (string $formName): string

+    public function getSharpCode(string $formName): string

     {

-        $code = $this->callMethod (['GetSharpCode', 'object'], $formName);

+        $code = $this->callMethod(['GetSharpCode', 'object'], $formName);

 

-        $code = \VoidCore::callMethod ($code, ['Replace', 'object'], 'public class '. $this->form->name .' : '. $this->form->name, 'public class '. $this->form->name .' : System.Windows.Forms.Form');

-        $code = \VoidCore::callMethod ($code, ['Replace', 'object'], '    private ', '    public ');

+        $code = \VoidCore::callMethod($code, ['Replace', 'object'], 'public class '.$this->form->name.' : '.$this->form->name, 'public class '.$this->form->name.' : System.Windows.Forms.Form');

+        $code = \VoidCore::callMethod($code, ['Replace', 'object'], '    private ', '    public ');

 

-        return \VoidCore::callMethod ($code, 'ToString');

+        return \VoidCore::callMethod($code, 'ToString');

     }

 

-    public function createComponent (array $component, string $componentName): int

+    public function createComponent(array $component, string $componentName): int

     {

         $this->objects[$componentName] = $component;

-        $selector = \VoidCore::createObject (...$component);

+        $selector = \VoidCore::createObject(...$component);

 

-        $this->callMethod ('AddComponent', $selector, $componentName);

+        $this->callMethod('AddComponent', $selector, $componentName);

 

         return $selector;

     }

 

-    public function setComponentToHistory (array $component, string $componentName): void

+    public function setComponentToHistory(array $component, string $componentName): void

     {

         $this->objects[$componentName] = $component;

     }

 

-    public function addComponent (int $selector, string $componentName): void

+    public function addComponent(int $selector, string $componentName): void

     {

-        $this->objects[$componentName] = [\VoidCore::callMethod (\VoidCore::callMethod ($selector, 'GetType'), 'ToString'), false];

+        $this->objects[$componentName] = [\VoidCore::callMethod(\VoidCore::callMethod($selector, 'GetType'), 'ToString'), false];

 

-        $this->callMethod ('AddComponent', $selector, $componentName);

+        $this->callMethod('AddComponent', $selector, $componentName);

     }

 

-    public function removeComponent (int $component): void

+    public function removeComponent(int $component): void

     {

-        unset ($this->objects[$this->getComponentName ($component)]);

+        unset ($this->objects[$this->getComponentName($component)]);

 

-        $this->callMethod ('RemoveComponent', $component);

+        $this->callMethod('RemoveComponent', $component);

     }

 

-    public function removeComponentHistoryByName (string $name): void

+    public function removeComponentHistoryByName(string $name): void

     {

         unset ($this->objects[$name]);

     }

 

-    public function removeSelected (): void

+    public function removeSelected(): void

     {

         $toUnset = [];

 

-        foreach ($this->getSelectedComponents ()->list as $object)

+        foreach ($this->getSelectedComponents()->list as $object)

         {

-            if ($object->getType ()->toString () != 'System.Windows.Forms.Form')

-                $toUnset[] = $this->getComponentName ($object->selector);

+            if ($object->getType()->toString() != 'System.Windows.Forms.Form')

+                $toUnset[] = $this->getComponentName($object->selector);

 

             else

             {

                 if ($this->formsList->items->count > 1)

                 {

-                    if (messageBox ('Вы действительно хотите удалить форму "'. $this->form->name .'"?', 'Подтвердите действие', enum ('System.Windows.Forms.MessageBoxButtons.YesNo'), enum ('System.Windows.Forms.MessageBoxIcon.Question')) == 6)

+                    if (messageBox('Вы действительно хотите удалить форму "'.$this->form->name.'"?', 'Подтвердите действие', enum('System.Windows.Forms.MessageBoxButtons.YesNo'), enum('System.Windows.Forms.MessageBoxIcon.Question')) == 6)

                     {

                         foreach ($this->objects as $name => $obj)

                             unset ($this->objects[$name]);

 

-                        unset ($this->formsList->items[array_flip ($this->formsList->items->names)[$form = $this->getComponentName ($object->selector)]]);

+                        unset ($this->formsList->items[array_flip($this->formsList->items->names)[$form = $this->getComponentName($object->selector)]]);

 

                         /*$this->form->dispose ();

                         \VoidCore::callMethod ($this->control, 'Dispose');*/

-                        $this->callMethod ('DeleteSelected');

+                        $this->callMethod('DeleteSelected');

 

-                        $designer = VoidStudioAPI::getObjects ('main')['Designer__'. $this->formsList->selectedTab->text .'Designer'];

+                        $designer = VoidStudioAPI::getObjects('main')['Designer__'.$this->formsList->selectedTab->text.'Designer'];

                         

                         $designer->propertyGrid->selectedObject = $designer->form;

-                        $designer->setSelectedComponents ($designer->form);

+                        $designer->setSelectedComponents($designer->form);

 

-                        unset (VoidStudioAPI::$objects['main']['Designer__'. $form .'Designer']);

+                        unset (VoidStudioAPI::$objects['main']['Designer__'.$form.'Designer']);

 

                         return;

                     }

@@ -304,7 +303,7 @@ 
 

                 else

                 {

-                    messageBox ('Нельзя удалить единственную форму проекта', 'Ошибка удаления', enum ('System.Windows.Forms.MessageBoxButtons.OK'), enum ('System.Windows.Forms.MessageBoxIcon.Error'));

+                    messageBox('Нельзя удалить единственную форму проекта', 'Ошибка удаления', enum('System.Windows.Forms.MessageBoxButtons.OK'), enum('System.Windows.Forms.MessageBoxIcon.Error'));

 

                     return;

                 }

@@ -314,52 +313,52 @@ 
         foreach ($toUnset as $name)

             unset ($this->objects[$name]);

 

-        $this->doAction ('delete');

+        $this->doAction('delete');

 

         foreach ($this->objects as $objectName => $object)

-            if (!is_int ($this->getComponentByName ($objectName)))

+            if (!is_int($this->getComponentByName($objectName)))

                 unset ($this->objects[$objectName]);

 

-        $this->currentSelectedItem->items->clear ();

-        $this->currentSelectedItem->items->addRange (array_keys ($this->objects));

-        $this->currentSelectedItem->selectedItem = $this->getComponentName ($this->getPrimarySelection ()->selector);

+        $this->currentSelectedItem->items->clear();

+        $this->currentSelectedItem->items->addRange(array_keys($this->objects));

+        $this->currentSelectedItem->selectedItem = $this->getComponentName($this->getPrimarySelection()->selector);

     }

 

-    public function renameComponent (int $component, string $name, string $fromName = null): void

+    public function renameComponent(int $component, string $name, string $fromName = null): void

     {

         if ($fromName === null)

-            $fromName = $this->getComponentName ($component);

+            $fromName = $this->getComponentName($component);

 

         $info = $this->objects[$fromName];

         unset ($this->objects[$fromName]);

         $this->objects[$name] = $info;

 

-        $this->callMethod ('RenameComponent', $component, $name);

+        $this->callMethod('RenameComponent', $component, $name);

     }

 

-    public function getComponentName (int $component): string

+    public function getComponentName(int $component): string

     {

-        return $this->callMethod ('GetComponentName', $component);

+        return $this->callMethod('GetComponentName', $component);

     }

 

-    public function getComponentByName (string $name)

+    public function getComponentByName(string $name)

     {

-        return $this->callMethod ('GetComponentByName', $name);

+        return $this->callMethod('GetComponentByName', $name);

     }

 

-    public function getComponentClass (string $name)

+    public function getComponentClass(string $name)

     {

         return isset ($this->objects[$name]) ?

             $this->objects[$name] : false;

     }

 

-    public function addProperty (int $selector, string $name, int $value, bool $readOnly, string $category, string $description, bool $visible)

+    public function addProperty(int $selector, string $name, int $value, bool $readOnly, string $category, string $description, bool $visible)

     {

-        $this->callMethod ('AddProperty', $selector, $name, $value, $readOnly, $category, $description, $visible);

+        $this->callMethod('AddProperty', $selector, $name, $value, $readOnly, $category, $description, $visible);

     }

 

-    public function removeProperty (int $selector, string $name)

+    public function removeProperty(int $selector, string $name)

     {

-        $this->callMethod ('RemoveProperty', $selector, $name);

+        $this->callMethod('RemoveProperty', $selector, $name);

     }

 }

Braces +24 added lines, -21 removed lines

@@ -17,8 +17,9 @@ 
         $this->form = $form === null ? new Form :

             EngineAdditions::coupleSelector ($form);

 

-        if (!is_object ($this->form))

-            throw new \Exception ('$form param in "VoidEngine\VoidDesigner" constructor must be instance of "VoidEngine\WFObject" ("VoidEngine\Form") or be object selector');

+        if (!is_object ($this->form)) {
+                    throw new \Exception ('$form param in "VoidEngine\VoidDesigner" constructor must be instance of "VoidEngine\WFObject" ("VoidEngine\Form") or be object selector');
+        }
 

         $this->propertyGrid        = $propertyGrid;

         $this->currentSelectedItem = $currentSelectedItem;

@@ -104,9 +105,10 @@ 
 			$name = $this->getComponentName ($args->component->selector);

 			unset ($this->objects[$name]);

 

-			foreach ($this->objects as $objectName => $object)

-				if (!is_int ($this->getComponentByName ($objectName)))

-					unset ($this->objects[$objectName]);

+			foreach ($this->objects as $objectName => $object) {
+							if (!is_int ($this->getComponentByName ($objectName)))

+					unset ($this->objects[$objectName]);
+			}
 

 			$this->currentSelectedItem->items->clear ();

 			$this->currentSelectedItem->items->addRange (array_keys ($this->objects));

@@ -273,17 +275,17 @@ 
 

         foreach ($this->getSelectedComponents ()->list as $object)

         {

-            if ($object->getType ()->toString () != 'System.Windows.Forms.Form')

-                $toUnset[] = $this->getComponentName ($object->selector);

-

-            else

+            if ($object->getType ()->toString () != 'System.Windows.Forms.Form') {
+                            $toUnset[] = $this->getComponentName ($object->selector);
+            } else

             {

                 if ($this->formsList->items->count > 1)

                 {

                     if (messageBox ('Вы действительно хотите удалить форму "'. $this->form->name .'"?', 'Подтвердите действие', enum ('System.Windows.Forms.MessageBoxButtons.YesNo'), enum ('System.Windows.Forms.MessageBoxIcon.Question')) == 6)

                     {

-                        foreach ($this->objects as $name => $obj)

-                            unset ($this->objects[$name]);

+                        foreach ($this->objects as $name => $obj) {
+                                                    unset ($this->objects[$name]);
+                        }
 

                         unset ($this->formsList->items[array_flip ($this->formsList->items->names)[$form = $this->getComponentName ($object->selector)]]);

 

@@ -300,9 +302,7 @@ 
 

                         return;

                     }

-                }

-

-                else

+                } else

                 {

                     messageBox ('Нельзя удалить единственную форму проекта', 'Ошибка удаления', enum ('System.Windows.Forms.MessageBoxButtons.OK'), enum ('System.Windows.Forms.MessageBoxIcon.Error'));

 

@@ -311,14 +311,16 @@ 
             }

         }

 

-        foreach ($toUnset as $name)

-            unset ($this->objects[$name]);

+        foreach ($toUnset as $name) {
+                    unset ($this->objects[$name]);
+        }
 

         $this->doAction ('delete');

 

-        foreach ($this->objects as $objectName => $object)

-            if (!is_int ($this->getComponentByName ($objectName)))

-                unset ($this->objects[$objectName]);

+        foreach ($this->objects as $objectName => $object) {
+                    if (!is_int ($this->getComponentByName ($objectName)))

+                unset ($this->objects[$objectName]);
+        }
 

         $this->currentSelectedItem->items->clear ();

         $this->currentSelectedItem->items->addRange (array_keys ($this->objects));

@@ -327,8 +329,9 @@ 
 

     public function renameComponent (int $component, string $name, string $fromName = null): void

     {

-        if ($fromName === null)

-            $fromName = $this->getComponentName ($component);

+        if ($fromName === null) {
+                    $fromName = $this->getComponentName ($component);
+        }
 

         $info = $this->objects[$fromName];

         unset ($this->objects[$fromName]);