winforms-php / VoidFramework

core/script.php

Braces +10 added lines, -7 removed lines

@@ -5,18 +5,21 @@
 const CORE_DIR = __DIR__;
 chdir (CORE_DIR);
 
-foreach (glob ('ext/php_*.dll') as $ext)
+foreach (glob ('ext/php_*.dll') as $ext) {
 	if (!extension_loaded (substr (basename ($ext), 4, -4)))
 		load_extension ($ext);
+}
 
-if (file_exists ('../engine/VoidEngine.php'))
+if (file_exists ('../engine/VoidEngine.php')) {
 	require '../engine/VoidEngine.php';
-
-else message ('VoidEngine not founded');
+} else {
+    message ('VoidEngine not founded');
+}
 
 $app = '../../app/start.php';
 
-if (file_exists ($app))
+if (file_exists ($app)) {
 	require $app;
-
-else \VoidCore::callMethod (\VoidCore::createObject ('WinForms_PHP.DebugForm'), 'ShowDialog');
+} else {
+    \VoidCore::callMethod (\VoidCore::createObject ('WinForms_PHP.DebugForm'), 'ShowDialog');
+}

engine/extensions/VLF/bin/parser.php

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 + 1));
 
-                    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 = '';

engine/extensions/VLF/bin/interpreter.php

Braces +58 added lines, -55 removed lines

@@ -31,15 +31,17 @@ 
                     $name  = $node->args['name'];
                     $args  = [];
 
-                    if (isset (self::$objects[$name]))
-                        break;
+                    if (isset (self::$objects[$name])) {
+                                            break;
+                    }
 
                     if (isset ($node->args['args']))
                     {
                         $args = $node->args['args'];
 
-                        foreach ($args as $arg_id => $arg)
-                            $args[$arg_id] = self::formatLine ($arg, self::$objects);
+                        foreach ($args as $arg_id => $arg) {
+                                                    $args[$arg_id] = self::formatLine ($arg, self::$objects);
+                        }
                     }
 
                     try
@@ -49,15 +51,12 @@ 
                         try
                         {
                             self::$objects[$name]->name = $name;
-                        }
-
-                        catch (\Throwable $e) {}
-                    }
-
-                    catch (\Throwable $e)
+                        } catch (\Throwable $e) {}
+                    } catch (\Throwable $e)
                     {
-                        if (self::$throw_errors)
-                            throw new \Exception ('Interpeter couldn\'t create object "'. $class .'" with name "'. $name .'" at line "'. $node->line .'". Exception info:'. "\n\n". (string) $e, 0, $e);
+                        if (self::$throw_errors) {
+                                                    throw new \Exception ('Interpeter couldn\'t create object "'. $class .'" with name "'. $name .'" at line "'. $node->line .'". Exception info:'. "\n\n". (string) $e, 0, $e);
+                        }
                     }
                 break;
 
@@ -76,13 +75,15 @@ 
                             $use = $ouse = substr ($use, ($pos = strpos ($use, '(') + 1), strpos ($use, ')') - $pos);
                             $use = explode (' ', $use);
 
-                            foreach ($use as $id => $useParam)  
-                                if (isset (self::$objects[$useParam]) && $use[$id + 1][0] == '$')
+                            foreach ($use as $id => $useParam) {
+                                                            if (isset (self::$objects[$useParam]) && $use[$id + 1][0] == '$')
                                 {
                                     $fname = $use[$id + 1];
+                            }
 
-                                    if (substr ($fname, strlen ($fname) - 1) == ',')
-                                        $fname = substr ($fname, 0, -1);
+                                    if (substr ($fname, strlen ($fname) - 1) == ',') {
+                                                                            $fname = substr ($fname, 0, -1);
+                                    }
 
                                     $preset .= "$fname = $useParam; ";
 
@@ -91,24 +92,22 @@ 
 
                             $preset        = self::formatLine ($preset, self::$objects);
                             $propertyValue = self::formatLine (str_replace ($ouse, implode (' ', $use), $propertyValue), self::$objects);
+                        } else {
+                            $propertyValue = self::formatLine ($propertyValue, self::$objects);
                         }
 
-                        else $propertyValue = self::formatLine ($propertyValue, self::$objects);
-
                         try
                         {
                             self::$objects[$name]->$propertyName = eval ("namespace VoidEngine; $preset return $propertyValue;");
-                        }
-
-                        catch (\Throwable $e)
+                        } catch (\Throwable $e)
                         {
-                            if (self::$throw_errors)
-                                throw new \Exception ('Interpeter couldn\'t set property "'. $propertyName .'" with value "'. $propertyValue .'" at line "'. $node->line .'". Exception info:'. "\n\n". (string) $e, 0, $e);
+                            if (self::$throw_errors) {
+                                                            throw new \Exception ('Interpeter couldn\'t set property "'. $propertyName .'" with value "'. $propertyValue .'" at line "'. $node->line .'". Exception info:'. "\n\n". (string) $e, 0, $e);
+                            }
                         }
+                    } elseif (self::$throw_errors) {
+                                            throw new \Exception ('Setting property to an non-object at line "'. $node->line);
                     }
-
-                    elseif (self::$throw_errors)
-                        throw new \Exception ('Setting property to an non-object at line "'. $node->line);
                 break;
 
                 case METHOD_CALL:
@@ -119,29 +118,28 @@ 
                         $methodName = $node->args['name'];
                         $methodArgs = $node->args['args'];
 
-                        foreach ($methodArgs as $arg_id => $arg)
-                            $methodArgs[$arg_id] = self::formatLine ($arg, self::$objects);
+                        foreach ($methodArgs as $arg_id => $arg) {
+                                                    $methodArgs[$arg_id] = self::formatLine ($arg, self::$objects);
+                        }
 
                         try
                         {
-                            if (strpos ($methodName, '->') !== false && self::$allow_multimethods_calls)
-                                eval ('namespace VoidEngine; _c('. self::$objects[$name]->selector .')->'. $methodName .' ('. implode (', ', $methodArgs) .');');
-
-                            elseif (sizeof ($methodArgs) > 0)
-                                self::$objects[$name]->$methodName (...eval ('namespace VoidEngine; return ['. implode (', ', $methodArgs) .'];'));
-
-                            else self::$objects[$name]->$methodName ();
-                        }
-
-                        catch (\Throwable $e)
+                            if (strpos ($methodName, '->') !== false && self::$allow_multimethods_calls) {
+                                                            eval ('namespace VoidEngine; _c('. self::$objects[$name]->selector .')->'. $methodName .' ('. implode (', ', $methodArgs) .');');
+                            } elseif (sizeof ($methodArgs) > 0) {
+                                                            self::$objects[$name]->$methodName (...eval ('namespace VoidEngine; return ['. implode (', ', $methodArgs) .'];'));
+                            } else {
+                                self::$objects[$name]->$methodName ();
+                            }
+                        } catch (\Throwable $e)
                         {
-                            if (self::$throw_errors)
-                                throw new \Exception ('Interpeter couldn\'t call method "'. $methodName .'" with arguments '. json_encode ($methodArgs) .' at line "'. $node->line .'". Exception info:'. "\n\n". (string) $e, 0, $e);
+                            if (self::$throw_errors) {
+                                                            throw new \Exception ('Interpeter couldn\'t call method "'. $methodName .'" with arguments '. json_encode ($methodArgs) .' at line "'. $node->line .'". Exception info:'. "\n\n". (string) $e, 0, $e);
+                            }
                         }
+                    } elseif (self::$throw_errors) {
+                                            throw new \Exception ('Calling method to an non-object at line "'. $node->line .'"');
                     }
-
-                    elseif (self::$throw_errors)
-                        throw new \Exception ('Calling method to an non-object at line "'. $node->line .'"');
                 break;
 
                 case STYLES_IMPORTING:
@@ -149,8 +147,9 @@ 
                     {
                         $path = eval ('namespace VoidEngine; return '. self::formatLine ($style, self::$objects) .';');
 
-                        if (!file_exists ($path))
-                            throw new \Exception ('Trying to import nonexistent style at line "'. $node->line .'"');
+                        if (!file_exists ($path)) {
+                                                    throw new \Exception ('Trying to import nonexistent style at line "'. $node->line .'"');
+                        }
                         
                         \VLF\VST\Interpreter::run (\VLF\VST\Parser::parse (file_get_contents ($path)));
                     }
@@ -163,12 +162,13 @@ 
 
             $nodes = $node->getNodes ();
 
-            if (isset ($node->args['styles']))
-                foreach ($node->args['styles'] as $style)
+            if (isset ($node->args['styles'])) {
+                            foreach ($node->args['styles'] as $style)
                     if (isset (\VLF\VST\Interpreter::$styles[$style]))
                         $nodes = array_merge ($nodes, \VLF\VST\Interpreter::$styles[$style]);
-
-                    else throw new \Exception ('Trying to set undefined style to object at line "'. $node->line .'"');
+            } else {
+                        throw new \Exception ('Trying to set undefined style to object at line "'. $node->line .'"');
+                    }
 
             self::$objects = self::run (new AST (array_map (
                 fn ($node) => $node->export (), $nodes)), $node);
@@ -208,8 +208,9 @@ 
 
             $nReplacement = [];
 
-            foreach ($replacement as $replaceTo => $nLn)
-                $nReplacement[$omap[$replaceTo]] = $replaceTo;
+            foreach ($replacement as $replaceTo => $nLn) {
+                            $nReplacement[$omap[$replaceTo]] = $replaceTo;
+            }
 
             $replacement = $nReplacement;
             $blacklist   = array_flip (['\'', '"', '$']);
@@ -218,10 +219,11 @@ 
             {
                 $replaced = false;
 
-                foreach ($replacement as $name => $replaceAt)
-                    if (substr ($line, $i, ($l = strlen ($name))) == $name && !isset ($blacklist[$line[$i - 1]]))
+                foreach ($replacement as $name => $replaceAt) {
+                                    if (substr ($line, $i, ($l = strlen ($name))) == $name && !isset ($blacklist[$line[$i - 1]]))
                     {
                         $newLine .= $replaceAt;
+                }
 
                         $i += $l - 1;
                         $replaced = true;
@@ -229,8 +231,9 @@ 
                         break;
                     }
 
-                if (!$replaced)
-                    $newLine .= $line[$i];
+                if (!$replaced) {
+                                    $newLine .= $line[$i];
+                }
             }
 
             $line = $newLine;

engine/extensions/VLF/bin/Translator.php

Braces +27 added lines, -18 removed lines

@@ -9,8 +9,9 @@ 
         $code = "<?php\n\nnamespace VoidEngine;\n\n";
         $definedObjects = [];
 
-        foreach ($tree->getNodes () as $node)
-            $code .= self::translateNode ($node, null, $definedObjects) ."\n";
+        foreach ($tree->getNodes () as $node) {
+                    $code .= self::translateNode ($node, null, $definedObjects) ."\n";
+        }
 
         return $code;
     }
@@ -27,8 +28,9 @@ 
                 break;
 
             case OBJECT_DEFINITION:
-                if (isset ($definedObjects[$node->args['name']]))
-                    break;
+                if (isset ($definedObjects[$node->args['name']])) {
+                                    break;
+                }
                 
                 $code .= '$'. $node->args['name'] .' = new '. $node->args['class'] .' ('. implode (', ', self::processArgs ($node->args['args'], $definedObjects)) .');' ."\n". '$'. $node->args['name'] .'->name = \''. $node->args['name'] .'\';' ."\n";
 
@@ -45,13 +47,15 @@ 
                     $use = $ouse = substr ($use, ($pos = strpos ($use, '(') + 1), strpos ($use, ')') - $pos);
                     $use = explode (' ', $use);
 
-                    foreach ($use as $id => $useParam)  
-                        if (isset ($definedObjects[$useParam]) && $use[$id + 1][0] == '$')
+                    foreach ($use as $id => $useParam) {
+                                            if (isset ($definedObjects[$useParam]) && $use[$id + 1][0] == '$')
                         {
                             $fname = $use[$id + 1];
+                    }
 
-                            if (substr ($fname, strlen ($fname) - 1) == ',')
-                                $fname = substr ($fname, 0, -1);
+                            if (substr ($fname, strlen ($fname) - 1) == ',') {
+                                                            $fname = substr ($fname, 0, -1);
+                            }
 
                             $preset .= "$fname = $useParam; ";
 
@@ -73,8 +77,9 @@ 
                 break;
         }
 
-        foreach ($node->getNodes () as $subnode)
-            $code .= self::translateNode ($subnode, $node, $definedObjects);
+        foreach ($node->getNodes () as $subnode) {
+                    $code .= self::translateNode ($subnode, $node, $definedObjects);
+        }
 
         return $code;
     }
@@ -83,8 +88,9 @@ 
     {
         $newArgs = [];
 
-        foreach ($args as $arg)
-            $newArgs[] = self::formatLine ($arg, $definedObjects);
+        foreach ($args as $arg) {
+                    $newArgs[] = self::formatLine ($arg, $definedObjects);
+        }
 
         return $newArgs;
     }
@@ -110,8 +116,9 @@ 
 
             $nReplacement = [];
 
-            foreach ($replacement as $replaceTo => $nLn)
-                $nReplacement[$omap[$replaceTo]] = $replaceTo;
+            foreach ($replacement as $replaceTo => $nLn) {
+                            $nReplacement[$omap[$replaceTo]] = $replaceTo;
+            }
 
             $replacement = $nReplacement;
             $blacklist   = array_flip (['\'', '"', '$']);
@@ -120,10 +127,11 @@ 
             {
                 $replaced = false;
 
-                foreach ($replacement as $name => $replaceAt)
-                    if (substr ($line, $i, ($l = strlen ($name))) == $name && !isset ($blacklist[$line[$i - 1]]))
+                foreach ($replacement as $name => $replaceAt) {
+                                    if (substr ($line, $i, ($l = strlen ($name))) == $name && !isset ($blacklist[$line[$i - 1]]))
                     {
                         $newLine .= $replaceAt;
+                }
 
                         $i += $l - 1;
                         $replaced = true;
@@ -131,8 +139,9 @@ 
                         break;
                     }
 
-                if (!$replaced)
-                    $newLine .= $line[$i];
+                if (!$replaced) {
+                                    $newLine .= $line[$i];
+                }
             }
 
             $line = $newLine;

engine/extensions/VLF/bin/AST/Node.php

Braces +3 added lines, -2 removed lines

@@ -22,8 +22,9 @@
      */
     public function __construct (array $node = null)
     {
-        if ($node !== null)
-            $this->import ($node);
+        if ($node !== null) {
+                    $this->import ($node);
+        }
     }
 
     /**

engine/extensions/VLF/bin/AST/Tree.php

Braces +6 added lines, -4 removed lines

@@ -17,8 +17,9 @@ 
      */
     public function __construct (array $tree = null)
     {
-        if ($tree !== null)
-            $this->import ($tree);
+        if ($tree !== null) {
+                    $this->import ($tree);
+        }
     }
 
     /**
@@ -30,8 +31,9 @@ 
      */
     public function import (array $tree): AST
     {
-        foreach ($tree as $node)
-            $this->nodes[] = new Node ($node);
+        foreach ($tree as $node) {
+                    $this->nodes[] = new Node ($node);
+        }
 
         return $this;
     }

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

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

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