winforms-php / VoidFramework

after_install.php

Braces +12 added lines, -7 removed lines

@@ -4,17 +4,22 @@
 
 function dir_copy (string $from, string $to): bool
 {
-    if (!is_dir ($from))
-        return false;
+    if (!is_dir ($from)) {
+            return false;
+    }
 
-    if (!is_dir ($to))
-        dir_create ($to);
+    if (!is_dir ($to)) {
+            dir_create ($to);
+    }
 
-    foreach (array_slice (scandir ($from), 2) as $file)
-        if (is_dir ($f = $from .'/'. $file))
+    foreach (array_slice (scandir ($from), 2) as $file) {
+            if (is_dir ($f = $from .'/'. $file))
             dir_copy ($f, $to .'/'. $file);
+    }
 
-        else copy ($f, $to .'/'. $file);
+        else {
+            copy ($f, $to .'/'. $file);
+        }
 
     return true;
 }

app_bundle/start.php

Braces +2 added lines, -1 removed lines

@@ -11,9 +11,10 @@
 	dirname (__DIR__) .'/qero-packages/KRypt0nn/VoidFramework/'. $package['github:KRypt0nn/VoidFramework']['basefolder'] .'/core' : __DIR__);
 
 # Подгружаем PHP расширения
-foreach (glob (CORE_DIR .'/ext/php_*.dll') as $ext)
+foreach (glob (CORE_DIR .'/ext/php_*.dll') as $ext) {
 	if (!extension_loaded ($ext = substr (basename ($ext), 4, -4)))
 		dl ($ext);
+}
 
 # Подгружаем Qero-пакеты
 require __DIR__ .'/../qero-packages/autoload.php';

engine/VoidEngine.php

Braces +2 added lines, -1 removed lines

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

engine/extensions/VLF/bin/importer.php

Braces +14 added lines, -14 removed lines

@@ -16,10 +16,11 @@ 
         $objects   = VLFInterpreter::run (new VLFParser ($vlf, $settings));
         $designers = [];
 
-        foreach ($objects as $name => $object)
-            if ($object instanceof Form)
+        foreach ($objects as $name => $object) {
+                    if ($object instanceof Form)
             {
                 $page = new TabPage ($name);
+        }
                 $designers[$object->selector] = new VoidDesigner ($page, $name, $propertyGrid, $eventsList, $currentSelectedItem, $formsList, $object);
 
                 $designers[$object->selector]->form->text = $object->text;
@@ -28,20 +29,19 @@ 
 
                 $formsList->items->add ($page);
                 $formsList->selectedTab = $page->selector;
-            }
-
-            elseif ($object instanceof Control)
-                try
+            } elseif ($object instanceof Control) {
+                            try
                 {
                     $parent = $object->parent;
-                    while (!isset ($designers[$parent->selector]) && $parent->parent)
-                        $parent = $parent->parent;
-
-                    if (isset ($designers[$parent->selector]))
-                        $designers[$parent->selector]->addComponent ($object->selector, $name);
-                }
-
-                catch (\Throwable $e) {}
+            }
+                    while (!isset ($designers[$parent->selector]) && $parent->parent) {
+                                            $parent = $parent->parent;
+                    }
+
+                    if (isset ($designers[$parent->selector])) {
+                                            $designers[$parent->selector]->addComponent ($object->selector, $name);
+                    }
+                } catch (\Throwable $e) {}
 
         return $designers;
     }

engine/extensions/VLF/bin/interpreter.php

Braces +78 added lines, -72 removed lines

@@ -22,19 +22,20 @@ 
 
     public static function run ($syntaxTree, string $resourcesDir = null, array $parent = null): array
     {
-        if ($syntaxTree instanceof VLFParser)
-            $syntaxTree = $syntaxTree->tree;
-
-        elseif (!is_array ($syntaxTree) && self::$throw_errors)
-            throw new \Exception ('$syntaxTree argument must be instance of VoidEngine\VLFParser or contains Abstract Syntax Tree - multi-dimensional array');
+        if ($syntaxTree instanceof VLFParser) {
+                    $syntaxTree = $syntaxTree->tree;
+        } elseif (!is_array ($syntaxTree) && self::$throw_errors) {
+                    throw new \Exception ('$syntaxTree argument must be instance of VoidEngine\VLFParser or contains Abstract Syntax Tree - multi-dimensional array');
+        }
 
-        foreach ($syntaxTree as $id => $syntaxInfo)
-            if (isset ($syntaxInfo['type']))
+        foreach ($syntaxTree as $id => $syntaxInfo) {
+                    if (isset ($syntaxInfo['type']))
             {
                 switch ($syntaxInfo['type'])
                 {
                     case VLF_OBJECT_DEFINITION:
                         $class = $syntaxInfo['info']['object_class'];
+        }
                         $name  = $syntaxInfo['info']['object_name'];
                         $args  = [];
 
@@ -42,12 +43,15 @@ 
                         {
                             $args = $syntaxInfo['info']['arguments'];
 
-                            foreach ($args as $arg_id => $arg)
-                                if (is_object ($arg) && $arg instanceof VLFLink)
+                            foreach ($args as $arg_id => $arg) {
+                                                            if (is_object ($arg) && $arg instanceof VLFLink)
                                     $args[$arg_id] = isset (self::$objects[$arg->name]) ?
                                         self::formatLine ($arg->name, self::$objects) : null;
+                            }
 
-                                else $args[$arg_id] = self::formatLine ($arg, self::$objects);
+                                else {
+                                    $args[$arg_id] = self::formatLine ($arg, self::$objects);
+                                }
                         }
 
                         try
@@ -57,15 +61,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 "'. $syntaxInfo['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 "'. $syntaxInfo['line'] .'". Exception info:'. "\n\n". (string) $e, 0, $e);
+                            }
                         }
                     break;
 
@@ -80,23 +81,24 @@ 
                             $propertyValue = $syntaxInfo['info']['property_value'];
                             $preset        = '';
 
-                            if (is_object ($propertyValue) && $propertyValue instanceof VLFLink)
-                                $propertyValue = isset (self::$objects[$propertyValue->name]) ?
+                            if (is_object ($propertyValue) && $propertyValue instanceof VLFLink) {
+                                                            $propertyValue = isset (self::$objects[$propertyValue->name]) ?
                                     self::formatLine ($propertyValue->name, self::$objects) : null;
-
-                            elseif (preg_match ('/function \((.*)\) use \((.*)\)/', $propertyValue))
+                            } elseif (preg_match ('/function \((.*)\) use \((.*)\)/', $propertyValue))
                             {
                                 $use = substr ($propertyValue, strpos ($propertyValue, 'use'));
                                 $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; ";
 
@@ -105,37 +107,34 @@ 
 
                                 $preset        = self::formatLine ($preset, self::$objects);
                                 $propertyValue = self::formatLine (str_replace ($ouse, join (' ', $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)
                             {
                                 try
                                 {
                                     $propertyValue = $syntaxInfo['info']['property_raw_value'];
 
-                                    if (strpos ($propertyName, '->') !== false)
-                                        eval ('namespace VoidEngine; '. $preset .' _c('. self::$objects[$name]->selector .')->'. $propertyName .' = '. $propertyValue .';');
-
-                                    else self::$objects[$name]->$propertyName = eval ("namespace VoidEngine; $preset return $propertyValue;");
-                                }
-
-                                catch (\Throwable $e)
+                                    if (strpos ($propertyName, '->') !== false) {
+                                                                            eval ('namespace VoidEngine; '. $preset .' _c('. self::$objects[$name]->selector .')->'. $propertyName .' = '. $propertyValue .';');
+                                    } else {
+                                        self::$objects[$name]->$propertyName = eval ("namespace VoidEngine; $preset return $propertyValue;");
+                                    }
+                                } catch (\Throwable $e)
                                 {
-                                    if (self::$throw_errors)
-                                        throw new \Exception ('Interpeter couldn\'t set property "'. $propertyName .'" with value "'. $propertyValue .'" at line "'. $syntaxInfo['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 "'. $syntaxInfo['line'] .'". Exception info:'. "\n\n". (string) $e, 0, $e);
+                                    }
                                 }
                             }
+                        } elseif (self::$throw_errors) {
+                                                    throw new \Exception ('Setting property to an non-object at line "'. $syntaxInfo['line']);
                         }
-
-                        elseif (self::$throw_errors)
-                            throw new \Exception ('Setting property to an non-object at line "'. $syntaxInfo['line']);
                     break;
 
                     case VLF_METHOD_CALL:
@@ -144,30 +143,32 @@ 
                             $methodName = $syntaxInfo['info']['method_name'];
                             $methodArgs = $syntaxInfo['info']['method_arguments'];
 
-                            foreach ($methodArgs as $arg_id => $arg)
-                                if (is_object ($arg) && $arg instanceof VLFLink)
+                            foreach ($methodArgs as $arg_id => $arg) {
+                                                            if (is_object ($arg) && $arg instanceof VLFLink)
                                     $methodArgs[$arg_id] = isset (self::$objects[$arg->name]) ?
                                         self::formatLine ($arg->name, self::$objects) : null;
+                            }
 
-                                else $methodArgs[$arg_id] = self::formatLine ($arg, self::$objects);
+                                else {
+                                    $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) .');');
-
-                                else self::$objects[$name]->$methodName (...$methodArgs);
-                            }
-
-                            catch (\Throwable $e)
+                                if (strpos ($methodName, '->') !== false && self::$allow_multimethods_calls) {
+                                                                    eval ('namespace VoidEngine; _c('. self::$objects[$name]->selector .')->'. $methodName .' ('. implode (', ', $methodArgs) .');');
+                                } else {
+                                    self::$objects[$name]->$methodName (...$methodArgs);
+                                }
+                            } catch (\Throwable $e)
                             {
-                                if (self::$throw_errors)
-                                    throw new \Exception ('Interpeter couldn\'t call method "'. $methodName .'" with arguments '. json_encode ($methodArgs) .' at line "'. $syntaxInfo['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 "'. $syntaxInfo['line'] .'". Exception info:'. "\n\n". (string) $e, 0, $e);
+                                }
                             }
+                        } elseif (self::$throw_errors) {
+                                                    throw new \Exception ('Calling method to an non-object at line "'. $syntaxInfo['line'] .'"');
                         }
-
-                        elseif (self::$throw_errors)
-                            throw new \Exception ('Calling method to an non-object at line "'. $syntaxInfo['line'] .'"');
                     break;
 
                     case VLF_RUNTIME_EXECUTABLE:
@@ -175,16 +176,18 @@ 
                     break;
                 }
 
-                if (isset ($syntaxInfo['syntax_nodes']) && sizeof ($syntaxInfo['syntax_nodes']) > 0)
-                    self::$objects = self::run ($syntaxInfo['syntax_nodes'], null, $syntaxInfo);
+                if (isset ($syntaxInfo['syntax_nodes']) && sizeof ($syntaxInfo['syntax_nodes']) > 0) {
+                                    self::$objects = self::run ($syntaxInfo['syntax_nodes'], null, $syntaxInfo);
+                }
+            } else {
+                throw new \Exception ('Catched unknown syntax node: "'. json_encode ($syntaxInfo) .'"');
             }
 
-            else throw new \Exception ('Catched unknown syntax node: "'. json_encode ($syntaxInfo) .'"');
-
-        if (is_dir ($resourcesDir))
-            foreach (glob ($resourcesDir .'/*.vrsf') as $id => $dir)
+        if (is_dir ($resourcesDir)) {
+                    foreach (glob ($resourcesDir .'/*.vrsf') as $id => $dir)
             {
                 $baseName = basenameNoExt ($dir);
+        }
                 $info     = explode ('.', $baseName);
 
                 if (isset (self::$objects[$info[0]]))
@@ -194,9 +197,9 @@ 
                         $collection = VoidEngine::getProperty (self::$objects[$info[0]]->selector, $info[1]);
                         
                         VoidEngine::callMethod ($collection, 'Add', [VoidEngine::importObject (base64_encode (file_get_contents ($dir))), 'object']);
+                    } else {
+                        VoidEngine::setProperty (self::$objects[$info[0]]->selector, $info[1], VoidEngine::importObject (base64_encode (file_get_contents ($dir))));
                     }
-                    
-                    else VoidEngine::setProperty (self::$objects[$info[0]]->selector, $info[1], VoidEngine::importObject (base64_encode (file_get_contents ($dir))));
                 }
             }
 
@@ -236,8 +239,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 (['\'', '"', '$']);
@@ -246,10 +250,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;
@@ -257,8 +262,9 @@ 
                         break;
                     }
 
-                if (!$replaced)
-                    $newLine .= $line[$i];
+                if (!$replaced) {
+                                    $newLine .= $line[$i];
+                }
             }
 
             $line = $newLine;

engine/extensions/VLF/bin/parser.php

Braces +98 added lines, -76 removed lines

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

engine/extensions/WinAPI/main.php

Braces +5 added lines, -6 removed lines

@@ -78,15 +78,14 @@
 
     public function __call ($method, $args)
     {
-        if (method_exists ($this, $method))
-            return $this->$method (...$args);
-        
-        else try
+        if (method_exists ($this, $method)) {
+                    return $this->$method (...$args);
+        } else {
+            try
         {
             return $this->WinAPI->$method (...$args);
         }
-
-        catch (\Throwable $e)
+        } catch (\Throwable $e)
         {
             throw new \Exception ('Method "'. $method .'" not found or return an exception. Exception info: '. "\n\n". (string) $e);
         }

engine/common/Globals.php

Braces +9 added lines, -10 removed lines

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

engine/common/EngineInterfaces.php

Braces +93 added lines, -99 removed lines

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