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

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/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/Constants.php

Braces +2 added lines, -1 removed lines

@@ -338,8 +338,9 @@
 	'clLight'  	  => $converter->fromHtml ('#EEEEEE')
 ];
 
-foreach ($constants as $name => $value)
+foreach ($constants as $name => $value) {
 	define ($name, $value);
+}
 
 $argv = START_PARAMS;
 $argc = sizeof ($argv);

engine/components/Scintilla.php

Braces +15 added lines, -11 removed lines

@@ -40,8 +40,9 @@ 
 
     public function set_syntax ($syntax)
     {
-        if (file_exists ($syntax))
-            $syntax = file_get_contents ($syntax);
+        if (file_exists ($syntax)) {
+                    $syntax = file_get_contents ($syntax);
+        }
 
         $syntax = json_decode ($syntax, true);
 
@@ -49,30 +50,33 @@ 
             !is_array ($syntax['syntax']) ||
             !is_array ($syntax['references']) ||
             !isset ($syntax['lexer'])
-        ) return false;
-
-        else
+        ) {
+            return false;
+        } else
         {
             $this->resetSyntax ();
             $this->clearSyntax ();
             
-            foreach ($syntax['references'] as $name => $value)
-                if (isset ($syntax['syntax'][$name]))
+            foreach ($syntax['references'] as $name => $value) {
+                            if (isset ($syntax['syntax'][$name]))
                 {
                     $element = VoidEngine::getArrayValue ($this->styles, $value);
+            }
                     $color   = $syntax['syntax'][$name];
 
-                    if (defined ($color))
-                        $color = constant ($color);
+                    if (defined ($color)) {
+                                            $color = constant ($color);
+                    }
                     
                     VoidEngine::setProperty ($element, 'ForeColor', [$color, 'color']);
                 }
 
             $this->lexer = $syntax['lexer'];
 
-            if (is_array ($syntax['keywords']))
-                foreach ($syntax['keywords'] as $id => $keywords)
+            if (is_array ($syntax['keywords'])) {
+                            foreach ($syntax['keywords'] as $id => $keywords)
                     $this->setKeywords ($id, $keywords);
+            }
 
             $this->propertyInit ('fold', 1);
             $this->propertyInit ('fold.compact', 1);

engine/components/Component.php

Braces +13 added lines, -12 removed lines

@@ -37,12 +37,12 @@ 
             {
                 Components::removeComponent ($this->$name);
 
-                if (VoidEngine::objectExists ($this->$name))
-                    VoidEngine::removeObjects ($this->$name);
+                if (VoidEngine::objectExists ($this->$name)) {
+                                    VoidEngine::removeObjects ($this->$name);
+                }
+            } elseif ($this->$name instanceof Component) {
+                            $this->$name->dispose ();
             }
-
-            elseif ($this->$name instanceof Component)
-                $this->$name->dispose ();
         }
 
         unset ($this->$name);
@@ -56,20 +56,21 @@ 
             {
                 Components::removeComponent ($value);
 
-                if (VoidEngine::objectExists ($value))
-                    VoidEngine::removeObjects ($value);
+                if (VoidEngine::objectExists ($value)) {
+                                    VoidEngine::removeObjects ($value);
+                }
+            } elseif ($value instanceof Component) {
+                            $value->dispose ();
             }
 
-            elseif ($value instanceof Component)
-                $value->dispose ();
-
             unset ($this->$param);
         }
 
         if (isset ($this->selector))
         {
-            if (VoidEngine::objectExists ($this->selector))
-                VoidEngine::removeObjects ($this->selector);
+            if (VoidEngine::objectExists ($this->selector)) {
+                            VoidEngine::removeObjects ($this->selector);
+            }
             
             Components::removeComponent ($this->selector);
         }

engine/components/TreeView.php

Braces +1 added lines, -3 removed lines

@@ -11,9 +11,7 @@
         try
         {
             $node = $this->selectedNode;
-        }
-
-        catch (\Throwable $e)
+        } catch (\Throwable $e)
         {
             return false;
         }