winforms-php / VoidFramework

engine/components/system/ImageList.php

Indentation +1 added lines, -1 removed lines

@@ -5,5 +5,5 @@
 class ImageList extends Control
 {
     protected ?string $classname = 'System.Windows.Forms.ImageList';
-	protected ?string $assembly  = 'System.Windows.Forms';
+    protected ?string $assembly  = 'System.Windows.Forms';
 }

Spacing +1 added lines, -1 removed lines

@@ -5,5 +5,5 @@
 class ImageList extends Control
 {
     protected ?string $classname = 'System.Windows.Forms.ImageList';
-	protected ?string $assembly  = 'System.Windows.Forms';
+	protected ?string $assembly = 'System.Windows.Forms';
 }

engine/components/system/Timer.php

Indentation +1 added lines, -1 removed lines

@@ -5,5 +5,5 @@
 class Timer extends Control
 {
     protected ?string $classname = 'System.Windows.Forms.Timer';
-	protected ?string $assembly  = 'System.Windows.Forms';
+    protected ?string $assembly  = 'System.Windows.Forms';
 }

Spacing +1 added lines, -1 removed lines

@@ -5,5 +5,5 @@
 class Timer extends Control
 {
     protected ?string $classname = 'System.Windows.Forms.Timer';
-	protected ?string $assembly  = 'System.Windows.Forms';
+	protected ?string $assembly = 'System.Windows.Forms';
 }

engine/components/dialogs/CommonDialog.php

Indentation +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 abstract class CommonDialog extends Component
 {
     protected ?string $classname = 'System.Windows.Forms.CommonDialog';
-	protected ?string $assembly  = 'System.Windows.Forms';
+    protected ?string $assembly  = 'System.Windows.Forms';
 
     public function execute (): int
     {

Spacing +3 added lines, -3 removed lines

@@ -5,10 +5,10 @@
 abstract class CommonDialog extends Component
 {
     protected ?string $classname = 'System.Windows.Forms.CommonDialog';
-	protected ?string $assembly  = 'System.Windows.Forms';
+	protected ?string $assembly = 'System.Windows.Forms';
 
-    public function execute (): int
+    public function execute(): int
     {
-        return $this->callMethod ('ShowDialog');
+        return $this->callMethod('ShowDialog');
     }
 }

engine/components/dialogs/FolderBrowserDialog.php

Spacing +2 added lines, -2 removed lines

@@ -6,8 +6,8 @@
 {
     protected ?string $classname = 'System.Windows.Forms.FolderBrowserDialog';
 	
-    public function get_path ()
+    public function get_path()
     {
-        return $this->getProperty ('SelectedPath');
+        return $this->getProperty('SelectedPath');
     }
 }

engine/components/dialogs/MessageBox.php

Spacing +2 added lines, -2 removed lines

@@ -7,8 +7,8 @@
     protected ?string $classname = 'System.Windows.Forms.MessageBox';
     protected ?string $assembly  = 'System.Windows.Forms';
     
-    public function __construct ()
+    public function __construct()
     {
-        parent::__construct ($this->classname, $this->assembly);
+        parent::__construct($this->classname, $this->assembly);
     }
 }

engine/components/system/Process.php

Indentation +15 added lines, -15 removed lines

@@ -6,28 +6,28 @@
 
 class Process extends Component
 {
-	protected ?string $classname = 'System.Diagnostics.Process';
-	protected ?string $assembly  = 'System';
+    protected ?string $classname = 'System.Diagnostics.Process';
+    protected ?string $assembly  = 'System';
 
-	public function __construct (int $pid = null)
-	{
+    public function __construct (int $pid = null)
+    {
         $this->selector = VoidCore::getClass ($this->classname, $this->assembly);
 
-		if ($pid !== null)
+        if ($pid !== null)
             $this->selector = $pid == getmypid () ?
                 VoidCore::callMethod ($this->selector, 'GetCurrentProcess') :
                 VoidCore::callMethod ($this->selector, 'GetProcessById', $pid);
 
-		Components::add ($this);
-	}
+        Components::add ($this);
+    }
 	
-	public static function getProcessById (int $pid)
-	{
-		return new self ($pid);
-	}
+    public static function getProcessById (int $pid)
+    {
+        return new self ($pid);
+    }
 	
-	public static function getCurrentProcess ()
-	{
-		return new self (getmypid ());
-	}
+    public static function getCurrentProcess ()
+    {
+        return new self (getmypid ());
+    }
 }

Spacing +9 added lines, -10 removed lines

@@ -9,25 +9,24 @@
 	protected ?string $classname = 'System.Diagnostics.Process';
 	protected ?string $assembly  = 'System';
 
-	public function __construct (int $pid = null)
+	public function __construct(int $pid = null)
 	{
-        $this->selector = VoidCore::getClass ($this->classname, $this->assembly);
+        $this->selector = VoidCore::getClass($this->classname, $this->assembly);
 
 		if ($pid !== null)
-            $this->selector = $pid == getmypid () ?
-                VoidCore::callMethod ($this->selector, 'GetCurrentProcess') :
-                VoidCore::callMethod ($this->selector, 'GetProcessById', $pid);
+            $this->selector = $pid == getmypid() ?
+                VoidCore::callMethod($this->selector, 'GetCurrentProcess') : VoidCore::callMethod($this->selector, 'GetProcessById', $pid);
 
-		Components::add ($this);
+		Components::add($this);
 	}
 	
-	public static function getProcessById (int $pid)
+	public static function getProcessById(int $pid)
 	{
-		return new self ($pid);
+		return new self($pid);
 	}
 	
-	public static function getCurrentProcess ()
+	public static function getCurrentProcess()
 	{
-		return new self (getmypid ());
+		return new self(getmypid());
 	}
 }

Braces +3 added lines, -2 removed lines

@@ -13,10 +13,11 @@
 	{
         $this->selector = VoidCore::getClass ($this->classname, $this->assembly);
 
-		if ($pid !== null)
-            $this->selector = $pid == getmypid () ?
+		if ($pid !== null) {
+		            $this->selector = $pid == getmypid () ?
                 VoidCore::callMethod ($this->selector, 'GetCurrentProcess') :
                 VoidCore::callMethod ($this->selector, 'GetProcessById', $pid);
+		}
 
 		Components::add ($this);
 	}

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

Spacing +57 added lines, -57 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,
@@ -122,7 +122,7 @@ 
                     ]
                 ]));
 
-                $tree->push ($objects->current ());
+                $tree->push($objects->current());
             }
 
             /**
@@ -130,30 +130,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,
@@ -166,35 +166,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,
@@ -212,26 +212,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,
@@ -247,7 +247,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 +53 added lines, -39 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,
@@ -141,17 +147,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,
@@ -174,11 +182,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);
@@ -212,25 +222,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,
@@ -247,7 +259,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

Braces +10 added lines, -8 removed lines

@@ -36,22 +36,24 @@
                 $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]) && !isset (self::$default_styles[$parent]))
                         {
                             if (self::$throw_errors)
                                 throw new \Exception ('Style "'. $parent .'" not founded');
+                }
+                        } else {
+                            $nodes = array_merge (self::$styles[$parent] ?? self::$default_styles[$parent], $nodes);
                         }
 
-                        else $nodes = array_merge (self::$styles[$parent] ?? self::$default_styles[$parent], $nodes);
-
-                if ($node->args['is_default'])
-                    self::$default_styles[$name] = isset (self::$objects[$name]) ?
+                if ($node->args['is_default']) {
+                                    self::$default_styles[$name] = isset (self::$objects[$name]) ?
                         array_merge (self::$default_styles[$name], $nodes) : $nodes;
-
-                else self::$styles[$name] = isset (self::$objects[$name]) ?
+                } else {
+                    self::$styles[$name] = isset (self::$objects[$name]) ?
                     array_merge (self::$styles[$name], $nodes) : $nodes;
+                }
             }
 
             list (self::$styles, self::$default_styles) = self::run (new AST (array_map (

Indentation +5 added lines, -5 removed lines

@@ -61,9 +61,9 @@
         return [self::$styles, self::$default_styles];
     }
 	
-	public static function clear (): void
-	{
-		self::$styles = [];
-		self::$default_styles = [];
-	}
+    public static function clear (): void
+    {
+        self::$styles = [];
+        self::$default_styles = [];
+    }
 }

Spacing +8 added lines, -8 removed lines

@@ -27,24 +27,24 @@ 
      * 
      * @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]) && !isset (self::$default_styles[$parent]))
                         {
                             if (self::$throw_errors)
-                                throw new \Exception ('Style "'. $parent .'" not founded');
+                                throw new \Exception('Style "'.$parent.'" not founded');
                         }
 
-                        else $nodes = array_merge (self::$styles[$parent] ?? self::$default_styles[$parent], $nodes);
+                        else $nodes = array_merge(self::$styles[$parent] ?? self::$default_styles[$parent], $nodes);
 
                 if ($node->args['is_default'])
                     self::$default_styles[$name] = isset (self::$objects[$name]) ?
@@ -54,14 +54,14 @@ 
                     array_merge (self::$styles[$name], $nodes) : $nodes;
             }
 
-            list (self::$styles, self::$default_styles) = self::run (new AST (array_map (
-                fn ($node) => $node->export (), $node->getNodes ())), $node);
+            list (self::$styles, self::$default_styles) = self::run(new AST(array_map(
+                fn($node) => $node->export(), $node->getNodes())), $node);
         }
 
         return [self::$styles, self::$default_styles];
     }
 	
-	public static function clear (): void
+	public static function clear(): void
 	{
 		self::$styles = [];
 		self::$default_styles = [];

engine/extensions/VLF/bin/parser.php

Spacing +76 added lines, -76 removed lines

@@ -17,33 +17,33 @@ 
      * 
      * @return AST - возвращает AST дерево разметки
      */
-    public static function parse (string $vlf): AST
+    public static function parse(string $vlf): AST
     {
         $tree    = new AST;
         $objects = new Stack;
 
-        if (file_exists ($vlf))
-            $vlf = file_get_contents ($vlf);
+        if (file_exists($vlf))
+            $vlf = file_get_contents($vlf);
 
-        $lines   = explode (self::$divider, $vlf);
+        $lines   = explode(self::$divider, $vlf);
         $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;
                 }
@@ -51,12 +51,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());
             }
 
             /**
@@ -64,16 +64,16 @@ 
              */
             if ($words[0] == 'import')
             {
-                $imports = substr ($line, strlen ($words[0]));
-                $parsed  = self::parseSubtext ($lines, $line_num, $height);
+                $imports = substr($line, strlen($words[0]));
+                $parsed  = self::parseSubtext($lines, $line_num, $height);
 
                 $imports .= $parsed[0];
                 $skip_at  = $parsed[1];
 
-                $imports = self::filter ($imports) ?
-                    array_map ('trim', self::parseArguments ($imports)) : [];
+                $imports = self::filter($imports) ?
+                    array_map ('trim', self::parseArguments($imports)) : [];
 
-                $tree->push (new Node ([
+                $tree->push(new Node([
                     'type'   => STYLES_IMPORTING,
                     'line'   => $line,
                     'words'  => $words,
@@ -96,9 +96,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;
@@ -109,7 +109,7 @@ 
              */
             elseif ($words[0][0] == '%')
             {
-                $code = substr ($line, strlen ($words[0]));
+                $code = substr($line, strlen($words[0]));
 
                 /**
                  * Обработка многострочного кода
@@ -118,16 +118,16 @@ 
                 {
                     if ($words[0][1] == '^')
                     {
-                        $parsed = self::parseSubtext ($lines, $line_num, $height);
+                        $parsed = self::parseSubtext($lines, $line_num, $height);
 
                         $code   .= $parsed[0];
                         $skip_at = $parsed[1];
                     }
 
-                    else throw new \Exception ('Unknown char founded after runtime execution definition at line '. ($line_num + 1));
+                    else throw new \Exception('Unknown char founded after runtime execution definition at line '.($line_num + 1));
                 }
 
-                $tree->push (new Node ([
+                $tree->push(new Node([
                     'type'   => RUNTIME_EXECUTION,
                     'line'   => $line,
                     'words'  => $words,
@@ -142,29 +142,29 @@ 
             /**
              * Установка свойства
              */
-            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'   => PROPERTY_SET,
                     'line'   => $line,
                     'words'  => $words,
@@ -182,26 +182,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'   => METHOD_CALL,
                     'line'   => $line,
                     'words'  => $words,
@@ -217,39 +217,39 @@ 
             /**
              * Объявление объекта
              */
-            elseif (sizeof ($words) > 1)
+            elseif (sizeof($words) > 1)
             {
                 $class  = $words[0];
                 $name   = $words[1];
                 $args   = [];
                 $styles = [];
 
-                if ($objects->size () > 0 && $objects->current ()->height < $height)
-                    $args[] = $objects->current ()->args['name'];
+                if ($objects->size() > 0 && $objects->current()->height < $height)
+                    $args[] = $objects->current()->args['name'];
 
-                if (($pos = strpos ($line, '(')) !== false)
+                if (($pos = strpos($line, '(')) !== false)
                 {
-                    if (($end = strrpos ($line, ')', $pos)) === false)
-                        throw new \Exception ('Incorrect class constructor arguments syntax at line '. ($line_num + 1));
+                    if (($end = strrpos($line, ')', $pos)) === false)
+                        throw new \Exception('Incorrect class constructor arguments syntax at line '.($line_num + 1));
 
-                    $args = substr ($line, $pos + 1, $end - $pos - 1);
+                    $args = substr($line, $pos + 1, $end - $pos - 1);
 
-                    $name = substr ($line, $len = strlen ($class), $pos - $len);
-                    $args = self::filter ($args) ?
-                        self::parseArguments ($args) : [];
+                    $name = substr($line, $len = strlen($class), $pos - $len);
+                    $args = self::filter($args) ?
+                        self::parseArguments($args) : [];
                 }
 
-                if (($end = strrpos ($line, ' > ')) !== false)
+                if (($end = strrpos($line, ' > ')) !== false)
                 {
-                    $styles = trim (substr ($line, $end + 3));
+                    $styles = trim(substr($line, $end + 3));
 
-                    if (strlen ($styles) == 0)
-                        throw new \Exception ('Trying to set empty style to object');
+                    if (strlen($styles) == 0)
+                        throw new \Exception('Trying to set empty style to object');
 
-                    $styles = array_map ('trim', explode (',', $styles));
+                    $styles = array_map('trim', explode(',', $styles));
                 }
 
-                $objects->push (new Node ([
+                $objects->push(new Node([
                     'type'   => OBJECT_DEFINITION,
                     'line'   => $line,
                     'words'  => $words,
@@ -257,19 +257,19 @@ 
 
                     'args' => [
                         'class'  => $class,
-                        'name'   => trim ($name),
+                        'name'   => trim($name),
                         'args'   => $args,
                         'styles' => $styles
                     ]
                 ]));
 
-                $tree->push ($objects->current ());
+                $tree->push($objects->current());
             }
 
             /**
              * Неопознанная структура
              */
-            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;
@@ -282,12 +282,12 @@ 
      * 
      * @return int - возвращает её высоту
      */
-    protected static function getHeight (string &$line): int
+    protected static function getHeight(string &$line): int
     {
         $i = 0;
         $height = 0;
 
-        while (isset ($line[$i]) && ctype_space ($line[$i]))
+        while (isset ($line[$i]) && ctype_space($line[$i]))
         {
             ++$height;
 
@@ -297,7 +297,7 @@ 
             ++$i;
         }
 
-        $line = substr ($line, $i);
+        $line = substr($line, $i);
 
         return $height;
     }
@@ -309,9 +309,9 @@ 
      * 
      * @return bool - возвращает true если строка не пустая
      */
-    protected static function filter (string $line): bool
+    protected static function filter(string $line): bool
     {
-        return strlen (trim ($line)) > 0;
+        return strlen(trim($line)) > 0;
     }
 
     /**
@@ -323,7 +323,7 @@ 
      * 
      * @return array - возвращает массив [текст, конечный индекс]
      */
-    protected static function parseSubtext (array $lines, $begin_id, int $down_height): array
+    protected static function parseSubtext(array $lines, $begin_id, int $down_height): array
     {
         $parsed = "\n";
 
@@ -332,17 +332,17 @@ 
             if ($line_id <= $begin_id)
                 continue;
 
-            if (!self::filter ($line))
+            if (!self::filter($line))
             {
                 $parsed .= "\n";
             
                 continue;
             }
 
-            $height = self::getHeight ($line);
+            $height = self::getHeight($line);
 
             if ($height > $down_height)
-                $parsed .= str_repeat (' ', $height - $down_height) ."$line\n";
+                $parsed .= str_repeat(' ', $height - $down_height)."$line\n";
 
             else return [$parsed, $line_id];
         }
@@ -357,7 +357,7 @@ 
      * 
      * @return array - возвращает массив аргументов
      */
-    protected static function parseArguments (string $arguments): array
+    protected static function parseArguments(string $arguments): array
     {
         $args = [];
 
@@ -366,7 +366,7 @@ 
 
         $t = '';
 
-        for ($i = 0, $len = strlen ($arguments); $i < $len; ++$i)
+        for ($i = 0, $len = strlen($arguments); $i < $len; ++$i)
         {
             $t .= $arguments[$i];
             
@@ -383,7 +383,7 @@ 
 
                 elseif (!$split1 && !$split2 && $arguments[$i] == ',')
                 {
-                    $args[] = substr ($t, 0, -1);
+                    $args[] = substr($t, 0, -1);
                     $t = '';
                 }
             }

Braces +63 added lines, -50 removed lines

@@ -22,8 +22,9 @@ 
         $tree    = new AST;
         $objects = new Stack;
 
-        if (file_exists ($vlf))
-            $vlf = file_get_contents ($vlf);
+        if (file_exists ($vlf)) {
+                    $vlf = file_get_contents ($vlf);
+        }
 
         $lines   = explode (self::$divider, $vlf);
         $skip_at = -1;
@@ -32,24 +33,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)
             {
@@ -95,10 +98,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;
@@ -122,9 +126,9 @@ 
 
                         $code   .= $parsed[0];
                         $skip_at = $parsed[1];
+                    } else {
+                        throw new \Exception ('Unknown char founded after runtime execution definition at line '. ($line_num + 1));
                     }
-
-                    else throw new \Exception ('Unknown char founded after runtime execution definition at line '. ($line_num + 1));
                 }
 
                 $tree->push (new Node ([
@@ -144,11 +148,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);
@@ -182,25 +188,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'   => METHOD_CALL,
                     'line'   => $line,
@@ -224,13 +232,15 @@ 
                 $args   = [];
                 $styles = [];
 
-                if ($objects->size () > 0 && $objects->current ()->height < $height)
-                    $args[] = $objects->current ()->args['name'];
+                if ($objects->size () > 0 && $objects->current ()->height < $height) {
+                                    $args[] = $objects->current ()->args['name'];
+                }
 
                 if (($pos = strpos ($line, '(')) !== false)
                 {
-                    if (($end = strrpos ($line, ')', $pos)) === false)
-                        throw new \Exception ('Incorrect class constructor arguments syntax at line '. ($line_num + 1));
+                    if (($end = strrpos ($line, ')', $pos)) === false) {
+                                            throw new \Exception ('Incorrect class constructor arguments syntax at line '. ($line_num + 1));
+                    }
 
                     $args = substr ($line, $pos + 1, $end - $pos - 1);
 
@@ -243,8 +253,9 @@ 
                 {
                     $styles = trim (substr ($line, $end + 3));
 
-                    if (strlen ($styles) == 0)
-                        throw new \Exception ('Trying to set empty style to object');
+                    if (strlen ($styles) == 0) {
+                                            throw new \Exception ('Trying to set empty style to object');
+                    }
 
                     $styles = array_map ('trim', explode (',', $styles));
                 }
@@ -269,7 +280,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;
@@ -291,8 +304,9 @@ 
         {
             ++$height;
 
-            if ($line[$i] == "\t")
-                $height += 3;
+            if ($line[$i] == "\t") {
+                            $height += 3;
+            }
 
             ++$i;
         }
@@ -329,8 +343,9 @@ 
 
         foreach ($lines as $line_id => $line)
         {
-            if ($line_id <= $begin_id)
-                continue;
+            if ($line_id <= $begin_id) {
+                            continue;
+            }
 
             if (!self::filter ($line))
             {
@@ -341,10 +356,11 @@ 
 
             $height = self::getHeight ($line);
 
-            if ($height > $down_height)
-                $parsed .= str_repeat (' ', $height - $down_height) ."$line\n";
-
-            else return [$parsed, $line_id];
+            if ($height > $down_height) {
+                            $parsed .= str_repeat (' ', $height - $down_height) ."$line\n";
+            } else {
+                return [$parsed, $line_id];
+            }
         }
 
         return [$parsed, $line_id + 1];
@@ -370,18 +386,15 @@ 
         {
             $t .= $arguments[$i];
             
-            if ($arguments[$i] == '\\')
-                $canSplit = $i + 1;
-
-            elseif ($canSplit < $i)
+            if ($arguments[$i] == '\\') {
+                            $canSplit = $i + 1;
+            } elseif ($canSplit < $i)
             {
-                if ($arguments[$i] == '\'' && !$split2)
-                    $split1 = !$split1;
-
-                elseif ($arguments[$i] == '"' && !$split1)
-                    $split2 = !$split2;
-
-                elseif (!$split1 && !$split2 && $arguments[$i] == ',')
+                if ($arguments[$i] == '\'' && !$split2) {
+                                    $split1 = !$split1;
+                } elseif ($arguments[$i] == '"' && !$split1) {
+                                    $split2 = !$split2;
+                } elseif (!$split1 && !$split2 && $arguments[$i] == ',')
                 {
                     $args[] = substr ($t, 0, -1);
                     $t = '';