winforms-php / VoidFramework

engine/extensions/VLF/bin/VST/Parser.php

Spacing +47 added lines, -47 removed lines

@@ -20,33 +20,33 @@ 
      * 
      * @return AST - возвращает AST дерево разметки
      */
-    public static function parse (string $vst): AST
+    public static function parse(string $vst): AST
     {
         $tree    = new AST;
         $objects = new Stack;
 
-        if (file_exists ($vst))
-            $vst = file_get_contents ($vst);
+        if (file_exists($vst))
+            $vst = file_get_contents($vst);
 
-        $lines   = explode (self::$divider, $vst);
+        $lines   = explode(self::$divider, $vst);
         $skip_at = -1;
 
         foreach ($lines as $line_num => $line)
         {
             // \VoidEngine\pre ($line_num .', '. ($skip_at > $line_num ? 'skip' : 'not skip') .': '. $line);
 
-            if ($skip_at > $line_num || !self::filter ($line))
+            if ($skip_at > $line_num || !self::filter($line))
                 continue;
 
-            $height = self::getHeight ($line);
-            $words  = array_filter (explode (' ', $line), 'VLF\Parser::filter');
+            $height = self::getHeight($line);
+            $words  = array_filter(explode(' ', $line), 'VLF\Parser::filter');
             $poped  = false;
 
             # Очищаем стек объектов
-            while ($objects->size () > 0)
-                if ($objects->current ()->height >= $height)
+            while ($objects->size() > 0)
+                if ($objects->current()->height >= $height)
                 {
-                    $objects->pop ();
+                    $objects->pop();
                     
                     $poped = true;
                 }
@@ -54,12 +54,12 @@ 
                 else break;
 
             # Создаём новую ссылку на объект
-            if ($poped && $objects->size () > 0)
+            if ($poped && $objects->size() > 0)
             {
-                $object = $objects->pop ();
+                $object = $objects->pop();
 
-                $objects->push (new Node (array_merge ($object->export (), ['nodes' => []])));
-                $tree->push ($objects->current ());
+                $objects->push(new Node(array_merge($object->export(), ['nodes' => []])));
+                $tree->push($objects->current());
             }
 
             /**
@@ -73,9 +73,9 @@ 
                 if (isset ($words[0][1]))
                 {
                     if ($words[0][1] == '^')
-                        $skip_at = self::parseSubtext ($lines, $line_num, $height)[1];
+                        $skip_at = self::parseSubtext($lines, $line_num, $height)[1];
 
-                    else throw new \Exception ('Unknown char founded after comment definition at line '. ($line_num + 1));
+                    else throw new \Exception('Unknown char founded after comment definition at line '.($line_num + 1));
                 }
 
                 continue;
@@ -86,30 +86,30 @@ 
              */
             elseif ($words[0][0] == '.')
             {
-                $pos     = strpos ($line, ':');
+                $pos     = strpos($line, ':');
                 $parents = null;
 
                 if ($pos !== false)
                 {
-                    $name = trim (substr ($line, 1, $pos - 1));
+                    $name = trim(substr($line, 1, $pos - 1));
 
                     if (isset ($line[$pos]))
                     {
-                        $parents = trim (substr ($line, $pos + 1));
+                        $parents = trim(substr($line, $pos + 1));
 
-                        if (strlen ($parents) == 0)
+                        if (strlen($parents) == 0)
                             $parents = null;
 
-                        else $parents = array_map ('trim', explode (',', $parents));
+                        else $parents = array_map('trim', explode(',', $parents));
                     }
                 }
 
-                else $name = trim (substr ($line, 1));
+                else $name = trim(substr($line, 1));
 
-                if ($parents === null && $objects->size () > 0 && $objects->current ()->height < $height)
-                    $parents = [$objects->current ()->args['name']];
+                if ($parents === null && $objects->size() > 0 && $objects->current()->height < $height)
+                    $parents = [$objects->current()->args['name']];
 
-                $objects->push (new Node ([
+                $objects->push(new Node([
                     'type'   => \VLF\STYLE_DEFINITION,
                     'line'   => $line,
                     'words'  => $words,
@@ -121,35 +121,35 @@ 
                     ]
                 ]));
 
-                $tree->push ($objects->current ());
+                $tree->push($objects->current());
             }
 
             /**
              * Установка свойства
              */
-            elseif (($pos = strpos ($line, ':')) !== false)
+            elseif (($pos = strpos($line, ':')) !== false)
             {
-                if ($objects->size () == 0)
-                    throw new \Exception ('Trying to set property to unknown object at line '. ($line_num + 1));
+                if ($objects->size() == 0)
+                    throw new \Exception('Trying to set property to unknown object at line '.($line_num + 1));
 
                 if (!isset ($words[1]))
-                    throw new \Exception ('Trying to set void property value at line '. ($line_num + 1));
+                    throw new \Exception('Trying to set void property value at line '.($line_num + 1));
 
-                $propertyName  = substr ($line, 0, $pos);
-                $propertyValue = substr ($line, $pos + 1);
+                $propertyName  = substr($line, 0, $pos);
+                $propertyValue = substr($line, $pos + 1);
 
                 /**
                  * Обработка многострочных свойств
                  */
                 if ($line[$pos + 1] == '^')
                 {
-                    $parsed = self::parseSubtext ($lines, $line_num, $height);
+                    $parsed = self::parseSubtext($lines, $line_num, $height);
 
-                    $propertyValue = substr ($propertyValue, 1) . $parsed[0];
+                    $propertyValue = substr($propertyValue, 1).$parsed[0];
                     $skip_at       = $parsed[1];
                 }
 
-                $objects->current ()->push (new Node ([
+                $objects->current()->push(new Node([
                     'type'   => \VLF\PROPERTY_SET,
                     'line'   => $line,
                     'words'  => $words,
@@ -167,26 +167,26 @@ 
              */
             elseif (isset ($words[0][1]) && $words[0][0] == '-' && $words[0][1] == '>')
             {
-                if ($objects->size () == 0)
-                    throw new \Exception ('Trying to call method from unknown object at line '. ($line_num + 1));
+                if ($objects->size() == 0)
+                    throw new \Exception('Trying to call method from unknown object at line '.($line_num + 1));
 
                 $methodArgs = [];
 
-                if (($pos = strpos ($line, '(')) !== false)
+                if (($pos = strpos($line, '(')) !== false)
                 {
-                    if (($end = strrpos ($line, ')', $pos)) === false)
-                        throw new \Exception ('Incorrect method arguments syntax at line '. ($line_num + 1));
+                    if (($end = strrpos($line, ')', $pos)) === false)
+                        throw new \Exception('Incorrect method arguments syntax at line '.($line_num + 1));
 
-                    $methodArgs = substr ($line, $pos + 1, $end - $pos - 1);
+                    $methodArgs = substr($line, $pos + 1, $end - $pos - 1);
 
-                    $methodName = trim (substr ($line, 2, $pos - 2));
-                    $methodArgs = self::filter ($methodArgs) ?
-                        self::parseArguments ($methodArgs) : [];
+                    $methodName = trim(substr($line, 2, $pos - 2));
+                    $methodArgs = self::filter($methodArgs) ?
+                        self::parseArguments($methodArgs) : [];
                 }
 
-                else $methodName = trim (substr ($line, 2));
+                else $methodName = trim(substr($line, 2));
 
-                $objects->current ()->push (new Node ([
+                $objects->current()->push(new Node([
                     'type'   => \VLF\METHOD_CALL,
                     'line'   => $line,
                     'words'  => $words,
@@ -202,7 +202,7 @@ 
             /**
              * Неопознанная структура
              */
-            else throw new \Exception ('Unsupported structure founded at line '. ($line_num + 1));
+            else throw new \Exception('Unsupported structure founded at line '.($line_num + 1));
         }
 
         return $tree;

Braces +43 added lines, -31 removed lines

@@ -25,8 +25,9 @@ 
         $tree    = new AST;
         $objects = new Stack;
 
-        if (file_exists ($vst))
-            $vst = file_get_contents ($vst);
+        if (file_exists ($vst)) {
+                    $vst = file_get_contents ($vst);
+        }
 
         $lines   = explode (self::$divider, $vst);
         $skip_at = -1;
@@ -35,24 +36,26 @@ 
         {
             // \VoidEngine\pre ($line_num .', '. ($skip_at > $line_num ? 'skip' : 'not skip') .': '. $line);
 
-            if ($skip_at > $line_num || !self::filter ($line))
-                continue;
+            if ($skip_at > $line_num || !self::filter ($line)) {
+                            continue;
+            }
 
             $height = self::getHeight ($line);
             $words  = array_filter (explode (' ', $line), 'VLF\Parser::filter');
             $poped  = false;
 
             # Очищаем стек объектов
-            while ($objects->size () > 0)
-                if ($objects->current ()->height >= $height)
+            while ($objects->size () > 0) {
+                            if ($objects->current ()->height >= $height)
                 {
                     $objects->pop ();
+            }
                     
                     $poped = true;
+                } else {
+                    break;
                 }
 
-                else break;
-
             # Создаём новую ссылку на объект
             if ($poped && $objects->size () > 0)
             {
@@ -72,10 +75,11 @@ 
                  */
                 if (isset ($words[0][1]))
                 {
-                    if ($words[0][1] == '^')
-                        $skip_at = self::parseSubtext ($lines, $line_num, $height)[1];
-
-                    else throw new \Exception ('Unknown char founded after comment definition at line '. ($line_num + 1));
+                    if ($words[0][1] == '^') {
+                                            $skip_at = self::parseSubtext ($lines, $line_num, $height)[1];
+                    } else {
+                        throw new \Exception ('Unknown char founded after comment definition at line '. ($line_num + 1));
+                    }
                 }
 
                 continue;
@@ -97,17 +101,19 @@ 
                     {
                         $parents = trim (substr ($line, $pos + 1));
 
-                        if (strlen ($parents) == 0)
-                            $parents = null;
-
-                        else $parents = array_map ('trim', explode (',', $parents));
+                        if (strlen ($parents) == 0) {
+                                                    $parents = null;
+                        } else {
+                            $parents = array_map ('trim', explode (',', $parents));
+                        }
                     }
+                } else {
+                    $name = trim (substr ($line, 1));
                 }
 
-                else $name = trim (substr ($line, 1));
-
-                if ($parents === null && $objects->size () > 0 && $objects->current ()->height < $height)
-                    $parents = [$objects->current ()->args['name']];
+                if ($parents === null && $objects->size () > 0 && $objects->current ()->height < $height) {
+                                    $parents = [$objects->current ()->args['name']];
+                }
 
                 $objects->push (new Node ([
                     'type'   => \VLF\STYLE_DEFINITION,
@@ -129,11 +135,13 @@ 
              */
             elseif (($pos = strpos ($line, ':')) !== false)
             {
-                if ($objects->size () == 0)
-                    throw new \Exception ('Trying to set property to unknown object at line '. ($line_num + 1));
+                if ($objects->size () == 0) {
+                                    throw new \Exception ('Trying to set property to unknown object at line '. ($line_num + 1));
+                }
 
-                if (!isset ($words[1]))
-                    throw new \Exception ('Trying to set void property value at line '. ($line_num + 1));
+                if (!isset ($words[1])) {
+                                    throw new \Exception ('Trying to set void property value at line '. ($line_num + 1));
+                }
 
                 $propertyName  = substr ($line, 0, $pos);
                 $propertyValue = substr ($line, $pos + 1);
@@ -167,25 +175,27 @@ 
              */
             elseif (isset ($words[0][1]) && $words[0][0] == '-' && $words[0][1] == '>')
             {
-                if ($objects->size () == 0)
-                    throw new \Exception ('Trying to call method from unknown object at line '. ($line_num + 1));
+                if ($objects->size () == 0) {
+                                    throw new \Exception ('Trying to call method from unknown object at line '. ($line_num + 1));
+                }
 
                 $methodArgs = [];
 
                 if (($pos = strpos ($line, '(')) !== false)
                 {
-                    if (($end = strrpos ($line, ')', $pos)) === false)
-                        throw new \Exception ('Incorrect method arguments syntax at line '. ($line_num + 1));
+                    if (($end = strrpos ($line, ')', $pos)) === false) {
+                                            throw new \Exception ('Incorrect method arguments syntax at line '. ($line_num + 1));
+                    }
 
                     $methodArgs = substr ($line, $pos + 1, $end - $pos - 1);
 
                     $methodName = trim (substr ($line, 2, $pos - 2));
                     $methodArgs = self::filter ($methodArgs) ?
                         self::parseArguments ($methodArgs) : [];
+                } else {
+                    $methodName = trim (substr ($line, 2));
                 }
 
-                else $methodName = trim (substr ($line, 2));
-
                 $objects->current ()->push (new Node ([
                     'type'   => \VLF\METHOD_CALL,
                     'line'   => $line,
@@ -202,7 +212,9 @@ 
             /**
              * Неопознанная структура
              */
-            else throw new \Exception ('Unsupported structure founded at line '. ($line_num + 1));
+            else {
+                throw new \Exception ('Unsupported structure founded at line '. ($line_num + 1));
+            }
         }
 
         return $tree;

engine/extensions/VLF/bin/VST/Interpreter.php

Spacing +7 added lines, -7 removed lines

@@ -26,30 +26,30 @@
      * 
      * @return array - возвращает список созданных объектов
      */
-    public static function run (AST $tree, Node $parent = null): array
+    public static function run(AST $tree, Node $parent = null): array
     {
-        foreach ($tree->getNodes () as $id => $node)
+        foreach ($tree->getNodes() as $id => $node)
         {
             if ($node->type == \VLF\STYLE_DEFINITION)
             {
                 $name  = $node->args['name'];
-                $nodes = $node->getNodes ();
+                $nodes = $node->getNodes();
 
                 if ($node->args['parents'] !== null)
                     foreach ($node->args['parents'] as $parent)
                     {
                         if (!isset (self::$styles[$parent]) && self::$throw_errors)
-                            throw new \Exception ('Style "'. $parent .'" not founded');
+                            throw new \Exception('Style "'.$parent.'" not founded');
 
-                        $nodes = array_merge ($nodes, self::$styles[$parent]);
+                        $nodes = array_merge($nodes, self::$styles[$parent]);
                     }
 
                 self::$styles[$name] = isset (self::$objects[$name]) ?
                     array_merge (self::$styles[$name], $nodes) : $nodes;
             }
 
-            self::$styles = self::run (new AST (array_map (
-                fn ($node) => $node->export (), $node->getNodes ())), $node);
+            self::$styles = self::run(new AST(array_map(
+                fn($node) => $node->export(), $node->getNodes())), $node);
         }
 
         return self::$styles;

Braces +3 added lines, -2 removed lines

@@ -35,11 +35,12 @@
                 $name  = $node->args['name'];
                 $nodes = $node->getNodes ();
 
-                if ($node->args['parents'] !== null)
-                    foreach ($node->args['parents'] as $parent)
+                if ($node->args['parents'] !== null) {
+                                    foreach ($node->args['parents'] as $parent)
                     {
                         if (!isset (self::$styles[$parent]) && self::$throw_errors)
                             throw new \Exception ('Style "'. $parent .'" not founded');
+                }
 
                         $nodes = array_merge ($nodes, self::$styles[$parent]);
                     }

engine/extensions/VLF/bin/Stack.php

Spacing +7 added lines, -7 removed lines

@@ -17,7 +17,7 @@ 
      * 
      * @return Stack - возвращает сам себя
      */
-    public function push ($item): Stack
+    public function push($item): Stack
     {
         $this->items[] = $item;
 
@@ -29,9 +29,9 @@ 
      * 
      * @return mixed - возвращает текущий элемент
      */
-    public function current ()
+    public function current()
     {
-        return end ($this->items);
+        return end($this->items);
     }
 
     /**
@@ -39,9 +39,9 @@ 
      * 
      * @return mixed - возвращает текущий элемент
      */
-    public function pop ()
+    public function pop()
     {
-        return array_pop ($this->items);
+        return array_pop($this->items);
     }
 
     /**
@@ -49,8 +49,8 @@ 
      * 
      * @return int - возвращает размер стэка
      */
-    public function size (): int
+    public function size(): int
     {
-        return sizeof ($this->items);
+        return sizeof($this->items);
     }
 }

engine/extensions/WinAPI/main.php

Spacing +5 added lines, -6 removed lines

@@ -27,7 +27,7 @@ 
 {
     protected $WinAPI;
 
-    public function __construct ()
+    public function __construct()
     {
         /**
          * Большинство функций было взято из класса "WinAPI" проекта "DevelStudio XL"
@@ -36,7 +36,7 @@ 
          * @see <https://vk.com/evsoft>
          * @see <https://vk.com/magic.breeze>
          */
-        $this->WinAPI = \FFI::cdef ('
+        $this->WinAPI = \FFI::cdef('
             struct LPCTSTR
             {
                 char string;
@@ -72,10 +72,9 @@ 
         ', 'User32.dll');
     }
 
-    public function __call ($method, $args)
+    public function __call($method, $args)
     {
-        return method_exists ($this, $method) ?
-            $this->$method (...$args) :
-            $this->WinAPI->$method (...$args);
+        return method_exists($this, $method) ?
+            $this->$method(...$args) : $this->WinAPI->$method(...$args);
     }
 }

engine/VoidEngine.php

Braces +4 added lines, -2 removed lines

@@ -48,10 +48,12 @@
 require 'components/Component.php';
 require 'components/Control.php';
 
-foreach (glob ('components/*/*.php') as $name)
+foreach (glob ('components/*/*.php') as $name) {
     require $name;
+}
 
-if (file_exists ('extensions'))
+if (file_exists ('extensions')) {
     foreach (scandir ('extensions') as $ext)
         if (file_exists ($ext = 'extensions/'. $ext .'/main.php'))
             require $ext;
+}

Spacing +6 added lines, -6 removed lines

@@ -34,7 +34,7 @@ 
 const ENGINE_VERSION = '4.0.0rc1';
 const ENGINE_DIR = __DIR__;
 
-chdir (ENGINE_DIR);
+chdir(ENGINE_DIR);
 
 require 'common/Events.php';
 require 'common/EngineInterfaces.php';
@@ -43,15 +43,15 @@ 
 require 'common/Components.php';
 require 'common/Others.php';
 
-define ('VoidEngine\CORE_VERSION', $APPLICATION->productVersion);
+define('VoidEngine\CORE_VERSION', $APPLICATION->productVersion);
 
 require 'components/Component.php';
 require 'components/Control.php';
 
-foreach (glob ('components/*/*.php') as $name)
+foreach (glob('components/*/*.php') as $name)
     require $name;
 
-if (file_exists ('extensions'))
-    foreach (scandir ('extensions') as $ext)
-        if (file_exists ($ext = 'extensions/'. $ext .'/main.php'))
+if (file_exists('extensions'))
+    foreach (scandir('extensions') as $ext)
+        if (file_exists($ext = 'extensions/'.$ext.'/main.php'))
             require $ext;

engine/common/EngineInterfaces.php

Indentation +8 added lines, -8 removed lines

@@ -55,7 +55,7 @@ 
                 $size = $this->count;
                 $list = [];
                 
-				for ($i = 0; $i < $size; ++$i)
+                for ($i = 0; $i < $size; ++$i)
                     $list[] = EngineAdditions::coupleSelector (VoidCore::getArrayValue ($this->selector, $i));
                 
                 return $list;
@@ -124,7 +124,7 @@ 
     # ArrayAccess
 
     public function offsetSet ($index, $value)
-	{
+    {
         try
         {
             $index === null ?
@@ -140,14 +140,14 @@ 
         }
     }
 	
-	public function offsetGet ($index)
-	{
-		return EngineAdditions::coupleSelector (VoidCore::getArrayValue ($this->selector, $index), $this->selector);
+    public function offsetGet ($index)
+    {
+        return EngineAdditions::coupleSelector (VoidCore::getArrayValue ($this->selector, $index), $this->selector);
     }
 	
-	public function offsetUnset ($index): void
-	{
-		$this->callMethod ('RemoveAt', $index);
+    public function offsetUnset ($index): void
+    {
+        $this->callMethod ('RemoveAt', $index);
     }
     
     public function offsetExists ($index): bool

Braces +45 added lines, -51 removed lines

@@ -12,16 +12,17 @@ 
 
     public function __construct ($name, $assembly = false, ...$args)
     {
-        foreach ($args as $id => $arg)
-            $args[$id] = EngineAdditions::uncoupleSelector ($arg);
+        foreach ($args as $id => $arg) {
+                    $args[$id] = EngineAdditions::uncoupleSelector ($arg);
+        }
         
-        if (is_int ($name) && VoidCore::objectExists ($name))
-            $this->selector = $name;
-
-        elseif (is_string ($name))
-            $this->selector = VoidCore::createObject ($name, $assembly, ...$args);
-
-        else throw new \Exception ('Incorrect params passed');
+        if (is_int ($name) && VoidCore::objectExists ($name)) {
+                    $this->selector = $name;
+        } elseif (is_string ($name)) {
+                    $this->selector = VoidCore::createObject ($name, $assembly, ...$args);
+        } else {
+            throw new \Exception ('Incorrect params passed');
+        }
 
         /*$this->isCollection = $this->getType ()
             ->isSubclassOf (VoidCore::typeof ('System.Collectons.Generic.ICollection'));*/
@@ -43,9 +44,7 @@ 
                 try
                 {
                     return $this->getProperty ('Count');
-                }
-
-                catch (\WinformsException $e)
+                } catch (\WinformsException $e)
                 {
                     return $this->getProperty ('Length');
                 }
@@ -55,8 +54,9 @@ 
                 $size = $this->count;
                 $list = [];
                 
-				for ($i = 0; $i < $size; ++$i)
-                    $list[] = EngineAdditions::coupleSelector (VoidCore::getArrayValue ($this->selector, $i));
+				for ($i = 0; $i < $size; ++$i) {
+				                    $list[] = EngineAdditions::coupleSelector (VoidCore::getArrayValue ($this->selector, $i));
+				}
                 
                 return $list;
             break;
@@ -65,13 +65,12 @@ 
                 $size  = $this->count;
                 $names = [];
                 
-                for ($i = 0; $i < $size; ++$i)
-                    try
+                for ($i = 0; $i < $size; ++$i) {
+                                    try
                     {
                         $names[] = VoidCore::getProperty (VoidCore::getArrayValue ($this->selector, [$i, VC_OBJECT]), 'Text');
-                    }
-
-                    catch (\WinformsException $e)
+                }
+                    } catch (\WinformsException $e)
                     {
                         $names[] = VoidCore::getArrayValue ($this->selector, [$i, VC_STRING]);
                     }
@@ -80,8 +79,9 @@ 
             break;
         }
 
-        if (method_exists ($this, $method = 'get_'. $name))
-            return $this->$method ();
+        if (method_exists ($this, $method = 'get_'. $name)) {
+                    return $this->$method ();
+        }
 
         return isset ($this->$name) ?
             $this->$name : EngineAdditions::coupleSelector ($this->getProperty ($name));
@@ -89,13 +89,13 @@ 
 
     public function __set (string $name, $value): void
     {
-        if (substr ($name, -5) == 'Event')
-            Events::setEvent ($this->selector, substr ($name, 0, -5), $value);
-
-        elseif (method_exists ($this, $method = 'set_'. $name))
-            $this->$method ($value);
-        
-        else $this->setProperty ($name, EngineAdditions::uncoupleSelector ($value));
+        if (substr ($name, -5) == 'Event') {
+                    Events::setEvent ($this->selector, substr ($name, 0, -5), $value);
+        } elseif (method_exists ($this, $method = 'set_'. $name)) {
+                    $this->$method ($value);
+        } else {
+            $this->setProperty ($name, EngineAdditions::uncoupleSelector ($value));
+        }
     }
 
     public function __call (string $name, array $args)
@@ -130,9 +130,7 @@ 
             $index === null ?
                 $this->callMethod ('Add', EngineAdditions::uncoupleSelector ($value)) :
                 $this->callMethod ('Insert', $index, EngineAdditions::uncoupleSelector ($value));
-        }
-
-        catch (\Throwable $e)
+        } catch (\Throwable $e)
         {
             $index === null ?
                 VoidCore::setArrayValue ($this->selector, $this->count, EngineAdditions::uncoupleSelector ($value)) :
@@ -155,9 +153,7 @@ 
         try
         {
             $this->offsetGet ($index);
-        }
-
-        catch (\WinformsException $e)
+        } catch (\WinformsException $e)
         {
             return false;
         }
@@ -171,8 +167,9 @@ 
     {
         $size = $this->count;
 
-        for ($i = 0; $i < $size; ++$i)
-            $callback (EngineAdditions::coupleSelector (VoidCore::getArrayValue ($this->selector, $type !== null ? [$i, $type] : $i), $this->selector), $i);
+        for ($i = 0; $i < $size; ++$i) {
+                    $callback (EngineAdditions::coupleSelector (VoidCore::getArrayValue ($this->selector, $type !== null ? [$i, $type] : $i), $this->selector), $i);
+        }
     }
 
     public function where (callable $comparator, string $type = null): array
@@ -180,9 +177,10 @@ 
         $size   = $this->count;
         $return = [];
 
-        for ($i = 0; $i < $size; ++$i)
-            if ($comparator ($value = EngineAdditions::coupleSelector (VoidCore::getArrayValue ($this->selector, $type !== null ? [$i, $type] : $i), $this->selector), $i))
+        for ($i = 0; $i < $size; ++$i) {
+                    if ($comparator ($value = EngineAdditions::coupleSelector (VoidCore::getArrayValue ($this->selector, $type !== null ? [$i, $type] : $i), $this->selector), $i))
                 $return[] = $value;
+        }
 
         return $return;
     }
@@ -206,16 +204,12 @@ 
         try
         {
             $info['name'] = $this->getProperty ('Name');
-        }
-
-        catch (\WinformsException $e) {}
+        } catch (\WinformsException $e) {}
 
         try
         {
             $info['info'] = $this->callMethod ('ToString');
-        }
-
-        catch (\WinformsException $e) {}
+        } catch (\WinformsException $e) {}
 
         return $info;
     }
@@ -225,13 +219,13 @@ 
 {
     public function __construct ($name, $assembly = false, ...$args)
     {
-        if (is_int ($name) && VoidCore::objectExists ($name))
-            $this->selector = $name;
-
-        elseif (is_string ($name))
-            $this->selector = VoidCore::getClass ($name, $assembly, ...$args);
-
-        else throw new \Exception ('Incorrect params passed');
+        if (is_int ($name) && VoidCore::objectExists ($name)) {
+                    $this->selector = $name;
+        } elseif (is_string ($name)) {
+                    $this->selector = VoidCore::getClass ($name, $assembly, ...$args);
+        } else {
+            throw new \Exception ('Incorrect params passed');
+        }
     }
 }
 

Spacing +61 added lines, -63 removed lines

@@ -10,44 +10,44 @@ 
     // protected ?string $name = null;
     // protected bool $isCollection = false;
 
-    public function __construct ($name, $assembly = false, ...$args)
+    public function __construct($name, $assembly = false, ...$args)
     {
         foreach ($args as $id => $arg)
-            $args[$id] = EngineAdditions::uncoupleSelector ($arg);
+            $args[$id] = EngineAdditions::uncoupleSelector($arg);
         
-        if (is_int ($name) && VoidCore::objectExists ($name))
+        if (is_int($name) && VoidCore::objectExists($name))
             $this->selector = $name;
 
-        elseif (is_string ($name))
-            $this->selector = VoidCore::createObject ($name, $assembly, ...$args);
+        elseif (is_string($name))
+            $this->selector = VoidCore::createObject($name, $assembly, ...$args);
 
-        else throw new \Exception ('Incorrect params passed');
+        else throw new \Exception('Incorrect params passed');
 
         /*$this->isCollection = $this->getType ()
             ->isSubclassOf (VoidCore::typeof ('System.Collectons.Generic.ICollection'));*/
     }
 
-    public function dispose (): void
+    public function dispose(): void
     {
-        VoidCore::removeObjects ($this->selector);
+        VoidCore::removeObjects($this->selector);
     }
 
     # Основные магические методы
 
-    public function __get (string $name)
+    public function __get(string $name)
     {
-        switch (strtolower ($name))
+        switch (strtolower($name))
         {
             case 'count':
             case 'length':
                 try
                 {
-                    return $this->getProperty ('Count');
+                    return $this->getProperty('Count');
                 }
 
                 catch (\WinformsException $e)
                 {
-                    return $this->getProperty ('Length');
+                    return $this->getProperty('Length');
                 }
             break;
 
@@ -56,7 +56,7 @@ 
                 $list = [];
                 
 				for ($i = 0; $i < $size; ++$i)
-                    $list[] = EngineAdditions::coupleSelector (VoidCore::getArrayValue ($this->selector, $i));
+                    $list[] = EngineAdditions::coupleSelector(VoidCore::getArrayValue($this->selector, $i));
                 
                 return $list;
             break;
@@ -68,93 +68,91 @@ 
                 for ($i = 0; $i < $size; ++$i)
                     try
                     {
-                        $names[] = VoidCore::getProperty (VoidCore::getArrayValue ($this->selector, [$i, VC_OBJECT]), 'Text');
+                        $names[] = VoidCore::getProperty(VoidCore::getArrayValue($this->selector, [$i, VC_OBJECT]), 'Text');
                     }
 
                     catch (\WinformsException $e)
                     {
-                        $names[] = VoidCore::getArrayValue ($this->selector, [$i, VC_STRING]);
+                        $names[] = VoidCore::getArrayValue($this->selector, [$i, VC_STRING]);
                     }
                 
                 return $names;
             break;
         }
 
-        if (method_exists ($this, $method = 'get_'. $name))
-            return $this->$method ();
+        if (method_exists($this, $method = 'get_'.$name))
+            return $this->$method();
 
         return isset ($this->$name) ?
-            $this->$name : EngineAdditions::coupleSelector ($this->getProperty ($name));
+            $this->$name : EngineAdditions::coupleSelector($this->getProperty($name));
     }
 
-    public function __set (string $name, $value): void
+    public function __set(string $name, $value): void
     {
-        if (substr ($name, -5) == 'Event')
-            Events::setEvent ($this->selector, substr ($name, 0, -5), $value);
+        if (substr($name, -5) == 'Event')
+            Events::setEvent($this->selector, substr($name, 0, -5), $value);
 
-        elseif (method_exists ($this, $method = 'set_'. $name))
-            $this->$method ($value);
+        elseif (method_exists($this, $method = 'set_'.$name))
+            $this->$method($value);
         
-        else $this->setProperty ($name, EngineAdditions::uncoupleSelector ($value));
+        else $this->setProperty($name, EngineAdditions::uncoupleSelector($value));
     }
 
-    public function __call (string $name, array $args)
+    public function __call(string $name, array $args)
     {
-        return EngineAdditions::coupleSelector ($this->callMethod ($name, array_map (
-            fn ($arg) => EngineAdditions::uncoupleSelector ($arg), $args)));
+        return EngineAdditions::coupleSelector($this->callMethod($name, array_map(
+            fn($arg) => EngineAdditions::uncoupleSelector($arg), $args)));
     }
 
     # Управление VoidCore
 
-    protected function getProperty ($name)
+    protected function getProperty($name)
     {
-        return VoidCore::getProperty ($this->selector, $name);
+        return VoidCore::getProperty($this->selector, $name);
     }
 
-    protected function setProperty (string $name, $value): void
+    protected function setProperty(string $name, $value): void
     {
-        VoidCore::setProperty ($this->selector, $name, $value);
+        VoidCore::setProperty($this->selector, $name, $value);
     }
 
-    protected function callMethod (string $name, array $args = [])
+    protected function callMethod(string $name, array $args = [])
     {
-        return VoidCore::callMethod ($this->selector, $name, ...$args);
+        return VoidCore::callMethod($this->selector, $name, ...$args);
     }
 
     # ArrayAccess
 
-    public function offsetSet ($index, $value)
+    public function offsetSet($index, $value)
 	{
         try
         {
             $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)
         {
             $index === null ?
-                VoidCore::setArrayValue ($this->selector, $this->count, EngineAdditions::uncoupleSelector ($value)) :
-                VoidCore::setArrayValue ($this->selector, $index, EngineAdditions::uncoupleSelector ($value));
+                VoidCore::setArrayValue($this->selector, $this->count, EngineAdditions::uncoupleSelector($value)) : VoidCore::setArrayValue($this->selector, $index, EngineAdditions::uncoupleSelector($value));
         }
     }
 	
-	public function offsetGet ($index)
+	public function offsetGet($index)
 	{
-		return EngineAdditions::coupleSelector (VoidCore::getArrayValue ($this->selector, $index), $this->selector);
+		return EngineAdditions::coupleSelector(VoidCore::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 (\WinformsException $e)
@@ -172,16 +170,16 @@ 
         $size = $this->count;
 
         for ($i = 0; $i < $size; ++$i)
-            $callback (EngineAdditions::coupleSelector (VoidCore::getArrayValue ($this->selector, $type !== null ? [$i, $type] : $i), $this->selector), $i);
+            $callback(EngineAdditions::coupleSelector(VoidCore::getArrayValue($this->selector, $type !== null ? [$i, $type] : $i), $this->selector), $i);
     }
 
-    public function where (callable $comparator, string $type = null): array
+    public function where(callable $comparator, string $type = null): array
     {
         $size   = $this->count;
         $return = [];
 
         for ($i = 0; $i < $size; ++$i)
-            if ($comparator ($value = EngineAdditions::coupleSelector (VoidCore::getArrayValue ($this->selector, $type !== null ? [$i, $type] : $i), $this->selector), $i))
+            if ($comparator($value = EngineAdditions::coupleSelector(VoidCore::getArrayValue($this->selector, $type !== null ? [$i, $type] : $i), $this->selector), $i))
                 $return[] = $value;
 
         return $return;
@@ -189,30 +187,30 @@ 
 
     # Магические методы
 
-    public function __destruct ()
+    public function __destruct()
     {
-        VoidCore::destructObject ($this->selector);
+        VoidCore::destructObject($this->selector);
     }
 
-    public function __toString (): string
+    public function __toString(): string
     {
         return $this->selector;
     }
 
-    public function __debugInfo (): array
+    public function __debugInfo(): array
     {
         $info = ['selector' => $this->selector];
 
         try
         {
-            $info['name'] = $this->getProperty ('Name');
+            $info['name'] = $this->getProperty('Name');
         }
 
         catch (\WinformsException $e) {}
 
         try
         {
-            $info['info'] = $this->callMethod ('ToString');
+            $info['info'] = $this->callMethod('ToString');
         }
 
         catch (\WinformsException $e) {}
@@ -223,29 +221,29 @@ 
 
 class NetClass extends NetObject
 {
-    public function __construct ($name, $assembly = false, ...$args)
+    public function __construct($name, $assembly = false, ...$args)
     {
-        if (is_int ($name) && VoidCore::objectExists ($name))
+        if (is_int($name) && VoidCore::objectExists($name))
             $this->selector = $name;
 
-        elseif (is_string ($name))
-            $this->selector = VoidCore::getClass ($name, $assembly, ...$args);
+        elseif (is_string($name))
+            $this->selector = VoidCore::getClass($name, $assembly, ...$args);
 
-        else throw new \Exception ('Incorrect params passed');
+        else throw new \Exception('Incorrect params passed');
     }
 }
 
 class EngineAdditions
 {
-    public static function coupleSelector ($selector)
+    public static function coupleSelector($selector)
     {
-        return is_int ($selector) && VoidCore::objectExists ($selector) ?
-            new NetObject ($selector) : $selector;
+        return is_int($selector) && VoidCore::objectExists($selector) ?
+            new NetObject($selector) : $selector;
     }
 
-    public static function uncoupleSelector ($object)
+    public static function uncoupleSelector($object)
     {
-        return is_object ($object) && $object instanceof NetObject ?
+        return is_object($object) && $object instanceof NetObject ?
             $object->selector : $object;
     }
 }

engine/common/Events.php

Indentation +4 added lines, -4 removed lines

@@ -9,17 +9,17 @@
     public static function setEvent (int $selector, string $eventName, callable $function): void
     {
         VoidCore::setEvent ($selector, $eventName, function ($sender, ...$args) use ($function)
-		{
+        {
             try
-			{
+            {
                 foreach ($args as $id => $arg)
                     $args[$id] = EngineAdditions::coupleSelector ($arg);
                 
                 return $function (_c ($sender) ?: new NetObject ($sender), ...$args);
             }
             
-			catch (\Throwable $e)
-			{
+            catch (\Throwable $e)
+            {
                 message ([
                     'type'  => get_class ($e),
                     'text'  => $e->getMessage (),

Spacing +13 added lines, -13 removed lines

@@ -6,34 +6,34 @@
 
 class Events
 {
-    public static function setEvent (int $selector, string $eventName, callable $function): void
+    public static function setEvent(int $selector, string $eventName, callable $function): void
     {
-        VoidCore::setEvent ($selector, $eventName, function ($sender, ...$args) use ($function)
+        VoidCore::setEvent($selector, $eventName, function($sender, ...$args) use ($function)
 		{
             try
 			{
                 foreach ($args as $id => $arg)
-                    $args[$id] = EngineAdditions::coupleSelector ($arg);
+                    $args[$id] = EngineAdditions::coupleSelector($arg);
                 
-                return $function (_c ($sender) ?: new NetObject ($sender), ...$args);
+                return $function(_c($sender) ?: new NetObject($sender), ...$args);
             }
             
 			catch (\Throwable $e)
 			{
-                message ([
-                    'type'  => get_class ($e),
-                    'text'  => $e->getMessage (),
-                    'file'  => $e->getFile (),
-                    'line'  => $e->getLine (),
-                    'code'  => $e->getCode (),
-                    'trace' => $e->getTraceAsString ()
+                message([
+                    'type'  => get_class($e),
+                    'text'  => $e->getMessage(),
+                    'file'  => $e->getFile(),
+                    'line'  => $e->getLine(),
+                    'code'  => $e->getCode(),
+                    'trace' => $e->getTraceAsString()
                 ], 'PHP Critical Error');
             }
         });
     }
 
-    public static function removeEvent (int $selector, string $eventName): void
+    public static function removeEvent(int $selector, string $eventName): void
     {
-        VoidCore::removeEvent ($selector, $eventName);
+        VoidCore::removeEvent($selector, $eventName);
     }
 }

Braces +4 added lines, -5 removed lines

@@ -12,13 +12,12 @@
 		{
             try
 			{
-                foreach ($args as $id => $arg)
-                    $args[$id] = EngineAdditions::coupleSelector ($arg);
+                foreach ($args as $id => $arg) {
+                                    $args[$id] = EngineAdditions::coupleSelector ($arg);
+                }
                 
                 return $function (_c ($sender) ?: new NetObject ($sender), ...$args);
-            }
-            
-			catch (\Throwable $e)
+            } catch (\Throwable $e)
 			{
                 message ([
                     'type'  => get_class ($e),

engine/common/Globals.php

Spacing +22 added lines, -22 removed lines

@@ -2,50 +2,50 @@ 
 
 namespace VoidEngine;
 
-register_superglobals ('APPLICATION', 'SCREEN');
+register_superglobals('APPLICATION', 'SCREEN');
 
 $APPLICATION = new class
 {
     public NetClass $application;
     public string $executablePath;
     
-    public function __construct ()
+    public function __construct()
     {
-        $this->application    = new NetClass ('System.Windows.Forms.Application');
+        $this->application    = new NetClass('System.Windows.Forms.Application');
         $this->executablePath = $this->application->executablePath;
     }
     
-    public function run ($form = null): void
+    public function run($form = null): void
     {
         if ($form instanceof NetObject)
-            $this->application->run ($form->selector);
+            $this->application->run($form->selector);
         
-        elseif (is_int ($form) && \VoidCore::objectExists ($form))
-            $this->application->run ($form);
+        elseif (is_int($form) && \VoidCore::objectExists($form))
+            $this->application->run($form);
         
         elseif ($form === null)
-            $this->application->run ();
+            $this->application->run();
 
-        else throw new \Exception ('$form param must be instance of "VoidEngine\NetObject" ("VoidEngine\Form"), be null or object selector');
+        else throw new \Exception('$form param must be instance of "VoidEngine\NetObject" ("VoidEngine\Form"), be null or object selector');
     }
     
-    public function restart (): void
+    public function restart(): void
     {
-        $this->application->restart ();
-        $this->close ();
+        $this->application->restart();
+        $this->close();
     }
     
-    public function close (): void
+    public function close(): void
     {
-        $this->application->exit ();
+        $this->application->exit();
     }
 
-    public function __call (string $name, array $args)
+    public function __call(string $name, array $args)
     {
-        return $this->application->$name (...$args);
+        return $this->application->$name(...$args);
     }
 
-    public function __get (string $name)
+    public function __get(string $name)
     {
         return $this->application->$name;
     }
@@ -55,14 +55,14 @@ 
 {
     public NetClass $screen;
     
-    public function __construct ()
+    public function __construct()
     {
-        $this->screen = new NetClass ('System.Windows.Forms.Screen');
+        $this->screen = new NetClass('System.Windows.Forms.Screen');
     }
     
-    public function __get ($name)
+    public function __get($name)
     {
-        switch (strtolower ($name))
+        switch (strtolower($name))
         {
             case 'width':
             case 'w':
@@ -80,7 +80,7 @@ 
         }
     }
     
-    public function __debugInfo (): array
+    public function __debugInfo(): array
     {
         return [
             $this->w,

Braces +9 added lines, -10 removed lines

@@ -17,16 +17,15 @@
     
     public function run ($form = null): void
     {
-        if ($form instanceof NetObject)
-            $this->application->run ($form->selector);
-        
-        elseif (is_int ($form) && \VoidCore::objectExists ($form))
-            $this->application->run ($form);
-        
-        elseif ($form === null)
-            $this->application->run ();
-
-        else throw new \Exception ('$form param must be instance of "VoidEngine\NetObject" ("VoidEngine\Form"), be null or object selector');
+        if ($form instanceof NetObject) {
+                    $this->application->run ($form->selector);
+        } elseif (is_int ($form) && \VoidCore::objectExists ($form)) {
+                    $this->application->run ($form);
+        } elseif ($form === null) {
+                    $this->application->run ();
+        } else {
+            throw new \Exception ('$form param must be instance of "VoidEngine\NetObject" ("VoidEngine\Form"), be null or object selector');
+        }
     }
     
     public function restart (): void

engine/common/Components.php

Spacing +15 added lines, -15 removed lines

@@ -6,61 +6,61 @@
 {
     protected static array $objects = [];
 
-    public static function add (NetObject $object): void
+    public static function add(NetObject $object): void
     {
-        self::$objects[$object->selector] = \WeakReference::create ($object);
+        self::$objects[$object->selector] = \WeakReference::create($object);
     }
 
-    public static function get (int $selector): ?NetObject
+    public static function get(int $selector): ?NetObject
     {
         if (!isset (self::$objects[$selector]))
             return null;
         
-        $object = self::$objects[$selector]->get ();
+        $object = self::$objects[$selector]->get();
 
         if ($object === null)
-            self::remove ($selector);
+            self::remove($selector);
 
         return $object;
     }
 
-    public static function exists (int $selector): bool
+    public static function exists(int $selector): bool
     {
         return isset (self::$objects[$selector]);
     }
 
-    public static function getObjects (): array
+    public static function getObjects(): array
     {
         return self::$objects;
     }
 
-    public static function remove (int $selector): void
+    public static function remove(int $selector): void
     {
         unset (self::$objects[$selector]);
     }
 
-    public static function clean (): void
+    public static function clean(): void
     {
         foreach (self::$objects as $selector => $reference)
-            if ($reference->get () === null)
+            if ($reference->get() === null)
                 unset (self::$objects[$selector]);
     }
 }
 
-function _c (int $selector): ?NetObject
+function _c(int $selector): ?NetObject
 {
-    return Components::get ($selector);
+    return Components::get($selector);
 }
 
 // TODO: поддержка многоуровневых ссылок вида родитель->родитель->объект
-function c (string $name): ?NetObject
+function c(string $name): ?NetObject
 {
     if (($object = _c($name)) !== null)
         return $object;
 
-    foreach (Components::getObjects () as $selector => $reference)
+    foreach (Components::getObjects() as $selector => $reference)
     {
-        $object = $reference->get ();
+        $object = $reference->get();
 
         if ($object === null)
             continue;

Braces +19 added lines, -15 removed lines

@@ -13,13 +13,15 @@ 
 
     public static function get (int $selector): ?NetObject
     {
-        if (!isset (self::$objects[$selector]))
-            return null;
+        if (!isset (self::$objects[$selector])) {
+                    return null;
+        }
         
         $object = self::$objects[$selector]->get ();
 
-        if ($object === null)
-            self::remove ($selector);
+        if ($object === null) {
+                    self::remove ($selector);
+        }
 
         return $object;
     }
@@ -41,9 +43,10 @@ 
 
     public static function clean (): void
     {
-        foreach (self::$objects as $selector => $reference)
-            if ($reference->get () === null)
+        foreach (self::$objects as $selector => $reference) {
+                    if ($reference->get () === null)
                 unset (self::$objects[$selector]);
+        }
     }
 }
 
@@ -55,23 +58,24 @@ 
 // TODO: поддержка многоуровневых ссылок вида родитель->родитель->объект
 function c (string $name): ?NetObject
 {
-    if (($object = _c($name)) !== null)
-        return $object;
+    if (($object = _c($name)) !== null) {
+            return $object;
+    }
 
     foreach (Components::getObjects () as $selector => $reference)
     {
         $object = $reference->get ();
 
-        if ($object === null)
-            continue;
+        if ($object === null) {
+                    continue;
+        }
 
         try
         {
-            if ($object->name == $name)
-                return $object;
-        }
-
-        catch (\WinformsException $e) {}
+            if ($object->name == $name) {
+                            return $object;
+            }
+        } catch (\WinformsException $e) {}
     }
 
     return null;