winforms-php / VoidStudio

bin/qero-packages/winforms-php/VoidFramework/engine/common/Others.php

Spacing +125 added lines, -126 removed lines

@@ -2,7 +2,7 @@ 
 
 namespace VoidEngine;
 
-function err_status (bool $status = null): bool
+function err_status(bool $status = null): bool
 {
     $oldStatus = $GLOBALS['__debug']['error_status'];
 
@@ -12,216 +12,216 @@ 
     return $oldStatus;
 }
 
-function err_no (): bool
+function err_no(): bool
 {
-    return err_status (false);
+    return err_status(false);
 }
 
-function err_yes (): bool
+function err_yes(): bool
 {
-    return err_status (true);
+    return err_status(true);
 }
 
-function run (string $path, ...$args)
+function run(string $path, ...$args)
 {
-    return (new Process)->start ($path, ...$args);
+    return (new Process)->start($path, ...$args);
 }
 
-function vbs_exec (string $code)
+function vbs_exec(string $code)
 {
-    file_put_contents ($path = getenv ('temp') .'/'. crc32 ($code) .'.vbs', $code);
+    file_put_contents($path = getenv('temp').'/'.crc32($code).'.vbs', $code);
 
-    (new \COM ('WScript.Shell'))->Run ($path, 0, true);
+    (new \COM('WScript.Shell'))->Run($path, 0, true);
 
-    unlink ($path);
+    unlink($path);
 }
 
-function php_errors_check (string $code): ?array
+function php_errors_check(string $code): ?array
 {
     try
     {
-        eval ('return; '. $code);
+        eval ('return; '.$code);
     }
 
     catch (\Throwable $e)
     {
         return [
-            'text' => $e->getMessage (), 
-			'line' => $e->getLine ()
+            'text' => $e->getMessage(), 
+			'line' => $e->getLine()
         ];
     }
 
     return null;
 }
 
-function enum (string $name): array
+function enum(string $name): array
 {
     return [
-        substr ($name, strrpos ($name, '.') + 1),
-        ($name = substr ($name, 0, strrpos ($name, '.'))) .', '. substr ($name, 0, strrpos ($name, '.'))
+        substr($name, strrpos($name, '.') + 1),
+        ($name = substr($name, 0, strrpos($name, '.'))).', '.substr($name, 0, strrpos($name, '.'))
     ];
 }
 
-function enum_parse (string $baseType, string $value)
+function enum_parse(string $baseType, string $value)
 {
     try
     {
-        return \VoidCore::callMethod (\VoidCore::getClass ('System.Enum',''), ['parse', 'object'], \VoidCore::typeof ($baseType), $value, true);
+        return \VoidCore::callMethod(\VoidCore::getClass('System.Enum', ''), ['parse', 'object'], \VoidCore::typeof($baseType), $value, true);
     }
 
     catch (\WinFormsException $e)
     {
-        return (new WFClass ($baseType))->$value;
+        return (new WFClass($baseType))->$value;
     }
 }
 
-function getNetArray (string $type, array $items = []): WFObject
+function getNetArray(string $type, array $items = []): WFObject
 {
-    $array = (new WFClass ('System.Array', null))
-        ->createInstance (\VoidCore::typeof ($type), $size = sizeof ($items));
+    $array = (new WFClass('System.Array', null))
+        ->createInstance(\VoidCore::typeof($type), $size = sizeof($items));
 
     for ($i = 0; $i < $size; ++$i)
-        $array[$i] = array_shift ($items);
+        $array[$i] = array_shift($items);
     
     return $array;
 }
 
-function dir_create (string $path, int $mode = 0777): void
+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
+function dir_delete(string $path): bool
 {
-    if (!is_dir ($path))
+    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);
+            dir_delete($file);
 
-            if (is_dir ($file))
-                rmdir ($file);
+            if (is_dir($file))
+                rmdir($file);
         }
 
-        else unlink ($file);
+        else unlink($file);
 
-    rmdir ($path);
+    rmdir($path);
 
     return true;
 }
 
-function dir_clean (string $path): void
+function dir_clean(string $path): void
 {
-    dir_delete ($path);
-    dir_create ($path);
+    dir_delete($path);
+    dir_create($path);
 }
 
-function dir_copy (string $from, string $to): bool
+function dir_copy(string $from, string $to): bool
 {
-    if (!is_dir ($from))
+    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))
-            dir_copy ($f, $to .'/'. $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;
 }
 
-function getARGBColor (string $color)
+function getARGBColor(string $color)
 {
-    return (new WFClass ('System.Drawing.ColorTranslator'))->fromHtml ($color);
+    return (new WFClass('System.Drawing.ColorTranslator'))->fromHtml($color);
 }
 
-function replaceSl (string $string): string
+function replaceSl(string $string): string
 {
-    return str_replace ('\\', '/', $string);
+    return str_replace('\\', '/', $string);
 }
 
-function replaceSr (string $string): string
+function replaceSr(string $string): string
 {
-    return str_replace ('/', '\\', $string);
+    return str_replace('/', '\\', $string);
 }
 
-function basenameNoExt (string $path): string
+function basenameNoExt(string $path): string
 {
-    return pathinfo ($path, PATHINFO_FILENAME);
+    return pathinfo($path, PATHINFO_FILENAME);
 }
 
-function file_ext (string $path): string
+function file_ext(string $path): string
 {
-    return strtolower (pathinfo ($path, PATHINFO_EXTENSION));
+    return strtolower(pathinfo($path, PATHINFO_EXTENSION));
 }
 
-function filepathNoExt (string $path): string
+function filepathNoExt(string $path): string
 {
-    return dirname ($path) .'/'. basenameNoExt ($path);
+    return dirname($path).'/'.basenameNoExt($path);
 }
 
-function array_first (array $array)
+function array_first(array $array)
 {
-    return array_shift ($array);
+    return array_shift($array);
 }
 
-function array_end (array $array)
+function array_end(array $array)
 {
-    return array_pop ($array);
+    return array_pop($array);
 }
 
-function substr_icount (string $haystack, string $needle, ...$params): int
+function substr_icount(string $haystack, string $needle, ...$params): int
 {
-	return substr_count (strtolower ($haystack), strtolower ($needle), ...$params);
+	return substr_count(strtolower($haystack), strtolower($needle), ...$params);
 }
 
-function str_replace_assoc (string $subject, array $replacements): string
+function str_replace_assoc(string $subject, array $replacements): string
 {
-	return str_replace (array_keys ($replacements), array_values ($replacements), $subject);
+	return str_replace(array_keys($replacements), array_values($replacements), $subject);
 }
 
-function pre (...$args): void
+function pre(...$args): void
 {
-	message (sizeof ($args) < 2 ? current ($args) : $args);
+	message(sizeof($args) < 2 ? current ($args) : $args);
 }
 
-function messageBox (string $message, string $caption = '', ...$args)
+function messageBox(string $message, string $caption = '', ...$args)
 {
-    return (new MessageBox)->show ($message, $caption, ...$args);
+    return (new MessageBox)->show($message, $caption, ...$args);
 }
 
 class Components
 {
     static array $components = [];
 
-    public static function addComponent (int $selector, object $object): void
+    public static function addComponent(int $selector, object $object): void
     {
         self::$components[$selector] = $object;
     }
 
-    public static function getComponent (int $selector)
+    public static function getComponent(int $selector)
     {
         return isset (self::$components[$selector]) ?
             self::$components[$selector] : false;
     }
 
-    public static function componentExists (int $selector): bool
+    public static function componentExists(int $selector): bool
     {
         return isset (self::$components[$selector]);
     }
 
-    public static function removeComponent (int $selector): void
+    public static function removeComponent(int $selector): void
     {
         unset (self::$components[$selector]);
     }
 
-    public static function cleanJunk (): void
+    public static function cleanJunk(): void
     {
         // TODO: более строгие правила очистки мусорных объектов
         
@@ -229,46 +229,46 @@ 
         {
             try
             {
-                if ($object->getType ()->isSubclassOf (\VoidCore::typeof ('System.Windows.Forms.Form', 'System.Windows.Forms')))
+                if ($object->getType()->isSubclassOf(\VoidCore::typeof('System.Windows.Forms.Form', 'System.Windows.Forms')))
                     continue;
             }
 
             catch (\Exception $e) {}
             
-            \VoidCore::destructObject ($selector);
+            \VoidCore::destructObject($selector);
 
-            if (!\VoidCore::objectExists ($selector))
+            if (!\VoidCore::objectExists($selector))
                 unset (self::$components[$selector]);
         }
     }
 }
 
-function _c (int $selector)
+function _c(int $selector)
 {
-    return Components::getComponent ($selector);
+    return Components::getComponent($selector);
 }
 
-function c ($name, bool $returnAllSimilarObjects = false)
+function c($name, bool $returnAllSimilarObjects = false)
 {
-    if (is_int ($name) && is_object ($object = _c ($name)))
+    if (is_int($name) && is_object($object = _c($name)))
         return $object;
 
     else
     {
-        $path    = explode ('->', $name);
+        $path    = explode('->', $name);
         $similar = [];
 
         foreach (Components::$components as $object)
             try
             {
-                if ($object->name == end ($path))
+                if ($object->name == end($path))
                 {
-                    if (sizeof ($path) > 1)
+                    if (sizeof($path) > 1)
                         try
                         {
-                            if (is_object ($parent = _c($object->parent->selector)))
+                            if (is_object($parent = _c($object->parent->selector)))
                             {
-                                if (c(join ('->', array_slice ($path, 0, -1))) == $parent)
+                                if (c(join('->', array_slice($path, 0, -1))) == $parent)
                                 {
                                     if ($returnAllSimilarObjects)
                                         $similar[] = $object;
@@ -302,18 +302,18 @@ 
                 continue;
             }
 
-        if (sizeof ($path) == 2)
+        if (sizeof($path) == 2)
         {
             $objects = c($path[1], true);
 
-            if (is_array ($objects))
+            if (is_array($objects))
             {
                 foreach ($objects as $id => $object)
                     try
                     {
-                        while (is_object ($parent = _c($object->parent->selector)))
+                        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])
+                            if ($parent->getType()->isSubclassOf(\VoidCore::typeof('System.Windows.Forms.Form', 'System.Windows.Forms')) && $parent->name == $path[0])
                                 return $objects[$id];
 
                             else $object = $parent;
@@ -331,70 +331,70 @@ 
             else return false;
         }
 
-        else return $returnAllSimilarObjects && sizeof ($similar) > 0 ?
+        else return $returnAllSimilarObjects && sizeof($similar) > 0 ?
             $similar : false;
     }
 }
 
-function setTimer (int $interval, callable $function): Timer
+function setTimer(int $interval, callable $function): Timer
 {
     $timer = new Timer;
     $timer->interval = $interval;
     
-    $timer->tickEvent = function ($self) use ($function)
+    $timer->tickEvent = function($self) use ($function)
     {
-        call_user_func ($function, $self);
+        call_user_func($function, $self);
     };
     
-	$timer->start ();
+	$timer->start();
     
     return $timer;
 }
 
 // FIXME: выполняется несколько раз, а не единожды
-function setTimeout (int $timeout, callable $function): Timer
+function setTimeout(int $timeout, callable $function): Timer
 {
     $timer = new Timer;
     $timer->interval = $timeout;
     
-    $timer->tickEvent = function ($self) use ($function)
+    $timer->tickEvent = function($self) use ($function)
     {
-        call_user_func ($function, $self);
+        call_user_func($function, $self);
 
-        $self->stop ();
+        $self->stop();
     };
     
-    $timer->start ();
+    $timer->start();
     
 	return $timer;
 }
 
 class Clipboard
 {
-    public static function getText ()
+    public static function getText()
     {
-        return (new WFClass ('System.Windows.Forms.Clipboard'))->getText ();
+        return (new WFClass('System.Windows.Forms.Clipboard'))->getText();
     }
     
-    public static function setText (string $text): void
+    public static function setText(string $text): void
     {
-        (new WFClass ('System.Windows.Forms.Clipboard'))->setText ($text);
+        (new WFClass('System.Windows.Forms.Clipboard'))->setText($text);
     }
     
-    public static function getFiles (): array
+    public static function getFiles(): array
     {
-        return (new WFClass ('System.Windows.Forms.Clipboard'))->getFileDropList ()->list;
+        return (new WFClass('System.Windows.Forms.Clipboard'))->getFileDropList()->list;
     }
     
-    public static function setFiles (array $files): void
+    public static function setFiles(array $files): void
     {
-        $collection = new WFObject ('System.Collections.Specialized.StringCollection');
+        $collection = new WFObject('System.Collections.Specialized.StringCollection');
 
         foreach ($files as $file)
-            $collection->add ((string) $file);
+            $collection->add((string) $file);
 
-        (new WFClass ('System.Windows.Forms.Clipboard'))->setFileDropList ($collection);
-        \VoidCore::removeObjects ($collection->selector);
+        (new WFClass('System.Windows.Forms.Clipboard'))->setFileDropList($collection);
+        \VoidCore::removeObjects($collection->selector);
     }
 }
 
@@ -402,14 +402,13 @@ 
 {
     protected $cursor;
 
-    public function __construct (int $handle = null)
+    public function __construct(int $handle = null)
     {
         $handle !== null ?
-            $this->cursor = new WFObject ('System.Windows.Forms.Cursor', false, $handle) :
-            $this->cursor = new WFClass ('System.Windows.Forms.Cursor');
+            $this->cursor = new WFObject('System.Windows.Forms.Cursor', false, $handle) : $this->cursor = new WFClass('System.Windows.Forms.Cursor');
     }
 
-    public function getPosition (): array
+    public function getPosition(): array
     {
         $pos = $this->cursor->position;
 
@@ -420,22 +419,22 @@ 
     }
 }
 
-function get_cursor_x (int $handle = null): int
+function get_cursor_x(int $handle = null): int
 {
-    return (new Cursor ($handle))->getPosition ()[0];
+    return (new Cursor($handle))->getPosition()[0];
 }
 
-function get_cursor_y (int $handle = null): int
+function get_cursor_y(int $handle = null): int
 {
-    return (new Cursor ($handle))->getPosition ()[1];
+    return (new Cursor($handle))->getPosition()[1];
 }
 
-function get_cursor_pos (int $handle = null): array
+function get_cursor_pos(int $handle = null): array
 {
-    return (new Cursor ($handle))->getPosition ();
+    return (new Cursor($handle))->getPosition();
 }
 
-set_error_handler (function ($no, $str, $file, $line)
+set_error_handler(function($no, $str, $file, $line)
 {
     // Мог ли я здесь сделать более адекватный код с использованием pow/sqrt? Да, мог
     // Почему не сделал? Скорость важнее
@@ -458,7 +457,7 @@ 
     ];
 
     if ($GLOBALS['__debug']['error_status'])
-        message ([
+        message([
             'type'      => $errarr[$no],
             'text'      => $str,
             'file'      => $file,

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');
-});
+    }
+    });

bin/qero-packages/winforms-php/VoidFramework/engine/common/Events.php

Indentation +4 added lines, -4 removed lines

@@ -7,9 +7,9 @@ 
     public static function setObjectEvent (int $object, string $eventName, callable $function)
     {
         \VoidCore::setEvent ($object, $eventName, function ($sender, ...$args) use ($function)
-		{
+        {
             try
-			{
+            {
                 foreach ($args as $id => $arg)
                     $args[$id] = EngineAdditions::coupleSelector ($arg);
                 
@@ -17,8 +17,8 @@ 
                     $e : new WFObject ($sender), ...$args);
             }
             
-			catch (\Throwable $e)
-			{
+            catch (\Throwable $e)
+            {
                 message ([
                     'type'  => get_class ($e),
                     'text'  => $e->getMessage (),

Spacing +14 added lines, -14 removed lines

@@ -4,35 +4,35 @@
 
 class Events
 {
-    public static function setObjectEvent (int $object, string $eventName, callable $function)
+    public static function setObjectEvent(int $object, string $eventName, callable $function)
     {
-        \VoidCore::setEvent ($object, $eventName, function ($sender, ...$args) use ($function)
+        \VoidCore::setEvent($object, $eventName, function($sender, ...$args) use ($function)
 		{
             try
 			{
                 foreach ($args as $id => $arg)
-                    $args[$id] = EngineAdditions::coupleSelector ($arg);
+                    $args[$id] = EngineAdditions::coupleSelector($arg);
                 
-                return $function (($e = _c($sender)) !== false ?
-                    $e : new WFObject ($sender), ...$args);
+                return $function(($e = _c($sender)) !== false ?
+                    $e : new WFObject($sender), ...$args);
             }
             
 			catch (\Throwable $e)
 			{
-                message ([
-                    'type'  => get_class ($e),
-                    'text'  => $e->getMessage (),
-                    'file'  => $e->getFile (),
-                    'line'  => $e->getLine (),
-                    'code'  => $e->getCode (),
-                    'trace' => $e->getTraceAsString ()
+                message([
+                    'type'  => get_class($e),
+                    'text'  => $e->getMessage(),
+                    'file'  => $e->getFile(),
+                    'line'  => $e->getLine(),
+                    'code'  => $e->getCode(),
+                    'trace' => $e->getTraceAsString()
                 ], 'PHP Critical Error');
             }
         });
     }
 
-    public static function removeObjectEvent (int $object, string $eventName)
+    public static function removeObjectEvent(int $object, string $eventName)
     {
-        \VoidCore::removeEvent ($object, $eventName);
+        \VoidCore::removeEvent($object, $eventName);
     }
 }

bin/qero-packages/winforms-php/VoidFramework/engine/common/EngineInterfaces.php

Indentation +46 added lines, -46 removed lines

@@ -197,7 +197,7 @@ 
     }
     
     public function __get ($name)
-	{
+    {
         if (method_exists ($this, $method = "get_$name"))
             $value = $this->$method ();
 
@@ -226,7 +226,7 @@ 
                 $size = $this->count;
                 $list = [];
                 
-				for ($i = 0; $i < $size; ++$i)
+                for ($i = 0; $i < $size; ++$i)
                     $list[] = EngineAdditions::coupleSelector (\VoidCore::getArrayValue ($this->selector, $i));
                 
                 return $list;
@@ -256,10 +256,10 @@ 
         }
 
         return EngineAdditions::coupleSelector ($value, $this->selector);
-	}
+    }
 	
-	public function __set ($name, $value)
-	{
+    public function __set ($name, $value)
+    {
         if (method_exists ($this, $method = "set_$name"))
             try
             {
@@ -287,8 +287,8 @@ 
         }
     }
 	
-	public function __call ($method, $args)
-	{
+    public function __call ($method, $args)
+    {
         $args = array_map (function ($arg)
         {
             return EngineAdditions::uncoupleSelector ($arg);
@@ -307,7 +307,7 @@ 
     }
     
     public function offsetSet ($index, $value)
-	{
+    {
         try
         {
             return $index === null ?
@@ -323,14 +323,14 @@ 
         }
     }
 	
-	public function offsetGet ($index)
-	{
-		return EngineAdditions::coupleSelector (\VoidCore::getArrayValue ($this->selector, $index), $this->selector);
+    public function offsetGet ($index)
+    {
+        return EngineAdditions::coupleSelector (\VoidCore::getArrayValue ($this->selector, $index), $this->selector);
     }
 	
-	public function offsetUnset ($index): void
-	{
-		$this->callMethod ('RemoveAt', $index);
+    public function offsetUnset ($index): void
+    {
+        $this->callMethod ('RemoveAt', $index);
     }
     
     public function offsetExists ($index): bool
@@ -348,19 +348,19 @@ 
         return true;
     }
 	
-	public function indexOf ($value): int
-	{
-		return $this->callMethod ('IndexOf', EngineAdditions::uncoupleSelector ($value));
+    public function indexOf ($value): int
+    {
+        return $this->callMethod ('IndexOf', EngineAdditions::uncoupleSelector ($value));
     }
     
     public function lastIndexOf ($value): int
-	{
-		return $this->callMethod ('LastIndexOf', EngineAdditions::uncoupleSelector ($value));
-	}
+    {
+        return $this->callMethod ('LastIndexOf', EngineAdditions::uncoupleSelector ($value));
+    }
 	
-	public function contains ($value): bool
-	{
-		return $this->callMethod ('Contains', EngineAdditions::uncoupleSelector ($value));
+    public function contains ($value): bool
+    {
+        return $this->callMethod ('Contains', EngineAdditions::uncoupleSelector ($value));
     }
 
     public function foreach (callable $callback, string $type = null): void
@@ -414,45 +414,45 @@ 
         return \VoidCore::callMethod ($this->selector, $method, ...$args);
     }
 	
-	protected function getArrayProperty ($name, string $type = null)
-	{
+    protected function getArrayProperty ($name, string $type = null)
+    {
         $array  = $this->getProperty ($name);
         $size   = \VoidCore::getProperty ($array, 'Length');
         $return = [];
 
-		for ($i = 0; $i < $size; ++$i)
+        for ($i = 0; $i < $size; ++$i)
             $return[] = \VoidCore::getArrayValue ($array, $type === null ? $i : [$i, $type]);
         
         \VoidCore::removeObjects ($array);
         
-		return $return;
+        return $return;
     }
 
     public function get_name ()
-	{
-		try
-		{
-			return $this->getProperty ('Name');
+    {
+        try
+        {
+            return $this->getProperty ('Name');
         }
         
-		catch (\Throwable $e)
-		{
-			return $this->name;
-		}
-	}
+        catch (\Throwable $e)
+        {
+            return $this->name;
+        }
+    }
 	
-	public function set_name (string $name)
-	{
-		try
-		{
-			$this->setProperty ('Name', $name);
+    public function set_name (string $name)
+    {
+        try
+        {
+            $this->setProperty ('Name', $name);
         }
         
-		catch (\Throwable $e)
-		{
-			$this->name = $name;
-		}
-	}
+        catch (\Throwable $e)
+        {
+            $this->name = $name;
+        }
+    }
 
     public function __toString (): string
     {

Spacing +104 added lines, -106 removed lines

@@ -24,20 +24,20 @@ 
      * @return array - возвращает список ошибок компиляции
      * 
      */
-    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
+    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);
+            $dictionary = new WFObject('System.Collections.Generic.Dictionary`2[System.String,System.String]', null);
 
         if ($assemblies === null)
-            $assemblies = getNetArray ('System.String', [
+            $assemblies = getNetArray('System.String', [
                 // CORE_DIR .'/CefSharp.dll',
-                CORE_DIR .'/FastColoredTextBox.dll',
-                CORE_DIR .'/ScintillaNET.dll'
+                CORE_DIR.'/FastColoredTextBox.dll',
+                CORE_DIR.'/ScintillaNET.dll'
             ]);
 
         if ($productName === null)
-            $productName = basenameNoExt ($savePath);
+            $productName = basenameNoExt($savePath);
 
         if ($productDescription === null)
             $productDescription = $productName;
@@ -49,16 +49,16 @@ 
             $companyName = 'Company N';
 
         if ($copyright === null)
-            $copyright = $companyName .' copyright (c) '. date ('Y');
+            $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;
+        return (new WFClass('WinForms_PHP.WFCompiler', null))->compile($savePath, $iconPath, $phpCode, $productDescription, $productName, $productVersion, $companyName, $copyright, $callSharpCode, $declareSharpCode, $dictionary, $assemblies)->names;
     }
 
-    public static function loadModule (string $path): bool
+    public static function loadModule(string $path): bool
     {
         try
         {
-            (new WFClass ('System.Reflection.Assembly', 'mscorlib'))->loadFrom ($path);
+            (new WFClass('System.Reflection.Assembly', 'mscorlib'))->loadFrom($path);
         }
 
         catch (\WinFormsException $e)
@@ -69,16 +69,16 @@ 
         return true;
     }
 
-    public static function getProperty (int $selector, string $name): array
+    public static function getProperty(int $selector, string $name): array
     {
-        $property = \VoidCore::callMethod (\VoidCore::callMethod ($selector, 'GetType'), 'GetProperty', $name);
+        $property = \VoidCore::callMethod(\VoidCore::callMethod($selector, 'GetType'), 'GetProperty', $name);
 
-        if (!is_int ($property))
+        if (!is_int($property))
             return false;
 
         try
         {
-            $propertyType = \VoidCore::getProperty ($property, ['PropertyType', 'string']);
+            $propertyType = \VoidCore::getProperty($property, ['PropertyType', 'string']);
 
             switch ($propertyType)
             {
@@ -114,7 +114,7 @@ 
                 default:
                     try
                     {
-                        \VoidCore::getProperty ($selector, [$name, 'int']);
+                        \VoidCore::getProperty($selector, [$name, 'int']);
 
                         $property = 'int';
                     }
@@ -123,7 +123,7 @@ 
                     {
                         return [
                             'type'  => 'vrsf',
-                            'value' => \VoidCore::exportObject (\VoidCore::getProperty ($selector, [$name, 'object']))
+                            'value' => \VoidCore::exportObject(\VoidCore::getProperty($selector, [$name, 'object']))
                         ];
                     }
                 break;
@@ -137,19 +137,19 @@ 
 
         return [
             'type'  => $property,
-            'value' => \VoidCore::getProperty ($selector, [$name, $property])
+            'value' => \VoidCore::getProperty($selector, [$name, $property])
         ];
     }
 
-    public static function getObjectEvents (int $object): array
+    public static function getObjectEvents(int $object): array
     {
         $events = [];
 
-        $props = \VoidCore::callMethod (\VoidCore::callMethod ($object, 'GetType'), 'GetEvents');
-        $len   = \VoidCore::getProperty ($props, 'Length');
+        $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');
+            $events[] = \VoidCore::getProperty(\VoidCore::getArrayValue($props, $i), 'Name');
 
         return $events;
     }
@@ -159,13 +159,13 @@ 
      * Тогда получается бесконечный цикл вида object->selector->selector->selector->...
      * Чтобы этого избежать нужно добавить исключение - переменную $selfSelector
      */
-    public static function coupleSelector ($value, int $selfSelector = null)
+    public static function coupleSelector($value, int $selfSelector = null)
     {
-        return is_int ($value) && \VoidCore::objectExists ($value) && $value != $selfSelector ?
-            new WFObject ($value) : $value;
+        return is_int($value) && \VoidCore::objectExists($value) && $value != $selfSelector ?
+            new WFObject($value) : $value;
     }
 
-    public static function uncoupleSelector ($value)
+    public static function uncoupleSelector($value)
     {
         return $value instanceof WFObject ?
             $value->selector : $value;
@@ -177,48 +177,48 @@ 
     protected int $selector = 0;
     protected $name;
 
-    public function __construct ($object, $classGroup = false, ...$args)
+    public function __construct($object, $classGroup = false, ...$args)
     {
         foreach ($args as $id => $arg)
-            $args[$id] = EngineAdditions::uncoupleSelector ($arg);
+            $args[$id] = EngineAdditions::uncoupleSelector($arg);
 
-        if (is_string ($object))
+        if (is_string($object))
         {
-            $this->selector = \VoidCore::createObject ($object, $classGroup, ...$args);
+            $this->selector = \VoidCore::createObject($object, $classGroup, ...$args);
             
             /*$this->selector = \VoidCore::createObject ($object, $classGroup == 'auto' ?
                 substr ($object, 0, strrpos ($object, '.')) : $classGroup, ...$args);*/
         }
 
-        elseif (is_int ($object) && \VoidCore::objectExists ($object))
+        elseif (is_int($object) && \VoidCore::objectExists($object))
             $this->selector = $object;
 
-        else throw new \Exception ('$object parameter must be string or object selector');
+        else throw new \Exception('$object parameter must be string or object selector');
     }
     
-    public function __get ($name)
+    public function __get($name)
 	{
-        if (method_exists ($this, $method = "get_$name"))
-            $value = $this->$method ();
+        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 (substr($name, -5) == 'Event')
+            $value = Events::getObjectEvent($this->selector, substr($name, 0, -5));
 
-        elseif (property_exists ($this, $name))
+        elseif (property_exists($this, $name))
             $value = $this->$name;
 
-        else switch (strtolower ($name))
+        else switch (strtolower($name))
         {
             case 'count':
             case 'length':
                 try
                 {
-                    return $this->getProperty ('Count');
+                    return $this->getProperty('Count');
                 }
 
                 catch (\WinFormsException $e)
                 {
-                    return $this->getProperty ('Length');
+                    return $this->getProperty('Length');
                 }
             break;
 
@@ -227,7 +227,7 @@ 
                 $list = [];
                 
 				for ($i = 0; $i < $size; ++$i)
-                    $list[] = EngineAdditions::coupleSelector (\VoidCore::getArrayValue ($this->selector, $i));
+                    $list[] = EngineAdditions::coupleSelector(\VoidCore::getArrayValue($this->selector, $i));
                 
                 return $list;
             break;
@@ -239,31 +239,31 @@ 
                 for ($i = 0; $i < $size; ++$i)
                     try
                     {
-                        $names[] = \VoidCore::getProperty (\VoidCore::getArrayValue ($this->selector, [$i, 'object']), 'Text');
+                        $names[] = \VoidCore::getProperty(\VoidCore::getArrayValue($this->selector, [$i, 'object']), 'Text');
                     }
 
                     catch (\WinFormsException $e)
                     {
-                        $names[] = \VoidCore::getArrayValue ($this->selector, [$i, 'string']);
+                        $names[] = \VoidCore::getArrayValue($this->selector, [$i, 'string']);
                     }
                 
                 return $names;
             break;
 
             default:
-                $value = $this->getProperty ($name);
+                $value = $this->getProperty($name);
             break;
         }
 
-        return EngineAdditions::coupleSelector ($value, $this->selector);
+        return EngineAdditions::coupleSelector($value, $this->selector);
 	}
 	
-	public function __set ($name, $value)
+	public function __set($name, $value)
 	{
-        if (method_exists ($this, $method = "set_$name"))
+        if (method_exists($this, $method = "set_$name"))
             try
             {
-                return $this->$method ($value);
+                return $this->$method($value);
             }
 
             # Метод "set_$name" может принимать в качестве параметра объект WFObject
@@ -272,72 +272,70 @@ 
             catch (\Throwable $e)
             {
                 return $value instanceof WFObject ?
-                    $this->$method ($value->selector) : null;
+                    $this->$method($value->selector) : null;
             }
 
-        elseif (substr ($name, -5) == 'Event')
-            Events::setObjectEvent ($this->selector, substr ($name, 0, -5), $value);
+        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));
+            $this->setProperty($name, EngineAdditions::uncoupleSelector($value));
         }
     }
 	
-	public function __call ($method, $args)
+	public function __call($method, $args)
 	{
-        $args = array_map (function ($arg)
+        $args = array_map(function($arg)
         {
-            return EngineAdditions::uncoupleSelector ($arg);
+            return EngineAdditions::uncoupleSelector($arg);
         }, $args);
 
-        return EngineAdditions::coupleSelector ($this->callMethod ($method, ...$args), $this->selector);
+        return EngineAdditions::coupleSelector($this->callMethod($method, ...$args), $this->selector);
     }
 
-    public function addRange ($values, $assoc = false): void
+    public function addRange($values, $assoc = false): void
     {
-        if (is_array ($values))
+        if (is_array($values))
             foreach ($values as $id => $value)
-                $this->offsetSet ($assoc ? $id : null, $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)
+    public function offsetSet($index, $value)
 	{
         try
         {
             return $index === null ?
-                $this->callMethod ('Add', EngineAdditions::uncoupleSelector ($value)) :
-                $this->callMethod ('Insert', $index, EngineAdditions::uncoupleSelector ($value));
+                $this->callMethod('Add', EngineAdditions::uncoupleSelector($value)) : $this->callMethod('Insert', $index, EngineAdditions::uncoupleSelector($value));
         }
 
         catch (\Throwable $e)
         {
             return $index === null ?
-                \VoidCore::setArrayValue ($this->selector, $this->count, EngineAdditions::uncoupleSelector ($value)) :
-                \VoidCore::setArrayValue ($this->selector, $index, EngineAdditions::uncoupleSelector ($value));
+                \VoidCore::setArrayValue($this->selector, $this->count, EngineAdditions::uncoupleSelector($value)) : \VoidCore::setArrayValue($this->selector, $index, EngineAdditions::uncoupleSelector($value));
         }
     }
 	
-	public function offsetGet ($index)
+	public function offsetGet($index)
 	{
-		return EngineAdditions::coupleSelector (\VoidCore::getArrayValue ($this->selector, $index), $this->selector);
+		return EngineAdditions::coupleSelector(\VoidCore::getArrayValue($this->selector, $index), $this->selector);
     }
 	
-	public function offsetUnset ($index): void
+	public function offsetUnset($index): void
 	{
-		$this->callMethod ('RemoveAt', $index);
+		$this->callMethod('RemoveAt', $index);
     }
     
-    public function offsetExists ($index): bool
+    public function offsetExists($index): bool
     {
         try
         {
-            $this->offsetGet ($index);
+            $this->offsetGet($index);
         }
 
         catch (\Exception $e)
@@ -348,19 +346,19 @@ 
         return true;
     }
 	
-	public function indexOf ($value): int
+	public function indexOf($value): int
 	{
-		return $this->callMethod ('IndexOf', EngineAdditions::uncoupleSelector ($value));
+		return $this->callMethod('IndexOf', EngineAdditions::uncoupleSelector($value));
     }
     
-    public function lastIndexOf ($value): int
+    public function lastIndexOf($value): int
 	{
-		return $this->callMethod ('LastIndexOf', EngineAdditions::uncoupleSelector ($value));
+		return $this->callMethod('LastIndexOf', EngineAdditions::uncoupleSelector($value));
 	}
 	
-	public function contains ($value): bool
+	public function contains($value): bool
 	{
-		return $this->callMethod ('Contains', EngineAdditions::uncoupleSelector ($value));
+		return $this->callMethod('Contains', EngineAdditions::uncoupleSelector($value));
     }
 
     public function foreach (callable $callback, string $type = null): void
@@ -368,71 +366,71 @@ 
         $size = $this->count;
 
         for ($i = 0; $i < $size; ++$i)
-            $callback (EngineAdditions::coupleSelector (\VoidCore::getArrayValue ($this->selector, $type !== null ? [$i, $type] : $i), $this->selector), $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
+    public function where(callable $comparator, string $type = null): array
     {
         $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))
+            if ($comparator($value = EngineAdditions::coupleSelector(\VoidCore::getArrayValue($this->selector, $type !== null ? [$i, $type] : $i), $this->selector), $i))
                 $return[] = $value;
 
         return $return;
     }
 	
-    protected function getProperty ($name)
+    protected function getProperty($name)
     {
         try
         {
-            return \VoidCore::getProperty ($this->selector, $name);
+            return \VoidCore::getProperty($this->selector, $name);
         }
 
         catch (\WinFormsException $e)
         {
-            return \VoidCore::getField ($this->selector, $name);
+            return \VoidCore::getField($this->selector, $name);
         }
     }
 
-    protected function setProperty ($name, $value)
+    protected function setProperty($name, $value)
     {
         try
         {
-            \VoidCore::setProperty ($this->selector, $name, $value);
+            \VoidCore::setProperty($this->selector, $name, $value);
         }
 
         catch (\WinFormsException $e)
         {
-            \VoidCore::setField ($this->selector, $name, $value);
+            \VoidCore::setField($this->selector, $name, $value);
         }
     }
 	
-    protected function callMethod ($method, ...$args)
+    protected function callMethod($method, ...$args)
     {
-        return \VoidCore::callMethod ($this->selector, $method, ...$args);
+        return \VoidCore::callMethod($this->selector, $method, ...$args);
     }
 	
-	protected function getArrayProperty ($name, string $type = null)
+	protected function getArrayProperty($name, string $type = null)
 	{
-        $array  = $this->getProperty ($name);
-        $size   = \VoidCore::getProperty ($array, 'Length');
+        $array  = $this->getProperty($name);
+        $size   = \VoidCore::getProperty($array, 'Length');
         $return = [];
 
 		for ($i = 0; $i < $size; ++$i)
-            $return[] = \VoidCore::getArrayValue ($array, $type === null ? $i : [$i, $type]);
+            $return[] = \VoidCore::getArrayValue($array, $type === null ? $i : [$i, $type]);
         
-        \VoidCore::removeObjects ($array);
+        \VoidCore::removeObjects($array);
         
 		return $return;
     }
 
-    public function get_name ()
+    public function get_name()
 	{
 		try
 		{
-			return $this->getProperty ('Name');
+			return $this->getProperty('Name');
         }
         
 		catch (\Throwable $e)
@@ -441,11 +439,11 @@ 
 		}
 	}
 	
-	public function set_name (string $name)
+	public function set_name(string $name)
 	{
 		try
 		{
-			$this->setProperty ('Name', $name);
+			$this->setProperty('Name', $name);
         }
         
 		catch (\Throwable $e)
@@ -454,22 +452,22 @@ 
 		}
 	}
 
-    public function __toString (): string
+    public function __toString(): string
     {
-        return $this->callMethod ('ToString');
+        return $this->callMethod('ToString');
     }
 }
 
 class WFClass extends WFObject
 {
-    public function __construct ($class, $classGroup = false)
+    public function __construct($class, $classGroup = false)
     {
-        if (is_string ($class))
-            $this->selector = \VoidCore::getClass ($class, $classGroup);
+        if (is_string($class))
+            $this->selector = \VoidCore::getClass($class, $classGroup);
 
-        elseif (is_int ($class) && \VoidCore::objectExists ($class))
+        elseif (is_int($class) && \VoidCore::objectExists($class))
             $this->selector = $class;
 
-        else throw new \Exception ('$class parameter must be string or class selector');
+        else throw new \Exception('$class parameter must be string or class selector');
     }
 }

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');
+        }
     }
 }

bin/qero-packages/winforms-php/VoidFramework/engine/common/Constants.php

Spacing +12 added lines, -12 removed lines

@@ -2,17 +2,17 @@ 
 
 namespace VoidEngine;
 
-$env 	= new WFClass ('System.Environment', 'mscorlib');
-$params = $env->getCommandLineArgs ()->list;
+$env = new WFClass('System.Environment', 'mscorlib');
+$params = $env->getCommandLineArgs()->list;
 
-$converter = new WFClass ('System.Drawing.ColorTranslator');
+$converter = new WFClass('System.Drawing.ColorTranslator');
 
 $constants = [
 	# Информация об окружении
 	
 	'EXE_NAME'     => $APPLICATION->executablePath,
-	'DOC_ROOT'     => dirname ($APPLICATION->executablePath),
-	'IS_ADMIN'     => is_writable (getenv ('SystemRoot')),
+	'DOC_ROOT'     => dirname($APPLICATION->executablePath),
+	'IS_ADMIN'     => is_writable(getenv('SystemRoot')),
 	'START_PARAMS' => $params,
 	'USERNAME'	   => $env->username,
 
@@ -332,17 +332,17 @@ 
 
 	# Моя подборка цветов
 
-	'clDark'	  => $converter->fromHtml ('#0D0F12'),
-	'clDark2'	  => $converter->fromHtml ('#121416'),
-	'clTurquoise' => $converter->fromHtml ('#00ADB5'),
-	'clLight'  	  => $converter->fromHtml ('#EEEEEE')
+	'clDark'	  => $converter->fromHtml('#0D0F12'),
+	'clDark2'	  => $converter->fromHtml('#121416'),
+	'clTurquoise' => $converter->fromHtml('#00ADB5'),
+	'clLight'  	  => $converter->fromHtml('#EEEEEE')
 ];
 
 foreach ($constants as $name => $value)
-	define ($name, $value);
+	define($name, $value);
 
 $argv = START_PARAMS;
-$argc = sizeof ($argv);
+$argc = sizeof($argv);
 
-\VoidCore::removeObjects ($converter->selector);
+\VoidCore::removeObjects($converter->selector);
 unset ($constants, $env, $params, $converter);

bin/qero-packages/winforms-php/VoidFramework/engine/common/Globals.php

Spacing +22 added lines, -22 removed lines

@@ -2,50 +2,50 @@ 
 
 namespace VoidEngine;
 
-register_superglobals ('APPLICATION', 'SCREEN');
+register_superglobals('APPLICATION', 'SCREEN');
 
 $APPLICATION = new class
 {
     public WFClass $application;
     public string $executablePath;
     
-    public function __construct ()
+    public function __construct()
     {
-        $this->application    = new WFClass ('System.Windows.Forms.Application');
+        $this->application    = new WFClass('System.Windows.Forms.Application');
         $this->executablePath = $this->application->executablePath;
     }
     
-    public function run ($form = null): void
+    public function run($form = null): void
     {
         if ($form instanceof WFObject)
-            $this->application->run ($form->selector);
+            $this->application->run($form->selector);
         
-        elseif (is_int ($form) && \VoidCore::objectExists ($form))
-            $this->application->run ($form);
+        elseif (is_int($form) && \VoidCore::objectExists($form))
+            $this->application->run($form);
         
         elseif ($form === null)
-            $this->application->run ();
+            $this->application->run();
 
-        else throw new \Exception ('$form param must be instance of "VoidEngine\WFObject" ("VoidEngine\Form"), be null or object selector');
+        else throw new \Exception('$form param must be instance of "VoidEngine\WFObject" ("VoidEngine\Form"), be null or object selector');
     }
     
-    public function restart (): void
+    public function restart(): void
     {
-        $this->application->restart ();
-        $this->close ();
+        $this->application->restart();
+        $this->close();
     }
     
-    public function close (): void
+    public function close(): void
     {
-        $this->application->exit ();
+        $this->application->exit();
     }
 
-    public function __call (string $name, array $args)
+    public function __call(string $name, array $args)
     {
-        return $this->application->$name (...$args);
+        return $this->application->$name(...$args);
     }
 
-    public function __get (string $name)
+    public function __get(string $name)
     {
         return $this->application->$name;
     }
@@ -55,14 +55,14 @@ 
 {
     public WFObject $screen;
     
-    public function __construct ()
+    public function __construct()
     {
-        $this->screen = new WFClass ('System.Windows.Forms.Screen');
+        $this->screen = new WFClass('System.Windows.Forms.Screen');
     }
     
-    public function __get ($name)
+    public function __get($name)
     {
-        switch (strtolower ($name))
+        switch (strtolower($name))
         {
             case 'width':
             case 'w':
@@ -80,7 +80,7 @@ 
         }
     }
     
-    public function __debugInfo (): array
+    public function __debugInfo(): array
     {
         return [
             $this->w,

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

bin/qero-packages/winforms-php/VoidFramework/engine/components/Process.php

Indentation +15 added lines, -15 removed lines

@@ -4,28 +4,28 @@
 
 class Process extends Component
 {
-	public $class 	  = 'System.Diagnostics.Process';
-	public $namespace = 'System';
+    public $class 	  = 'System.Diagnostics.Process';
+    public $namespace = 'System';
 
-	public function __construct (int $pid = null)
-	{
+    public function __construct (int $pid = null)
+    {
         $this->selector = \VoidCore::getClass ($this->class, $this->namespace);
 
-		if ($pid !== null)
+        if ($pid !== null)
             $this->selector = $pid == getmypid () ?
                 \VoidCore::callMethod ($this->selector, 'GetCurrentProcess') :
                 \VoidCore::callMethod ($this->selector, 'GetProcessById', $pid);
 
-		Components::addComponent ($this->selector, $this);
-	}
+        Components::addComponent ($this->selector, $this);
+    }
 	
-	public static function getProcessById (int $pid)
-	{
-		return new self ($pid);
-	}
+    public static function getProcessById (int $pid)
+    {
+        return new self ($pid);
+    }
 	
-	public static function getCurrentProcess ()
-	{
-		return new self (getmypid ());
-	}
+    public static function getCurrentProcess ()
+    {
+        return new self (getmypid ());
+    }
 }

Spacing +10 added lines, -11 removed lines

@@ -4,28 +4,27 @@
 
 class Process extends Component
 {
-	public $class 	  = 'System.Diagnostics.Process';
+	public $class = 'System.Diagnostics.Process';
 	public $namespace = 'System';
 
-	public function __construct (int $pid = null)
+	public function __construct(int $pid = null)
 	{
-        $this->selector = \VoidCore::getClass ($this->class, $this->namespace);
+        $this->selector = \VoidCore::getClass($this->class, $this->namespace);
 
 		if ($pid !== null)
-            $this->selector = $pid == getmypid () ?
-                \VoidCore::callMethod ($this->selector, 'GetCurrentProcess') :
-                \VoidCore::callMethod ($this->selector, 'GetProcessById', $pid);
+            $this->selector = $pid == getmypid() ?
+                \VoidCore::callMethod($this->selector, 'GetCurrentProcess') : \VoidCore::callMethod($this->selector, 'GetProcessById', $pid);
 
-		Components::addComponent ($this->selector, $this);
+		Components::addComponent($this->selector, $this);
 	}
 	
-	public static function getProcessById (int $pid)
+	public static function getProcessById(int $pid)
 	{
-		return new self ($pid);
+		return new self($pid);
 	}
 	
-	public static function getCurrentProcess ()
+	public static function getCurrentProcess()
 	{
-		return new self (getmypid ());
+		return new self(getmypid());
 	}
 }

Braces +3 added lines, -2 removed lines

@@ -11,10 +11,11 @@
 	{
         $this->selector = \VoidCore::getClass ($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);
 	}

bin/qero-packages/winforms-php/VoidFramework/engine/components/Image.php

Indentation +7 added lines, -7 removed lines

@@ -31,14 +31,14 @@
     }
 
     public function applyToObject (int $selector): void
-	{
-		\VoidCore::setProperty ($selector, 'Icon', $this->selector);
-	}
+    {
+        \VoidCore::setProperty ($selector, 'Icon', $this->selector);
+    }
 	
-	public function saveToFile (string $file): void
-	{
-		\VoidCore::callMethod ($this->selector, 'Save', $file);
-	}
+    public function saveToFile (string $file): void
+    {
+        \VoidCore::callMethod ($this->selector, 'Save', $file);
+    }
 }
 
 class Bitmap extends WFObject

Spacing +13 added lines, -13 removed lines

@@ -7,14 +7,14 @@ 
     public $class     = 'System.Drawing.Image';
     public $namespace = 'System.Drawing';
 
-    public function __construct ()
+    public function __construct()
     {
-        parent::__construct ($this->class);
+        parent::__construct($this->class);
     }
 
-    public function loadFromFile (string $path)
+    public function loadFromFile(string $path)
     {
-        return $this->fromFile ($path);
+        return $this->fromFile($path);
     }
 }
 
@@ -23,21 +23,21 @@ 
     public $class     = 'System.Drawing.Icon';
     public $namespace = 'System.Drawing';
 
-    public function __construct (string $file)
+    public function __construct(string $file)
     {
-        parent::__construct ($this->class);
+        parent::__construct($this->class);
 
-        $this->fromFile ($file);
+        $this->fromFile($file);
     }
 
-    public function applyToObject (int $selector): void
+    public function applyToObject(int $selector): void
 	{
-		\VoidCore::setProperty ($selector, 'Icon', $this->selector);
+		\VoidCore::setProperty($selector, 'Icon', $this->selector);
 	}
 	
-	public function saveToFile (string $file): void
+	public function saveToFile(string $file): void
 	{
-		\VoidCore::callMethod ($this->selector, 'Save', $file);
+		\VoidCore::callMethod($this->selector, 'Save', $file);
 	}
 }
 
@@ -46,8 +46,8 @@ 
     public $class     = 'System.Drawing.Bitmap';
     public $namespace = 'System.Drawing';
 
-    public function __construct (string $filename)
+    public function __construct(string $filename)
     {
-        parent::__construct ($this->class, $this->namespace, [$filename, 'string']);
+        parent::__construct($this->class, $this->namespace, [$filename, 'string']);
     }
 }

bin/qero-packages/winforms-php/VoidFramework/engine/components/Form.php

Indentation +28 added lines, -28 removed lines

@@ -4,37 +4,37 @@ 
 
 class Form extends Control
 {
-	public $class = 'System.Windows.Forms.Form';
+    public $class = 'System.Windows.Forms.Form';
 
-	public function get_icon ()
-	{
-		return new FormIcon ($this->selector);
-	}
+    public function get_icon ()
+    {
+        return new FormIcon ($this->selector);
+    }
 	
-	public function get_clientSize ()
-	{
-		$size = $this->getProperty ('ClientSize');
+    public function get_clientSize ()
+    {
+        $size = $this->getProperty ('ClientSize');
 		
-		return [
-			\VoidCore::getProperty ($size, 'Width'),
-			\VoidCore::getProperty ($size, 'Height')
-		];
-	}
+        return [
+            \VoidCore::getProperty ($size, 'Width'),
+            \VoidCore::getProperty ($size, 'Height')
+        ];
+    }
 	
-	public function set_clientSize ($size)
-	{
-		if (is_array ($size))
-		{
-			$clientSize = $this->getProperty ('ClientSize');
+    public function set_clientSize ($size)
+    {
+        if (is_array ($size))
+        {
+            $clientSize = $this->getProperty ('ClientSize');
 
-			\VoidCore::setProperty ($clientSize, 'Width', array_shift ($size));
-			\VoidCore::setProperty ($clientSize, 'Height', array_shift ($size));
+            \VoidCore::setProperty ($clientSize, 'Width', array_shift ($size));
+            \VoidCore::setProperty ($clientSize, 'Height', array_shift ($size));
 
-			$this->setProperty ('ClientSize', $clientSize);
-		}
+            $this->setProperty ('ClientSize', $clientSize);
+        }
 
-		else $this->setProperty ('ClientSize', EngineAdditions::uncoupleSelector ($size));
-	}
+        else $this->setProperty ('ClientSize', EngineAdditions::uncoupleSelector ($size));
+    }
 }
 
 class FormIcon extends Icon
@@ -47,12 +47,12 @@ 
     }
 
     public function loadFromFile (string $file)
-	{
+    {
         $icon = \VoidCore::createObject ('System.Drawing.Icon', 'System.Drawing', $file);
         
         \VoidCore::setProperty ($this->formSelector, 'Icon', $icon);
 
-		if (!isset ($this->selector))
-		    $this->selector = $icon;
-	}
+        if (!isset ($this->selector))
+            $this->selector = $icon;
+    }
 }

Spacing +17 added lines, -17 removed lines

@@ -6,34 +6,34 @@ 
 {
 	public $class = 'System.Windows.Forms.Form';
 
-	public function get_icon ()
+	public function get_icon()
 	{
-		return new FormIcon ($this->selector);
+		return new FormIcon($this->selector);
 	}
 	
-	public function get_clientSize ()
+	public function get_clientSize()
 	{
-		$size = $this->getProperty ('ClientSize');
+		$size = $this->getProperty('ClientSize');
 		
 		return [
-			\VoidCore::getProperty ($size, 'Width'),
-			\VoidCore::getProperty ($size, 'Height')
+			\VoidCore::getProperty($size, 'Width'),
+			\VoidCore::getProperty($size, 'Height')
 		];
 	}
 	
-	public function set_clientSize ($size)
+	public function set_clientSize($size)
 	{
-		if (is_array ($size))
+		if (is_array($size))
 		{
-			$clientSize = $this->getProperty ('ClientSize');
+			$clientSize = $this->getProperty('ClientSize');
 
-			\VoidCore::setProperty ($clientSize, 'Width', array_shift ($size));
-			\VoidCore::setProperty ($clientSize, 'Height', array_shift ($size));
+			\VoidCore::setProperty($clientSize, 'Width', array_shift($size));
+			\VoidCore::setProperty($clientSize, 'Height', array_shift($size));
 
-			$this->setProperty ('ClientSize', $clientSize);
+			$this->setProperty('ClientSize', $clientSize);
 		}
 
-		else $this->setProperty ('ClientSize', EngineAdditions::uncoupleSelector ($size));
+		else $this->setProperty('ClientSize', EngineAdditions::uncoupleSelector($size));
 	}
 }
 
@@ -41,16 +41,16 @@ 
 {
     protected $formSelector;
 
-    public function __construct (int $formSelector)
+    public function __construct(int $formSelector)
     {
         $this->formSelector = $formSelector;
     }
 
-    public function loadFromFile (string $file)
+    public function loadFromFile(string $file)
 	{
-        $icon = \VoidCore::createObject ('System.Drawing.Icon', 'System.Drawing', $file);
+        $icon = \VoidCore::createObject('System.Drawing.Icon', 'System.Drawing', $file);
         
-        \VoidCore::setProperty ($this->formSelector, 'Icon', $icon);
+        \VoidCore::setProperty($this->formSelector, 'Icon', $icon);
 
 		if (!isset ($this->selector))
 		    $this->selector = $icon;

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

bin/qero-packages/winforms-php/VoidFramework/engine/components/ColorDialog.php

Spacing +6 added lines, -6 removed lines

@@ -6,18 +6,18 @@
 {
     public $class = 'System.Windows.Forms.ColorDialog';
 
-    public function __construct ()
+    public function __construct()
     {
-        parent::__construct ($this->class);
+        parent::__construct($this->class);
     }
 	
-    public function get_color ()
+    public function get_color()
     {
-        return $this->getProperty (['Color', 'color']);
+        return $this->getProperty(['Color', 'color']);
     }
 	
-    public function set_color (int $color)
+    public function set_color(int $color)
     {
-        $this->setProperty ('Color', $color);
+        $this->setProperty('Color', $color);
     }
 }