winforms-php / VoidFramework

engine/VoidEngine.php

Braces +2 added lines, -1 removed lines

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

engine/common/Others.php

Braces +81 added lines, -72 removed lines

@@ -6,8 +6,9 @@ 
 {
     $oldStatus = $GLOBALS['error_status'];
 
-    if ($status !== null)
-        $GLOBALS['error_status'] = $status;
+    if ($status !== null) {
+            $GLOBALS['error_status'] = $status;
+    }
 
     return $oldStatus;
 }
@@ -41,9 +42,7 @@ 
     try
     {
         eval ('return; '. $code);
-    }
-
-    catch (\Throwable $e)
+    } catch (\Throwable $e)
     {
         return [
             'text' => $e->getMessage (), 
@@ -67,34 +66,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;
@@ -108,17 +112,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;
 }
@@ -216,16 +225,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]);
+            }
         }
     }
 }
@@ -237,16 +246,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))
                 {
@@ -259,32 +267,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;
             }
@@ -295,31 +301,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;
+        }
     }
 }
 
@@ -377,8 +384,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);
@@ -444,12 +452,13 @@ 
         16384 => 'E_USER_DEPRECATED'
     ];
 
-    if ($GLOBALS['error_status'])
-        message ([
+    if ($GLOBALS['error_status']) {
+            message ([
             'type'      => $errarr[$no],
             'text'      => $str,
             'file'      => $file,
             'line'      => $line,
             'backtrace' => debug_backtrace ()
         ], 'PHP Script Error');
-});
+    }
+    });

engine/common/EngineInterfaces.php

Braces +90 added lines, -97 removed lines

@@ -380,30 +380,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;
     }
@@ -416,9 +423,7 @@ 
         try
         {
             (new WFClass ('System.Reflection.Assembly', 'mscorlib'))->loadFrom ($path);
-        }
-
-        catch (\Throwable $e)
+        } catch (\Throwable $e)
         {
             return false;
         }
@@ -430,8 +435,9 @@ 
     {
         $property = VoidEngine::callMethod (VoidEngine::callMethod ($selector, 'GetType'), 'GetProperty', $name);
 
-        if (!is_int ($property))
-            return false;
+        if (!is_int ($property)) {
+                    return false;
+        }
 
         try
         {
@@ -474,9 +480,7 @@ 
                         VoidEngine::getProperty ($selector, [$name, 'int']);
 
                         $property = 'int';
-                    }
-
-                    catch (\Throwable $e)
+                    } catch (\Throwable $e)
                     {
                         return [
                             'type'  => 'vrsf',
@@ -485,9 +489,7 @@ 
                     }
                 break;
             }
-        }
-
-        catch (\Throwable $e)
+        } catch (\Throwable $e)
         {
             $property = 'object';
         }
@@ -505,8 +507,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;
     }
@@ -536,40 +539,38 @@ 
 
     public function __construct ($object, ?string $classGroup = 'auto', ...$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))
-            $this->selector = VoidEngine::createObject ($object, $classGroup == 'auto' ?
+        if (is_string ($object)) {
+                    $this->selector = VoidEngine::createObject ($object, $classGroup == 'auto' ?
                 substr ($object, 0, strrpos ($object, '.')) : $classGroup, ...$args);
-
-        elseif (is_int ($object) && VoidEngine::objectExists ($object))
-            $this->selector = $object;
-
-        else throw new \Exception ('$object parameter must be string or object selector');
+        } elseif (is_int ($object) && VoidEngine::objectExists ($object)) {
+                    $this->selector = $object;
+        } else {
+            throw new \Exception ('$object parameter must be string or object selector');
+        }
     }
     
     public function __get ($name)
 	{
-        if (method_exists ($this, $method = "get_$name"))
-            $value = $this->$method ();
-
-        elseif (substr ($name, -5) == 'Event')
-            $value = Events::getObjectEvent ($this->selector, substr ($name, 0, -5));
-
-        elseif (property_exists ($this, $name))
-            $value = $this->$name;
-
-        else switch (strtolower ($name))
+        if (method_exists ($this, $method = "get_$name")) {
+                    $value = $this->$method ();
+        } elseif (substr ($name, -5) == 'Event') {
+                    $value = Events::getObjectEvent ($this->selector, substr ($name, 0, -5));
+        } elseif (property_exists ($this, $name)) {
+                    $value = $this->$name;
+        } else {
+            switch (strtolower ($name))
         {
             case 'count':
             case 'length':
                 try
                 {
                     return $this->getProperty ('Count');
-                }
-
-                catch (\Throwable $e)
+        }
+                } catch (\Throwable $e)
                 {
                     return $this->getProperty ('Length');
                 }
@@ -579,8 +580,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;
@@ -589,13 +591,12 @@ 
                 $size = $this->count;
                 $names = [];
                 
-                for ($i = 0; $i < $size; ++$i)
-                    try
+                for ($i = 0; $i < $size; ++$i) {
+                                    try
                     {
                         $names[] = VoidEngine::getProperty (VoidEngine::getArrayValue ($this->selector, [$i, 'object']), 'Text');
-                    }
-
-                    catch (\Throwable $e)
+                }
+                    } catch (\Throwable $e)
                     {
                         $names[] = VoidEngine::getArrayValue ($this->selector, [$i, 'string']);
                     }
@@ -613,10 +614,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
@@ -626,12 +628,11 @@ 
             {
                 return $value instanceof WFObject ?
                     $this->$method ($value->selector) : null;
-            }
-
-        elseif (substr ($name, -5) == 'Event')
-            Events::setObjectEvent ($this->selector, substr ($name, 0, -5), $value);
-        
-        else $this->setProperty ($name, EngineAdditions::uncoupleSelector ($value));
+            } elseif (substr ($name, -5) == 'Event') {
+                    Events::setObjectEvent ($this->selector, substr ($name, 0, -5), $value);
+        } else {
+            $this->setProperty ($name, EngineAdditions::uncoupleSelector ($value));
+        }
     }
 	
 	public function __call ($method, $args)
@@ -646,8 +647,9 @@ 
 
     public function addRange (array $values, $assoc = false): void
     {
-        foreach ($values as $id => $value)
-            $this->offsetSet ($assoc ? $id : null, $value);
+        foreach ($values as $id => $value) {
+                    $this->offsetSet ($assoc ? $id : null, $value);
+        }
     }
     
     public function offsetSet ($index, $value)
@@ -657,9 +659,7 @@ 
             return $index === null ?
                 $this->callMethod ('Add', EngineAdditions::uncoupleSelector ($value)) :
                 $this->callMethod ('Insert', $index, EngineAdditions::uncoupleSelector ($value));
-        }
-
-        catch (\Throwable $e)
+        } catch (\Throwable $e)
         {
             return $index === null ?
                 VoidEngine::setArrayValue ($this->selector, $this->count, $value) :
@@ -682,9 +682,7 @@ 
         try
         {
             $this->offsetGet ($index);
-        }
-
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             return false;
         }
@@ -711,8 +709,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
@@ -720,9 +719,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;
     }
@@ -732,9 +732,7 @@ 
         try
         {
             return VoidEngine::getProperty ($this->selector, $name);
-        }
-
-        catch (\Throwable $e)
+        } catch (\Throwable $e)
         {
             return VoidEngine::getField ($this->selector, $name);
         }
@@ -745,9 +743,7 @@ 
         try
         {
             VoidEngine::setProperty ($this->selector, $name, $value);
-        }
-
-        catch (\Throwable $e)
+        } catch (\Throwable $e)
         {
             VoidEngine::setField ($this->selector, $name, $value);
         }
@@ -764,8 +760,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);
         
@@ -777,9 +774,7 @@ 
 		try
 		{
 			return $this->getProperty ('Name');
-        }
-        
-		catch (\Throwable $e)
+        } catch (\Throwable $e)
 		{
 			return $this->name;
 		}
@@ -790,9 +785,7 @@ 
 		try
 		{
 			$this->setProperty ('Name', $name);
-        }
-        
-		catch (\Throwable $e)
+        } catch (\Throwable $e)
 		{
 			$this->name = $name;
 		}
@@ -810,14 +803,14 @@ 
 
     public function __construct ($class, ?string $classGroup = 'auto')
     {
-        if (is_string ($class))
-            $this->selector = VoidEngine::createClass ($class, $classGroup == 'auto' ?
+        if (is_string ($class)) {
+                    $this->selector = VoidEngine::createClass ($class, $classGroup == 'auto' ?
                 substr ($class, 0, strrpos ($class, '.')) : $classGroup
             );
-
-        elseif (is_int ($class) && VoidEngine::objectExists ($class))
-            $this->selector = $class;
-
-        else throw new \Exception ('$class parameter must be string or class selector');
+        } elseif (is_int ($class) && VoidEngine::objectExists ($class)) {
+                    $this->selector = $class;
+        } else {
+            throw new \Exception ('$class parameter must be string or class selector');
+        }
     }
 }

engine/common/Events.php

Braces +4 added lines, -5 removed lines

@@ -10,14 +10,13 @@
 		{
             try
 			{
-                foreach ($args as $id => $arg)
-                    $args[$id] = EngineAdditions::coupleSelector ($arg);
+                foreach ($args as $id => $arg) {
+                                    $args[$id] = EngineAdditions::coupleSelector ($arg);
+                }
                 
                 return $function (($e = _c($sender)) !== false ?
                     $e : new WFObject ($sender), ...$args);
-            }
-            
-			catch (\Throwable $e)
+            } catch (\Throwable $e)
 			{
                 message ([
                     'type'  => get_class ($e),

core/script.php

Braces +9 added lines, -7 removed lines

@@ -7,19 +7,21 @@
 const CORE_DIR = __DIR__;
 chdir (CORE_DIR);
 
-foreach (glob ('ext/php_*.dll') as $ext)
+foreach (glob ('ext/php_*.dll') as $ext) {
 	if (!extension_loaded (substr (basename ($ext), 4, -4)))
 		load_extension ($ext);
+}
 
-if (file_exists ('../engine/VoidEngine.php'))
+if (file_exists ('../engine/VoidEngine.php')) {
 	require '../engine/VoidEngine.php';
-
-elseif (file_exists (FRAMEWORK_DIR .'/engine/VoidEngine.php'))
+} elseif (file_exists (FRAMEWORK_DIR .'/engine/VoidEngine.php')) {
 	require FRAMEWORK_DIR .'/engine/VoidEngine.php';
-
-else message ('VoidEngine not founded');
+} else {
+    message ('VoidEngine not founded');
+}
 
 $app = '../../app/start.php';
 
-if (file_exists ($app))
+if (file_exists ($app)) {
 	require $app;
+}

app_bundle/start.php

Braces +2 added lines, -1 removed lines

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