winforms-php / VoidFramework

engine/VoidEngine.php

Spacing +8 added lines, -8 removed lines

@@ -36,17 +36,17 @@ 
 const ENGINE_VERSION = '3.3.0 build-2019/08/24';
 const ENGINE_DIR = __DIR__;
 
-chdir (ENGINE_DIR);
+chdir(ENGINE_DIR);
 
 $GLOBALS['error_status'] = true;
 
 $GLOBALS['__debug'] = [
-    'start_time' => microtime (true)
+    'start_time' => microtime(true)
 ];
 
-$GLOBALS['__ub_write_handler'] = function (...$args)
+$GLOBALS['__ub_write_handler'] = function(...$args)
 {
-    pre (...$args);
+    pre(...$args);
 };
 
 require 'common/EngineInterfaces.php';
@@ -105,9 +105,9 @@ 
 require 'components/Designer.php';
 require 'components/EventGrid.php';
 
-if (is_dir ('extensions'))
-    foreach (scandir ('extensions') as $ext)
-        if (is_dir ('extensions/'. $ext) && file_exists ($ext = 'extensions/'. $ext .'/main.php'))
+if (is_dir('extensions'))
+    foreach (scandir('extensions') as $ext)
+        if (is_dir('extensions/'.$ext) && file_exists($ext = 'extensions/'.$ext.'/main.php'))
             require $ext;
 
-gc_collect_cycles ();
+gc_collect_cycles();

Braces +2 added lines, -1 removed lines

@@ -105,9 +105,10 @@
 require 'components/Designer.php';
 require 'components/EventGrid.php';
 
-if (is_dir ('extensions'))
+if (is_dir ('extensions')) {
     foreach (scandir ('extensions') as $ext)
         if (is_dir ('extensions/'. $ext) && file_exists ($ext = 'extensions/'. $ext .'/main.php'))
             require $ext;
+}
 
 gc_collect_cycles ();

engine/extensions/VLF/bin/parser.php

Spacing +78 added lines, -80 removed lines

@@ -31,10 +31,10 @@ 
      * АААААААААААААААААААААААА
      */
 
-    public function __construct (string $content, array $settings = [])
+    public function __construct(string $content, array $settings = [])
     {
-        if (file_exists ($content))
-            $content = file_get_contents ($content);
+        if (file_exists($content))
+            $content = file_get_contents($content);
 
         // Зачем? Так надо!
         // ДА БАГ ЭТО, НЕ ПИ%ДИ!!! И Я ПОНЯТИЯ НЕ ИМЕЮ КАК И ПОЧЕМУ!!!
@@ -45,14 +45,14 @@ 
             if (isset ($this->$name))
                 $this->$name = $setting;
 
-            else throw new \Exception ('Trying to setting up undefined property "'. $name .'"');
+            else throw new \Exception('Trying to setting up undefined property "'.$name.'"');
         }
 
-        if ($this->use_caching && file_exists ($file = VLF_EXT_DIR .'/cache/'. sha1 ($content) .'.cache'))
+        if ($this->use_caching && file_exists($file = VLF_EXT_DIR.'/cache/'.sha1($content).'.cache'))
         {
-            $info = unserialize (gzinflate (file_get_contents ($file)));
+            $info = unserialize(gzinflate(file_get_contents($file)));
 
-            if ($info[0] == sha1 (file_get_contents (__FILE__)))
+            if ($info[0] == sha1(file_get_contents(__FILE__)))
             {
                 $this->tree  = $info[1][0];
                 $this->links = $info[1][1];
@@ -60,20 +60,20 @@ 
                 return;
             }
 
-            else unlink ($file);
+            else unlink($file);
         }
 
-        $info = $this->generateSyntaxTree ($content);
+        $info = $this->generateSyntaxTree($content);
 
         $this->tree  = $info[0];
         $this->links = $info[1];
 
         if ($this->use_caching)
         {
-            if (!is_dir (dirname (__DIR__) .'/cache'))
-                mkdir (dirname (__DIR__) .'/cache');
+            if (!is_dir(dirname(__DIR__).'/cache'))
+                mkdir(dirname(__DIR__).'/cache');
 
-            file_put_contents (VLF_EXT_DIR .'/cache/'. sha1 ($content) .'.cache', gzdeflate (serialize ([sha1 (file_get_contents (__FILE__)), $info])));
+            file_put_contents(VLF_EXT_DIR.'/cache/'.sha1($content).'.cache', gzdeflate(serialize([sha1(file_get_contents(__FILE__)), $info])));
         }
     }
 
@@ -85,9 +85,9 @@ 
      * 
      * @return array - возвращает АСД
      */
-    protected function generateSyntaxTree (string $content): array
+    protected function generateSyntaxTree(string $content): array
     {
-        $lines          = $this->linesFilter ($untouched_lines = explode ($this->divider, $content));
+        $lines          = $this->linesFilter($untouched_lines = explode($this->divider, $content));
         $current_object = null;
         $parent_objects = [];
         $skip_at        = -1;
@@ -95,18 +95,18 @@ 
         $links          = [];
 
         if ($this->debug_mode)
-            pre ($lines);
+            pre($lines);
 
         foreach ($lines as $id => $line)
         {
             if ($skip_at > $id)
                 continue;
 
-            $height = $this->getLineHeight ($line);
-            $words  = $this->linesFilter (explode (' ', $line));
+            $height = $this->getLineHeight($line);
+            $words  = $this->linesFilter(explode(' ', $line));
 
             if ($this->debug_mode)
-                pre ($words);
+                pre($words);
 
             /**
              * Высокоинтеллектуальный фикс
@@ -128,7 +128,7 @@ 
                 $updated = false;
 
                 if ($this->debug_mode)
-                    pre ($current_object);
+                    pre($current_object);
 
                 while (isset ($tree[$current_object]['info']['subparent_link']) && $tree[$link = $tree[$current_object]['info']['subparent_link']->link]['hard'] < $tree[$current_object]['hard'])
                 {
@@ -136,7 +136,7 @@ 
                     $updated        = true;
 
                     if ($this->debug_mode)
-                        pre ($current_object);
+                        pre($current_object);
                 }
 
                 if (
@@ -151,16 +151,16 @@ 
                     break;
 
                 if ($this->debug_mode)
-                    pre ($current_object);
+                    pre($current_object);
             }
 
             /**
              * Button ...
              */
-            if (class_exists ($words[0]) || class_exists ('\VoidEngine\\'. $words[0]))
+            if (class_exists($words[0]) || class_exists('\VoidEngine\\'.$words[0]))
             {
                 if (!isset ($words[1]))
-                    throw new \Exception ('Object name mustn\'t be empty at line "'. $line .'"');
+                    throw new \Exception('Object name mustn\'t be empty at line "'.$line.'"');
 
                 /**
                  * Button NewButton
@@ -206,39 +206,38 @@ 
                         'syntax_nodes' => []
                     ];
 
-                    if (($begin = strpos ($line, '(')) !== false)
+                    if (($begin = strpos($line, '(')) !== false)
                     {
                         ++$begin;
                         
-                        $end = strrpos ($line, ')');
+                        $end = strrpos($line, ')');
 
                         if ($end === false)
-                            throw new \Exception ('Line "'. $line .'" have arguments list initialization, but not have list ending');
+                            throw new \Exception('Line "'.$line.'" have arguments list initialization, but not have list ending');
 
                         elseif ($begin < $end)
                         {
                             $arguments = [];
-                            $parsed    = explode (',', substr ($line, $begin, $end - $begin));
+                            $parsed    = explode(',', substr($line, $begin, $end - $begin));
 
                             foreach ($parsed as $argument_id => $argument)
                             {
-                                $argument = trim ($argument);
+                                $argument = trim($argument);
 
-                                if (strlen ($argument) > 0)
+                                if (strlen($argument) > 0)
                                     $arguments[] = isset ($links[$argument]) ?
-                                        new VLFLink ($argument, $links[$argument]) :
-                                        $argument;
+                                        new VLFLink($argument, $links[$argument]) : $argument;
 
-                                else throw new \Exception ('Argument '. ($argument_id + 1) .' mustn\'t have zero length at line "'. $line .'"');
+                                else throw new \Exception('Argument '.($argument_id + 1).' mustn\'t have zero length at line "'.$line.'"');
                             }
 
                             $tree[$id]['info']['arguments'] = $arguments;
 
-                            if (!$this->ignore_postobject_info && trim (substr ($line, $end)) > 0)
-                                throw new \Exception ('You mustn\'t write any chars after arguments definition');
+                            if (!$this->ignore_postobject_info && trim(substr($line, $end)) > 0)
+                                throw new \Exception('You mustn\'t write any chars after arguments definition');
                         }
 
-                        $tree[$id]['info']['subparent_link'] = new VLFLink ($tree[$current_object]['info']['object_name'], $current_object);
+                        $tree[$id]['info']['subparent_link'] = new VLFLink($tree[$current_object]['info']['object_name'], $current_object);
                     }
 
                     /**
@@ -248,7 +247,7 @@ 
                     elseif ($current_object !== null && $tree[$current_object]['hard'] < $height)
                     {
                         $tree[$id]['info']['arguments'] = [
-                            new VLFLink ($tree[$current_object]['info']['object_name'], $current_object)
+                            new VLFLink($tree[$current_object]['info']['object_name'], $current_object)
                         ];
 
                         $parent_objects[$id] = $current_object;
@@ -295,17 +294,17 @@ 
                 {
                     if ($words[0][1] == '^')
                     {
-                        $parsed = $this->parseSubText ($untouched_lines, $id, $height);
+                        $parsed = $this->parseSubText($untouched_lines, $id, $height);
 
                         $comment .= $parsed[0];
                         $skip_at  = $parsed[1];
                     }
 
-                    else throw new \Exception ('Unknown char founded after syntax-control symbol at line "'. $line .'"');
+                    else throw new \Exception('Unknown char founded after syntax-control symbol at line "'.$line.'"');
                 }
                 
                 if ($this->debug_mode)
-                    pre ("Comment:\n\n$comment");
+                    pre("Comment:\n\n$comment");
             }
 
             /**
@@ -317,19 +316,19 @@ 
              */
             elseif ($words[0][0] == '%')
             {
-                $code = substr ($line, strlen ($words[0]));
+                $code = substr($line, strlen($words[0]));
 
                 if (isset ($words[0][1]))
                 {
                     if ($words[0][1] == '^')
                     {
-                        $parsed = $this->parseSubText ($untouched_lines, $id, $height);
+                        $parsed = $this->parseSubText($untouched_lines, $id, $height);
 
                         $code   .= $parsed[0];
                         $skip_at = $parsed[1];
                     }
 
-                    else throw new \Exception ('Unknown char founded after syntax-control symbol at line "'. $line .'"');
+                    else throw new \Exception('Unknown char founded after syntax-control symbol at line "'.$line.'"');
                 }
                 
                 $tree[$id] = [
@@ -354,7 +353,7 @@ 
              * Form MyForm
              *     Button MyButton
              */
-            elseif (is_int ($current_object) && isset ($tree[$current_object]['hard']))
+            elseif (is_int($current_object) && isset ($tree[$current_object]['hard']))
             {
                 if ($height <= $tree[$current_object]['hard'] && isset ($parent_objects[$current_object]))
                 {
@@ -380,16 +379,16 @@ 
                 /**
                  * property_name: property_value
                  */
-                $postChar = substr ($words[0], strlen ($words[0]) - 1);
+                $postChar = substr($words[0], strlen($words[0]) - 1);
 
                 if ($postChar == ':' || $postChar == '^')
                 {
                     if (!isset ($words[1]))
-                        throw new \Exception ('Property value mustn\'t be empty at line "'. $line .'"');
+                        throw new \Exception('Property value mustn\'t be empty at line "'.$line.'"');
 
-                    $propertyName     = substr ($words[0], 0, -1);
-                    $propertyValue    = implode (' ', array_slice ($words, 1));
-                    $propertyRawValue = ltrim (substr ($line, strlen ($words[0])));
+                    $propertyName     = substr($words[0], 0, -1);
+                    $propertyValue    = implode(' ', array_slice($words, 1));
+                    $propertyRawValue = ltrim(substr($line, strlen($words[0])));
 
                     /**
                      * property_name:^ property_value_1
@@ -397,10 +396,10 @@ 
                      */
                     if ($postChar == '^')
                     {
-                        $parsed = $this->parseSubText ($untouched_lines, $id, $height);
+                        $parsed = $this->parseSubText($untouched_lines, $id, $height);
 
                         $skip_at           = $parsed[1];
-                        $propertyName      = substr ($propertyName, 0, -1);
+                        $propertyName      = substr($propertyName, 0, -1);
                         $propertyRawValue .= $parsed[0];
                         $propertyValue     = $propertyRawValue;
                     }
@@ -421,7 +420,7 @@ 
                     ];
 
                     if (isset ($links[$info['info']['property_value']]))
-                        $info['info']['property_value'] = new VLFLink ($info['info']['property_value'], $links[$info['info']['property_value']]);
+                        $info['info']['property_value'] = new VLFLink($info['info']['property_value'], $links[$info['info']['property_value']]);
 
                     $tree[$current_object]['syntax_nodes'][] = $info;
                 }
@@ -429,37 +428,36 @@ 
                 /**
                  * ->method_name ([method_arguments])
                  */
-                elseif (substr ($words[0], 0, 2) == '->')
+                elseif (substr($words[0], 0, 2) == '->')
                 {
                     $arguments = [];
                     
-                    if (($begin = strpos ($line, '(')) !== false)
+                    if (($begin = strpos($line, '(')) !== false)
                     {
                         ++$begin;
                         
-                        $end = strrpos ($line, ')');
+                        $end = strrpos($line, ')');
 
                         if ($end === false)
-                            throw new \Exception ('Line "'. $line .'" have arguments list initialization, but not have list ending');
+                            throw new \Exception('Line "'.$line.'" have arguments list initialization, but not have list ending');
 
                         elseif ($begin < $end)
                         {
-                            $parsed = explode (',', substr ($line, $begin, $end - $begin));
+                            $parsed = explode(',', substr($line, $begin, $end - $begin));
 
                             foreach ($parsed as $argument_id => $argument)
                             {
-                                $argument = trim ($argument);
+                                $argument = trim($argument);
 
-                                if (strlen ($argument) > 0)
+                                if (strlen($argument) > 0)
                                     $arguments[] = isset ($links[$argument]) ?
-                                        new VLFLink ($argument, $links[$argument]) :
-                                        $argument;
+                                        new VLFLink($argument, $links[$argument]) : $argument;
 
-                                else throw new \Exception ('Argument '. ($argument_id + 1) .' mustn\'t have zero length at line "'. $line .'"');
+                                else throw new \Exception('Argument '.($argument_id + 1).' mustn\'t have zero length at line "'.$line.'"');
                             }
 
-                            if (!$this->ignore_postobject_info && trim (substr ($line, $end)) > 0)
-                                throw new \Exception ('You mustn\'t write any chars after arguments definition');
+                            if (!$this->ignore_postobject_info && trim(substr($line, $end)) > 0)
+                                throw new \Exception('You mustn\'t write any chars after arguments definition');
                         }
                     }
 
@@ -467,7 +465,7 @@ 
                      * ->show
                      */
                     elseif (!$this->ignore_unexpected_method_args)
-                        throw new \Exception ('Unexpected method arguments list at line "'. $line .'"');
+                        throw new \Exception('Unexpected method arguments list at line "'.$line.'"');
 
                     $tree[$current_object]['syntax_nodes'][] = [
                         'type'  => VLF_METHOD_CALL,
@@ -476,7 +474,7 @@ 
                         'words' => $words,
 
                         'info' => [
-                            'method_name'      => substr ($words[0], 2),
+                            'method_name'      => substr($words[0], 2),
                             'method_arguments' => $arguments
                         ],
 
@@ -499,7 +497,7 @@ 
                  */
                 else
                 {
-                    $parsed  = $this->parseSubText ($untouched_lines, $id, $height);
+                    $parsed  = $this->parseSubText($untouched_lines, $id, $height);
                     $skip_at = $parsed[1];
                     
                     $tree[$id] = [
@@ -509,7 +507,7 @@ 
                         'words' => $words,
 
                         'info' => [
-                            'object_vlf_info' => $line ."\n". $parsed[0]
+                            'object_vlf_info' => $line."\n".$parsed[0]
                         ],
 
                         'syntax_nodes' => []
@@ -520,7 +518,7 @@ 
             /**
              * Что-то загадочное, таинственное, неизвестное человечеству
              */
-            else throw new \Exception ('Unknown structures founded at line "'. $line .'"');
+            else throw new \Exception('Unknown structures founded at line "'.$line.'"');
         }
 
         return [$tree, $links];
@@ -536,7 +534,7 @@ 
      * 
      * @return array - возвращает спарсенные подстроки
      */
-    protected function parseSubText (array $lines, $begin_id, int $down_height): array
+    protected function parseSubText(array $lines, $begin_id, int $down_height): array
     {
         $parsed = "\n";
 
@@ -545,17 +543,17 @@ 
             if ($line_id <= $begin_id)
                 continue;
 
-            if (!(bool)(trim ($line)))
+            if (!(bool) (trim($line)))
             {
                 $parsed .= "\n";
             
                 continue;
             }
 
-            $height = $this->getLineHeight ($line);
+            $height = $this->getLineHeight($line);
 
             if ($this->debug_mode)
-                pre ("$height, $down_height, $line");
+                pre("$height, $down_height, $line");
 
             if ($height > $down_height)
                 $parsed .= "$line\n";
@@ -566,7 +564,7 @@ 
         return [$parsed, $line_id];
     }
 
-    public function __get ($name) // Возвращалка переменных парсера
+    public function __get($name) // Возвращалка переменных парсера
     {
         return isset ($this->$name) ?
             $this->$name : false;
@@ -580,14 +578,14 @@ 
      * 
      * @return int - высота строки
      */
-    protected function getLineHeight (string &$line): int
+    protected function getLineHeight(string &$line): int
     {
         $i = 0;
 
         while (isset ($line[$i]) && $line[$i] == "\t")
             ++$i;
         
-        return strlen ($line = str_repeat ('    ', $i) . substr ($line, $i)) - strlen ($line = trim ($line));
+        return strlen($line = str_repeat('    ', $i).substr($line, $i)) - strlen($line = trim($line));
     }
 
     /**
@@ -598,14 +596,14 @@ 
      * 
      * @return array - возвращает очищенный массив
      */
-    protected function linesFilter (array $segments): array
+    protected function linesFilter(array $segments): array
     {
-        return array_filter ($segments, function ($text)
+        return array_filter($segments, function($text)
         {
-            if ($this->strong_line_parser && preg_match ('/[^a-z0-9]/i', $text))
-                throw new \Exception  ('Line "'. $text .'" mustn\'t have any not-alphabet or not-numeric characters');
+            if ($this->strong_line_parser && preg_match('/[^a-z0-9]/i', $text))
+                throw new \Exception('Line "'.$text.'" mustn\'t have any not-alphabet or not-numeric characters');
             
-            return strlen (trim ($text)) > 0;
+            return strlen(trim($text)) > 0;
         });
     }
 }

Braces +98 added lines, -76 removed lines

@@ -33,8 +33,9 @@ 
 
     public function __construct (string $content, array $settings = [])
     {
-        if (file_exists ($content))
-            $content = file_get_contents ($content);
+        if (file_exists ($content)) {
+                    $content = file_get_contents ($content);
+        }
 
         // Зачем? Так надо!
         // ДА БАГ ЭТО, НЕ ПИ%ДИ!!! И Я ПОНЯТИЯ НЕ ИМЕЮ КАК И ПОЧЕМУ!!!
@@ -42,10 +43,11 @@ 
 
         foreach ($settings as $name => $setting)
         {
-            if (isset ($this->$name))
-                $this->$name = $setting;
-
-            else throw new \Exception ('Trying to setting up undefined property "'. $name .'"');
+            if (isset ($this->$name)) {
+                            $this->$name = $setting;
+            } else {
+                throw new \Exception ('Trying to setting up undefined property "'. $name .'"');
+            }
         }
 
         if ($this->use_caching && file_exists ($file = VLF_EXT_DIR .'/cache/'. sha1 ($content) .'.cache'))
@@ -58,9 +60,9 @@ 
                 $this->links = $info[1][1];
 
                 return;
+            } else {
+                unlink ($file);
             }
-
-            else unlink ($file);
         }
 
         $info = $this->generateSyntaxTree ($content);
@@ -70,8 +72,9 @@ 
 
         if ($this->use_caching)
         {
-            if (!is_dir (dirname (__DIR__) .'/cache'))
-                mkdir (dirname (__DIR__) .'/cache');
+            if (!is_dir (dirname (__DIR__) .'/cache')) {
+                            mkdir (dirname (__DIR__) .'/cache');
+            }
 
             file_put_contents (VLF_EXT_DIR .'/cache/'. sha1 ($content) .'.cache', gzdeflate (serialize ([sha1 (file_get_contents (__FILE__)), $info])));
         }
@@ -94,19 +97,22 @@ 
         $tree           = [];
         $links          = [];
 
-        if ($this->debug_mode)
-            pre ($lines);
+        if ($this->debug_mode) {
+                    pre ($lines);
+        }
 
         foreach ($lines as $id => $line)
         {
-            if ($skip_at > $id)
-                continue;
+            if ($skip_at > $id) {
+                            continue;
+            }
 
             $height = $this->getLineHeight ($line);
             $words  = $this->linesFilter (explode (' ', $line));
 
-            if ($this->debug_mode)
-                pre ($words);
+            if ($this->debug_mode) {
+                            pre ($words);
+            }
 
             /**
              * Высокоинтеллектуальный фикс
@@ -127,16 +133,18 @@ 
             {
                 $updated = false;
 
-                if ($this->debug_mode)
-                    pre ($current_object);
+                if ($this->debug_mode) {
+                                    pre ($current_object);
+                }
 
                 while (isset ($tree[$current_object]['info']['subparent_link']) && $tree[$link = $tree[$current_object]['info']['subparent_link']->link]['hard'] < $tree[$current_object]['hard'])
                 {
                     $current_object = $link;
                     $updated        = true;
 
-                    if ($this->debug_mode)
-                        pre ($current_object);
+                    if ($this->debug_mode) {
+                                            pre ($current_object);
+                    }
                 }
 
                 if (
@@ -145,13 +153,15 @@ 
                     isset ($tree[$current_object]['info']['arguments'][0]) &&
                     $tree[$current_object]['info']['arguments'][0] instanceof VLFLink &&
                     $tree[$tree[$current_object]['info']['arguments'][0]->link]['hard'] < $tree[$current_object]['hard']
-                ) $current_object = $tree[$current_object]['info']['arguments'][0]->link;
-
-                elseif (!$updated)
-                    break;
+                ) {
+                    $current_object = $tree[$current_object]['info']['arguments'][0]->link;
+                } elseif (!$updated) {
+                                    break;
+                }
 
-                if ($this->debug_mode)
-                    pre ($current_object);
+                if ($this->debug_mode) {
+                                    pre ($current_object);
+                }
             }
 
             /**
@@ -159,8 +169,9 @@ 
              */
             if (class_exists ($words[0]) || class_exists ('\VoidEngine\\'. $words[0]))
             {
-                if (!isset ($words[1]))
-                    throw new \Exception ('Object name mustn\'t be empty at line "'. $line .'"');
+                if (!isset ($words[1])) {
+                                    throw new \Exception ('Object name mustn\'t be empty at line "'. $line .'"');
+                }
 
                 /**
                  * Button NewButton
@@ -188,9 +199,7 @@ 
                     $current_object = $id;
 
                     continue;
-                }
-
-                else
+                } else
                 {
                     $tree[$id] = [
                         'type'  => VLF_OBJECT_DEFINITION,
@@ -212,10 +221,9 @@ 
                         
                         $end = strrpos ($line, ')');
 
-                        if ($end === false)
-                            throw new \Exception ('Line "'. $line .'" have arguments list initialization, but not have list ending');
-
-                        elseif ($begin < $end)
+                        if ($end === false) {
+                                                    throw new \Exception ('Line "'. $line .'" have arguments list initialization, but not have list ending');
+                        } elseif ($begin < $end)
                         {
                             $arguments = [];
                             $parsed    = explode (',', substr ($line, $begin, $end - $begin));
@@ -224,18 +232,20 @@ 
                             {
                                 $argument = trim ($argument);
 
-                                if (strlen ($argument) > 0)
-                                    $arguments[] = isset ($links[$argument]) ?
+                                if (strlen ($argument) > 0) {
+                                                                    $arguments[] = isset ($links[$argument]) ?
                                         new VLFLink ($argument, $links[$argument]) :
                                         $argument;
-
-                                else throw new \Exception ('Argument '. ($argument_id + 1) .' mustn\'t have zero length at line "'. $line .'"');
+                                } else {
+                                    throw new \Exception ('Argument '. ($argument_id + 1) .' mustn\'t have zero length at line "'. $line .'"');
+                                }
                             }
 
                             $tree[$id]['info']['arguments'] = $arguments;
 
-                            if (!$this->ignore_postobject_info && trim (substr ($line, $end)) > 0)
-                                throw new \Exception ('You mustn\'t write any chars after arguments definition');
+                            if (!$this->ignore_postobject_info && trim (substr ($line, $end)) > 0) {
+                                                            throw new \Exception ('You mustn\'t write any chars after arguments definition');
+                            }
                         }
 
                         $tree[$id]['info']['subparent_link'] = new VLFLink ($tree[$current_object]['info']['object_name'], $current_object);
@@ -299,13 +309,14 @@ 
 
                         $comment .= $parsed[0];
                         $skip_at  = $parsed[1];
+                    } else {
+                        throw new \Exception ('Unknown char founded after syntax-control symbol at line "'. $line .'"');
                     }
-
-                    else throw new \Exception ('Unknown char founded after syntax-control symbol at line "'. $line .'"');
                 }
                 
-                if ($this->debug_mode)
-                    pre ("Comment:\n\n$comment");
+                if ($this->debug_mode) {
+                                    pre ("Comment:\n\n$comment");
+                }
             }
 
             /**
@@ -327,9 +338,9 @@ 
 
                         $code   .= $parsed[0];
                         $skip_at = $parsed[1];
+                    } else {
+                        throw new \Exception ('Unknown char founded after syntax-control symbol at line "'. $line .'"');
                     }
-
-                    else throw new \Exception ('Unknown char founded after syntax-control symbol at line "'. $line .'"');
                 }
                 
                 $tree[$id] = [
@@ -384,8 +395,9 @@ 
 
                 if ($postChar == ':' || $postChar == '^')
                 {
-                    if (!isset ($words[1]))
-                        throw new \Exception ('Property value mustn\'t be empty at line "'. $line .'"');
+                    if (!isset ($words[1])) {
+                                            throw new \Exception ('Property value mustn\'t be empty at line "'. $line .'"');
+                    }
 
                     $propertyName     = substr ($words[0], 0, -1);
                     $propertyValue    = implode (' ', array_slice ($words, 1));
@@ -420,8 +432,9 @@ 
                         'syntax_nodes' => []
                     ];
 
-                    if (isset ($links[$info['info']['property_value']]))
-                        $info['info']['property_value'] = new VLFLink ($info['info']['property_value'], $links[$info['info']['property_value']]);
+                    if (isset ($links[$info['info']['property_value']])) {
+                                            $info['info']['property_value'] = new VLFLink ($info['info']['property_value'], $links[$info['info']['property_value']]);
+                    }
 
                     $tree[$current_object]['syntax_nodes'][] = $info;
                 }
@@ -439,10 +452,9 @@ 
                         
                         $end = strrpos ($line, ')');
 
-                        if ($end === false)
-                            throw new \Exception ('Line "'. $line .'" have arguments list initialization, but not have list ending');
-
-                        elseif ($begin < $end)
+                        if ($end === false) {
+                                                    throw new \Exception ('Line "'. $line .'" have arguments list initialization, but not have list ending');
+                        } elseif ($begin < $end)
                         {
                             $parsed = explode (',', substr ($line, $begin, $end - $begin));
 
@@ -450,24 +462,27 @@ 
                             {
                                 $argument = trim ($argument);
 
-                                if (strlen ($argument) > 0)
-                                    $arguments[] = isset ($links[$argument]) ?
+                                if (strlen ($argument) > 0) {
+                                                                    $arguments[] = isset ($links[$argument]) ?
                                         new VLFLink ($argument, $links[$argument]) :
                                         $argument;
-
-                                else throw new \Exception ('Argument '. ($argument_id + 1) .' mustn\'t have zero length at line "'. $line .'"');
+                                } else {
+                                    throw new \Exception ('Argument '. ($argument_id + 1) .' mustn\'t have zero length at line "'. $line .'"');
+                                }
                             }
 
-                            if (!$this->ignore_postobject_info && trim (substr ($line, $end)) > 0)
-                                throw new \Exception ('You mustn\'t write any chars after arguments definition');
+                            if (!$this->ignore_postobject_info && trim (substr ($line, $end)) > 0) {
+                                                            throw new \Exception ('You mustn\'t write any chars after arguments definition');
+                            }
                         }
                     }
 
                     /**
                      * ->show
                      */
-                    elseif (!$this->ignore_unexpected_method_args)
-                        throw new \Exception ('Unexpected method arguments list at line "'. $line .'"');
+                    elseif (!$this->ignore_unexpected_method_args) {
+                                            throw new \Exception ('Unexpected method arguments list at line "'. $line .'"');
+                    }
 
                     $tree[$current_object]['syntax_nodes'][] = [
                         'type'  => VLF_METHOD_CALL,
@@ -520,7 +535,9 @@ 
             /**
              * Что-то загадочное, таинственное, неизвестное человечеству
              */
-            else throw new \Exception ('Unknown structures founded at line "'. $line .'"');
+            else {
+                throw new \Exception ('Unknown structures founded at line "'. $line .'"');
+            }
         }
 
         return [$tree, $links];
@@ -542,8 +559,9 @@ 
 
         foreach ($lines as $line_id => $line)
         {
-            if ($line_id <= $begin_id)
-                continue;
+            if ($line_id <= $begin_id) {
+                            continue;
+            }
 
             if (!(bool)(trim ($line)))
             {
@@ -554,13 +572,15 @@ 
 
             $height = $this->getLineHeight ($line);
 
-            if ($this->debug_mode)
-                pre ("$height, $down_height, $line");
-
-            if ($height > $down_height)
-                $parsed .= "$line\n";
+            if ($this->debug_mode) {
+                            pre ("$height, $down_height, $line");
+            }
 
-            else break;
+            if ($height > $down_height) {
+                            $parsed .= "$line\n";
+            } else {
+                break;
+            }
         }
 
         return [$parsed, $line_id];
@@ -584,8 +604,9 @@ 
     {
         $i = 0;
 
-        while (isset ($line[$i]) && $line[$i] == "\t")
-            ++$i;
+        while (isset ($line[$i]) && $line[$i] == "\t") {
+                    ++$i;
+        }
         
         return strlen ($line = str_repeat ('    ', $i) . substr ($line, $i)) - strlen ($line = trim ($line));
     }
@@ -602,8 +623,9 @@ 
     {
         return array_filter ($segments, function ($text)
         {
-            if ($this->strong_line_parser && preg_match ('/[^a-z0-9]/i', $text))
-                throw new \Exception  ('Line "'. $text .'" mustn\'t have any not-alphabet or not-numeric characters');
+            if ($this->strong_line_parser && preg_match ('/[^a-z0-9]/i', $text)) {
+                            throw new \Exception  ('Line "'. $text .'" mustn\'t have any not-alphabet or not-numeric characters');
+            }
             
             return strlen (trim ($text)) > 0;
         });

engine/common/EngineInterfaces.php

Spacing +144 added lines, -146 removed lines

@@ -17,9 +17,9 @@ 
      * 
      */
 
-    public static function createObject ($objectName, $objectGroup = null, ...$args): int
+    public static function createObject($objectName, $objectGroup = null, ...$args): int
     {
-        return \VoidCore::createObject ($objectName, $objectGroup, ...$args);
+        return \VoidCore::createObject($objectName, $objectGroup, ...$args);
     }
 
     /**
@@ -34,9 +34,9 @@ 
      * 
      */
 
-    public static function removeObjects (int ...$selectors): void
+    public static function removeObjects(int ...$selectors): void
     {
-        \VoidCore::removeObjects (...$selectors);
+        \VoidCore::removeObjects(...$selectors);
     }
 
     /**
@@ -51,9 +51,9 @@ 
      * 
      */
 
-    public static function destructObject (int $selector): bool
+    public static function destructObject(int $selector): bool
     {
-        return \VoidCore::destructObject ($selector);
+        return \VoidCore::destructObject($selector);
     }
 
     /**
@@ -68,9 +68,9 @@ 
      * 
      */
 
-    public static function createClass ($className, $classGroup = null): int
+    public static function createClass($className, $classGroup = null): int
     {
-        return \VoidCore::getClass ($className, $classGroup);
+        return \VoidCore::getClass($className, $classGroup);
     }
 
     /**
@@ -83,9 +83,9 @@ 
      * 
      */
 
-    public static function createDelegate (string $type, string $code): int
+    public static function createDelegate(string $type, string $code): int
     {
-        return \VoidCore::createDelegate ($type, $code);
+        return \VoidCore::createDelegate($type, $code);
     }
 
     /**
@@ -102,9 +102,9 @@ 
      * 
      */
 
-    public static function objectExists (int $selector): bool
+    public static function objectExists(int $selector): bool
     {
-        return \VoidCore::objectExists ($selector);
+        return \VoidCore::objectExists($selector);
     }
 
     /**
@@ -117,9 +117,9 @@ 
     * 
     */
 
-    public static function objectType ($objectName, $objectGroup = null)
+    public static function objectType($objectName, $objectGroup = null)
     {
-        return \VoidCore::typeof ($objectName, $objectGroup);
+        return \VoidCore::typeof($objectName, $objectGroup);
     }
 
     /**
@@ -140,9 +140,9 @@ 
      * 
      */
 
-    public static function getProperty (int $selector, $propertyName)
+    public static function getProperty(int $selector, $propertyName)
     {
-        return \VoidCore::getProp ($selector, $propertyName);
+        return \VoidCore::getProp($selector, $propertyName);
     }
 
     /**
@@ -162,9 +162,9 @@ 
      * 
      */
 
-    public static function setProperty (int $selector, string $propertyName, $value): void
+    public static function setProperty(int $selector, string $propertyName, $value): void
     {
-        \VoidCore::setProp ($selector, $propertyName, $value);
+        \VoidCore::setProp($selector, $propertyName, $value);
     }
 
     /**
@@ -184,9 +184,9 @@ 
      * 
      */
 
-    public static function getField (int $selector, $fieldName)
+    public static function getField(int $selector, $fieldName)
     {
-        return \VoidCore::getField ($selector, $fieldName);
+        return \VoidCore::getField($selector, $fieldName);
     }
 
     /**
@@ -201,9 +201,9 @@ 
      * 
      */
 
-    public static function setField (int $selector, string $fieldName, $value): void
+    public static function setField(int $selector, string $fieldName, $value): void
     {
-        \VoidCore::setField ($selector, $fieldName, $value);
+        \VoidCore::setField($selector, $fieldName, $value);
     }
 
     /**
@@ -227,9 +227,9 @@ 
      * 
      */
 
-    public static function callMethod (int $selector, $methodName, ...$args)
+    public static function callMethod(int $selector, $methodName, ...$args)
     {
-        return \VoidCore::callMethod ($selector, $methodName, ...$args);
+        return \VoidCore::callMethod($selector, $methodName, ...$args);
     }
 
     /**
@@ -245,9 +245,9 @@ 
      * 
      */
 
-    public static function getArrayValue (int $selector, $index)
+    public static function getArrayValue(int $selector, $index)
     {
-        return \VoidCore::getArrayValue ($selector, $index);
+        return \VoidCore::getArrayValue($selector, $index);
     }
 
     /**
@@ -265,9 +265,9 @@ 
      * 
      */
 
-    public static function setArrayValue (int $selector, $index, $value): void
+    public static function setArrayValue(int $selector, $index, $value): void
     {
-        \VoidCore::setArrayValue ($selector, $index, $value);
+        \VoidCore::setArrayValue($selector, $index, $value);
     }
 
     /**
@@ -282,13 +282,13 @@ 
      * 
      */
 
-    public static function setObjectEvent (int $selector, string $eventName, string $code): void
+    public static function setObjectEvent(int $selector, string $eventName, string $code): void
     {
-        if (self::eventExists ($selector, $eventName))
-            self::removeObjectEvent ($selector, $eventName);
+        if (self::eventExists($selector, $eventName))
+            self::removeObjectEvent($selector, $eventName);
 
-        \VoidCore::setEvent ($selector, $eventName, $code);
-        Components::setComponentEvent ($selector, $eventName, $code);
+        \VoidCore::setEvent($selector, $eventName, $code);
+        Components::setComponentEvent($selector, $eventName, $code);
     }
 
     /**
@@ -306,9 +306,9 @@ 
      * 
      */
 
-    public static function eventExists (int $selector, string $eventName): bool
+    public static function eventExists(int $selector, string $eventName): bool
     {
-        return \VoidCore::eventExists ($selector, $eventName);
+        return \VoidCore::eventExists($selector, $eventName);
     }
 
     /**
@@ -325,10 +325,10 @@ 
      * 
      */
 
-    public static function removeObjectEvent (int $selector, string $eventName): void
+    public static function removeObjectEvent(int $selector, string $eventName): void
     {
-        \VoidCore::removeEvent ($selector, $eventName);
-        Components::removeComponentEvent ($selector, $eventName);
+        \VoidCore::removeEvent($selector, $eventName);
+        Components::removeComponentEvent($selector, $eventName);
     }
 
     /**
@@ -340,9 +340,9 @@ 
      * 
      */
 
-    public static function importObject (string $data): int
+    public static function importObject(string $data): int
     {
-        return \VoidCore::importObject ($data);
+        return \VoidCore::importObject($data);
     }
 
     /**
@@ -354,9 +354,9 @@ 
      * 
      */
 
-    public static function exportObject (int $selector): string
+    public static function exportObject(int $selector): string
     {
-        return \VoidCore::exportObject ($selector);
+        return \VoidCore::exportObject($selector);
     }
 
     /**
@@ -380,20 +380,20 @@ 
      * 
      */
 
-    public static function compile (string $savePath, string $iconPath, string $phpCode, string $productDescription = null, string $productName = null, string $productVersion = null, string $companyName = null, string $copyright = null, string $callSharpCode = '', string $declareSharpCode = '', WFObject $dictionary = null, WFObject $assemblies = null): array
+    public static function compile(string $savePath, string $iconPath, string $phpCode, string $productDescription = null, string $productName = null, string $productVersion = null, string $companyName = null, string $copyright = null, string $callSharpCode = '', string $declareSharpCode = '', WFObject $dictionary = null, WFObject $assemblies = null): array
     {
         if ($dictionary === null)
-            $dictionary = new WFObject ('System.Collections.Generic.Dictionary`2[System.String,System.String]', null);
+            $dictionary = new WFObject('System.Collections.Generic.Dictionary`2[System.String,System.String]', null);
 
         if ($assemblies === null)
-            $assemblies = getNetArray ('System.String', [
+            $assemblies = getNetArray('System.String', [
                 // CORE_DIR .'/CefSharp.dll',
-                CORE_DIR .'/FastColoredTextBox.dll',
-                CORE_DIR .'/ScintillaNET.dll'
+                CORE_DIR.'/FastColoredTextBox.dll',
+                CORE_DIR.'/ScintillaNET.dll'
             ]);
 
         if ($productName === null)
-            $productName = basenameNoExt ($savePath);
+            $productName = basenameNoExt($savePath);
 
         if ($productDescription === null)
             $productDescription = $productName;
@@ -405,19 +405,19 @@ 
             $companyName = 'Company N';
 
         if ($copyright === null)
-            $copyright = $companyName .' copyright (c) '. date ('Y');
+            $copyright = $companyName.' copyright (c) '.date('Y');
 
-        return (new WFClass ('WinForms_PHP.WFCompiler', null))->compile ($savePath, $iconPath, $phpCode, $productDescription, $productName, $productVersion, $companyName, $copyright, $callSharpCode, $declareSharpCode, $dictionary, $assemblies)->names;
+        return (new WFClass('WinForms_PHP.WFCompiler', null))->compile($savePath, $iconPath, $phpCode, $productDescription, $productName, $productVersion, $companyName, $copyright, $callSharpCode, $declareSharpCode, $dictionary, $assemblies)->names;
     }
 }
 
 class EngineAdditions
 {
-    public static function loadModule (string $path): bool
+    public static function loadModule(string $path): bool
     {
         try
         {
-            (new WFClass ('System.Reflection.Assembly', 'mscorlib'))->loadFrom ($path);
+            (new WFClass('System.Reflection.Assembly', 'mscorlib'))->loadFrom($path);
         }
 
         catch (\Throwable $e)
@@ -428,16 +428,16 @@ 
         return true;
     }
 
-    public static function getProperty (int $selector, string $name): array
+    public static function getProperty(int $selector, string $name): array
     {
-        $property = VoidEngine::callMethod (VoidEngine::callMethod ($selector, 'GetType'), 'GetProperty', $name);
+        $property = VoidEngine::callMethod(VoidEngine::callMethod($selector, 'GetType'), 'GetProperty', $name);
 
-        if (!is_int ($property))
+        if (!is_int($property))
             return false;
 
         try
         {
-            $propertyType = VoidEngine::getProperty ($property, ['PropertyType', 'string']);
+            $propertyType = VoidEngine::getProperty($property, ['PropertyType', 'string']);
 
             switch ($propertyType)
             {
@@ -473,7 +473,7 @@ 
                 default:
                     try
                     {
-                        VoidEngine::getProperty ($selector, [$name, 'int']);
+                        VoidEngine::getProperty($selector, [$name, 'int']);
 
                         $property = 'int';
                     }
@@ -482,7 +482,7 @@ 
                     {
                         return [
                             'type'  => 'vrsf',
-                            'value' => VoidEngine::exportObject (VoidEngine::getProperty ($selector, [$name, 'object']))
+                            'value' => VoidEngine::exportObject(VoidEngine::getProperty($selector, [$name, 'object']))
                         ];
                     }
                 break;
@@ -496,30 +496,30 @@ 
 
         return [
             'type'  => $property,
-            'value' => VoidEngine::getProperty ($selector, [$name, $property])
+            'value' => VoidEngine::getProperty($selector, [$name, $property])
         ];
     }
 
-    public static function getObjectEvents (int $object): array
+    public static function getObjectEvents(int $object): array
     {
         $events = [];
 
-        $props = VoidEngine::callMethod (VoidEngine::callMethod ($object, 'GetType'), 'GetEvents');
-        $len   = VoidEngine::getProperty ($props, 'Length');
+        $props = VoidEngine::callMethod(VoidEngine::callMethod($object, 'GetType'), 'GetEvents');
+        $len   = VoidEngine::getProperty($props, 'Length');
 
         for ($i = 0; $i < $len; ++$i)
-            $events[] = VoidEngine::getProperty (VoidEngine::getArrayValue ($props, $i), 'Name');
+            $events[] = VoidEngine::getProperty(VoidEngine::getArrayValue($props, $i), 'Name');
 
         return $events;
     }
 
-    public static function coupleSelector ($value, int $selfSelector = null)
+    public static function coupleSelector($value, int $selfSelector = null)
     {
-        return is_int ($value) && VoidEngine::objectExists ($value) && $value != $selfSelector ?
-            new WFObject ($value) : $value;
+        return is_int($value) && VoidEngine::objectExists($value) && $value != $selfSelector ?
+            new WFObject($value) : $value;
     }
 
-    public static function uncoupleSelector ($value)
+    public static function uncoupleSelector($value)
     {
         return $value instanceof WFObject ?
             $value->selector : $value;
@@ -531,44 +531,44 @@ 
     protected $selector;
     protected $name;
 
-    public function __construct ($object, ?string $classGroup = 'auto', ...$args)
+    public function __construct($object, ?string $classGroup = 'auto', ...$args)
     {
         foreach ($args as $id => $arg)
-            $args[$id] = ngineAdditions::uncoupleSelector ($arg);
+            $args[$id] = ngineAdditions::uncoupleSelector($arg);
 
-        if (is_string ($object))
-            $this->selector = VoidEngine::createObject ($object, $classGroup == 'auto' ?
-                substr ($object, 0, strrpos ($object, '.')) : $classGroup, ...$args);
+        if (is_string($object))
+            $this->selector = VoidEngine::createObject($object, $classGroup == 'auto' ?
+                substr ($object, 0, strrpos($object, '.')) : $classGroup, ...$args);
 
-        elseif (is_int ($object) && VoidEngine::objectExists ($object))
+        elseif (is_int($object) && VoidEngine::objectExists($object))
             $this->selector = $object;
 
-        else throw new \Exception ('$object parameter must be string or object selector');
+        else throw new \Exception('$object parameter must be string or object selector');
     }
     
-    public function __get ($name)
+    public function __get($name)
 	{
-        if (method_exists ($this, $method = "get_$name"))
-            $value = $this->$method ();
+        if (method_exists($this, $method = "get_$name"))
+            $value = $this->$method();
 
-        elseif (substr ($name, -5) == 'Event')
-            $value = Events::getObjectEvent ($this->selector, substr ($name, 0, -5));
+        elseif (substr($name, -5) == 'Event')
+            $value = Events::getObjectEvent($this->selector, substr($name, 0, -5));
 
-        elseif (property_exists ($this, $name))
+        elseif (property_exists($this, $name))
             $value = $this->$name;
 
-        else switch (strtolower ($name))
+        else switch (strtolower($name))
         {
             case 'count':
             case 'length':
                 try
                 {
-                    return $this->getProperty ('Count');
+                    return $this->getProperty('Count');
                 }
 
                 catch (\Throwable $e)
                 {
-                    return $this->getProperty ('Length');
+                    return $this->getProperty('Length');
                 }
             break;
 
@@ -577,7 +577,7 @@ 
                 $list = [];
                 
 				for ($i = 0; $i < $size; ++$i)
-                    $list[] = EngineAdditions::coupleSelector (VoidEngine::getArrayValue ($this->selector, $i));
+                    $list[] = EngineAdditions::coupleSelector(VoidEngine::getArrayValue($this->selector, $i));
                 
                 return $list;
             break;
@@ -589,31 +589,31 @@ 
                 for ($i = 0; $i < $size; ++$i)
                     try
                     {
-                        $names[] = VoidEngine::getProperty (VoidEngine::getArrayValue ($this->selector, [$i, 'object']), 'Text');
+                        $names[] = VoidEngine::getProperty(VoidEngine::getArrayValue($this->selector, [$i, 'object']), 'Text');
                     }
 
                     catch (\Throwable $e)
                     {
-                        $names[] = VoidEngine::getArrayValue ($this->selector, [$i, 'string']);
+                        $names[] = VoidEngine::getArrayValue($this->selector, [$i, 'string']);
                     }
                 
                 return $names;
             break;
 
             default:
-                $value = $this->getProperty ($name);
+                $value = $this->getProperty($name);
             break;
         }
 
-        return EngineAdditions::coupleSelector ($value, $this->selector);
+        return EngineAdditions::coupleSelector($value, $this->selector);
 	}
 	
-	public function __set ($name, $value)
+	public function __set($name, $value)
 	{
-        if (method_exists ($this, $method = "set_$name"))
+        if (method_exists($this, $method = "set_$name"))
             try
             {
-                return $this->$method ($value);
+                return $this->$method($value);
             }
 
             # Метод "set_$name" может принимать в качестве параметра объект WFObject
@@ -622,63 +622,61 @@ 
             catch (\Throwable $e)
             {
                 return $value instanceof WFObject ?
-                    $this->$method ($value->selector) : null;
+                    $this->$method($value->selector) : null;
             }
 
-        elseif (substr ($name, -5) == 'Event')
-            Events::setObjectEvent ($this->selector, substr ($name, 0, -5), $value);
+        elseif (substr($name, -5) == 'Event')
+            Events::setObjectEvent($this->selector, substr($name, 0, -5), $value);
         
-        else $this->setProperty ($name, EngineAdditions::uncoupleSelector ($value));
+        else $this->setProperty($name, EngineAdditions::uncoupleSelector($value));
     }
 	
-	public function __call ($method, $args)
+	public function __call($method, $args)
 	{
-        $args = array_map (function ($arg)
+        $args = array_map(function($arg)
         {
-            return EngineAdditions::uncoupleSelector ($arg);
+            return EngineAdditions::uncoupleSelector($arg);
         }, $args);
 
-        return EngineAdditions::coupleSelector ($this->callMethod ($method, ...$args), $this->selector);
+        return EngineAdditions::coupleSelector($this->callMethod($method, ...$args), $this->selector);
     }
 
-    public function addRange (array $values, $assoc = false): void
+    public function addRange(array $values, $assoc = false): void
     {
         foreach ($values as $id => $value)
-            $this->offsetSet ($assoc ? $id : null, $value);
+            $this->offsetSet($assoc ? $id : null, $value);
     }
     
-    public function offsetSet ($index, $value)
+    public function offsetSet($index, $value)
 	{
         try
         {
             return $index === null ?
-                $this->callMethod ('Add', EngineAdditions::uncoupleSelector ($value)) :
-                $this->callMethod ('Insert', $index, EngineAdditions::uncoupleSelector ($value));
+                $this->callMethod('Add', EngineAdditions::uncoupleSelector($value)) : $this->callMethod('Insert', $index, EngineAdditions::uncoupleSelector($value));
         }
 
         catch (\Throwable $e)
         {
             return $index === null ?
-                VoidEngine::setArrayValue ($this->selector, $this->count, $value) :
-                VoidEngine::setArrayValue ($this->selector, $index, $value);
+                VoidEngine::setArrayValue($this->selector, $this->count, $value) : VoidEngine::setArrayValue($this->selector, $index, $value);
         }
     }
 	
-	public function offsetGet ($index)
+	public function offsetGet($index)
 	{
-		return EngineAdditions::coupleSelector (VoidEngine::getArrayValue ($this->selector, $index), $this->selector);
+		return EngineAdditions::coupleSelector(VoidEngine::getArrayValue($this->selector, $index), $this->selector);
     }
 	
-	public function offsetUnset ($index): void
+	public function offsetUnset($index): void
 	{
-		$this->callMethod ('RemoveAt', $index);
+		$this->callMethod('RemoveAt', $index);
     }
     
-    public function offsetExists ($index): bool
+    public function offsetExists($index): bool
     {
         try
         {
-            $this->offsetGet ($index);
+            $this->offsetGet($index);
         }
 
         catch (\Exception $e)
@@ -689,19 +687,19 @@ 
         return true;
     }
 	
-	public function indexOf ($value): int
+	public function indexOf($value): int
 	{
-		return $this->callMethod ('IndexOf', EngineAdditions::uncoupleSelector ($value));
+		return $this->callMethod('IndexOf', EngineAdditions::uncoupleSelector($value));
     }
     
-    public function lastIndexOf ($value): int
+    public function lastIndexOf($value): int
 	{
-		return $this->callMethod ('LastIndexOf', EngineAdditions::uncoupleSelector ($value));
+		return $this->callMethod('LastIndexOf', EngineAdditions::uncoupleSelector($value));
 	}
 	
-	public function contains ($value): bool
+	public function contains($value): bool
 	{
-		return $this->callMethod ('Contains', EngineAdditions::uncoupleSelector ($value));
+		return $this->callMethod('Contains', EngineAdditions::uncoupleSelector($value));
     }
 
     public function foreach (\Closure $callback, string $type = null): void
@@ -709,71 +707,71 @@ 
         $size = $this->count;
 
         for ($i = 0; $i < $size; ++$i)
-            $callback (EngineAdditions::coupleSelector (VoidEngine::getArrayValue ($this->selector, $type !== null ? [$i, $type] : $i), $this->selector), $i);
+            $callback(EngineAdditions::coupleSelector(VoidEngine::getArrayValue($this->selector, $type !== null ? [$i, $type] : $i), $this->selector), $i);
     }
 
-    public function where (\Closure $comparator, string $type = null): array
+    public function where(\Closure $comparator, string $type = null): array
     {
         $size   = $this->count;
         $return = [];
 
         for ($i = 0; $i < $size; ++$i)
-            if ($comparator ($value = EngineAdditions::coupleSelector (VoidEngine::getArrayValue ($this->selector, $type !== null ? [$i, $type] : $i), $this->selector), $i))
+            if ($comparator($value = EngineAdditions::coupleSelector(VoidEngine::getArrayValue($this->selector, $type !== null ? [$i, $type] : $i), $this->selector), $i))
                 $return[] = $value;
 
         return $return;
     }
 	
-    protected function getProperty ($name)
+    protected function getProperty($name)
     {
         try
         {
-            return VoidEngine::getProperty ($this->selector, $name);
+            return VoidEngine::getProperty($this->selector, $name);
         }
 
         catch (\Throwable $e)
         {
-            return VoidEngine::getField ($this->selector, $name);
+            return VoidEngine::getField($this->selector, $name);
         }
     }
 
-    protected function setProperty ($name, $value)
+    protected function setProperty($name, $value)
     {
         try
         {
-            VoidEngine::setProperty ($this->selector, $name, $value);
+            VoidEngine::setProperty($this->selector, $name, $value);
         }
 
         catch (\Throwable $e)
         {
-            VoidEngine::setField ($this->selector, $name, $value);
+            VoidEngine::setField($this->selector, $name, $value);
         }
     }
 	
-    protected function callMethod ($method, ...$args)
+    protected function callMethod($method, ...$args)
     {
-        return VoidEngine::callMethod ($this->selector, $method, ...$args);
+        return VoidEngine::callMethod($this->selector, $method, ...$args);
     }
 	
-	protected function getArrayProperty ($name, string $type = null)
+	protected function getArrayProperty($name, string $type = null)
 	{
-        $array  = $this->getProperty ($name);
-        $size   = VoidEngine::getProperty ($array, 'Length');
+        $array  = $this->getProperty($name);
+        $size   = VoidEngine::getProperty($array, 'Length');
         $return = [];
 
 		for ($i = 0; $i < $size; ++$i)
-            $return[] = VoidEngine::getArrayValue ($array, $type === null ? $i : [$i, $type]);
+            $return[] = VoidEngine::getArrayValue($array, $type === null ? $i : [$i, $type]);
         
-        VoidEngine::removeObjects ($array);
+        VoidEngine::removeObjects($array);
         
 		return $return;
     }
 
-    public function get_name ()
+    public function get_name()
 	{
 		try
 		{
-			return $this->getProperty ('Name');
+			return $this->getProperty('Name');
         }
         
 		catch (\Throwable $e)
@@ -782,11 +780,11 @@ 
 		}
 	}
 	
-	public function set_name (string $name)
+	public function set_name(string $name)
 	{
 		try
 		{
-			$this->setProperty ('Name', $name);
+			$this->setProperty('Name', $name);
         }
         
 		catch (\Throwable $e)
@@ -795,9 +793,9 @@ 
 		}
 	}
 
-    public function __toString (): string
+    public function __toString(): string
     {
-        return $this->callMethod ('ToString');
+        return $this->callMethod('ToString');
     }
 }
 
@@ -805,16 +803,16 @@ 
 {
     protected $selector;
 
-    public function __construct ($class, ?string $classGroup = 'auto')
+    public function __construct($class, ?string $classGroup = 'auto')
     {
-        if (is_string ($class))
-            $this->selector = VoidEngine::createClass ($class, $classGroup == 'auto' ?
-                substr ($class, 0, strrpos ($class, '.')) : $classGroup
+        if (is_string($class))
+            $this->selector = VoidEngine::createClass($class, $classGroup == 'auto' ?
+                substr ($class, 0, strrpos($class, '.')) : $classGroup
             );
 
-        elseif (is_int ($class) && VoidEngine::objectExists ($class))
+        elseif (is_int($class) && VoidEngine::objectExists($class))
             $this->selector = $class;
 
-        else throw new \Exception ('$class parameter must be string or class selector');
+        else throw new \Exception('$class parameter must be string or class selector');
     }
 }

Braces +93 added lines, -99 removed lines

@@ -284,8 +284,9 @@ 
 
     public static function setObjectEvent (int $selector, string $eventName, string $code): void
     {
-        if (self::eventExists ($selector, $eventName))
-            self::removeObjectEvent ($selector, $eventName);
+        if (self::eventExists ($selector, $eventName)) {
+                    self::removeObjectEvent ($selector, $eventName);
+        }
 
         \VoidCore::setEvent ($selector, $eventName, $code);
         Components::setComponentEvent ($selector, $eventName, $code);
@@ -382,30 +383,37 @@ 
 
     public static function compile (string $savePath, string $iconPath, string $phpCode, string $productDescription = null, string $productName = null, string $productVersion = null, string $companyName = null, string $copyright = null, string $callSharpCode = '', string $declareSharpCode = '', WFObject $dictionary = null, WFObject $assemblies = null): array
     {
-        if ($dictionary === null)
-            $dictionary = new WFObject ('System.Collections.Generic.Dictionary`2[System.String,System.String]', null);
+        if ($dictionary === null) {
+                    $dictionary = new WFObject ('System.Collections.Generic.Dictionary`2[System.String,System.String]', null);
+        }
 
-        if ($assemblies === null)
-            $assemblies = getNetArray ('System.String', [
+        if ($assemblies === null) {
+                    $assemblies = getNetArray ('System.String', [
                 // CORE_DIR .'/CefSharp.dll',
                 CORE_DIR .'/FastColoredTextBox.dll',
                 CORE_DIR .'/ScintillaNET.dll'
             ]);
+        }
 
-        if ($productName === null)
-            $productName = basenameNoExt ($savePath);
+        if ($productName === null) {
+                    $productName = basenameNoExt ($savePath);
+        }
 
-        if ($productDescription === null)
-            $productDescription = $productName;
+        if ($productDescription === null) {
+                    $productDescription = $productName;
+        }
 
-        if ($productVersion === null)
-            $productVersion = '1.0';
+        if ($productVersion === null) {
+                    $productVersion = '1.0';
+        }
 
-        if ($companyName === null)
-            $companyName = 'Company N';
+        if ($companyName === null) {
+                    $companyName = 'Company N';
+        }
 
-        if ($copyright === null)
-            $copyright = $companyName .' copyright (c) '. date ('Y');
+        if ($copyright === null) {
+                    $copyright = $companyName .' copyright (c) '. date ('Y');
+        }
 
         return (new WFClass ('WinForms_PHP.WFCompiler', null))->compile ($savePath, $iconPath, $phpCode, $productDescription, $productName, $productVersion, $companyName, $copyright, $callSharpCode, $declareSharpCode, $dictionary, $assemblies)->names;
     }
@@ -418,9 +426,7 @@ 
         try
         {
             (new WFClass ('System.Reflection.Assembly', 'mscorlib'))->loadFrom ($path);
-        }
-
-        catch (\Throwable $e)
+        } catch (\Throwable $e)
         {
             return false;
         }
@@ -432,8 +438,9 @@ 
     {
         $property = VoidEngine::callMethod (VoidEngine::callMethod ($selector, 'GetType'), 'GetProperty', $name);
 
-        if (!is_int ($property))
-            return false;
+        if (!is_int ($property)) {
+                    return false;
+        }
 
         try
         {
@@ -476,9 +483,7 @@ 
                         VoidEngine::getProperty ($selector, [$name, 'int']);
 
                         $property = 'int';
-                    }
-
-                    catch (\Throwable $e)
+                    } catch (\Throwable $e)
                     {
                         return [
                             'type'  => 'vrsf',
@@ -487,9 +492,7 @@ 
                     }
                 break;
             }
-        }
-
-        catch (\Throwable $e)
+        } catch (\Throwable $e)
         {
             $property = 'object';
         }
@@ -507,8 +510,9 @@ 
         $props = VoidEngine::callMethod (VoidEngine::callMethod ($object, 'GetType'), 'GetEvents');
         $len   = VoidEngine::getProperty ($props, 'Length');
 
-        for ($i = 0; $i < $len; ++$i)
-            $events[] = VoidEngine::getProperty (VoidEngine::getArrayValue ($props, $i), 'Name');
+        for ($i = 0; $i < $len; ++$i) {
+                    $events[] = VoidEngine::getProperty (VoidEngine::getArrayValue ($props, $i), 'Name');
+        }
 
         return $events;
     }
@@ -533,40 +537,38 @@ 
 
     public function __construct ($object, ?string $classGroup = 'auto', ...$args)
     {
-        foreach ($args as $id => $arg)
-            $args[$id] = ngineAdditions::uncoupleSelector ($arg);
+        foreach ($args as $id => $arg) {
+                    $args[$id] = ngineAdditions::uncoupleSelector ($arg);
+        }
 
-        if (is_string ($object))
-            $this->selector = VoidEngine::createObject ($object, $classGroup == 'auto' ?
+        if (is_string ($object)) {
+                    $this->selector = VoidEngine::createObject ($object, $classGroup == 'auto' ?
                 substr ($object, 0, strrpos ($object, '.')) : $classGroup, ...$args);
-
-        elseif (is_int ($object) && VoidEngine::objectExists ($object))
-            $this->selector = $object;
-
-        else throw new \Exception ('$object parameter must be string or object selector');
+        } elseif (is_int ($object) && VoidEngine::objectExists ($object)) {
+                    $this->selector = $object;
+        } else {
+            throw new \Exception ('$object parameter must be string or object selector');
+        }
     }
     
     public function __get ($name)
 	{
-        if (method_exists ($this, $method = "get_$name"))
-            $value = $this->$method ();
-
-        elseif (substr ($name, -5) == 'Event')
-            $value = Events::getObjectEvent ($this->selector, substr ($name, 0, -5));
-
-        elseif (property_exists ($this, $name))
-            $value = $this->$name;
-
-        else switch (strtolower ($name))
+        if (method_exists ($this, $method = "get_$name")) {
+                    $value = $this->$method ();
+        } elseif (substr ($name, -5) == 'Event') {
+                    $value = Events::getObjectEvent ($this->selector, substr ($name, 0, -5));
+        } elseif (property_exists ($this, $name)) {
+                    $value = $this->$name;
+        } else {
+            switch (strtolower ($name))
         {
             case 'count':
             case 'length':
                 try
                 {
                     return $this->getProperty ('Count');
-                }
-
-                catch (\Throwable $e)
+        }
+                } catch (\Throwable $e)
                 {
                     return $this->getProperty ('Length');
                 }
@@ -576,8 +578,9 @@ 
                 $size = $this->count;
                 $list = [];
                 
-				for ($i = 0; $i < $size; ++$i)
-                    $list[] = EngineAdditions::coupleSelector (VoidEngine::getArrayValue ($this->selector, $i));
+				for ($i = 0; $i < $size; ++$i) {
+				                    $list[] = EngineAdditions::coupleSelector (VoidEngine::getArrayValue ($this->selector, $i));
+				}
                 
                 return $list;
             break;
@@ -586,13 +589,12 @@ 
                 $size = $this->count;
                 $names = [];
                 
-                for ($i = 0; $i < $size; ++$i)
-                    try
+                for ($i = 0; $i < $size; ++$i) {
+                                    try
                     {
                         $names[] = VoidEngine::getProperty (VoidEngine::getArrayValue ($this->selector, [$i, 'object']), 'Text');
-                    }
-
-                    catch (\Throwable $e)
+                }
+                    } catch (\Throwable $e)
                     {
                         $names[] = VoidEngine::getArrayValue ($this->selector, [$i, 'string']);
                     }
@@ -610,10 +612,11 @@ 
 	
 	public function __set ($name, $value)
 	{
-        if (method_exists ($this, $method = "set_$name"))
-            try
+        if (method_exists ($this, $method = "set_$name")) {
+                    try
             {
                 return $this->$method ($value);
+        }
             }
 
             # Метод "set_$name" может принимать в качестве параметра объект WFObject
@@ -623,12 +626,11 @@ 
             {
                 return $value instanceof WFObject ?
                     $this->$method ($value->selector) : null;
-            }
-
-        elseif (substr ($name, -5) == 'Event')
-            Events::setObjectEvent ($this->selector, substr ($name, 0, -5), $value);
-        
-        else $this->setProperty ($name, EngineAdditions::uncoupleSelector ($value));
+            } elseif (substr ($name, -5) == 'Event') {
+                    Events::setObjectEvent ($this->selector, substr ($name, 0, -5), $value);
+        } else {
+            $this->setProperty ($name, EngineAdditions::uncoupleSelector ($value));
+        }
     }
 	
 	public function __call ($method, $args)
@@ -643,8 +645,9 @@ 
 
     public function addRange (array $values, $assoc = false): void
     {
-        foreach ($values as $id => $value)
-            $this->offsetSet ($assoc ? $id : null, $value);
+        foreach ($values as $id => $value) {
+                    $this->offsetSet ($assoc ? $id : null, $value);
+        }
     }
     
     public function offsetSet ($index, $value)
@@ -654,9 +657,7 @@ 
             return $index === null ?
                 $this->callMethod ('Add', EngineAdditions::uncoupleSelector ($value)) :
                 $this->callMethod ('Insert', $index, EngineAdditions::uncoupleSelector ($value));
-        }
-
-        catch (\Throwable $e)
+        } catch (\Throwable $e)
         {
             return $index === null ?
                 VoidEngine::setArrayValue ($this->selector, $this->count, $value) :
@@ -679,9 +680,7 @@ 
         try
         {
             $this->offsetGet ($index);
-        }
-
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             return false;
         }
@@ -708,8 +707,9 @@ 
     {
         $size = $this->count;
 
-        for ($i = 0; $i < $size; ++$i)
-            $callback (EngineAdditions::coupleSelector (VoidEngine::getArrayValue ($this->selector, $type !== null ? [$i, $type] : $i), $this->selector), $i);
+        for ($i = 0; $i < $size; ++$i) {
+                    $callback (EngineAdditions::coupleSelector (VoidEngine::getArrayValue ($this->selector, $type !== null ? [$i, $type] : $i), $this->selector), $i);
+        }
     }
 
     public function where (\Closure $comparator, string $type = null): array
@@ -717,9 +717,10 @@ 
         $size   = $this->count;
         $return = [];
 
-        for ($i = 0; $i < $size; ++$i)
-            if ($comparator ($value = EngineAdditions::coupleSelector (VoidEngine::getArrayValue ($this->selector, $type !== null ? [$i, $type] : $i), $this->selector), $i))
+        for ($i = 0; $i < $size; ++$i) {
+                    if ($comparator ($value = EngineAdditions::coupleSelector (VoidEngine::getArrayValue ($this->selector, $type !== null ? [$i, $type] : $i), $this->selector), $i))
                 $return[] = $value;
+        }
 
         return $return;
     }
@@ -729,9 +730,7 @@ 
         try
         {
             return VoidEngine::getProperty ($this->selector, $name);
-        }
-
-        catch (\Throwable $e)
+        } catch (\Throwable $e)
         {
             return VoidEngine::getField ($this->selector, $name);
         }
@@ -742,9 +741,7 @@ 
         try
         {
             VoidEngine::setProperty ($this->selector, $name, $value);
-        }
-
-        catch (\Throwable $e)
+        } catch (\Throwable $e)
         {
             VoidEngine::setField ($this->selector, $name, $value);
         }
@@ -761,8 +758,9 @@ 
         $size   = VoidEngine::getProperty ($array, 'Length');
         $return = [];
 
-		for ($i = 0; $i < $size; ++$i)
-            $return[] = VoidEngine::getArrayValue ($array, $type === null ? $i : [$i, $type]);
+		for ($i = 0; $i < $size; ++$i) {
+		            $return[] = VoidEngine::getArrayValue ($array, $type === null ? $i : [$i, $type]);
+		}
         
         VoidEngine::removeObjects ($array);
         
@@ -774,9 +772,7 @@ 
 		try
 		{
 			return $this->getProperty ('Name');
-        }
-        
-		catch (\Throwable $e)
+        } catch (\Throwable $e)
 		{
 			return $this->name;
 		}
@@ -787,9 +783,7 @@ 
 		try
 		{
 			$this->setProperty ('Name', $name);
-        }
-        
-		catch (\Throwable $e)
+        } catch (\Throwable $e)
 		{
 			$this->name = $name;
 		}
@@ -807,14 +801,14 @@ 
 
     public function __construct ($class, ?string $classGroup = 'auto')
     {
-        if (is_string ($class))
-            $this->selector = VoidEngine::createClass ($class, $classGroup == 'auto' ?
+        if (is_string ($class)) {
+                    $this->selector = VoidEngine::createClass ($class, $classGroup == 'auto' ?
                 substr ($class, 0, strrpos ($class, '.')) : $classGroup
             );
-
-        elseif (is_int ($class) && VoidEngine::objectExists ($class))
-            $this->selector = $class;
-
-        else throw new \Exception ('$class parameter must be string or class selector');
+        } elseif (is_int ($class) && VoidEngine::objectExists ($class)) {
+                    $this->selector = $class;
+        } else {
+            throw new \Exception ('$class parameter must be string or class selector');
+        }
     }
 }

engine/common/Others.php

Indentation +9 added lines, -9 removed lines

@@ -47,7 +47,7 @@ 
     {
         return [
             'text' => $e->getMessage (), 
-			'line' => $e->getLine ()
+            'line' => $e->getLine ()
         ];
     }
 
@@ -165,17 +165,17 @@ 
 
 function substr_icount (string $haystack, string $needle, ...$params): int
 {
-	return substr_count (strtolower ($haystack), strtolower ($needle), ...$params);
+    return substr_count (strtolower ($haystack), strtolower ($needle), ...$params);
 }
 
 function str_replace_assoc (string $subject, array $replacements): string
 {
-	return str_replace (array_keys ($replacements), array_values ($replacements), $subject);
+    return str_replace (array_keys ($replacements), array_values ($replacements), $subject);
 }
 
 function pre (...$args): void
 {
-	message (sizeof ($args) < 2 ? current ($args) : $args);
+    message (sizeof ($args) < 2 ? current ($args) : $args);
 }
 
 function messageBox (string $message, string $caption = '', ...$args)
@@ -333,9 +333,9 @@ 
                     }
 
                     catch (\Throwable $e)
-					{
-						continue;
-					}
+                    {
+                        continue;
+                    }
 
                 return false;
             }
@@ -358,7 +358,7 @@ 
         call_user_func ($function, $self);
     };
     
-	$timer->start ();
+    $timer->start ();
     
     return $timer;
 }
@@ -378,7 +378,7 @@ 
     
     $timer->start ();
     
-	return $timer;
+    return $timer;
 }
 
 class Clipboard

Spacing +133 added lines, -134 removed lines

@@ -2,7 +2,7 @@ 
 
 namespace VoidEngine;
 
-function err_status (bool $status = null): bool
+function err_status(bool $status = null): bool
 {
     $oldStatus = $GLOBALS['error_status'];
 
@@ -12,175 +12,175 @@ 
     return $oldStatus;
 }
 
-function err_no (): bool
+function err_no(): bool
 {
-    return err_status (false);
+    return err_status(false);
 }
 
-function err_yes (): bool
+function err_yes(): bool
 {
-    return err_status (true);
+    return err_status(true);
 }
 
-function run (string $path, ...$args)
+function run(string $path, ...$args)
 {
-    return (new Process)->start ($path, ...$args);
+    return (new Process)->start($path, ...$args);
 }
 
-function vbs_exec (string $code)
+function vbs_exec(string $code)
 {
-    file_put_contents ($path = getenv ('temp') .'/'. crc32 ($code) .'.vbs', $code);
+    file_put_contents($path = getenv('temp').'/'.crc32($code).'.vbs', $code);
 
-    (new \COM ('WScript.Shell'))->Run ($path, 0, true);
+    (new \COM('WScript.Shell'))->Run($path, 0, true);
 
-    unlink ($path);
+    unlink($path);
 }
 
-function php_errors_check (string $code): ?array
+function php_errors_check(string $code): ?array
 {
     try
     {
-        eval ('return; '. $code);
+        eval ('return; '.$code);
     }
 
     catch (\Throwable $e)
     {
         return [
-            'text' => $e->getMessage (), 
-			'line' => $e->getLine ()
+            'text' => $e->getMessage(), 
+			'line' => $e->getLine()
         ];
     }
 
     return null;
 }
 
-function enum (string $name): array
+function enum(string $name): array
 {
     return [
-        substr ($name, strrpos ($name, '.') + 1),
-        ($name = substr ($name, 0, strrpos ($name, '.'))) .', '. substr ($name, 0, strrpos ($name, '.'))
+        substr($name, strrpos($name, '.') + 1),
+        ($name = substr($name, 0, strrpos($name, '.'))).', '.substr($name, 0, strrpos($name, '.'))
     ];
 }
 
-function getNetArray (string $type, array $items = []): WFObject
+function getNetArray(string $type, array $items = []): WFObject
 {
-    $array = (new WFClass ('System.Array', null))
-        ->createInstance (VoidEngine::objectType ($type), $size = sizeof ($items));
+    $array = (new WFClass('System.Array', null))
+        ->createInstance(VoidEngine::objectType($type), $size = sizeof($items));
 
     for ($i = 0; $i < $size; ++$i)
-        $array[$i] = array_shift ($items);
+        $array[$i] = array_shift($items);
     
     return $array;
 }
 
-function dir_create (string $path, int $mode = 0777): void
+function dir_create(string $path, int $mode = 0777): void
 {
-    if (!is_dir ($path))
-        mkdir ($path, $mode, true);
+    if (!is_dir($path))
+        mkdir($path, $mode, true);
 }
 
-function dir_delete (string $path): bool
+function dir_delete(string $path): bool
 {
-    if (!is_dir ($path))
+    if (!is_dir($path))
         return false;
 
-    foreach (array_slice (scandir ($path), 2) as $file)
-        if (is_dir ($file = $path .'/'. $file))
+    foreach (array_slice(scandir($path), 2) as $file)
+        if (is_dir($file = $path.'/'.$file))
         {
-            dir_delete ($file);
+            dir_delete($file);
 
-            if (is_dir ($file))
-                rmdir ($file);
+            if (is_dir($file))
+                rmdir($file);
         }
 
-        else unlink ($file);
+        else unlink($file);
 
-    rmdir ($path);
+    rmdir($path);
 
     return true;
 }
 
-function dir_clean (string $path): void
+function dir_clean(string $path): void
 {
-    dir_delete ($path);
-    dir_create ($path);
+    dir_delete($path);
+    dir_create($path);
 }
 
-function dir_copy (string $from, string $to): bool
+function dir_copy(string $from, string $to): bool
 {
-    if (!is_dir ($from))
+    if (!is_dir($from))
         return false;
 
-    if (!is_dir ($to))
-        dir_create ($to);
+    if (!is_dir($to))
+        dir_create($to);
 
-    foreach (array_slice (scandir ($from), 2) as $file)
-        if (is_dir ($f = $from .'/'. $file))
-            dir_copy ($f, $to .'/'. $file);
+    foreach (array_slice(scandir($from), 2) as $file)
+        if (is_dir($f = $from.'/'.$file))
+            dir_copy($f, $to.'/'.$file);
 
-        else copy ($f, $to .'/'. $file);
+        else copy($f, $to.'/'.$file);
 
     return true;
 }
 
-function getARGBColor (string $color)
+function getARGBColor(string $color)
 {
-    return (new WFClass ('System.Drawing.ColorTranslator'))->fromHtml ($color);
+    return (new WFClass('System.Drawing.ColorTranslator'))->fromHtml($color);
 }
 
-function replaceSl (string $string): string
+function replaceSl(string $string): string
 {
-    return str_replace ('\\', '/', $string);
+    return str_replace('\\', '/', $string);
 }
 
-function replaceSr (string $string): string
+function replaceSr(string $string): string
 {
-    return str_replace ('/', '\\', $string);
+    return str_replace('/', '\\', $string);
 }
 
-function basenameNoExt (string $path): string
+function basenameNoExt(string $path): string
 {
-    return pathinfo ($path, PATHINFO_FILENAME);
+    return pathinfo($path, PATHINFO_FILENAME);
 }
 
-function file_ext (string $path): string
+function file_ext(string $path): string
 {
-    return strtolower (pathinfo ($path, PATHINFO_EXTENSION));
+    return strtolower(pathinfo($path, PATHINFO_EXTENSION));
 }
 
-function filepathNoExt (string $path): string
+function filepathNoExt(string $path): string
 {
-    return dirname ($path) .'/'. basenameNoExt ($path);
+    return dirname($path).'/'.basenameNoExt($path);
 }
 
-function array_first (array $array)
+function array_first(array $array)
 {
-    return array_shift ($array);
+    return array_shift($array);
 }
 
-function array_end (array $array)
+function array_end(array $array)
 {
-    return array_pop ($array);
+    return array_pop($array);
 }
 
-function substr_icount (string $haystack, string $needle, ...$params): int
+function substr_icount(string $haystack, string $needle, ...$params): int
 {
-	return substr_count (strtolower ($haystack), strtolower ($needle), ...$params);
+	return substr_count(strtolower($haystack), strtolower($needle), ...$params);
 }
 
-function str_replace_assoc (string $subject, array $replacements): string
+function str_replace_assoc(string $subject, array $replacements): string
 {
-	return str_replace (array_keys ($replacements), array_values ($replacements), $subject);
+	return str_replace(array_keys($replacements), array_values($replacements), $subject);
 }
 
-function pre (...$args): void
+function pre(...$args): void
 {
-	message (sizeof ($args) < 2 ? current ($args) : $args);
+	message(sizeof($args) < 2 ? current ($args) : $args);
 }
 
-function messageBox (string $message, string $caption = '', ...$args)
+function messageBox(string $message, string $caption = '', ...$args)
 {
-    return (new MessageBox)->show ($message, $caption, ...$args);
+    return (new MessageBox)->show($message, $caption, ...$args);
 }
 
 class Components
@@ -188,47 +188,47 @@ 
     static $components = [];
     static $events = [];
 
-    public static function addComponent (int $selector, object $object): void
+    public static function addComponent(int $selector, object $object): void
     {
         self::$components[$selector] = $object;
         self::$events[$selector] = [];
     }
 
-    public static function getComponent (int $selector)
+    public static function getComponent(int $selector)
     {
         return isset (self::$components[$selector]) ?
             self::$components[$selector] : false;
     }
 
-    public static function componentExists (int $selector): bool
+    public static function componentExists(int $selector): bool
     {
         return isset (self::$components[$selector]);
     }
 
-    public static function setComponentEvent (int $selector, string $eventName, string $code): void
+    public static function setComponentEvent(int $selector, string $eventName, string $code): void
     {
-        self::$events[$selector][strtolower ($eventName)] = $code;
+        self::$events[$selector][strtolower($eventName)] = $code;
     }
 
-    public static function getComponentEvent (int $selector, string $eventName)
+    public static function getComponentEvent(int $selector, string $eventName)
     {
-        $eventName = strtolower ($eventName);
+        $eventName = strtolower($eventName);
 
         return isset (self::$events[$selector][$eventName]) ?
             self::$events[$selector][$eventName] : false;
     }
 
-    public static function removeComponentEvent (int $selector, string $eventName): void
+    public static function removeComponentEvent(int $selector, string $eventName): void
     {
-        unset (self::$events[$selector][strtolower ($eventName)]);
+        unset (self::$events[$selector][strtolower($eventName)]);
     }
 
-    public static function removeComponent (int $selector): void
+    public static function removeComponent(int $selector): void
     {
         unset (self::$components[$selector], self::$events[$selector]);
     }
 
-    public static function cleanJunk (): void
+    public static function cleanJunk(): void
     {
         // TODO: более строгие правила очистки мусорных объектов
         
@@ -236,15 +236,15 @@ 
         {
             try
             {
-                if ($object->getType ()->isSubclassOf (VoidEngine::objectType ('System.Windows.Forms.Form', 'System.Windows.Forms')))
+                if ($object->getType()->isSubclassOf(VoidEngine::objectType('System.Windows.Forms.Form', 'System.Windows.Forms')))
                     continue;
             }
 
             catch (\Exception $e) {}
             
-            VoidEngine::destructObject ($selector);
+            VoidEngine::destructObject($selector);
 
-            if (!VoidEngine::objectExists ($selector))
+            if (!VoidEngine::objectExists($selector))
             {
                 unset (self::$components[$selector]);
 
@@ -255,32 +255,32 @@ 
     }
 }
 
-function _c (int $selector)
+function _c(int $selector)
 {
-    return Components::getComponent ($selector);
+    return Components::getComponent($selector);
 }
 
-function c ($name, bool $returnAllSimilarObjects = false)
+function c($name, bool $returnAllSimilarObjects = false)
 {
-    if (is_int ($name) && is_object ($object = _c ($name)))
+    if (is_int($name) && is_object($object = _c($name)))
         return $object;
 
     else
     {
-        $path    = explode ('->', $name);
+        $path    = explode('->', $name);
         $similar = [];
 
         foreach (Components::$components as $object)
             try
             {
-                if ($object->name == end ($path))
+                if ($object->name == end($path))
                 {
-                    if (sizeof ($path) > 1)
+                    if (sizeof($path) > 1)
                         try
                         {
-                            if (is_object ($parent = _c($object->parent->selector)))
+                            if (is_object($parent = _c($object->parent->selector)))
                             {
-                                if (c(join ('->', array_slice ($path, 0, -1))) == $parent)
+                                if (c(join('->', array_slice($path, 0, -1))) == $parent)
                                 {
                                     if ($returnAllSimilarObjects)
                                         $similar[] = $object;
@@ -314,18 +314,18 @@ 
                 continue;
             }
 
-        if (sizeof ($path) == 2)
+        if (sizeof($path) == 2)
         {
             $objects = c($path[1], true);
 
-            if (is_array ($objects))
+            if (is_array($objects))
             {
                 foreach ($objects as $id => $object)
                     try
                     {
-                        while (is_object ($parent = _c($object->parent->selector)))
+                        while (is_object($parent = _c($object->parent->selector)))
                         {
-                            if ($parent->getType ()->isSubclassOf (VoidEngine::objectType ('System.Windows.Forms.Form', 'System.Windows.Forms')) && $parent->name == $path[0])
+                            if ($parent->getType()->isSubclassOf(VoidEngine::objectType('System.Windows.Forms.Form', 'System.Windows.Forms')) && $parent->name == $path[0])
                                 return $objects[$id];
 
                             else $object = $parent;
@@ -343,70 +343,70 @@ 
             else return false;
         }
 
-        else return $returnAllSimilarObjects && sizeof ($similar) > 0 ?
+        else return $returnAllSimilarObjects && sizeof($similar) > 0 ?
             $similar : false;
     }
 }
 
-function setTimer (int $interval, callable $function): Timer
+function setTimer(int $interval, callable $function): Timer
 {
     $timer = new Timer;
     $timer->interval = $interval;
     
-    $timer->tickEvent = function ($self) use ($function)
+    $timer->tickEvent = function($self) use ($function)
     {
-        call_user_func ($function, $self);
+        call_user_func($function, $self);
     };
     
-	$timer->start ();
+	$timer->start();
     
     return $timer;
 }
 
 // FIXME: выполняется несколько раз, а не единожды
-function setTimeout (int $timeout, callable $function): Timer
+function setTimeout(int $timeout, callable $function): Timer
 {
     $timer = new Timer;
     $timer->interval = $timeout;
     
-    $timer->tickEvent = function ($self) use ($function)
+    $timer->tickEvent = function($self) use ($function)
     {
-        call_user_func ($function, $self);
+        call_user_func($function, $self);
 
-        $self->stop ();
+        $self->stop();
     };
     
-    $timer->start ();
+    $timer->start();
     
 	return $timer;
 }
 
 class Clipboard
 {
-    public static function getText ()
+    public static function getText()
     {
-        return (new WFClass ('System.Windows.Forms.Clipboard'))->getText ();
+        return (new WFClass('System.Windows.Forms.Clipboard'))->getText();
     }
     
-    public static function setText (string $text): void
+    public static function setText(string $text): void
     {
-        (new WFClass ('System.Windows.Forms.Clipboard'))->setText ($text);
+        (new WFClass('System.Windows.Forms.Clipboard'))->setText($text);
     }
     
-    public static function getFiles (): array
+    public static function getFiles(): array
     {
-        return (new WFClass ('System.Windows.Forms.Clipboard'))->getFileDropList ()->list;
+        return (new WFClass('System.Windows.Forms.Clipboard'))->getFileDropList()->list;
     }
     
-    public static function setFiles (array $files): void
+    public static function setFiles(array $files): void
     {
-        $collection = new WFObject ('System.Collections.Specialized.StringCollection');
+        $collection = new WFObject('System.Collections.Specialized.StringCollection');
 
         foreach ($files as $file)
-            $collection->add ((string) $file);
+            $collection->add((string) $file);
 
-        (new WFClass ('System.Windows.Forms.Clipboard'))->setFileDropList ($collection);
-        VoidEngine::removeObjects ($collection->selector);
+        (new WFClass('System.Windows.Forms.Clipboard'))->setFileDropList($collection);
+        VoidEngine::removeObjects($collection->selector);
     }
 }
 
@@ -414,14 +414,13 @@ 
 {
     protected $cursor;
 
-    public function __construct (int $handle = null)
+    public function __construct(int $handle = null)
     {
         $handle !== null ?
-            $this->cursor = new WFObject ('System.Windows.Forms.Cursor', 'auto', $handle) :
-            $this->cursor = new WFClass ('System.Windows.Forms.Cursor');
+            $this->cursor = new WFObject('System.Windows.Forms.Cursor', 'auto', $handle) : $this->cursor = new WFClass('System.Windows.Forms.Cursor');
     }
 
-    public function getPosition (): array
+    public function getPosition(): array
     {
         $pos = $this->cursor->position;
 
@@ -432,35 +431,35 @@ 
     }
 }
 
-function get_cursor_x (int $handle = null): int
+function get_cursor_x(int $handle = null): int
 {
-    $cursor = new Cursor ($handle);
+    $cursor = new Cursor($handle);
 
-    return $cursor->getPosition ()[0];
+    return $cursor->getPosition()[0];
 }
 
-function get_cursor_y (int $handle = null): int
+function get_cursor_y(int $handle = null): int
 {
-    $cursor = new Cursor ($handle);
+    $cursor = new Cursor($handle);
 
-    return $cursor->getPosition ()[1];
+    return $cursor->getPosition()[1];
 }
 
-function get_cursor_pos (int $handle = null): array
+function get_cursor_pos(int $handle = null): array
 {
-    $cursor = new Cursor ($handle);
+    $cursor = new Cursor($handle);
 
-    return $cursor->getPosition ();
+    return $cursor->getPosition();
 }
 
-set_error_handler (function (...$args)
+set_error_handler(function(...$args)
 {
     if ($GLOBALS['error_status'])
-        pre ($args);
+        pre($args);
 });
 
-set_exception_handler (function (...$args)
+set_exception_handler(function(...$args)
 {
     if ($GLOBALS['error_status'])
-        pre ($args);
+        pre($args);
 });

Braces +85 added lines, -75 removed lines

@@ -6,8 +6,9 @@ 
 {
     $oldStatus = $GLOBALS['error_status'];
 
-    if ($status !== null)
-        $GLOBALS['error_status'] = $status;
+    if ($status !== null) {
+            $GLOBALS['error_status'] = $status;
+    }
 
     return $oldStatus;
 }
@@ -41,9 +42,7 @@ 
     try
     {
         eval ('return; '. $code);
-    }
-
-    catch (\Throwable $e)
+    } catch (\Throwable $e)
     {
         return [
             'text' => $e->getMessage (), 
@@ -67,34 +66,39 @@ 
     $array = (new WFClass ('System.Array', null))
         ->createInstance (VoidEngine::objectType ($type), $size = sizeof ($items));
 
-    for ($i = 0; $i < $size; ++$i)
-        $array[$i] = array_shift ($items);
+    for ($i = 0; $i < $size; ++$i) {
+            $array[$i] = array_shift ($items);
+    }
     
     return $array;
 }
 
 function dir_create (string $path, int $mode = 0777): void
 {
-    if (!is_dir ($path))
-        mkdir ($path, $mode, true);
-}
+    if (!is_dir ($path)) {
+            mkdir ($path, $mode, true);
+    }
+    }
 
 function dir_delete (string $path): bool
 {
-    if (!is_dir ($path))
-        return false;
+    if (!is_dir ($path)) {
+            return false;
+    }
 
-    foreach (array_slice (scandir ($path), 2) as $file)
-        if (is_dir ($file = $path .'/'. $file))
+    foreach (array_slice (scandir ($path), 2) as $file) {
+            if (is_dir ($file = $path .'/'. $file))
         {
             dir_delete ($file);
+    }
 
-            if (is_dir ($file))
-                rmdir ($file);
+            if (is_dir ($file)) {
+                            rmdir ($file);
+            }
+        } else {
+            unlink ($file);
         }
 
-        else unlink ($file);
-
     rmdir ($path);
 
     return true;
@@ -108,17 +112,22 @@ 
 
 function dir_copy (string $from, string $to): bool
 {
-    if (!is_dir ($from))
-        return false;
+    if (!is_dir ($from)) {
+            return false;
+    }
 
-    if (!is_dir ($to))
-        dir_create ($to);
+    if (!is_dir ($to)) {
+            dir_create ($to);
+    }
 
-    foreach (array_slice (scandir ($from), 2) as $file)
-        if (is_dir ($f = $from .'/'. $file))
+    foreach (array_slice (scandir ($from), 2) as $file) {
+            if (is_dir ($f = $from .'/'. $file))
             dir_copy ($f, $to .'/'. $file);
+    }
 
-        else copy ($f, $to .'/'. $file);
+        else {
+            copy ($f, $to .'/'. $file);
+        }
 
     return true;
 }
@@ -236,11 +245,10 @@ 
         {
             try
             {
-                if ($object->getType ()->isSubclassOf (VoidEngine::objectType ('System.Windows.Forms.Form', 'System.Windows.Forms')))
-                    continue;
-            }
-
-            catch (\Exception $e) {}
+                if ($object->getType ()->isSubclassOf (VoidEngine::objectType ('System.Windows.Forms.Form', 'System.Windows.Forms'))) {
+                                    continue;
+                }
+            } catch (\Exception $e) {}
             
             VoidEngine::destructObject ($selector);
 
@@ -248,8 +256,9 @@ 
             {
                 unset (self::$components[$selector]);
 
-                if (isset (self::$events[$selector]))
-                    unset (self::$events[$selector]);
+                if (isset (self::$events[$selector])) {
+                                    unset (self::$events[$selector]);
+                }
             }
         }
     }
@@ -262,16 +271,15 @@ 
 
 function c ($name, bool $returnAllSimilarObjects = false)
 {
-    if (is_int ($name) && is_object ($object = _c ($name)))
-        return $object;
-
-    else
+    if (is_int ($name) && is_object ($object = _c ($name))) {
+            return $object;
+    } else
     {
         $path    = explode ('->', $name);
         $similar = [];
 
-        foreach (Components::$components as $object)
-            try
+        foreach (Components::$components as $object) {
+                    try
             {
                 if ($object->name == end ($path))
                 {
@@ -284,32 +292,30 @@ 
                                 {
                                     if ($returnAllSimilarObjects)
                                         $similar[] = $object;
+        }
 
-                                    else return $object;
+                                    else {
+                                        return $object;
+                                    }
+                                } else {
+                                    continue;
                                 }
-
-                                else continue;
+                            } else {
+                                continue;
                             }
-
-                            else continue;
-                        }
-
-                        catch (\Throwable $e)
+                        } catch (\Throwable $e)
                         {
                             continue;
-                        }
-
-                    else
+                        } else
                     {
-                        if ($returnAllSimilarObjects)
-                            $similar[] = $object;
-
-                        else return $object;
+                        if ($returnAllSimilarObjects) {
+                                                    $similar[] = $object;
+                        } else {
+                            return $object;
+                        }
                     }
                 }
-            }
-
-            catch (\Exception $e)
+            } catch (\Exception $e)
             {
                 continue;
             }
@@ -320,31 +326,32 @@ 
 
             if (is_array ($objects))
             {
-                foreach ($objects as $id => $object)
-                    try
+                foreach ($objects as $id => $object) {
+                                    try
                     {
                         while (is_object ($parent = _c($object->parent->selector)))
                         {
                             if ($parent->getType ()->isSubclassOf (VoidEngine::objectType ('System.Windows.Forms.Form', 'System.Windows.Forms')) && $parent->name == $path[0])
                                 return $objects[$id];
+                }
 
-                            else $object = $parent;
+                            else {
+                                $object = $parent;
+                            }
                         }
-                    }
-
-                    catch (\Throwable $e)
+                    } catch (\Throwable $e)
 					{
 						continue;
 					}
 
                 return false;
+            } else {
+                return false;
             }
-
-            else return false;
-        }
-
-        else return $returnAllSimilarObjects && sizeof ($similar) > 0 ?
+        } else {
+            return $returnAllSimilarObjects && sizeof ($similar) > 0 ?
             $similar : false;
+        }
     }
 }
 
@@ -402,8 +409,9 @@ 
     {
         $collection = new WFObject ('System.Collections.Specialized.StringCollection');
 
-        foreach ($files as $file)
-            $collection->add ((string) $file);
+        foreach ($files as $file) {
+                    $collection->add ((string) $file);
+        }
 
         (new WFClass ('System.Windows.Forms.Clipboard'))->setFileDropList ($collection);
         VoidEngine::removeObjects ($collection->selector);
@@ -455,12 +463,14 @@ 
 
 set_error_handler (function (...$args)
 {
-    if ($GLOBALS['error_status'])
-        pre ($args);
-});
+    if ($GLOBALS['error_status']) {
+            pre ($args);
+    }
+    });
 
 set_exception_handler (function (...$args)
 {
-    if ($GLOBALS['error_status'])
-        pre ($args);
-});
+    if ($GLOBALS['error_status']) {
+            pre ($args);
+    }
+    });

engine/components/Component.php

Spacing +29 added lines, -29 removed lines

@@ -9,83 +9,83 @@
     public $class     = 'System.Windows.Forms.Component';
     public $namespace = 'System.Windows.Forms';
 
-    public function __construct ($className = null, ...$args)
+    public function __construct($className = null, ...$args)
     {
-        parent::__construct (
+        parent::__construct(
             $className === null ? $this->class : $className,
             $this->namespace, ...$args
         );
         
-        Components::addComponent ($this->selector, $this);
+        Components::addComponent($this->selector, $this);
     }
 	
-    public function __debugInfo (): array
+    public function __debugInfo(): array
     {
         return [
-            'description' => @$this->__toString (),
+            'description' => @$this->__toString(),
             'selector'    => @$this->selector,
             'name'        => @$this->name,
-            'objectInfo'  => @json_encode ($this, JSON_PRETTY_PRINT)
+            'objectInfo'  => @json_encode($this, JSON_PRETTY_PRINT)
         ];
     }
 
-    public function __unset ($name)
+    public function __unset($name)
     {
         if (isset ($this->$name))
         {
-            if (is_int ($this->$name))
+            if (is_int($this->$name))
             {
-                Components::removeComponent ($this->$name);
+                Components::removeComponent($this->$name);
 
-                if (VoidEngine::objectExists ($this->$name))
-                    VoidEngine::removeObjects ($this->$name);
+                if (VoidEngine::objectExists($this->$name))
+                    VoidEngine::removeObjects($this->$name);
             }
 
             elseif ($this->$name instanceof Component)
-                $this->$name->dispose ();
+                $this->$name->dispose();
         }
 
         unset ($this->$name);
     }
 
-    public function dispose (): void
+    public function dispose(): void
 	{
-        foreach (array_diff (get_object_vars ($this), ['selector']) as $param => $value)
+        foreach (array_diff(get_object_vars($this), ['selector']) as $param => $value)
         {
-            if (is_int ($value))
+            if (is_int($value))
             {
-                Components::removeComponent ($value);
+                Components::removeComponent($value);
 
-                if (VoidEngine::objectExists ($value))
-                    VoidEngine::removeObjects ($value);
+                if (VoidEngine::objectExists($value))
+                    VoidEngine::removeObjects($value);
             }
 
             elseif ($value instanceof Component)
-                $value->dispose ();
+                $value->dispose();
 
             unset ($this->$param);
         }
 
         if (isset ($this->selector))
         {
-            if (VoidEngine::objectExists ($this->selector))
-                VoidEngine::removeObjects ($this->selector);
+            if (VoidEngine::objectExists($this->selector))
+                VoidEngine::removeObjects($this->selector);
             
-            Components::removeComponent ($this->selector);
+            Components::removeComponent($this->selector);
         }
 
-        Components::cleanJunk ();
-        gc_collect_cycles ();
+        Components::cleanJunk();
+        gc_collect_cycles();
     }
 
-    public function __destruct ()
+    public function __destruct()
     {
-        if (isset ($this->selector) && VoidEngine::destructObject ($this->selector))
+        if (isset ($this->selector) && VoidEngine::destructObject($this->selector))
         {
-            VoidEngine::removeObjects ($this->selector);
-            Components::removeComponent ($this->selector);
+            VoidEngine::removeObjects($this->selector);
+            Components::removeComponent($this->selector);
 
-            gc_collect_cycles ();
+            gc_collect_cycles();
         }
     }
 }

engine/components/TreeView.php

Spacing +5 added lines, -5 removed lines

@@ -6,7 +6,7 @@ 
 {
     public $class = 'System.Windows.Forms.TreeView';
 
-    public function get_path ()
+    public function get_path()
     {
         try
         {
@@ -26,15 +26,15 @@ 
 {
     public $class = 'System.Windows.Forms.TreeNode';
 
-    public function __construct (string $text = '')
+    public function __construct(string $text = '')
     {
-        parent::__construct (null, $this->class);
+        parent::__construct(null, $this->class);
 
         $this->text = $text;
     }
 
-    public function get_path ()
+    public function get_path()
     {
-        return $this->getProperty ('FullPath');
+        return $this->getProperty('FullPath');
     }
 }

engine/components/Form.php

Indentation +25 added lines, -25 removed lines

@@ -4,36 +4,36 @@ 
 
 class Form extends Control
 {
-	public $class = 'System.Windows.Forms.Form';
+    public $class = 'System.Windows.Forms.Form';
 
-	public function get_icon ()
-	{
-		return new FormIcon ($this->selector);
-	}
+    public function get_icon ()
+    {
+        return new FormIcon ($this->selector);
+    }
 	
-	public function get_clientSize ()
-	{
-		$obj = $this->getProperty ('ClientSize');
+    public function get_clientSize ()
+    {
+        $obj = $this->getProperty ('ClientSize');
 
-		$w = VoidEngine::getProperty ($obj, 'Width');
-		$h = VoidEngine::getProperty ($obj, 'Height');
+        $w = VoidEngine::getProperty ($obj, 'Width');
+        $h = VoidEngine::getProperty ($obj, 'Height');
 		
-		VoidEngine::removeObjects ($obj);
+        VoidEngine::removeObjects ($obj);
 		
-		return [$w, $h];
-	}
+        return [$w, $h];
+    }
 	
-	public function set_clientSize (array $size)
-	{
-		$obj = $this->getProperty ('ClientSize');
+    public function set_clientSize (array $size)
+    {
+        $obj = $this->getProperty ('ClientSize');
 
-		VoidEngine::setProperty ($obj, 'Width', array_shift ($size));
-		VoidEngine::setProperty ($obj, 'Height', array_shift ($size));
+        VoidEngine::setProperty ($obj, 'Width', array_shift ($size));
+        VoidEngine::setProperty ($obj, 'Height', array_shift ($size));
 
-		$this->setProperty ('ClientSize', $obj);
+        $this->setProperty ('ClientSize', $obj);
 
-		VoidEngine::removeObjects ($obj);
-	}
+        VoidEngine::removeObjects ($obj);
+    }
 }
 
 class FormIcon extends Icon
@@ -46,12 +46,12 @@ 
     }
 
     public function loadFromFile (string $file)
-	{
+    {
         $icon = VoidEngine::createObject ('System.Drawing.Icon', 'System.Drawing', $file);
         
         VoidEngine::setProperty ($this->formSelector, 'Icon', $icon);
 
-		if (!isset ($this->selector))
-		    $this->selector = $icon;
-	}
+        if (!isset ($this->selector))
+            $this->selector = $icon;
+    }
 }

Spacing +17 added lines, -17 removed lines

@@ -6,33 +6,33 @@ 
 {
 	public $class = 'System.Windows.Forms.Form';
 
-	public function get_icon ()
+	public function get_icon()
 	{
-		return new FormIcon ($this->selector);
+		return new FormIcon($this->selector);
 	}
 	
-	public function get_clientSize ()
+	public function get_clientSize()
 	{
-		$obj = $this->getProperty ('ClientSize');
+		$obj = $this->getProperty('ClientSize');
 
-		$w = VoidEngine::getProperty ($obj, 'Width');
-		$h = VoidEngine::getProperty ($obj, 'Height');
+		$w = VoidEngine::getProperty($obj, 'Width');
+		$h = VoidEngine::getProperty($obj, 'Height');
 		
-		VoidEngine::removeObjects ($obj);
+		VoidEngine::removeObjects($obj);
 		
 		return [$w, $h];
 	}
 	
-	public function set_clientSize (array $size)
+	public function set_clientSize(array $size)
 	{
-		$obj = $this->getProperty ('ClientSize');
+		$obj = $this->getProperty('ClientSize');
 
-		VoidEngine::setProperty ($obj, 'Width', array_shift ($size));
-		VoidEngine::setProperty ($obj, 'Height', array_shift ($size));
+		VoidEngine::setProperty($obj, 'Width', array_shift($size));
+		VoidEngine::setProperty($obj, 'Height', array_shift($size));
 
-		$this->setProperty ('ClientSize', $obj);
+		$this->setProperty('ClientSize', $obj);
 
-		VoidEngine::removeObjects ($obj);
+		VoidEngine::removeObjects($obj);
 	}
 }
 
@@ -40,16 +40,16 @@ 
 {
     protected $formSelector;
 
-    public function __construct (int $formSelector)
+    public function __construct(int $formSelector)
     {
         $this->formSelector = $formSelector;
     }
 
-    public function loadFromFile (string $file)
+    public function loadFromFile(string $file)
 	{
-        $icon = VoidEngine::createObject ('System.Drawing.Icon', 'System.Drawing', $file);
+        $icon = VoidEngine::createObject('System.Drawing.Icon', 'System.Drawing', $file);
         
-        VoidEngine::setProperty ($this->formSelector, 'Icon', $icon);
+        VoidEngine::setProperty($this->formSelector, 'Icon', $icon);
 
 		if (!isset ($this->selector))
 		    $this->selector = $icon;

engine/components/PictureBox.php

Indentation +28 added lines, -28 removed lines

@@ -4,48 +4,48 @@
 
 class PictureBox extends Control
 {
-	public $class = 'System.Windows.Forms.PictureBox';
+    public $class = 'System.Windows.Forms.PictureBox';
 
-	protected $image;
+    protected $image;
 	
-	public function __construct (Component $parent = null)
-	{
+    public function __construct (Component $parent = null)
+    {
         parent::__construct ($parent, $this->class);
         
-		$this->image = new PictureBoxImage ($this->selector);
-	}
+        $this->image = new PictureBoxImage ($this->selector);
+    }
 }
 
 class PictureBoxImage
 {
-	protected $selector;
+    protected $selector;
     protected $pictureBoxSelector;
     protected $clipboard;
     
-	public function __construct (int $pictureBoxSelector)
-	{
-		$this->pictureBoxSelector = $pictureBoxSelector;
-		$this->selector			  = VoidEngine::getProperty ($pictureBoxSelector, 'Image');
-		$this->clipboard		  = new WFClass ('System.Windows.Forms.Clipboard');
-	}
+    public function __construct (int $pictureBoxSelector)
+    {
+        $this->pictureBoxSelector = $pictureBoxSelector;
+        $this->selector			  = VoidEngine::getProperty ($pictureBoxSelector, 'Image');
+        $this->clipboard		  = new WFClass ('System.Windows.Forms.Clipboard');
+    }
 	
-	public function loadFromFile (string $file)
-	{
+    public function loadFromFile (string $file)
+    {
         VoidEngine::setProperty ($this->pictureBoxSelector, 'Image', (new Image ())->loadFromFile ($file)->selector);
-	}
+    }
 	
-	public function saveToFile (string $file)
-	{
-		VoidEngine::callMethod ($this->selector, 'Save', $file);
-	}
+    public function saveToFile (string $file)
+    {
+        VoidEngine::callMethod ($this->selector, 'Save', $file);
+    }
 	
-	public function loadFromClipboard ()
-	{
-		VoidEngine::setProperty ($this->pictureBoxSelector, 'Image', $this->clipboard->getImage ());
-	}
+    public function loadFromClipboard ()
+    {
+        VoidEngine::setProperty ($this->pictureBoxSelector, 'Image', $this->clipboard->getImage ());
+    }
 	
-	public function saveToClipboard ()
-	{
-		$this->clipboard->setImage (VoidEngine::getProperty ($this->pictureBoxSelector, 'Image'));
-	}
+    public function saveToClipboard ()
+    {
+        $this->clipboard->setImage (VoidEngine::getProperty ($this->pictureBoxSelector, 'Image'));
+    }
 }

Spacing +14 added lines, -14 removed lines

@@ -8,11 +8,11 @@ 
 
 	protected $image;
 	
-	public function __construct (Component $parent = null)
+	public function __construct(Component $parent = null)
 	{
-        parent::__construct ($parent, $this->class);
+        parent::__construct($parent, $this->class);
         
-		$this->image = new PictureBoxImage ($this->selector);
+		$this->image = new PictureBoxImage($this->selector);
 	}
 }
 
@@ -22,30 +22,30 @@ 
     protected $pictureBoxSelector;
     protected $clipboard;
     
-	public function __construct (int $pictureBoxSelector)
+	public function __construct(int $pictureBoxSelector)
 	{
 		$this->pictureBoxSelector = $pictureBoxSelector;
-		$this->selector			  = VoidEngine::getProperty ($pictureBoxSelector, 'Image');
-		$this->clipboard		  = new WFClass ('System.Windows.Forms.Clipboard');
+		$this->selector			  = VoidEngine::getProperty($pictureBoxSelector, 'Image');
+		$this->clipboard		  = new WFClass('System.Windows.Forms.Clipboard');
 	}
 	
-	public function loadFromFile (string $file)
+	public function loadFromFile(string $file)
 	{
-        VoidEngine::setProperty ($this->pictureBoxSelector, 'Image', (new Image ())->loadFromFile ($file)->selector);
+        VoidEngine::setProperty($this->pictureBoxSelector, 'Image', (new Image())->loadFromFile($file)->selector);
 	}
 	
-	public function saveToFile (string $file)
+	public function saveToFile(string $file)
 	{
-		VoidEngine::callMethod ($this->selector, 'Save', $file);
+		VoidEngine::callMethod($this->selector, 'Save', $file);
 	}
 	
-	public function loadFromClipboard ()
+	public function loadFromClipboard()
 	{
-		VoidEngine::setProperty ($this->pictureBoxSelector, 'Image', $this->clipboard->getImage ());
+		VoidEngine::setProperty($this->pictureBoxSelector, 'Image', $this->clipboard->getImage());
 	}
 	
-	public function saveToClipboard ()
+	public function saveToClipboard()
 	{
-		$this->clipboard->setImage (VoidEngine::getProperty ($this->pictureBoxSelector, 'Image'));
+		$this->clipboard->setImage(VoidEngine::getProperty($this->pictureBoxSelector, 'Image'));
 	}
 }

engine/components/Designer.php

Spacing +91 added lines, -92 removed lines

@@ -20,21 +20,20 @@ 
     protected $currentSelectedItem;
     protected $formsList;
 
-    public function __construct (Component $parent, string $formName = 'form', PropertyGrid $propertyGrid, EventGrid $eventsList, ComboBox $currentSelectedItem, TabControl $formsList, $form = null)
+    public function __construct(Component $parent, string $formName = 'form', PropertyGrid $propertyGrid, EventGrid $eventsList, 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->eventsList          = $eventsList;
         $this->currentSelectedItem = $currentSelectedItem;
         $this->formsList           = $formsList;
 
-        $this->selector = VoidEngine::createObject ('WinForms_PHP.FormDesigner4', null, $this->form->selector, $formName);
-        Components::addComponent ($this->selector, $this);
+        $this->selector = VoidEngine::createObject('WinForms_PHP.FormDesigner4', null, $this->form->selector, $formName);
+        Components::addComponent($this->selector, $this);
 
         $this->form->name = $formName;
 
@@ -44,185 +43,185 @@ 
             $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'];
 
-        VoidEngine::setProperty ($this->control, 'Parent', $parent->selector);
+        VoidEngine::setProperty($this->control, 'Parent', $parent->selector);
 
-        VoidEngine::setObjectEvent ($this->control, 'KeyDown', '
+        VoidEngine::setObjectEvent($this->control, 'KeyDown', '
             namespace VoidEngine;
 
             if ((new WFObject ($args))->keycode == 46)
-                _c('. $this->selector .')->removeSelected ();
+                _c('. $this->selector.')->removeSelected ();
         ');
 
-        VoidEngine::setObjectEvent ($this->selector, 'SelectionChanged', '
+        VoidEngine::setObjectEvent($this->selector, 'SelectionChanged', '
             namespace VoidEngine;
 
-            $objects     = VoidEngine::callMethod ('. $this->selector .', "GetSelectedComponents");
+            $objects     = VoidEngine::callMethod ('. $this->selector.', "GetSelectedComponents");
             $firstObject = VoidEngine::getArrayValue ($objects, 0);
             
-            _c('. $propertyGrid->selector .')->selectedObject = $firstObject;
-            _c('. $eventsList->selector .')->selectedObject = $firstObject;
-            _c('. $currentSelectedItem->selector .')->selectedItem = _c('. $this->selector .')->getComponentName ($firstObject);
+            _c('. $propertyGrid->selector.')->selectedObject = $firstObject;
+            _c('. $eventsList->selector.')->selectedObject = $firstObject;
+            _c('. $currentSelectedItem->selector.')->selectedItem = _c('.$this->selector.')->getComponentName ($firstObject);
 
             if (isset (Components::$events[$firstObject]) && sizeof (Components::$events[$firstObject]) > 0)
                 foreach (Components::$events[$firstObject] as $eventName => $event)
-                    _c('. $eventsList->selector .')->getEventByName ($eventName)->value = "(добавлено)";
+                    _c('. $eventsList->selector.')->getEventByName ($eventName)->value = "(добавлено)";
 
-            _c('. $eventsList->selector .')->refresh ();
+            _c('. $eventsList->selector.')->refresh ();
         ');
     }
 
-    public function initDesigner (): void
+    public function initDesigner(): void
     {
-        $this->componentAddedEvent = function ($self, $args)
+        $this->componentAddedEvent = function($self, $args)
         {
             if (isset ($GLOBALS['new_component']))
             {
-                $self->setComponentToHistory ($GLOBALS['new_component'][1], $GLOBALS['new_component'][0]);
-                $components = VoidStudioAPI::getObjects ('main')['PropertiesPanel__SelectedComponent'];
+                $self->setComponentToHistory($GLOBALS['new_component'][1], $GLOBALS['new_component'][0]);
+                $components = VoidStudioAPI::getObjects('main')['PropertiesPanel__SelectedComponent'];
 
-                $components->items->clear ();
-                $components->items->addRange (array_keys ($self->objects));
+                $components->items->clear();
+                $components->items->addRange(array_keys($self->objects));
 
                 $components->selectedItem = $GLOBALS['new_component'][0];
-                $self->setSelectedComponents ($args->component);
+                $self->setSelectedComponents($args->component);
 
                 unset ($GLOBALS['new_component']);
             }
         };
 
-        $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->clickEvent = function () use ($self)
+            $delItem = new ToolStripMenuItem('Удалить');
+            $delItem->image = (new Image)->loadFromFile(APP_DIR.'/system/icons/Delete_16x.png');
+            $delItem->clickEvent = function() use ($self)
             {
-                $self->removeSelected ();
+                $self->removeSelected();
             };
 
-            $toFrontItem = new ToolStripMenuItem ('На передний план');
-            $toFrontItem->image = (new Image)->loadFromFile (APP_DIR .'/system/icons/Front_16x.png');
-            $toFrontItem->clickEvent = function () use ($self)
+            $toFrontItem = new ToolStripMenuItem('На передний план');
+            $toFrontItem->image = (new Image)->loadFromFile(APP_DIR.'/system/icons/Front_16x.png');
+            $toFrontItem->clickEvent = function() use ($self)
             {
-                $self->bringToFrontSelected ();
+                $self->bringToFrontSelected();
             };
 
-            $toBackItem = new ToolStripMenuItem ('На задний план');
-            $toBackItem->image = (new Image)->loadFromFile (APP_DIR .'/system/icons/Back_16x.png');
-            $toBackItem->clickEvent = function () use ($self)
+            $toBackItem = new ToolStripMenuItem('На задний план');
+            $toBackItem->image = (new Image)->loadFromFile(APP_DIR.'/system/icons/Back_16x.png');
+            $toBackItem->clickEvent = function() use ($self)
             {
-                $self->sendToBackSelected ();
+                $self->sendToBackSelected();
             };
 
-            $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 ($value->getType ()->toString () == 'System.Windows.Forms.Form')
                     // if ($value->getType ()->isSubclassOf (VoidEngine::objectType ('System.Windows.Forms.Form', 'System.Windows.Forms')))
-                        pre ($self->getSharpCode ($self->form->name));
+                        pre($self->getSharpCode($self->form->name));
                 });
             };
 
             $menu = new ContextMenuStrip;
-            $menu->items->addRange ([
+            $menu->items->addRange([
                 $delItem, '-',
                 $toFrontItem, $toBackItem, '-',
                 $infoItem
             ]);
 
-            $menu->show ($self->form, $self->form->pointToClient (VoidEngine::createObject ('System.Drawing.Point', 'System.Drawing', $args->x, $args->y)));
+            $menu->show($self->form, $self->form->pointToClient(VoidEngine::createObject('System.Drawing.Point', 'System.Drawing', $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, bool $asObject = false): string
+    public function getSharpCode(string $formName, bool $asObject = false): string
     {
-        $code = $this->callMethod (['GetSharpCode', 'object'], $formName);
+        $code = $this->callMethod(['GetSharpCode', 'object'], $formName);
 
-        $code = VoidEngine::callMethod ($code, ['Replace', 'object'], 'public class '. $this->form->name .' : '. $this->form->name, 'public class '. $this->form->name .' : System.Windows.Forms.Form');
-        $code = VoidEngine::callMethod ($code, ['Replace', 'object'], '    private ', '    public ');
+        $code = VoidEngine::callMethod($code, ['Replace', 'object'], 'public class '.$this->form->name.' : '.$this->form->name, 'public class '.$this->form->name.' : System.Windows.Forms.Form');
+        $code = VoidEngine::callMethod($code, ['Replace', 'object'], '    private ', '    public ');
 
         return $asObject ?
-            $code : VoidEngine::callMethod ($code, 'ToString');
+            $code : VoidEngine::callMethod($code, 'ToString');
     }
 
-    public function createComponent (array $component, string $componentName): int
+    public function createComponent(array $component, string $componentName): int
     {
         $this->objects[$componentName] = $component;
-        $selector = VoidEngine::createObject (...$component);
+        $selector = VoidEngine::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] = [VoidEngine::callMethod (VoidEngine::callMethod ($selector, 'GetType'), 'ToString'), 'auto'];
+        $this->objects[$componentName] = [VoidEngine::callMethod(VoidEngine::callMethod($selector, 'GetType'), 'ToString'), 'auto'];
 
-        $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 ();
                         VoidEngine::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;
                     }
@@ -230,7 +229,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;
                 }
@@ -240,52 +239,52 @@ 
         foreach ($toUnset as $name)
             unset ($this->objects[$name]);
 
-        $this->callMethod ('DeleteSelected');
+        $this->callMethod('DeleteSelected');
 
         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->items->clear();
+        $this->currentSelectedItem->items->addRange(array_keys($this->objects));
         $this->currentSelectedItem->selectedItem = $this->form->name;
     }
 
-    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 +19 added lines, -17 removed lines

@@ -25,8 +25,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->eventsList          = $eventsList;
@@ -199,17 +200,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)]]);
 
@@ -226,9 +227,7 @@ 
 
                         return;
                     }
-                }
-
-                else
+                } else
                 {
                     messageBox ('Нельзя удалить единственную форму проекта', 'Ошибка удаления', enum ('System.Windows.Forms.MessageBoxButtons.OK'), enum ('System.Windows.Forms.MessageBoxIcon.Error'));
 
@@ -237,14 +236,16 @@ 
             }
         }
 
-        foreach ($toUnset as $name)
-            unset ($this->objects[$name]);
+        foreach ($toUnset as $name) {
+                    unset ($this->objects[$name]);
+        }
 
         $this->callMethod ('DeleteSelected');
 
-        foreach ($this->objects as $objectName => $object)
-            if (!is_int ($this->getComponentByName ($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));
@@ -253,8 +254,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]);