winforms-php / VoidFramework

engine/common/EngineInterfaces.php

Braces +90 added lines, -99 removed lines

@@ -360,30 +360,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;
     }
@@ -396,9 +403,7 @@ 
         try
         {
             (new WFClass ('System.Reflection.Assembly', 'mscorlib'))->loadFrom ($path);
-        }
-
-        catch (\WinFormsException $e)
+        } catch (\WinFormsException $e)
         {
             return false;
         }
@@ -410,8 +415,9 @@ 
     {
         $property = VoidEngine::callMethod (VoidEngine::callMethod ($selector, 'GetType'), 'GetProperty', $name);
 
-        if (!is_int ($property))
-            return false;
+        if (!is_int ($property)) {
+                    return false;
+        }
 
         try
         {
@@ -454,9 +460,7 @@ 
                         VoidEngine::getProperty ($selector, [$name, 'int']);
 
                         $property = 'int';
-                    }
-
-                    catch (\WinFormsException $e)
+                    } catch (\WinFormsException $e)
                     {
                         return [
                             'type'  => 'vrsf',
@@ -465,9 +469,7 @@ 
                     }
                 break;
             }
-        }
-
-        catch (\Throwable $e)
+        } catch (\Throwable $e)
         {
             $property = 'object';
         }
@@ -485,8 +487,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;
     }
@@ -516,8 +519,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))
         {
@@ -525,35 +529,31 @@ 
             
             /*$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 (\WinFormsException $e)
+        }
+                } catch (\WinFormsException $e)
                 {
                     return $this->getProperty ('Length');
                 }
@@ -563,8 +563,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;
@@ -573,13 +574,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 (\WinFormsException $e)
+                }
+                    } catch (\WinFormsException $e)
                     {
                         $names[] = VoidEngine::getArrayValue ($this->selector, [$i, 'string']);
                     }
@@ -597,10 +597,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
@@ -610,15 +611,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));
         }
@@ -636,11 +635,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)
@@ -650,9 +650,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, EngineAdditions::uncoupleSelector ($value)) :
@@ -675,9 +673,7 @@ 
         try
         {
             $this->offsetGet ($index);
-        }
-
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             return false;
         }
@@ -704,8 +700,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 (callable $comparator, string $type = null): array
@@ -713,9 +710,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;
     }
@@ -725,9 +723,7 @@ 
         try
         {
             return VoidEngine::getProperty ($this->selector, $name);
-        }
-
-        catch (\WinFormsException $e)
+        } catch (\WinFormsException $e)
         {
             return VoidEngine::getField ($this->selector, $name);
         }
@@ -738,9 +734,7 @@ 
         try
         {
             VoidEngine::setProperty ($this->selector, $name, $value);
-        }
-
-        catch (\WinFormsException $e)
+        } catch (\WinFormsException $e)
         {
             VoidEngine::setField ($this->selector, $name, $value);
         }
@@ -757,8 +751,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);
         
@@ -770,9 +765,7 @@ 
 		try
 		{
 			return $this->getProperty ('Name');
-        }
-        
-		catch (\Throwable $e)
+        } catch (\Throwable $e)
 		{
 			return $this->name;
 		}
@@ -783,9 +776,7 @@ 
 		try
 		{
 			$this->setProperty ('Name', $name);
-        }
-        
-		catch (\Throwable $e)
+        } catch (\Throwable $e)
 		{
 			$this->name = $name;
 		}
@@ -801,12 +792,12 @@ 
 {
     public function __construct ($class, $classGroup = false)
     {
-        if (is_string ($class))
-            $this->selector = VoidEngine::createClass ($class, $classGroup);
-
-        elseif (is_int ($class) && VoidEngine::objectExists ($class))
-            $this->selector = $class;
-
-        else throw new \Exception ('$class parameter must be string or class selector');
+        if (is_string ($class)) {
+                    $this->selector = VoidEngine::createClass ($class, $classGroup);
+        } elseif (is_int ($class) && VoidEngine::objectExists ($class)) {
+                    $this->selector = $class;
+        } else {
+            throw new \Exception ('$class parameter must be string or class 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 VoidEngine::callMethod (VoidEngine::createClass ('System.Enum',''), ['parse', 'object'], VoidEngine::objectType ($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 (VoidEngine::objectType ($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 (VoidEngine::objectType ('System.Windows.Forms.Form', 'System.Windows.Forms')))
-                    continue;
-            }
-
-            catch (\Exception $e) {}
+                if ($object->getType ()->isSubclassOf (VoidEngine::objectType ('System.Windows.Forms.Form', 'System.Windows.Forms'))) {
+                                    continue;
+                }
+            } catch (\Exception $e) {}
             
             VoidEngine::destructObject ($selector);
 
-            if (!VoidEngine::objectExists ($selector))
-                unset (self::$components[$selector]);
+            if (!VoidEngine::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 (VoidEngine::objectType ('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);
         VoidEngine::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/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 @@ 
                 VoidEngine::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/TreeView.php

Braces +1 added lines, -3 removed lines

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

engine/components/Form.php

Braces +5 added lines, -4 removed lines

@@ -31,9 +31,9 @@ 
 			VoidEngine::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 @@ 
         
         VoidEngine::setProperty ($this->formSelector, 'Icon', $icon);
 
-		if (!isset ($this->selector))
-		    $this->selector = $icon;
+		if (!isset ($this->selector)) {
+				    $this->selector = $icon;
+		}
 	}
 }