winforms-php / VoidFramework

engine/components/Process.php

Braces +3 added lines, -2 removed lines

@@ -11,10 +11,11 @@
 	{
         $this->selector = \VoidCore::createClass ($this->class, $this->namespace);
 
-		if ($pid !== null)
-            $this->selector = $pid == getmypid () ?
+		if ($pid !== null) {
+		            $this->selector = $pid == getmypid () ?
                 \VoidCore::callMethod ($this->selector, 'GetCurrentProcess') :
                 \VoidCore::callMethod ($this->selector, 'GetProcessById', $pid);
+		}
 
 		Components::addComponent ($this->selector, $this);
 	}

engine/components/Form.php

Braces +5 added lines, -4 removed lines

@@ -31,9 +31,9 @@ 
 			\VoidCore::setProperty ($clientSize, 'Height', array_shift ($size));
 
 			$this->setProperty ('ClientSize', $clientSize);
+		} else {
+		    $this->setProperty ('ClientSize', EngineAdditions::uncoupleSelector ($size));
 		}
-
-		else $this->setProperty ('ClientSize', EngineAdditions::uncoupleSelector ($size));
 	}
 }
 
@@ -52,7 +52,8 @@ 
         
         \VoidCore::setProperty ($this->formSelector, 'Icon', $icon);
 
-		if (!isset ($this->selector))
-		    $this->selector = $icon;
+		if (!isset ($this->selector)) {
+				    $this->selector = $icon;
+		}
 	}
 }

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 = \VoidCore::getArrayValue ($this->styles, $value);
+            }
                     $color   = $syntax['syntax'][$name];
 
-                    if (defined ($color))
-                        $color = constant ($color);
+                    if (defined ($color)) {
+                                            $color = constant ($color);
+                    }
                     
                     \VoidCore::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/Control.php

Braces +11 added lines, -10 removed lines

@@ -10,8 +10,9 @@ 
     {
         parent::__construct ($className, ...$args);
 
-        if ($parent)
-            $this->parent = $parent;
+        if ($parent) {
+                    $this->parent = $parent;
+        }
     }
 	
     public function get_caption (): string
@@ -35,9 +36,9 @@ 
                 \VoidCore::createObject ('System.Drawing.Font', 'System.Drawing', $font[0], $font[1]);
             
             $this->setProperty ('Font', $obj);
+        } else {
+            $this->setProperty ('Font', EngineAdditions::uncoupleSelector ($font));
         }
-
-        else $this->setProperty ('Font', EngineAdditions::uncoupleSelector ($font));
     }
 	
     public function get_backgroundColor ()
@@ -120,9 +121,9 @@ 
             $this->top    = (int) $bounds[1];
             $this->width  = (int) $bounds[2];
             $this->height = (int) $bounds[3];
+        } else {
+            $this->setProperty ('Bounds', EngineAdditions::uncoupleSelector ($bounds));
         }
-
-        else $this->setProperty ('Bounds', EngineAdditions::uncoupleSelector ($bounds));
     }
 	
     public function get_location (): array
@@ -141,9 +142,9 @@ 
             
             $this->left = $location[0];
             $this->top  = $location[1];
+        } else {
+            $this->setProperty ('Location', EngineAdditions::uncoupleSelector ($location));
         }
-
-        else $this->setProperty ('Location', EngineAdditions::uncoupleSelector ($location));
     }
 	
     public function get_size (): array
@@ -162,9 +163,9 @@ 
             
             $this->width  = (int) $size[0];
             $this->height = (int) $size[1];
+        } else {
+            $this->setProperty ('Size', EngineAdditions::uncoupleSelector ($size));
         }
-
-        else $this->setProperty ('Size', EngineAdditions::uncoupleSelector ($size));
     }
 	
     public function setBounds (int $x, int $y, int $w, int $h)

engine/components/Component.php

Braces +13 added lines, -12 removed lines

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

engine/common/Others.php

Braces +82 added lines, -75 removed lines

@@ -6,8 +6,9 @@ 
 {
     $oldStatus = $GLOBALS['__debug']['error_status'];
 
-    if ($status !== null)
-        $GLOBALS['__debug']['error_status'] = $status;
+    if ($status !== null) {
+            $GLOBALS['__debug']['error_status'] = $status;
+    }
 
     return $oldStatus;
 }
@@ -41,9 +42,7 @@ 
     try
     {
         eval ('return; '. $code);
-    }
-
-    catch (\Throwable $e)
+    } catch (\Throwable $e)
     {
         return [
             'text' => $e->getMessage (), 
@@ -67,9 +66,7 @@ 
     try
     {
         return \VoidCore::callMethod (\VoidCore::getClass ('System.Enum',''), ['parse', 'object'], \VoidCore::typeof ($baseType), $value, true);
-    }
-
-    catch (\WinFormsException $e)
+    } catch (\WinFormsException $e)
     {
         return (new WFClass ($baseType))->$value;
     }
@@ -80,34 +77,39 @@ 
     $array = (new WFClass ('System.Array', null))
         ->createInstance (\VoidCore::typeof ($type), $size = sizeof ($items));
 
-    for ($i = 0; $i < $size; ++$i)
-        $array[$i] = array_shift ($items);
+    for ($i = 0; $i < $size; ++$i) {
+            $array[$i] = array_shift ($items);
+    }
     
     return $array;
 }
 
 function dir_create (string $path, int $mode = 0777): void
 {
-    if (!is_dir ($path))
-        mkdir ($path, $mode, true);
-}
+    if (!is_dir ($path)) {
+            mkdir ($path, $mode, true);
+    }
+    }
 
 function dir_delete (string $path): bool
 {
-    if (!is_dir ($path))
-        return false;
+    if (!is_dir ($path)) {
+            return false;
+    }
 
-    foreach (array_slice (scandir ($path), 2) as $file)
-        if (is_dir ($file = $path .'/'. $file))
+    foreach (array_slice (scandir ($path), 2) as $file) {
+            if (is_dir ($file = $path .'/'. $file))
         {
             dir_delete ($file);
+    }
 
-            if (is_dir ($file))
-                rmdir ($file);
+            if (is_dir ($file)) {
+                            rmdir ($file);
+            }
+        } else {
+            unlink ($file);
         }
 
-        else unlink ($file);
-
     rmdir ($path);
 
     return true;
@@ -121,17 +123,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;
 }
@@ -229,16 +236,16 @@ 
         {
             try
             {
-                if ($object->getType ()->isSubclassOf (\VoidCore::typeof ('System.Windows.Forms.Form', 'System.Windows.Forms')))
-                    continue;
-            }
-
-            catch (\Exception $e) {}
+                if ($object->getType ()->isSubclassOf (\VoidCore::typeof ('System.Windows.Forms.Form', 'System.Windows.Forms'))) {
+                                    continue;
+                }
+            } catch (\Exception $e) {}
             
             \VoidCore::destructObject ($selector);
 
-            if (!\VoidCore::objectExists ($selector))
-                unset (self::$components[$selector]);
+            if (!\VoidCore::objectExists ($selector)) {
+                            unset (self::$components[$selector]);
+            }
         }
     }
 }
@@ -250,16 +257,15 @@ 
 
 function c ($name, bool $returnAllSimilarObjects = false)
 {
-    if (is_int ($name) && is_object ($object = _c ($name)))
-        return $object;
-
-    else
+    if (is_int ($name) && is_object ($object = _c ($name))) {
+            return $object;
+    } else
     {
         $path    = explode ('->', $name);
         $similar = [];
 
-        foreach (Components::$components as $object)
-            try
+        foreach (Components::$components as $object) {
+                    try
             {
                 if ($object->name == end ($path))
                 {
@@ -272,32 +278,30 @@ 
                                 {
                                     if ($returnAllSimilarObjects)
                                         $similar[] = $object;
+        }
 
-                                    else return $object;
+                                    else {
+                                        return $object;
+                                    }
+                                } else {
+                                    continue;
                                 }
-
-                                else continue;
+                            } else {
+                                continue;
                             }
-
-                            else continue;
-                        }
-
-                        catch (\Throwable $e)
+                        } catch (\Throwable $e)
                         {
                             continue;
-                        }
-
-                    else
+                        } else
                     {
-                        if ($returnAllSimilarObjects)
-                            $similar[] = $object;
-
-                        else return $object;
+                        if ($returnAllSimilarObjects) {
+                                                    $similar[] = $object;
+                        } else {
+                            return $object;
+                        }
                     }
                 }
-            }
-
-            catch (\Exception $e)
+            } catch (\Exception $e)
             {
                 continue;
             }
@@ -308,31 +312,32 @@ 
 
             if (is_array ($objects))
             {
-                foreach ($objects as $id => $object)
-                    try
+                foreach ($objects as $id => $object) {
+                                    try
                     {
                         while (is_object ($parent = _c($object->parent->selector)))
                         {
                             if ($parent->getType ()->isSubclassOf (\VoidCore::typeof ('System.Windows.Forms.Form', 'System.Windows.Forms')) && $parent->name == $path[0])
                                 return $objects[$id];
+                }
 
-                            else $object = $parent;
+                            else {
+                                $object = $parent;
+                            }
                         }
-                    }
-
-                    catch (\Throwable $e)
+                    } catch (\Throwable $e)
 					{
 						continue;
 					}
 
                 return false;
+            } else {
+                return false;
             }
-
-            else return false;
-        }
-
-        else return $returnAllSimilarObjects && sizeof ($similar) > 0 ?
+        } else {
+            return $returnAllSimilarObjects && sizeof ($similar) > 0 ?
             $similar : false;
+        }
     }
 }
 
@@ -390,8 +395,9 @@ 
     {
         $collection = new WFObject ('System.Collections.Specialized.StringCollection');
 
-        foreach ($files as $file)
-            $collection->add ((string) $file);
+        foreach ($files as $file) {
+                    $collection->add ((string) $file);
+        }
 
         (new WFClass ('System.Windows.Forms.Clipboard'))->setFileDropList ($collection);
         \VoidCore::removeObjects ($collection->selector);
@@ -457,11 +463,12 @@ 
         16384 => 'E_USER_DEPRECATED'
     ];
 
-    if ($GLOBALS['__debug']['error_status'])
-        message ([
+    if ($GLOBALS['__debug']['error_status']) {
+            message ([
             'type'      => $errarr[$no],
             'text'      => $str,
             'file'      => $file,
             'line'      => $line
         ], 'PHP Script Error');
-});
+    }
+    });

engine/common/EngineInterfaces.php

Braces +90 added lines, -99 removed lines

@@ -26,30 +26,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', [
+        if ($assemblies === null) {
+                    $assemblies = getNetArray ('System.String', [
                 // 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;
     }
@@ -59,9 +66,7 @@ 
         try
         {
             (new WFClass ('System.Reflection.Assembly', 'mscorlib'))->loadFrom ($path);
-        }
-
-        catch (\WinFormsException $e)
+        } catch (\WinFormsException $e)
         {
             return false;
         }
@@ -73,8 +78,9 @@ 
     {
         $property = \VoidCore::callMethod (\VoidCore::callMethod ($selector, 'GetType'), 'GetProperty', $name);
 
-        if (!is_int ($property))
-            return false;
+        if (!is_int ($property)) {
+                    return false;
+        }
 
         try
         {
@@ -117,9 +123,7 @@ 
                         \VoidCore::getProperty ($selector, [$name, 'int']);
 
                         $property = 'int';
-                    }
-
-                    catch (\WinFormsException $e)
+                    } catch (\WinFormsException $e)
                     {
                         return [
                             'type'  => 'vrsf',
@@ -128,9 +132,7 @@ 
                     }
                 break;
             }
-        }
-
-        catch (\Throwable $e)
+        } catch (\Throwable $e)
         {
             $property = 'object';
         }
@@ -148,8 +150,9 @@ 
         $props = \VoidCore::callMethod (\VoidCore::callMethod ($object, 'GetType'), 'GetEvents');
         $len   = \VoidCore::getProperty ($props, 'Length');
 
-        for ($i = 0; $i < $len; ++$i)
-            $events[] = \VoidCore::getProperty (\VoidCore::getArrayValue ($props, $i), 'Name');
+        for ($i = 0; $i < $len; ++$i) {
+                    $events[] = \VoidCore::getProperty (\VoidCore::getArrayValue ($props, $i), 'Name');
+        }
 
         return $events;
     }
@@ -179,8 +182,9 @@ 
 
     public function __construct ($object, $classGroup = false, ...$args)
     {
-        foreach ($args as $id => $arg)
-            $args[$id] = EngineAdditions::uncoupleSelector ($arg);
+        foreach ($args as $id => $arg) {
+                    $args[$id] = EngineAdditions::uncoupleSelector ($arg);
+        }
 
         if (is_string ($object))
         {
@@ -188,35 +192,31 @@ 
             
             /*$this->selector = \VoidCore::createObject ($object, $classGroup == 'auto' ?
                 substr ($object, 0, strrpos ($object, '.')) : $classGroup, ...$args);*/
+        } elseif (is_int ($object) && \VoidCore::objectExists ($object)) {
+                    $this->selector = $object;
+        } else {
+            throw new \Exception ('$object parameter must be string or object selector');
         }
-
-        elseif (is_int ($object) && \VoidCore::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 (\WinFormsException $e)
+        }
+                } catch (\WinFormsException $e)
                 {
                     return $this->getProperty ('Length');
                 }
@@ -226,8 +226,9 @@ 
                 $size = $this->count;
                 $list = [];
                 
-				for ($i = 0; $i < $size; ++$i)
-                    $list[] = EngineAdditions::coupleSelector (\VoidCore::getArrayValue ($this->selector, $i));
+				for ($i = 0; $i < $size; ++$i) {
+				                    $list[] = EngineAdditions::coupleSelector (\VoidCore::getArrayValue ($this->selector, $i));
+				}
                 
                 return $list;
             break;
@@ -236,13 +237,12 @@ 
                 $size = $this->count;
                 $names = [];
                 
-                for ($i = 0; $i < $size; ++$i)
-                    try
+                for ($i = 0; $i < $size; ++$i) {
+                                    try
                     {
                         $names[] = \VoidCore::getProperty (\VoidCore::getArrayValue ($this->selector, [$i, 'object']), 'Text');
-                    }
-
-                    catch (\WinFormsException $e)
+                }
+                    } catch (\WinFormsException $e)
                     {
                         $names[] = \VoidCore::getArrayValue ($this->selector, [$i, 'string']);
                     }
@@ -260,10 +260,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
@@ -273,15 +274,13 @@ 
             {
                 return $value instanceof WFObject ?
                     $this->$method ($value->selector) : null;
-            }
-
-        elseif (substr ($name, -5) == 'Event')
-            Events::setObjectEvent ($this->selector, substr ($name, 0, -5), $value);
-        
-        else
+            } elseif (substr ($name, -5) == 'Event') {
+                    Events::setObjectEvent ($this->selector, substr ($name, 0, -5), $value);
+        } else
         {
-            if (is_array ($value) && is_string (current ($value)))
-                $value = getNetArray ('System.String', $value);
+            if (is_array ($value) && is_string (current ($value))) {
+                            $value = getNetArray ('System.String', $value);
+            }
 
             $this->setProperty ($name, EngineAdditions::uncoupleSelector ($value));
         }
@@ -299,11 +298,12 @@ 
 
     public function addRange ($values, $assoc = false): void
     {
-        if (is_array ($values))
-            foreach ($values as $id => $value)
+        if (is_array ($values)) {
+                    foreach ($values as $id => $value)
                 $this->offsetSet ($assoc ? $id : null, $value);
-
-        else $this->callMethod ('AddRange', EngineAdditions::uncoupleSelector ($values));
+        } else {
+            $this->callMethod ('AddRange', EngineAdditions::uncoupleSelector ($values));
+        }
     }
     
     public function offsetSet ($index, $value)
@@ -313,9 +313,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 ?
                 \VoidCore::setArrayValue ($this->selector, $this->count, EngineAdditions::uncoupleSelector ($value)) :
@@ -338,9 +336,7 @@ 
         try
         {
             $this->offsetGet ($index);
-        }
-
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             return false;
         }
@@ -367,8 +363,9 @@ 
     {
         $size = $this->count;
 
-        for ($i = 0; $i < $size; ++$i)
-            $callback (EngineAdditions::coupleSelector (\VoidCore::getArrayValue ($this->selector, $type !== null ? [$i, $type] : $i), $this->selector), $i);
+        for ($i = 0; $i < $size; ++$i) {
+                    $callback (EngineAdditions::coupleSelector (\VoidCore::getArrayValue ($this->selector, $type !== null ? [$i, $type] : $i), $this->selector), $i);
+        }
     }
 
     public function where (callable $comparator, string $type = null): array
@@ -376,9 +373,10 @@ 
         $size   = $this->count;
         $return = [];
 
-        for ($i = 0; $i < $size; ++$i)
-            if ($comparator ($value = EngineAdditions::coupleSelector (\VoidCore::getArrayValue ($this->selector, $type !== null ? [$i, $type] : $i), $this->selector), $i))
+        for ($i = 0; $i < $size; ++$i) {
+                    if ($comparator ($value = EngineAdditions::coupleSelector (\VoidCore::getArrayValue ($this->selector, $type !== null ? [$i, $type] : $i), $this->selector), $i))
                 $return[] = $value;
+        }
 
         return $return;
     }
@@ -388,9 +386,7 @@ 
         try
         {
             return \VoidCore::getProperty ($this->selector, $name);
-        }
-
-        catch (\WinFormsException $e)
+        } catch (\WinFormsException $e)
         {
             return \VoidCore::getField ($this->selector, $name);
         }
@@ -401,9 +397,7 @@ 
         try
         {
             \VoidCore::setProperty ($this->selector, $name, $value);
-        }
-
-        catch (\WinFormsException $e)
+        } catch (\WinFormsException $e)
         {
             \VoidCore::setField ($this->selector, $name, $value);
         }
@@ -420,8 +414,9 @@ 
         $size   = \VoidCore::getProperty ($array, 'Length');
         $return = [];
 
-		for ($i = 0; $i < $size; ++$i)
-            $return[] = \VoidCore::getArrayValue ($array, $type === null ? $i : [$i, $type]);
+		for ($i = 0; $i < $size; ++$i) {
+		            $return[] = \VoidCore::getArrayValue ($array, $type === null ? $i : [$i, $type]);
+		}
         
         \VoidCore::removeObjects ($array);
         
@@ -433,9 +428,7 @@ 
 		try
 		{
 			return $this->getProperty ('Name');
-        }
-        
-		catch (\Throwable $e)
+        } catch (\Throwable $e)
 		{
 			return $this->name;
 		}
@@ -446,9 +439,7 @@ 
 		try
 		{
 			$this->setProperty ('Name', $name);
-        }
-        
-		catch (\Throwable $e)
+        } catch (\Throwable $e)
 		{
 			$this->name = $name;
 		}
@@ -464,12 +455,12 @@ 
 {
     public function __construct ($class, $classGroup = false)
     {
-        if (is_string ($class))
-            $this->selector = \VoidCore::getClass ($class, $classGroup);
-
-        elseif (is_int ($class) && \VoidCore::objectExists ($class))
-            $this->selector = $class;
-
-        else throw new \Exception ('$class parameter must be string or class selector');
+        if (is_string ($class)) {
+                    $this->selector = \VoidCore::getClass ($class, $classGroup);
+        } elseif (is_int ($class) && \VoidCore::objectExists ($class)) {
+                    $this->selector = $class;
+        } else {
+            throw new \Exception ('$class parameter must be string or class selector');
+        }
     }
 }

engine/common/Globals.php

Braces +9 added lines, -10 removed lines

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

engine/extensions/VLF/bin/interpreter.php

Braces +80 added lines, -75 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,33 +143,34 @@ 
                             $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) .');');
-
-                                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 "'. $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:
@@ -178,16 +178,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]]))
@@ -197,9 +199,9 @@ 
                         $collection = \VoidCore::getProperty (self::$objects[$info[0]]->selector, $info[1]);
                         
                         \VoidCore::callMethod ($collection, 'Add', [\VoidCore::importObject (base64_encode (file_get_contents ($dir))), 'object']);
+                    } else {
+                        \VoidCore::setProperty (self::$objects[$info[0]]->selector, $info[1], \VoidCore::importObject (base64_encode (file_get_contents ($dir))));
                     }
-                    
-                    else \VoidCore::setProperty (self::$objects[$info[0]]->selector, $info[1], \VoidCore::importObject (base64_encode (file_get_contents ($dir))));
                 }
             }
 
@@ -239,8 +241,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 (['\'', '"', '$']);
@@ -249,10 +252,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;
@@ -260,8 +264,9 @@ 
                         break;
                     }
 
-                if (!$replaced)
-                    $newLine .= $line[$i];
+                if (!$replaced) {
+                                    $newLine .= $line[$i];
+                }
             }
 
             $line = $newLine;