winforms-php / VoidStudio

bin/qero-packages/autoload.php

Braces +4 added lines, -3 removed lines

@@ -17,9 +17,10 @@
 
 spl_autoload_register (function ($class) use ($classes)
 {
-    if (isset ($classes[$class]))
-        include __DIR__ .'/'. $classes[$class];
-});
+    if (isset ($classes[$class])) {
+            include __DIR__ .'/'. $classes[$class];
+    }
+    });
 
 $required_packages = array
 (

Indentation +3 added lines, -3 removed lines

@@ -23,7 +23,7 @@
 
 $required_packages = array
 (
-	array ('github:winforms-php/VoidFramework', '3.5.4'),
-	array ('github:KRypt0nn/ConsoleArgs', '1.5'),
-	array ('github:winforms-php/VoidBuilder', '1.2')
+    array ('github:winforms-php/VoidFramework', '3.5.4'),
+    array ('github:KRypt0nn/ConsoleArgs', '1.5'),
+    array ('github:winforms-php/VoidBuilder', '1.2')
 );

Spacing +7 added lines, -9 removed lines

@@ -10,20 +10,18 @@
 require 'winforms-php/VoidBuilder/VoidBuilder.php';
 
 
-$classes = array
-(
+$classes = array(
     
 );
 
-spl_autoload_register (function ($class) use ($classes)
+spl_autoload_register(function($class) use ($classes)
 {
     if (isset ($classes[$class]))
-        include __DIR__ .'/'. $classes[$class];
+        include __DIR__.'/'.$classes[$class];
 });
 
-$required_packages = array
-(
-	array ('github:winforms-php/VoidFramework', '3.5.4'),
-	array ('github:KRypt0nn/ConsoleArgs', '1.5'),
-	array ('github:winforms-php/VoidBuilder', '1.2')
+$required_packages = array(
+	array('github:winforms-php/VoidFramework', '3.5.4'),
+	array('github:KRypt0nn/ConsoleArgs', '1.5'),
+	array('github:winforms-php/VoidBuilder', '1.2')
 );

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) && VoidEngine::objectExists ($form))
-            $this->application->run ($form);
+        elseif (is_int($form) && VoidEngine::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,

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

Spacing +122 added lines, -123 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,203 +12,203 @@ 
     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 getNetArray (string $type, array $items = []): WFObject
+function getNetArray(string $type, array $items = []): WFObject
 {
-    $array = (new WFClass ('System.Array', null))
-        ->createInstance (VoidEngine::objectType ($type), $size = sizeof ($items));
+    $array = (new WFClass('System.Array', null))
+        ->createInstance(VoidEngine::objectType($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: более строгие правила очистки мусорных объектов
         
@@ -216,46 +216,46 @@ 
         {
             try
             {
-                if ($object->getType ()->isSubclassOf (VoidEngine::objectType ('System.Windows.Forms.Form', 'System.Windows.Forms')))
+                if ($object->getType()->isSubclassOf(VoidEngine::objectType('System.Windows.Forms.Form', 'System.Windows.Forms')))
                     continue;
             }
 
             catch (\Exception $e) {}
             
-            VoidEngine::destructObject ($selector);
+            VoidEngine::destructObject($selector);
 
-            if (!VoidEngine::objectExists ($selector))
+            if (!VoidEngine::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;
@@ -289,18 +289,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 (VoidEngine::objectType ('System.Windows.Forms.Form', 'System.Windows.Forms')) && $parent->name == $path[0])
+                            if ($parent->getType()->isSubclassOf(VoidEngine::objectType('System.Windows.Forms.Form', 'System.Windows.Forms')) && $parent->name == $path[0])
                                 return $objects[$id];
 
                             else $object = $parent;
@@ -318,70 +318,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);
-        VoidEngine::removeObjects ($collection->selector);
+        (new WFClass('System.Windows.Forms.Clipboard'))->setFileDropList($collection);
+        VoidEngine::removeObjects($collection->selector);
     }
 }
 
@@ -389,14 +389,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', 'auto', $handle) :
-            $this->cursor = new WFClass ('System.Windows.Forms.Cursor');
+            $this->cursor = new WFObject('System.Windows.Forms.Cursor', 'auto', $handle) : $this->cursor = new WFClass('System.Windows.Forms.Cursor');
     }
 
-    public function getPosition (): array
+    public function getPosition(): array
     {
         $pos = $this->cursor->position;
 
@@ -407,22 +406,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? Да, мог
     // Почему не сделал? Скорость важнее
@@ -445,7 +444,7 @@ 
     ];
 
     if ($GLOBALS['__debug']['error_status'])
-        message ([
+        message([
             'type'      => $errarr[$no],
             'text'      => $str,
             'file'      => $file,

Braces +81 added lines, -72 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,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,11 +452,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/VoidEngine.php

Spacing +6 added lines, -6 removed lines

@@ -36,10 +36,10 @@ 
 const ENGINE_VERSION = '3.5.4 build-2019/09/15';
 const ENGINE_DIR = __DIR__;
 
-chdir (ENGINE_DIR);
+chdir(ENGINE_DIR);
 
 $GLOBALS['__debug'] = [
-    'start_time'   => microtime (true),
+    'start_time'   => microtime(true),
     'error_status' => true
 ];
 
@@ -49,7 +49,7 @@ 
 require 'common/Others.php';
 require 'common/Events.php';
 
-define ('VoidEngine\CORE_VERSION', $APPLICATION->productVersion);
+define('VoidEngine\CORE_VERSION', $APPLICATION->productVersion);
 
 require 'components/Component.php';
 require 'components/Control.php';
@@ -97,7 +97,7 @@ 
 require 'components/FastColoredTextBox.php';
 require 'components/Scintilla.php';
 
-if (is_dir ('extensions'))
-    foreach (scandir ('extensions') as $ext)
-        if (is_dir ('extensions/'. $ext) && file_exists ($ext = 'extensions/'. $ext .'/main.php'))
+if (is_dir('extensions'))
+    foreach (scandir('extensions') as $ext)
+        if (is_dir('extensions/'.$ext) && file_exists($ext = 'extensions/'.$ext.'/main.php'))
             require $ext;

bin/app/system/debug/DebugHook.php

Spacing +27 added lines, -27 removed lines

@@ -10,29 +10,29 @@ 
 

 $debugger = new class

 {

-    static function debugOutput ($data): void

+    static function debugOutput($data): void

     {

-        file_put_contents ('__debug_answer', serialize ([

-            'timestamp' => time (),

+        file_put_contents('__debug_answer', serialize([

+            'timestamp' => time(),

             'data'      => $data

         ]));

 

-        while (file_exists ('__debug_answer'))

-            usleep (100);

+        while (file_exists('__debug_answer'))

+            usleep(100);

     }

 

-    static function seekObjects (WFObject $object): array

+    static function seekObjects(WFObject $object): array

     {

         $objects = [$object->selector];

 

         try

         {

-            $object->controls->foreach (function ($value) use (&$objects)

+            $object->controls->foreach(function($value) use (&$objects)

             {

-                $objects = array_merge ($objects, self::seekObjects ($value));

+                $objects = array_merge($objects, self::seekObjects($value));

             });

 

-            return array_unique ($objects);

+            return array_unique($objects);

         }

 

         catch (\Throwable $e)

@@ -42,33 +42,33 @@ 
     }

 };

 

-set_error_handler (function (...$args) use ($debugger)

+set_error_handler(function(...$args) use ($debugger)

 {

-    $debugger::debugOutput ([

+    $debugger::debugOutput([

         'type' => 'errorCatched',

         'info' => $args

     ]);

 });

 

-set_exception_handler (function (...$args) use ($debugger)

+set_exception_handler(function(...$args) use ($debugger)

 {

-    $debugger::debugOutput ([

+    $debugger::debugOutput([

         'type' => 'exceptionCatched',

         'info' => $args

     ]);

 });

 

-setTimer (500, function () use ($debugger)

+setTimer(500, function() use ($debugger)

 {

     $debug = &$GLOBALS['__DEBUG'];

 

     if (!isset ($debug['last_timestamp']))

         $debug['last_timestamp'] = 0;

 

-    elseif (file_exists ('__debug_request'))

+    elseif (file_exists('__debug_request'))

     {

-        $request = unserialize (file_get_contents ('__debug_request'));

-        unlink ('__debug_request');

+        $request = unserialize(file_get_contents('__debug_request'));

+        unlink('__debug_request');

 

         if ($request['timestamp'] > $debug['last_timestamp'])

         {

@@ -80,15 +80,15 @@ 
                     $referenced = [];

 

                     foreach (Components::$components as $selector => $component)

-                        $referenced = array_merge ($referenced, array_diff ($debugger::seekObjects ($component), $component->getType ()->isSubclassOf (VoidEngine::objectType ('System.Windows.Forms.Form', 'System.Windows.Forms')) ? 

+                        $referenced = array_merge($referenced, array_diff($debugger::seekObjects($component), $component->getType()->isSubclassOf(VoidEngine::objectType('System.Windows.Forms.Form', 'System.Windows.Forms')) ? 

                             [] : [$selector]));

 

                     // array_slice потому, что первым компонентом в списке всегда будет таймер debug hooker'а

-                    $debugger::debugOutput (array_slice (array_map (function ($object) use ($referenced)

+                    $debugger::debugOutput(array_slice(array_map(function($object) use ($referenced)

                     {

-                        return array_merge ($object->__debugInfo (), [

-                            'status' => array_search ($object->selector, $referenced) !== false ? 1 : (

-                                $object->getType ()->isSubclassOf (VoidEngine::objectType ('System.Windows.Forms.Control', 'System.Windows.Forms')) ? 0 : 2

+                        return array_merge($object->__debugInfo(), [

+                            'status' => array_search($object->selector, $referenced) !== false ? 1 : (

+                                $object->getType()->isSubclassOf(VoidEngine::objectType('System.Windows.Forms.Control', 'System.Windows.Forms')) ? 0 : 2

                             ),

 

                             'name' => $object->name

@@ -101,9 +101,9 @@ 
                         try

                         {

                             if (!isset ($debug['colors'][$selector]))

-                                $debug['colors'][$selector] = VoidEngine::getProperty ($selector, ['BackColor', 'color']);

+                                $debug['colors'][$selector] = VoidEngine::getProperty($selector, ['BackColor', 'color']);

 

-                            VoidEngine::setProperty ($selector, 'BackColor', [clYellow, 'color']);

+                            VoidEngine::setProperty($selector, 'BackColor', [clYellow, 'color']);

                         }

 

                         catch (\Throwable $e)

@@ -116,7 +116,7 @@ 
                     foreach ($request['arguments']['selectors'] as $selector)

                         try

                         {

-                            VoidEngine::setProperty ($selector, 'BackColor', [$debug['colors'][$selector], 'color']);

+                            VoidEngine::setProperty($selector, 'BackColor', [$debug['colors'][$selector], 'color']);

                         }

 

                         catch (\Throwable $e)

@@ -129,7 +129,7 @@ 
                     foreach ($request['arguments']['selectors'] as $selector)

                         try

                         {

-                            VoidEngine::callMethod ($selector, 'Dispose');

+                            VoidEngine::callMethod($selector, 'Dispose');

                         }

                         

                         catch (\Throwable $e)

@@ -137,7 +137,7 @@ 
                             continue;

                         }

 

-                    VoidEngine::removeObjects (...$request['arguments']['selectors']);

+                    VoidEngine::removeObjects(...$request['arguments']['selectors']);

                 break;

             }

         }

Braces +26 added lines, -30 removed lines

@@ -17,8 +17,9 @@ 
             'data'      => $data

         ]));

 

-        while (file_exists ('__debug_answer'))

-            usleep (100);

+        while (file_exists ('__debug_answer')) {
+                    usleep (100);
+        }
     }

 

     static function seekObjects (WFObject $object): array

@@ -33,9 +34,7 @@ 
             });

 

             return array_unique ($objects);

-        }

-

-        catch (\Throwable $e)

+        } catch (\Throwable $e)

         {

             return $objects;

         }

@@ -62,10 +61,9 @@ 
 {

     $debug = &$GLOBALS['__DEBUG'];

 

-    if (!isset ($debug['last_timestamp']))

-        $debug['last_timestamp'] = 0;

-

-    elseif (file_exists ('__debug_request'))

+    if (!isset ($debug['last_timestamp'])) {
+            $debug['last_timestamp'] = 0;
+    } elseif (file_exists ('__debug_request'))

     {

         $request = unserialize (file_get_contents ('__debug_request'));

         unlink ('__debug_request');

@@ -79,9 +77,10 @@ 
                 case 'get_objects':

                     $referenced = [];

 

-                    foreach (Components::$components as $selector => $component)

-                        $referenced = array_merge ($referenced, array_diff ($debugger::seekObjects ($component), $component->getType ()->isSubclassOf (VoidEngine::objectType ('System.Windows.Forms.Form', 'System.Windows.Forms')) ? 

-                            [] : [$selector]));

+                    foreach (Components::$components as $selector => $component) {
+                                            $referenced = array_merge ($referenced, array_diff ($debugger::seekObjects ($component), $component->getType ()->isSubclassOf (VoidEngine::objectType ('System.Windows.Forms.Form', 'System.Windows.Forms')) ? 

+                            [] : [$selector]));
+                    }
 

                     // array_slice потому, что первым компонентом в списке всегда будет таймер debug hooker'а

                     $debugger::debugOutput (array_slice (array_map (function ($object) use ($referenced)

@@ -97,42 +96,39 @@ 
                 break;

 

                 case 'bulb_objects':

-                    foreach ($request['arguments']['selectors'] as $selector)

-                        try

+                    foreach ($request['arguments']['selectors'] as $selector) {
+                                            try

                         {

                             if (!isset ($debug['colors'][$selector]))

-                                $debug['colors'][$selector] = VoidEngine::getProperty ($selector, ['BackColor', 'color']);

+                                $debug['colors'][$selector] = VoidEngine::getProperty ($selector, ['BackColor', 'color']);
+                    }
 

                             VoidEngine::setProperty ($selector, 'BackColor', [clYellow, 'color']);

-                        }

-

-                        catch (\Throwable $e)

+                        } catch (\Throwable $e)

                         {

                             continue;

                         }

                 break;

 

                 case 'unbulb_objects':

-                    foreach ($request['arguments']['selectors'] as $selector)

-                        try

+                    foreach ($request['arguments']['selectors'] as $selector) {
+                                            try

                         {

-                            VoidEngine::setProperty ($selector, 'BackColor', [$debug['colors'][$selector], 'color']);

-                        }

-

-                        catch (\Throwable $e)

+                            VoidEngine::setProperty ($selector, 'BackColor', [$debug['colors'][$selector], 'color']);
+                    }
+                        } catch (\Throwable $e)

                         {

                             continue;

                         }

                 break;

 

                 case 'remove_objects':

-                    foreach ($request['arguments']['selectors'] as $selector)

-                        try

+                    foreach ($request['arguments']['selectors'] as $selector) {
+                                            try

                         {

-                            VoidEngine::callMethod ($selector, 'Dispose');

-                        }

-                        

-                        catch (\Throwable $e)

+                            VoidEngine::callMethod ($selector, 'Dispose');
+                    }
+                        } catch (\Throwable $e)

                         {

                             continue;

                         }

bin/app/php/ClassWorker.php

Spacing +24 added lines, -24 removed lines

@@ -4,14 +4,14 @@ 
 

 class ClassWorker

 {

-    public static function applyClass (string $code, string $class, string $apply): string

+    public static function applyClass(string $code, string $class, string $apply): string

     {

-        $code = self::stripComments ($code);

+        $code = self::stripComments($code);

 

         $split1 = $split2 = false;

 

-        $len      = strlen ($code);

-        $classLen = strlen ($class);

+        $len      = strlen($code);

+        $classLen = strlen($class);

 

         $class_predefined = false;

         $class_close = null;

@@ -26,15 +26,15 @@ 
 

             elseif (!$split1 && !$split2)

             {

-                if ($code[$i] == 'c' && substr ($code, $i, 5) == 'class')

+                if ($code[$i] == 'c' && substr($code, $i, 5) == 'class')

                 {

                     for ($j = $i + 5; $j < $len; ++$j)

-                        if (in_array ($code[$j], ["\n", "\r", "\t", ' ']))

+                        if (in_array($code[$j], ["\n", "\r", "\t", ' ']))

                             continue;

 

                         else

                         {

-                            if (substr ($code, $j, $classLen) == $class)

+                            if (substr($code, $j, $classLen) == $class)

                                 $class_predefined = true;

 

                             $i = $j;

@@ -57,7 +57,7 @@ 
                         --$class_close;

 

                     if ($class_close === 0)

-                        return substr ($code, 0, $i) . $apply . substr ($code, $i);

+                        return substr($code, 0, $i).$apply.substr($code, $i);

                 }

             }

         }

@@ -65,14 +65,14 @@ 
         return $code;

     }

 

-    public static function getAvailableClassMethods (string $code, string $class): array

+    public static function getAvailableClassMethods(string $code, string $class): array

     {

-        $code = self::stripComments ($code);

+        $code = self::stripComments($code);

 

         $split1 = $split2 = false;

 

-        $len      = strlen ($code);

-        $classLen = strlen ($class);

+        $len      = strlen($code);

+        $classLen = strlen($class);

 

         $class_predefined = false;

         $class_close = null;

@@ -89,15 +89,15 @@ 
 

             elseif (!$split1 && !$split2)

             {

-                if ($code[$i] == 'c' && substr ($code, $i, 5) == 'class')

+                if ($code[$i] == 'c' && substr($code, $i, 5) == 'class')

                 {

                     for ($j = $i + 5; $j < $len; ++$j)

-                        if (in_array ($code[$j], ["\n", "\r", "\t", ' ']))

+                        if (in_array($code[$j], ["\n", "\r", "\t", ' ']))

                             continue;

 

                         else

                         {

-                            if (substr ($code, $j, $classLen) == $class)

+                            if (substr($code, $j, $classLen) == $class)

                                 $class_predefined = true;

 

                             $i = $j;

@@ -108,22 +108,22 @@ 
 

                 elseif ($class_predefined == true)

                 {

-                    if ($code[$i] == 's' && substr ($code, $i, 6) == 'static')

+                    if ($code[$i] == 's' && substr($code, $i, 6) == 'static')

                     {

                         for ($j = $i + 6; $j < $len; ++$j)

-                            if (!in_array ($code[$j], ["\n", "\r", "\t", ' ']))

+                            if (!in_array($code[$j], ["\n", "\r", "\t", ' ']))

                                 break;

 

-                        if ($code[$j] == 'f' && substr ($code, $j, 8) == 'function')

+                        if ($code[$j] == 'f' && substr($code, $j, 8) == 'function')

                         {

                             for ($j = $j + 8; $j < $len; ++$j)

-                                if (in_array ($code[$j], ["\n", "\r", "\t", ' ']))

+                                if (in_array($code[$j], ["\n", "\r", "\t", ' ']))

                                     continue;

 

                                 else

                                 {

                                     $i = $j;

-                                    $methods[] = trim (substr ($code, $j, strpos ($code, '(', $j) - $j));

+                                    $methods[] = trim(substr($code, $j, strpos($code, '(', $j) - $j));

 

                                     break;

                                 }

@@ -150,13 +150,13 @@ 
         return $methods;

     }

 

-    public static function stripComments (string $code): string

+    public static function stripComments(string $code): string

     {

-        $tokens = token_get_all ("<?php\n\n". $code);

+        $tokens = token_get_all("<?php\n\n".$code);

         $return = '';

 

         foreach ($tokens as $token)

-            if (is_string ($token))

+            if (is_string($token))

                 $return .= $token;

 

             else

@@ -176,6 +176,6 @@ 
                 }

             }

 

-        return substr ($return, 7);

+        return substr($return, 7);

     }

 }

Braces +63 added lines, -64 removed lines

@@ -18,46 +18,45 @@ 
 

         for ($i = 0; $i < $len; ++$i)

         {

-            if ($code[$i] == '\'' && !$split2)

-                $split1 = !$split1;

-

-            elseif ($code[$i] == '"' && !$split1)

-                $split2 = !$split2;

-

-            elseif (!$split1 && !$split2)

+            if ($code[$i] == '\'' && !$split2) {
+                            $split1 = !$split1;
+            } elseif ($code[$i] == '"' && !$split1) {
+                            $split2 = !$split2;
+            } elseif (!$split1 && !$split2)

             {

                 if ($code[$i] == 'c' && substr ($code, $i, 5) == 'class')

                 {

-                    for ($j = $i + 5; $j < $len; ++$j)

-                        if (in_array ($code[$j], ["\n", "\r", "\t", ' ']))

-                            continue;

+                    for ($j = $i + 5; $j < $len; ++$j) {
+                                            if (in_array ($code[$j], ["\n", "\r", "\t", ' ']))

+                            continue;
+                    }
 

                         else

                         {

-                            if (substr ($code, $j, $classLen) == $class)

-                                $class_predefined = true;

+                            if (substr ($code, $j, $classLen) == $class) {
+                                                            $class_predefined = true;
+                            }
 

                             $i = $j;

 

                             break;

                         }

-                }

-

-                elseif ($class_predefined == true)

+                } elseif ($class_predefined == true)

                 {

                     if ($code[$i] == '{')

                     {

-                        if ($class_close === null)

-                            $class_close = 1;

-

-                        else ++$class_close;

-                    }

-

-                    elseif ($code[$i] == '}')

-                        --$class_close;

-

-                    if ($class_close === 0)

-                        return substr ($code, 0, $i) . $apply . substr ($code, $i);

+                        if ($class_close === null) {
+                                                    $class_close = 1;
+                        } else {
+                            ++$class_close;
+                        }
+                    } elseif ($code[$i] == '}') {
+                                            --$class_close;
+                    }
+

+                    if ($class_close === 0) {
+                                            return substr ($code, 0, $i) . $apply . substr ($code, $i);
+                    }
                 }

             }

         }

@@ -81,44 +80,44 @@ 
 

         for ($i = 0; $i < $len; ++$i)

         {

-            if ($code[$i] == '\'' && !$split2)

-                $split1 = !$split1;

-

-            elseif ($code[$i] == '"' && !$split1)

-                $split2 = !$split2;

-

-            elseif (!$split1 && !$split2)

+            if ($code[$i] == '\'' && !$split2) {
+                            $split1 = !$split1;
+            } elseif ($code[$i] == '"' && !$split1) {
+                            $split2 = !$split2;
+            } elseif (!$split1 && !$split2)

             {

                 if ($code[$i] == 'c' && substr ($code, $i, 5) == 'class')

                 {

-                    for ($j = $i + 5; $j < $len; ++$j)

-                        if (in_array ($code[$j], ["\n", "\r", "\t", ' ']))

-                            continue;

+                    for ($j = $i + 5; $j < $len; ++$j) {
+                                            if (in_array ($code[$j], ["\n", "\r", "\t", ' ']))

+                            continue;
+                    }
 

                         else

                         {

-                            if (substr ($code, $j, $classLen) == $class)

-                                $class_predefined = true;

+                            if (substr ($code, $j, $classLen) == $class) {
+                                                            $class_predefined = true;
+                            }
 

                             $i = $j;

 

                             break;

                         }

-                }

-

-                elseif ($class_predefined == true)

+                } elseif ($class_predefined == true)

                 {

                     if ($code[$i] == 's' && substr ($code, $i, 6) == 'static')

                     {

-                        for ($j = $i + 6; $j < $len; ++$j)

-                            if (!in_array ($code[$j], ["\n", "\r", "\t", ' ']))

-                                break;

+                        for ($j = $i + 6; $j < $len; ++$j) {
+                                                    if (!in_array ($code[$j], ["\n", "\r", "\t", ' ']))

+                                break;
+                        }
 

                         if ($code[$j] == 'f' && substr ($code, $j, 8) == 'function')

                         {

-                            for ($j = $j + 8; $j < $len; ++$j)

-                                if (in_array ($code[$j], ["\n", "\r", "\t", ' ']))

-                                    continue;

+                            for ($j = $j + 8; $j < $len; ++$j) {
+                                                            if (in_array ($code[$j], ["\n", "\r", "\t", ' ']))

+                                    continue;
+                            }
 

                                 else

                                 {

@@ -128,21 +127,20 @@ 
                                     break;

                                 }

                         }

-                    }

-                    

-                    elseif ($code[$i] == '{')

+                    } elseif ($code[$i] == '{')

                     {

-                        if ($class_close === null)

-                            $class_close = 1;

-

-                        else ++$class_close;

-                    }

-

-                    elseif ($code[$i] == '}')

-                        --$class_close;

-

-                    if ($class_close === 0)

-                        return $methods;

+                        if ($class_close === null) {
+                                                    $class_close = 1;
+                        } else {
+                            ++$class_close;
+                        }
+                    } elseif ($code[$i] == '}') {
+                                            --$class_close;
+                    }
+

+                    if ($class_close === 0) {
+                                            return $methods;
+                    }
                 }

             }

         }

@@ -155,9 +153,10 @@ 
         $tokens = token_get_all ("<?php\n\n". $code);

         $return = '';

 

-        foreach ($tokens as $token)

-            if (is_string ($token))

-                $return .= $token;

+        foreach ($tokens as $token) {
+                    if (is_string ($token))

+                $return .= $token;
+        }
 

             else

             {

bin/app/php/Designer.php

Indentation +32 added lines, -32 removed lines

@@ -78,40 +78,40 @@ 
     {

         $this->componentAddedEvent = function ($self, $args)

         {

-			if (!isset ($GLOBALS['new_component']))

-			{

+            if (!isset ($GLOBALS['new_component']))

+            {

                 $name = $args->component->getType ()->toString ();

 

                 // pre (VoidEngine::getProperty ($args->component->selector, 'Name'));

                 

-				$GLOBALS['new_component'] = [$this->getComponentName ($args->component->selector), [$name, substr ($name, 0, strrpos ($name, '.'))]];

-			}

+                $GLOBALS['new_component'] = [$this->getComponentName ($args->component->selector), [$name, substr ($name, 0, strrpos ($name, '.'))]];

+            }

 			

-			$this->setComponentToHistory ($GLOBALS['new_component'][1], $GLOBALS['new_component'][0]);

-			$components = VoidStudioAPI::getObjects ('main')['PropertiesPanel__SelectedComponent'];

+            $this->setComponentToHistory ($GLOBALS['new_component'][1], $GLOBALS['new_component'][0]);

+            $components = VoidStudioAPI::getObjects ('main')['PropertiesPanel__SelectedComponent'];

 

-			$components->items->clear ();

-			$components->items->addRange (array_keys ($this->objects));

+            $components->items->clear ();

+            $components->items->addRange (array_keys ($this->objects));

 

-			$components->selectedItem = $GLOBALS['new_component'][0];

-			$this->setSelectedComponents ($args->component);

+            $components->selectedItem = $GLOBALS['new_component'][0];

+            $this->setSelectedComponents ($args->component);

 

-			unset ($GLOBALS['new_component']);

+            unset ($GLOBALS['new_component']);

         };

 		

-		$this->componentRemovedEvent = function ($self, $args)

-		{

-			$name = $this->getComponentName ($args->component->selector);

-			unset ($this->objects[$name]);

+        $this->componentRemovedEvent = function ($self, $args)

+        {

+            $name = $this->getComponentName ($args->component->selector);

+            unset ($this->objects[$name]);

 

-			foreach ($this->objects as $objectName => $object)

-				if (!is_int ($this->getComponentByName ($objectName)))

-					unset ($this->objects[$objectName]);

+            foreach ($this->objects as $objectName => $object)

+                if (!is_int ($this->getComponentByName ($objectName)))

+                    unset ($this->objects[$objectName]);

 

-			$this->currentSelectedItem->items->clear ();

-			$this->currentSelectedItem->items->addRange (array_keys ($this->objects));

-			$this->currentSelectedItem->selectedItem = $this->getComponentName ($this->getPrimarySelection ()->selector);

-		};

+            $this->currentSelectedItem->items->clear ();

+            $this->currentSelectedItem->items->addRange (array_keys ($this->objects));

+            $this->currentSelectedItem->selectedItem = $this->getComponentName ($this->getPrimarySelection ()->selector);

+        };

 

         // ! Отредактировал что-то здесь?

         // ! Не забудь отредактировать и в main.vlf

@@ -151,9 +151,9 @@ 
             // $desItem->shortcutKeys = 131148;

             $desItem->clickEvent = function () use ($object, $locker, $locked)

             {

-				$locker->setValue ($object, !$locked);

+                $locker->setValue ($object, !$locked);

 

-				$this->propertyGrid->refresh ();

+                $this->propertyGrid->refresh ();

             };

 

             $selectAllItem = new ToolStripMenuItem ('Выделить всё');

@@ -161,7 +161,7 @@ 
             $selectAllItem->shortcutKeys = 131137;

             $selectAllItem->clickEvent = function () use ($self)

             {

-				$self->doAction ('selectAll');

+                $self->doAction ('selectAll');

             };

 			

             $cutItem = new ToolStripMenuItem ('Вырезать');

@@ -169,7 +169,7 @@ 
             $cutItem->shortcutKeys = 131160;

             $cutItem->clickEvent = function () use ($self)

             {

-				$self->doAction ('cut');

+                $self->doAction ('cut');

             };

 			

             $copyItem = new ToolStripMenuItem ('Копировать');

@@ -177,7 +177,7 @@ 
             $copyItem->shortcutKeys = 131139;

             $copyItem->clickEvent = function () use ($self)

             {

-				$self->doAction ('copy');

+                $self->doAction ('copy');

             };

 			

             $pasteItem = new ToolStripMenuItem ('Вставить');

@@ -185,7 +185,7 @@ 
             $pasteItem->shortcutKeys = 131158;

             $pasteItem->clickEvent = function () use ($self)

             {

-				$self->doAction('paste');

+                $self->doAction('paste');

             };

 			

             $undoItem = new ToolStripMenuItem ('Отменить');

@@ -193,7 +193,7 @@ 
             $undoItem->shortcutKeys = 131162;

             $undoItem->clickEvent = function () use ($self)

             {

-				$self->undoEngine->undo ();

+                $self->undoEngine->undo ();

             };

 			

             $redoItem = new ToolStripMenuItem ('Повторить');

@@ -201,7 +201,7 @@ 
             $redoItem->shortcutKeys = 131161;

             $redoItem->clickEvent = function () use ($self)

             {

-				$self->undoEngine->redo ();

+                $self->undoEngine->redo ();

             };

 

             $infoItem = new ToolStripMenuItem ('Отладочная информация');

@@ -212,7 +212,7 @@ 
                 {

                     pre ($value instanceof Component ? $value : $value->toString () ."\nSelector: ". $value->selector);

 

-					if ((new WFObject(VoidEngine::objectType ('System.Windows.Forms.Form', 'System.Windows.Forms')))->isAssignableFrom ($value->getType ()))

+                    if ((new WFObject(VoidEngine::objectType ('System.Windows.Forms.Form', 'System.Windows.Forms')))->isAssignableFrom ($value->getType ()))

                         pre ($self->getSharpCode ($self->form->name));

                 });

             };

@@ -221,7 +221,7 @@ 
             $menu->items->addRange ([

                 $selectAllItem, $copyItem, $pasteItem, $cutItem, $delItem, '-',

                 $toFrontItem, $toBackItem, $desItem, '-',

-				$undoItem, $redoItem, '-',

+                $undoItem, $redoItem, '-',

                 $infoItem

             ]);

 

Spacing +134 added lines, -135 removed lines

@@ -12,20 +12,19 @@ 
     protected $currentSelectedItem;

     protected $formsList;

 

-    public function __construct (Component $parent, string $formName = 'form', PropertyGrid $propertyGrid, ComboBox $currentSelectedItem, TabControl $formsList, $form = null)

+    public function __construct(Component $parent, string $formName = 'form', PropertyGrid $propertyGrid, ComboBox $currentSelectedItem, TabControl $formsList, $form = null)

     {

-        $this->form = $form === null ? new Form :

-            EngineAdditions::coupleSelector ($form);

+        $this->form = $form === null ? new Form : EngineAdditions::coupleSelector($form);

 

-        if (!is_object ($this->form))

-            throw new \Exception ('$form param in "VoidEngine\VoidDesigner" constructor must be instance of "VoidEngine\WFObject" ("VoidEngine\Form") or be object selector');

+        if (!is_object($this->form))

+            throw new \Exception('$form param in "VoidEngine\VoidDesigner" constructor must be instance of "VoidEngine\WFObject" ("VoidEngine\Form") or be object selector');

 

         $this->propertyGrid        = $propertyGrid;

         $this->currentSelectedItem = $currentSelectedItem;

         $this->formsList           = $formsList;

 

-        $this->selector = VoidEngine::createObject ('WinForms_PHP.FormDesigner5', null, $this->form->selector, $formName);

-        Components::addComponent ($this->selector, $this);

+        $this->selector = VoidEngine::createObject('WinForms_PHP.FormDesigner5', null, $this->form->selector, $formName);

+        Components::addComponent($this->selector, $this);

 

         $this->form->name = $formName;

 

@@ -35,281 +34,281 @@ 
             $this->form->size = [400, 360];

         }

 

-        $this->control = $this->callMethod ('GetControl');

+        $this->control = $this->callMethod('GetControl');

         $this->objects[$formName] = ['System.Windows.Forms.Form', 'System.Windows.Forms'];

 

-        VoidEngine::setProperty ($this->control, 'Parent', $parent->selector);

+        VoidEngine::setProperty($this->control, 'Parent', $parent->selector);

 

-        $this->selectionChangedEvent = function ()

+        $this->selectionChangedEvent = function()

         {

-            $object = $this->getPrimarySelection ()->selector;

+            $object = $this->getPrimarySelection()->selector;

             

             $this->propertyGrid->selectedObject = $object;

-            $this->currentSelectedItem->selectedItem = $this->getComponentName ($object);

+            $this->currentSelectedItem->selectedItem = $this->getComponentName($object);

         };

 

-        $this->createUniqueMethodNameEvent = function ($self, $args)

+        $this->createUniqueMethodNameEvent = function($self, $args)

         {

-            return $this->getComponentName ($args->component->selector) . '_' . $args->eventDescriptor->Name;

+            return $this->getComponentName($args->component->selector).'_'.$args->eventDescriptor->Name;

         };

         

-        $this->getCompatibleMethodsEvent = function ()

+        $this->getCompatibleMethodsEvent = function()

         {

             $form = $this->formsList->selectedTab->text;

             

-            return getNetArray ('System.String', ClassWorker::getAvailableClassMethods (VoidStudioAPI::$events[$form] ?? '', $form))->selector;

+            return getNetArray('System.String', ClassWorker::getAvailableClassMethods(VoidStudioAPI::$events[$form] ?? '', $form))->selector;

         };

         

-        $this->showCodeEvent = function ($self, $args)

+        $this->showCodeEvent = function($self, $args)

         {

-            VoidStudioAPI::openEventEditor ($this->propertyGrid->selectedObject->selector, $args->methodName, $form = c('Designer__FormsList')->selectedTab->text, VoidStudioAPI::getObjects ('main')['Designer__'. $form .'Designer']);

+            VoidStudioAPI::openEventEditor($this->propertyGrid->selectedObject->selector, $args->methodName, $form = c('Designer__FormsList')->selectedTab->text, VoidStudioAPI::getObjects('main')['Designer__'.$form.'Designer']);

         };

 

-        $this->freeMethodEvent = function ($self, $args)

+        $this->freeMethodEvent = function($self, $args)

         {

             $object = $this->propertyGrid->selectedObject->selector;

 

-            Events::removeObjectEvent ($object, $method = $args->eventDescriptor->Name);

+            Events::removeObjectEvent($object, $method = $args->eventDescriptor->Name);

             unset (VoidStudioAPI::$events[$object][$method]);

         };

     }

 

-    public function initDesigner (): void

+    public function initDesigner(): void

     {

-        $this->componentAddedEvent = function ($self, $args)

+        $this->componentAddedEvent = function($self, $args)

         {

 			if (!isset ($GLOBALS['new_component']))

 			{

-                $name = $args->component->getType ()->toString ();

+                $name = $args->component->getType()->toString();

 

                 // pre (VoidEngine::getProperty ($args->component->selector, 'Name'));

                 

-				$GLOBALS['new_component'] = [$this->getComponentName ($args->component->selector), [$name, substr ($name, 0, strrpos ($name, '.'))]];

+				$GLOBALS['new_component'] = [$this->getComponentName($args->component->selector), [$name, substr($name, 0, strrpos($name, '.'))]];

 			}

 			

-			$this->setComponentToHistory ($GLOBALS['new_component'][1], $GLOBALS['new_component'][0]);

-			$components = VoidStudioAPI::getObjects ('main')['PropertiesPanel__SelectedComponent'];

+			$this->setComponentToHistory($GLOBALS['new_component'][1], $GLOBALS['new_component'][0]);

+			$components = VoidStudioAPI::getObjects('main')['PropertiesPanel__SelectedComponent'];

 

-			$components->items->clear ();

-			$components->items->addRange (array_keys ($this->objects));

+			$components->items->clear();

+			$components->items->addRange(array_keys($this->objects));

 

 			$components->selectedItem = $GLOBALS['new_component'][0];

-			$this->setSelectedComponents ($args->component);

+			$this->setSelectedComponents($args->component);

 

 			unset ($GLOBALS['new_component']);

         };

 		

-		$this->componentRemovedEvent = function ($self, $args)

+		$this->componentRemovedEvent = function($self, $args)

 		{

-			$name = $this->getComponentName ($args->component->selector);

+			$name = $this->getComponentName($args->component->selector);

 			unset ($this->objects[$name]);

 

 			foreach ($this->objects as $objectName => $object)

-				if (!is_int ($this->getComponentByName ($objectName)))

+				if (!is_int($this->getComponentByName($objectName)))

 					unset ($this->objects[$objectName]);

 

-			$this->currentSelectedItem->items->clear ();

-			$this->currentSelectedItem->items->addRange (array_keys ($this->objects));

-			$this->currentSelectedItem->selectedItem = $this->getComponentName ($this->getPrimarySelection ()->selector);

+			$this->currentSelectedItem->items->clear();

+			$this->currentSelectedItem->items->addRange(array_keys($this->objects));

+			$this->currentSelectedItem->selectedItem = $this->getComponentName($this->getPrimarySelection()->selector);

 		};

 

         // ! Отредактировал что-то здесь?

         // ! Не забудь отредактировать и в main.vlf

 

-        $this->rightClickEvent = function ($self, $args)

+        $this->rightClickEvent = function($self, $args)

         {

-            $delItem = new ToolStripMenuItem ('Удалить');

-            $delItem->image = (new Image)->loadFromFile (APP_DIR .'/system/icons/Delete_16x.png');

+            $delItem = new ToolStripMenuItem('Удалить');

+            $delItem->image = (new Image)->loadFromFile(APP_DIR.'/system/icons/Delete_16x.png');

             $delItem->shortcutKeys = 46;

-            $delItem->clickEvent = function () use ($self)

+            $delItem->clickEvent = function() use ($self)

             {

-                $this->removeSelected ();

+                $this->removeSelected();

             };

 

-            $toFrontItem = new ToolStripMenuItem ('На передний план');

-            $toFrontItem->image = (new Image)->loadFromFile (APP_DIR .'/system/icons/Front_16x.png');

+            $toFrontItem = new ToolStripMenuItem('На передний план');

+            $toFrontItem->image = (new Image)->loadFromFile(APP_DIR.'/system/icons/Front_16x.png');

             // $toFrontItem->shortcutKeys = 131142;

-            $toFrontItem->clickEvent = function () use ($self)

+            $toFrontItem->clickEvent = function() use ($self)

             {

-                $self->doAction ('bringToFront');

+                $self->doAction('bringToFront');

             };

 

-            $toBackItem = new ToolStripMenuItem ('На задний план');

-            $toBackItem->image = (new Image)->loadFromFile (APP_DIR .'/system/icons/Back_16x.png');

+            $toBackItem = new ToolStripMenuItem('На задний план');

+            $toBackItem->image = (new Image)->loadFromFile(APP_DIR.'/system/icons/Back_16x.png');

             // $toBackItem->shortcutKeys = 131138;

-            $toBackItem->clickEvent = function () use ($self)

+            $toBackItem->clickEvent = function() use ($self)

             {

-                $self->doAction ('sendToBack');

+                $self->doAction('sendToBack');

             };

 

-            $locked = ($locker = (new WFClass ('System.ComponentModel.TypeDescriptor', 'System'))

-                ->getProperties ($object = $this->propertyGrid->selectedObject->selector)['Locked'])

-                ->getValue ($object);

+            $locked = ($locker = (new WFClass('System.ComponentModel.TypeDescriptor', 'System'))

+                ->getProperties($object = $this->propertyGrid->selectedObject->selector)['Locked'])

+                ->getValue($object);

 			

-            $desItem = new ToolStripMenuItem ($locked ? 'Разблокировать' : 'Заблокировать');

-            $desItem->image = (new Image)->loadFromFile (APP_DIR .'/system/icons/'. ($locked ? 'Unlock' : 'Lock') .'_16x.png');

+            $desItem = new ToolStripMenuItem($locked ? 'Разблокировать' : 'Заблокировать');

+            $desItem->image = (new Image)->loadFromFile(APP_DIR.'/system/icons/'.($locked ? 'Unlock' : 'Lock').'_16x.png');

             // $desItem->shortcutKeys = 131148;

-            $desItem->clickEvent = function () use ($object, $locker, $locked)

+            $desItem->clickEvent = function() use ($object, $locker, $locked)

             {

-				$locker->setValue ($object, !$locked);

+				$locker->setValue($object, !$locked);

 

-				$this->propertyGrid->refresh ();

+				$this->propertyGrid->refresh();

             };

 

-            $selectAllItem = new ToolStripMenuItem ('Выделить всё');

-            $selectAllItem->image = (new Image)->loadFromFile (APP_DIR .'/system/icons/SelectAll_16x.png');

+            $selectAllItem = new ToolStripMenuItem('Выделить всё');

+            $selectAllItem->image = (new Image)->loadFromFile(APP_DIR.'/system/icons/SelectAll_16x.png');

             $selectAllItem->shortcutKeys = 131137;

-            $selectAllItem->clickEvent = function () use ($self)

+            $selectAllItem->clickEvent = function() use ($self)

             {

-				$self->doAction ('selectAll');

+				$self->doAction('selectAll');

             };

 			

-            $cutItem = new ToolStripMenuItem ('Вырезать');

-            $cutItem->image = (new Image)->loadFromFile (APP_DIR .'/system/icons/Cut_16x.png');

+            $cutItem = new ToolStripMenuItem('Вырезать');

+            $cutItem->image = (new Image)->loadFromFile(APP_DIR.'/system/icons/Cut_16x.png');

             $cutItem->shortcutKeys = 131160;

-            $cutItem->clickEvent = function () use ($self)

+            $cutItem->clickEvent = function() use ($self)

             {

-				$self->doAction ('cut');

+				$self->doAction('cut');

             };

 			

-            $copyItem = new ToolStripMenuItem ('Копировать');

-            $copyItem->image = (new Image)->loadFromFile (APP_DIR .'/system/icons/Copy_16x.png');

+            $copyItem = new ToolStripMenuItem('Копировать');

+            $copyItem->image = (new Image)->loadFromFile(APP_DIR.'/system/icons/Copy_16x.png');

             $copyItem->shortcutKeys = 131139;

-            $copyItem->clickEvent = function () use ($self)

+            $copyItem->clickEvent = function() use ($self)

             {

-				$self->doAction ('copy');

+				$self->doAction('copy');

             };

 			

-            $pasteItem = new ToolStripMenuItem ('Вставить');

-            $pasteItem->image = (new Image)->loadFromFile (APP_DIR .'/system/icons/Paste_16x.png');

+            $pasteItem = new ToolStripMenuItem('Вставить');

+            $pasteItem->image = (new Image)->loadFromFile(APP_DIR.'/system/icons/Paste_16x.png');

             $pasteItem->shortcutKeys = 131158;

-            $pasteItem->clickEvent = function () use ($self)

+            $pasteItem->clickEvent = function() use ($self)

             {

 				$self->doAction('paste');

             };

 			

-            $undoItem = new ToolStripMenuItem ('Отменить');

-            $undoItem->image = (new Image)->loadFromFile (APP_DIR .'/system/icons/Undo_16x.png');

+            $undoItem = new ToolStripMenuItem('Отменить');

+            $undoItem->image = (new Image)->loadFromFile(APP_DIR.'/system/icons/Undo_16x.png');

             $undoItem->shortcutKeys = 131162;

-            $undoItem->clickEvent = function () use ($self)

+            $undoItem->clickEvent = function() use ($self)

             {

-				$self->undoEngine->undo ();

+				$self->undoEngine->undo();

             };

 			

-            $redoItem = new ToolStripMenuItem ('Повторить');

-            $redoItem->image = (new Image)->loadFromFile (APP_DIR .'/system/icons/Redo_16x.png');

+            $redoItem = new ToolStripMenuItem('Повторить');

+            $redoItem->image = (new Image)->loadFromFile(APP_DIR.'/system/icons/Redo_16x.png');

             $redoItem->shortcutKeys = 131161;

-            $redoItem->clickEvent = function () use ($self)

+            $redoItem->clickEvent = function() use ($self)

             {

-				$self->undoEngine->redo ();

+				$self->undoEngine->redo();

             };

 

-            $infoItem = new ToolStripMenuItem ('Отладочная информация');

-            $infoItem->image = (new Image)->loadFromFile (APP_DIR .'/system/icons/Debug_16x.png');

-            $infoItem->clickEvent = function () use ($self)

+            $infoItem = new ToolStripMenuItem('Отладочная информация');

+            $infoItem->image = (new Image)->loadFromFile(APP_DIR.'/system/icons/Debug_16x.png');

+            $infoItem->clickEvent = function() use ($self)

             {

-                $self->getSelectedComponents ()->foreach (function ($value) use ($self)

+                $self->getSelectedComponents()->foreach(function($value) use ($self)

                 {

-                    pre ($value instanceof Component ? $value : $value->toString () ."\nSelector: ". $value->selector);

+                    pre($value instanceof Component ? $value : $value->toString()."\nSelector: ".$value->selector);

 

-					if ((new WFObject(VoidEngine::objectType ('System.Windows.Forms.Form', 'System.Windows.Forms')))->isAssignableFrom ($value->getType ()))

-                        pre ($self->getSharpCode ($self->form->name));

+					if ((new WFObject(VoidEngine::objectType('System.Windows.Forms.Form', 'System.Windows.Forms')))->isAssignableFrom($value->getType()))

+                        pre($self->getSharpCode($self->form->name));

                 });

             };

 

             $menu = new ContextMenuStrip;

-            $menu->items->addRange ([

+            $menu->items->addRange([

                 $selectAllItem, $copyItem, $pasteItem, $cutItem, $delItem, '-',

                 $toFrontItem, $toBackItem, $desItem, '-',

 				$undoItem, $redoItem, '-',

                 $infoItem

             ]);

 

-            $menu->show ($self->form, $self->form->pointToClient (VoidEngine::createObject ('System.Drawing.Point', 'System.Drawing', $args->x, $args->y)));

+            $menu->show($self->form, $self->form->pointToClient(VoidEngine::createObject('System.Drawing.Point', 'System.Drawing', $args->x, $args->y)));

         };

 

-        VoidStudioAPI::addObjects ('main', ['Designer__'. $this->form->name .'Designer' => $this]);

+        VoidStudioAPI::addObjects('main', ['Designer__'.$this->form->name.'Designer' => $this]);

     }

 

-    public function focus (): void

+    public function focus(): void

     {

-        $this->form->focus ();

+        $this->form->focus();

     }

 

-    public function getSharpCode (string $formName): string

+    public function getSharpCode(string $formName): string

     {

-        $code = $this->callMethod (['GetSharpCode', 'object'], $formName);

+        $code = $this->callMethod(['GetSharpCode', 'object'], $formName);

 

-        $code = VoidEngine::callMethod ($code, ['Replace', 'object'], 'public class '. $this->form->name .' : '. $this->form->name, 'public class '. $this->form->name .' : System.Windows.Forms.Form');

-        $code = VoidEngine::callMethod ($code, ['Replace', 'object'], '    private ', '    public ');

+        $code = VoidEngine::callMethod($code, ['Replace', 'object'], 'public class '.$this->form->name.' : '.$this->form->name, 'public class '.$this->form->name.' : System.Windows.Forms.Form');

+        $code = VoidEngine::callMethod($code, ['Replace', 'object'], '    private ', '    public ');

 

-        return VoidEngine::callMethod ($code, 'ToString');

+        return VoidEngine::callMethod($code, 'ToString');

     }

 

-    public function createComponent (array $component, string $componentName): int

+    public function createComponent(array $component, string $componentName): int

     {

         $this->objects[$componentName] = $component;

-        $selector = VoidEngine::createObject (...$component);

+        $selector = VoidEngine::createObject(...$component);

 

-        $this->callMethod ('AddComponent', $selector, $componentName);

+        $this->callMethod('AddComponent', $selector, $componentName);

 

         return $selector;

     }

 

-    public function setComponentToHistory (array $component, string $componentName): void

+    public function setComponentToHistory(array $component, string $componentName): void

     {

         $this->objects[$componentName] = $component;

     }

 

-    public function addComponent (int $selector, string $componentName): void

+    public function addComponent(int $selector, string $componentName): void

     {

-        $this->objects[$componentName] = [VoidEngine::callMethod (VoidEngine::callMethod ($selector, 'GetType'), 'ToString'), 'auto'];

+        $this->objects[$componentName] = [VoidEngine::callMethod(VoidEngine::callMethod($selector, 'GetType'), 'ToString'), 'auto'];

 

-        $this->callMethod ('AddComponent', $selector, $componentName);

+        $this->callMethod('AddComponent', $selector, $componentName);

     }

 

-    public function removeComponent (int $component): void

+    public function removeComponent(int $component): void

     {

-        unset ($this->objects[$this->getComponentName ($component)]);

+        unset ($this->objects[$this->getComponentName($component)]);

 

-        $this->callMethod ('RemoveComponent', $component);

+        $this->callMethod('RemoveComponent', $component);

     }

 

-    public function removeComponentHistoryByName (string $name): void

+    public function removeComponentHistoryByName(string $name): void

     {

         unset ($this->objects[$name]);

     }

 

-    public function removeSelected (): void

+    public function removeSelected(): void

     {

         $toUnset = [];

 

-        foreach ($this->getSelectedComponents ()->list as $object)

+        foreach ($this->getSelectedComponents()->list as $object)

         {

-            if ($object->getType ()->toString () != 'System.Windows.Forms.Form')

-                $toUnset[] = $this->getComponentName ($object->selector);

+            if ($object->getType()->toString() != 'System.Windows.Forms.Form')

+                $toUnset[] = $this->getComponentName($object->selector);

 

             else

             {

                 if ($this->formsList->items->count > 1)

                 {

-                    if (messageBox ('Вы действительно хотите удалить форму "'. $this->form->name .'"?', 'Подтвердите действие', enum ('System.Windows.Forms.MessageBoxButtons.YesNo'), enum ('System.Windows.Forms.MessageBoxIcon.Question')) == 6)

+                    if (messageBox('Вы действительно хотите удалить форму "'.$this->form->name.'"?', 'Подтвердите действие', enum('System.Windows.Forms.MessageBoxButtons.YesNo'), enum('System.Windows.Forms.MessageBoxIcon.Question')) == 6)

                     {

                         foreach ($this->objects as $name => $obj)

                             unset ($this->objects[$name]);

 

-                        unset ($this->formsList->items[array_flip ($this->formsList->items->names)[$form = $this->getComponentName ($object->selector)]]);

+                        unset ($this->formsList->items[array_flip($this->formsList->items->names)[$form = $this->getComponentName($object->selector)]]);

 

                         /*$this->form->dispose ();

                         VoidEngine::callMethod ($this->control, 'Dispose');*/

-                        $this->callMethod ('DeleteSelected');

+                        $this->callMethod('DeleteSelected');

 

-                        $designer = VoidStudioAPI::getObjects ('main')['Designer__'. $this->formsList->selectedTab->text .'Designer'];

+                        $designer = VoidStudioAPI::getObjects('main')['Designer__'.$this->formsList->selectedTab->text.'Designer'];

                         

                         $designer->propertyGrid->selectedObject = $designer->form;

-                        $designer->setSelectedComponents ($designer->form);

+                        $designer->setSelectedComponents($designer->form);

 

-                        unset (VoidStudioAPI::$objects['main']['Designer__'. $form .'Designer']);

+                        unset (VoidStudioAPI::$objects['main']['Designer__'.$form.'Designer']);

 

                         return;

                     }

@@ -317,7 +316,7 @@ 
 

                 else

                 {

-                    messageBox ('Нельзя удалить единственную форму проекта', 'Ошибка удаления', enum ('System.Windows.Forms.MessageBoxButtons.OK'), enum ('System.Windows.Forms.MessageBoxIcon.Error'));

+                    messageBox('Нельзя удалить единственную форму проекта', 'Ошибка удаления', enum('System.Windows.Forms.MessageBoxButtons.OK'), enum('System.Windows.Forms.MessageBoxIcon.Error'));

 

                     return;

                 }

@@ -327,52 +326,52 @@ 
         foreach ($toUnset as $name)

             unset ($this->objects[$name]);

 

-        $this->doAction ('delete');

+        $this->doAction('delete');

 

         foreach ($this->objects as $objectName => $object)

-            if (!is_int ($this->getComponentByName ($objectName)))

+            if (!is_int($this->getComponentByName($objectName)))

                 unset ($this->objects[$objectName]);

 

-        $this->currentSelectedItem->items->clear ();

-        $this->currentSelectedItem->items->addRange (array_keys ($this->objects));

-        $this->currentSelectedItem->selectedItem = $this->getComponentName ($this->getPrimarySelection ()->selector);

+        $this->currentSelectedItem->items->clear();

+        $this->currentSelectedItem->items->addRange(array_keys($this->objects));

+        $this->currentSelectedItem->selectedItem = $this->getComponentName($this->getPrimarySelection()->selector);

     }

 

-    public function renameComponent (int $component, string $name, string $fromName = null): void

+    public function renameComponent(int $component, string $name, string $fromName = null): void

     {

         if ($fromName === null)

-            $fromName = $this->getComponentName ($component);

+            $fromName = $this->getComponentName($component);

 

         $info = $this->objects[$fromName];

         unset ($this->objects[$fromName]);

         $this->objects[$name] = $info;

 

-        $this->callMethod ('RenameComponent', $component, $name);

+        $this->callMethod('RenameComponent', $component, $name);

     }

 

-    public function getComponentName (int $component): string

+    public function getComponentName(int $component): string

     {

-        return $this->callMethod ('GetComponentName', $component);

+        return $this->callMethod('GetComponentName', $component);

     }

 

-    public function getComponentByName (string $name)

+    public function getComponentByName(string $name)

     {

-        return $this->callMethod ('GetComponentByName', $name);

+        return $this->callMethod('GetComponentByName', $name);

     }

 

-    public function getComponentClass (string $name)

+    public function getComponentClass(string $name)

     {

         return isset ($this->objects[$name]) ?

             $this->objects[$name] : false;

     }

 

-    public function addProperty (int $selector, string $name, int $value, bool $readOnly, string $category, string $description, bool $visible)

+    public function addProperty(int $selector, string $name, int $value, bool $readOnly, string $category, string $description, bool $visible)

     {

-        $this->callMethod ('AddProperty', $selector, $name, $value, $readOnly, $category, $description, $visible);

+        $this->callMethod('AddProperty', $selector, $name, $value, $readOnly, $category, $description, $visible);

     }

 

-    public function removeProperty (int $selector, string $name)

+    public function removeProperty(int $selector, string $name)

     {

-        $this->callMethod ('RemoveProperty', $selector, $name);

+        $this->callMethod('RemoveProperty', $selector, $name);

     }

 }

Braces +27 added lines, -23 removed lines

@@ -17,8 +17,9 @@ 
         $this->form = $form === null ? new Form :

             EngineAdditions::coupleSelector ($form);

 

-        if (!is_object ($this->form))

-            throw new \Exception ('$form param in "VoidEngine\VoidDesigner" constructor must be instance of "VoidEngine\WFObject" ("VoidEngine\Form") or be object selector');

+        if (!is_object ($this->form)) {
+                    throw new \Exception ('$form param in "VoidEngine\VoidDesigner" constructor must be instance of "VoidEngine\WFObject" ("VoidEngine\Form") or be object selector');
+        }
 

         $this->propertyGrid        = $propertyGrid;

         $this->currentSelectedItem = $currentSelectedItem;

@@ -104,9 +105,10 @@ 
 			$name = $this->getComponentName ($args->component->selector);

 			unset ($this->objects[$name]);

 

-			foreach ($this->objects as $objectName => $object)

-				if (!is_int ($this->getComponentByName ($objectName)))

-					unset ($this->objects[$objectName]);

+			foreach ($this->objects as $objectName => $object) {
+							if (!is_int ($this->getComponentByName ($objectName)))

+					unset ($this->objects[$objectName]);
+			}
 

 			$this->currentSelectedItem->items->clear ();

 			$this->currentSelectedItem->items->addRange (array_keys ($this->objects));

@@ -212,8 +214,9 @@ 
                 {

                     pre ($value instanceof Component ? $value : $value->toString () ."\nSelector: ". $value->selector);

 

-					if ((new WFObject(VoidEngine::objectType ('System.Windows.Forms.Form', 'System.Windows.Forms')))->isAssignableFrom ($value->getType ()))

-                        pre ($self->getSharpCode ($self->form->name));

+					if ((new WFObject(VoidEngine::objectType ('System.Windows.Forms.Form', 'System.Windows.Forms')))->isAssignableFrom ($value->getType ())) {
+					                        pre ($self->getSharpCode ($self->form->name));
+					}
                 });

             };

 

@@ -286,17 +289,17 @@ 
 

         foreach ($this->getSelectedComponents ()->list as $object)

         {

-            if ($object->getType ()->toString () != 'System.Windows.Forms.Form')

-                $toUnset[] = $this->getComponentName ($object->selector);

-

-            else

+            if ($object->getType ()->toString () != 'System.Windows.Forms.Form') {
+                            $toUnset[] = $this->getComponentName ($object->selector);
+            } else

             {

                 if ($this->formsList->items->count > 1)

                 {

                     if (messageBox ('Вы действительно хотите удалить форму "'. $this->form->name .'"?', 'Подтвердите действие', enum ('System.Windows.Forms.MessageBoxButtons.YesNo'), enum ('System.Windows.Forms.MessageBoxIcon.Question')) == 6)

                     {

-                        foreach ($this->objects as $name => $obj)

-                            unset ($this->objects[$name]);

+                        foreach ($this->objects as $name => $obj) {
+                                                    unset ($this->objects[$name]);
+                        }
 

                         unset ($this->formsList->items[array_flip ($this->formsList->items->names)[$form = $this->getComponentName ($object->selector)]]);

 

@@ -313,9 +316,7 @@ 
 

                         return;

                     }

-                }

-

-                else

+                } else

                 {

                     messageBox ('Нельзя удалить единственную форму проекта', 'Ошибка удаления', enum ('System.Windows.Forms.MessageBoxButtons.OK'), enum ('System.Windows.Forms.MessageBoxIcon.Error'));

 

@@ -324,14 +325,16 @@ 
             }

         }

 

-        foreach ($toUnset as $name)

-            unset ($this->objects[$name]);

+        foreach ($toUnset as $name) {
+                    unset ($this->objects[$name]);
+        }
 

         $this->doAction ('delete');

 

-        foreach ($this->objects as $objectName => $object)

-            if (!is_int ($this->getComponentByName ($objectName)))

-                unset ($this->objects[$objectName]);

+        foreach ($this->objects as $objectName => $object) {
+                    if (!is_int ($this->getComponentByName ($objectName)))

+                unset ($this->objects[$objectName]);
+        }
 

         $this->currentSelectedItem->items->clear ();

         $this->currentSelectedItem->items->addRange (array_keys ($this->objects));

@@ -340,8 +343,9 @@ 
 

     public function renameComponent (int $component, string $name, string $fromName = null): void

     {

-        if ($fromName === null)

-            $fromName = $this->getComponentName ($component);

+        if ($fromName === null) {
+                    $fromName = $this->getComponentName ($component);
+        }
 

         $info = $this->objects[$fromName];

         unset ($this->objects[$fromName]);

bin/app/php/ProjectManager.php

Spacing +41 added lines, -41 removed lines

@@ -6,28 +6,28 @@ 
 {

     public static string $projectPath = '';

 

-    public static function createProject (string $name = 'default'): bool

+    public static function createProject(string $name = 'default'): bool

     {

-        if (!is_dir ($dir = 'C:/Users/'. USERNAME .'/Documents/VoidStudio'))

-            dir_create ($dir);

+        if (!is_dir($dir = 'C:/Users/'.USERNAME.'/Documents/VoidStudio'))

+            dir_create($dir);

 

-        if (is_dir ($dir = $dir .'/'. $name))

+        if (is_dir($dir = $dir.'/'.$name))

         {

-            if (messageBox ('Проект "'. $name .'" уже создан. Перезаписать его?', 'Подтвердите действие', enum ('System.Windows.Forms.MessageBoxButtons.YesNo'), enum ('System.Windows.Forms.MessageBoxIcon.Question')) == 6)

-                dir_clean ($dir);

+            if (messageBox('Проект "'.$name.'" уже создан. Перезаписать его?', 'Подтвердите действие', enum('System.Windows.Forms.MessageBoxButtons.YesNo'), enum('System.Windows.Forms.MessageBoxIcon.Question')) == 6)

+                dir_clean($dir);

 

             else return false;

         }

 

-        else dir_create ($dir);

+        else dir_create($dir);

 

         self::$projectPath = $dir;

 

-        VoidStudioAPI::getObjects ('main')['MainForm']->caption    = $name .' — VoidStudio';

-        VoidStudioAPI::getObjects ('modules')['MainForm']->caption = $name .' — модули проекта';

-        VoidStudioAPI::getObjects ('main')['ToolsPanel__LogList']->items->add ('Проект "'. $name .'" успешно создан');

+        VoidStudioAPI::getObjects('main')['MainForm']->caption    = $name.' — VoidStudio';

+        VoidStudioAPI::getObjects('modules')['MainForm']->caption = $name.' — модули проекта';

+        VoidStudioAPI::getObjects('main')['ToolsPanel__LogList']->items->add('Проект "'.$name.'" успешно создан');

 

-        dir_create ($dir .'/modules');

+        dir_create($dir.'/modules');

         // copy (__DIR__ .'/../Qero/Qero.phar', $dir .'/Qero.phar');

 

         // require $dir .'/Qero.phar';

@@ -35,7 +35,7 @@ 
         return true;

     }

 

-    public static function saveProject (string $file): void

+    public static function saveProject(string $file): void

     {

         $info = [

             'forms'   => [],

@@ -43,84 +43,84 @@ 
             'objects' => []

         ];

 

-        foreach (VoidStudioAPI::getObjects ('main')['Designer__FormsList']->items->names as $item)

+        foreach (VoidStudioAPI::getObjects('main')['Designer__FormsList']->items->names as $item)

         {

-            $designer = VoidStudioAPI::getObjects ('main')['Designer__'. $item .'Designer'];

+            $designer = VoidStudioAPI::getObjects('main')['Designer__'.$item.'Designer'];

 

-            $info['forms'][$item]   = VoidStudioBuilder::appendDesignerData ($designer->getSharpCode ($item), $designer);

-            $info['objects'][$item] = array_keys ($designer->objects);

+            $info['forms'][$item]   = VoidStudioBuilder::appendDesignerData($designer->getSharpCode($item), $designer);

+            $info['objects'][$item] = array_keys($designer->objects);

             $info['events'][$item]  = VoidStudioAPI::$events[$item] ?? null;

         }

 

-        file_put_contents ($file, gzdeflate (serialize ($info), 9));

+        file_put_contents($file, gzdeflate(serialize($info), 9));

 

-        if (replaceSl (self::$projectPath) != replaceSl (dirname ($file)))

-            dir_copy (self::$projectPath .'/modules', dirname ($file) .'/modules');

+        if (replaceSl(self::$projectPath) != replaceSl(dirname($file)))

+            dir_copy(self::$projectPath.'/modules', dirname($file).'/modules');

 

-        VoidStudioAPI::getObjects ('main')['ToolsPanel__LogList']->items->add ('Проект успешно сохранён');

+        VoidStudioAPI::getObjects('main')['ToolsPanel__LogList']->items->add('Проект успешно сохранён');

     }

 

-    public static function openProject (string $file): void

+    public static function openProject(string $file): void

     {

-        messageBox ('В настоящий момент пересматривается алгоритм открытия проектов, поэтому возможны многочисленные баги (в т.ч. невозможность компиляции открытого проекта)'. "\n\nБудет исправлено в ближайшее время\nС уважением, разработчики проекта WinForms PHP", 'Предупреждение об ошибках', enum ('System.Windows.Forms.MessageBoxButtons.OK'), enum ('System.Windows.Forms.MessageBoxIcon.Warning'));

+        messageBox('В настоящий момент пересматривается алгоритм открытия проектов, поэтому возможны многочисленные баги (в т.ч. невозможность компиляции открытого проекта)'."\n\nБудет исправлено в ближайшее время\nС уважением, разработчики проекта WinForms PHP", 'Предупреждение об ошибках', enum('System.Windows.Forms.MessageBoxButtons.OK'), enum('System.Windows.Forms.MessageBoxIcon.Warning'));

 

-        self::$projectPath = dirname ($file); 

+        self::$projectPath = dirname($file); 

 

-        $info    = unserialize (gzinflate (file_get_contents ($file)));

-        $objects = VoidStudioAPI::getObjects ('main');

+        $info    = unserialize(gzinflate(file_get_contents($file)));

+        $objects = VoidStudioAPI::getObjects('main');

 

         foreach ($objects['Designer__FormsList']->items->names as $form)

         {

-            $designer = VoidStudioAPI::$objects['main']['Designer__'. $form .'Designer'];

+            $designer = VoidStudioAPI::$objects['main']['Designer__'.$form.'Designer'];

 

-            $designer->form->dispose ();

-            $designer->control->dispose ();

+            $designer->form->dispose();

+            $designer->control->dispose();

 

-            unset (VoidStudioAPI::$objects['main']['Designer__'. $form .'Designer'], $designer);

+            unset (VoidStudioAPI::$objects['main']['Designer__'.$form.'Designer'], $designer);

         }

 

         $objects['PropertiesList__List']->selectedObject = null;

-        $objects['Designer__FormsList']->items->clear ();

+        $objects['Designer__FormsList']->items->clear();

 

         foreach ($info['forms'] as $formName => $form)

         {

-            $sourceForm = (new WFClass ('WinForms_PHP.WFCompiler', ''))->evalCS ("using System;\nusing System.Windows.Forms;\nusing System.Reflection;\nusing System.Linq;\nusing System.ComponentModel;\n\npublic class CodeEvaler\n{\n\tpublic object EvalCode ()\n\t{\n\t\tForm form = new $formName ();\n\n\t\tVoidControlsParser.ParseControlsForOpening (\"$formName\", (Control) form);\n\n\t\treturn form;\n\t}\n}\n\n". file_get_contents (APP_DIR .'/system/presets/compile_parser_preset.cs') ."\n\n". (string)($form), true);

+            $sourceForm = (new WFClass('WinForms_PHP.WFCompiler', ''))->evalCS("using System;\nusing System.Windows.Forms;\nusing System.Reflection;\nusing System.Linq;\nusing System.ComponentModel;\n\npublic class CodeEvaler\n{\n\tpublic object EvalCode ()\n\t{\n\t\tForm form = new $formName ();\n\n\t\tVoidControlsParser.ParseControlsForOpening (\"$formName\", (Control) form);\n\n\t\treturn form;\n\t}\n}\n\n".file_get_contents(APP_DIR.'/system/presets/compile_parser_preset.cs')."\n\n".(string) ($form), true);

 

             $form = $GLOBALS['__underConstruction'][$formName];

             unset ($GLOBALS['__underConstruction'], $form[$formName]);

 

-            $formObjects = array_flip ($info['objects'][$formName]);

+            $formObjects = array_flip($info['objects'][$formName]);

 

             foreach ($form as $name => $selector)

                 if (!isset ($formObjects[$name]))

                     unset ($form[$name]);

 

-            $page = new TabPage ($formName);

+            $page = new TabPage($formName);

             $page->backgroundColor = clWhite;

 

-            $objects['Designer__FormsList']->items->add ($page);

+            $objects['Designer__FormsList']->items->add($page);

 

-            $designer = new VoidDesigner ($page, $formName, $objects['PropertiesList__List'], $objects['PropertiesPanel__SelectedComponent'], $objects['Designer__FormsList'], $sourceForm);

-            $designer->initDesigner ();

+            $designer = new VoidDesigner($page, $formName, $objects['PropertiesList__List'], $objects['PropertiesPanel__SelectedComponent'], $objects['Designer__FormsList'], $sourceForm);

+            $designer->initDesigner();

 

             // VoidStudioAPI::$objects['main']['Designer__'. $formName .'Designer'] = $designer;

             VoidStudioAPI::$events[$formName] = $info['events'][$formName] ?? null;

 

             foreach ($form as $name => $selector)

-                $designer->addComponent ($selector, $name);

+                $designer->addComponent($selector, $name);

         }

 

         // Components::cleanJunk ();

 

         $objects['Designer__FormsList']->selectedTab = $page;

 

-        $objects['PropertiesPanel__SelectedComponent']->items->clear ();

-        $objects['PropertiesPanel__SelectedComponent']->items->addRange (array_keys ($designer->objects));

+        $objects['PropertiesPanel__SelectedComponent']->items->clear();

+        $objects['PropertiesPanel__SelectedComponent']->items->addRange(array_keys($designer->objects));

         $objects['PropertiesPanel__SelectedComponent']->selectedItem = $formName;

 

-        VoidStudioAPI::getObjects ('main')['MainForm']->caption = basenameNoExt ($file) .' — VoidStudio';

+        VoidStudioAPI::getObjects('main')['MainForm']->caption = basenameNoExt($file).' — VoidStudio';

 

         $objects['PropertiesList__List']->selectedObject = $designer->form;

-        $designer->focus ();

+        $designer->focus();

     }

 }

Braces +21 added lines, -16 removed lines

@@ -8,18 +8,20 @@ 
 

     public static function createProject (string $name = 'default'): bool

     {

-        if (!is_dir ($dir = 'C:/Users/'. USERNAME .'/Documents/VoidStudio'))

-            dir_create ($dir);

+        if (!is_dir ($dir = 'C:/Users/'. USERNAME .'/Documents/VoidStudio')) {
+                    dir_create ($dir);
+        }
 

         if (is_dir ($dir = $dir .'/'. $name))

         {

-            if (messageBox ('Проект "'. $name .'" уже создан. Перезаписать его?', 'Подтвердите действие', enum ('System.Windows.Forms.MessageBoxButtons.YesNo'), enum ('System.Windows.Forms.MessageBoxIcon.Question')) == 6)

-                dir_clean ($dir);

-

-            else return false;

-        }

-

-        else dir_create ($dir);

+            if (messageBox ('Проект "'. $name .'" уже создан. Перезаписать его?', 'Подтвердите действие', enum ('System.Windows.Forms.MessageBoxButtons.YesNo'), enum ('System.Windows.Forms.MessageBoxIcon.Question')) == 6) {
+                            dir_clean ($dir);
+            } else {
+                return false;
+            }
+        } else {
+            dir_create ($dir);
+        }
 

         self::$projectPath = $dir;

 

@@ -54,8 +56,9 @@ 
 

         file_put_contents ($file, gzdeflate (serialize ($info), 9));

 

-        if (replaceSl (self::$projectPath) != replaceSl (dirname ($file)))

-            dir_copy (self::$projectPath .'/modules', dirname ($file) .'/modules');

+        if (replaceSl (self::$projectPath) != replaceSl (dirname ($file))) {
+                    dir_copy (self::$projectPath .'/modules', dirname ($file) .'/modules');
+        }
 

         VoidStudioAPI::getObjects ('main')['ToolsPanel__LogList']->items->add ('Проект успешно сохранён');

     }

@@ -91,9 +94,10 @@ 
 

             $formObjects = array_flip ($info['objects'][$formName]);

 

-            foreach ($form as $name => $selector)

-                if (!isset ($formObjects[$name]))

-                    unset ($form[$name]);

+            foreach ($form as $name => $selector) {
+                            if (!isset ($formObjects[$name]))

+                    unset ($form[$name]);
+            }
 

             $page = new TabPage ($formName);

             $page->backgroundColor = clWhite;

@@ -106,8 +110,9 @@ 
             // VoidStudioAPI::$objects['main']['Designer__'. $formName .'Designer'] = $designer;

             VoidStudioAPI::$events[$formName] = $info['events'][$formName] ?? null;

 

-            foreach ($form as $name => $selector)

-                $designer->addComponent ($selector, $name);

+            foreach ($form as $name => $selector) {
+                            $designer->addComponent ($selector, $name);
+            }
         }

 

         // Components::cleanJunk ();

bin/app/php/Builder.php

Spacing +51 added lines, -52 removed lines

@@ -6,132 +6,131 @@
 

 class VoidStudioBuilder

 {

-    public static function compileProject (string $save, string $enteringPoint, array $references, array $settings = [], bool $printSuccessCompile = false, bool $debug = false): array

+    public static function compileProject(string $save, string $enteringPoint, array $references, array $settings = [], bool $printSuccessCompile = false, bool $debug = false): array

     {

-        $savePath   = dirname ($save) .'/'. basenameNoExt ($save);

-        $globalCode = file_get_contents (APP_DIR .'/system/presets/compile_parser_preset.cs') ."\n\n";

+        $savePath   = dirname($save).'/'.basenameNoExt($save);

+        $globalCode = file_get_contents(APP_DIR.'/system/presets/compile_parser_preset.cs')."\n\n";

         $eventsCode = '';

         $forms      = [];

 

         for ($i = 0; $i < 5; ++$i)

-            if (!isset ($settings[$i]) || !strlen (trim ($settings[$i])))

+            if (!isset ($settings[$i]) || !strlen(trim($settings[$i])))

                 $settings[$i] = null;

 

-        $settings = array_slice ($settings, 0, 5);

+        $settings = array_slice($settings, 0, 5);

 

-        foreach (VoidStudioAPI::getObjects ('main')['Designer__FormsList']->items->names as $id => $item)

+        foreach (VoidStudioAPI::getObjects('main')['Designer__FormsList']->items->names as $id => $item)

         {

-            $designer    = VoidStudioAPI::getObjects ('main')['Designer__'. $item .'Designer'];

-            $globalCode .= self::appendDesignerData ($designer->getSharpCode ($item), $designer);

+            $designer    = VoidStudioAPI::getObjects('main')['Designer__'.$item.'Designer'];

+            $globalCode .= self::appendDesignerData($designer->getSharpCode($item), $designer);

 

             $forms[] = $item;

 

             if (isset (VoidStudioAPI::$events[$item]))

             {

-                $eventsCode .= VoidStudioAPI::$events[$item] ."\n\n";

+                $eventsCode .= VoidStudioAPI::$events[$item]."\n\n";

 

                 foreach ($designer->objects as $name => $objectType)

-                    foreach ($designer->getComponentEvents ($designer->getComponentByName ($name))->list as $event)

-                        $eventsCode .= 'Events::setObjectEvent ($GLOBALS[\'__underConstruction\'][\''. $item .'\'][\''. $name .'\'], \''. $event->eventDescriptor->Name .'\', \'VoidEngine\\'. $item .'::'. $event->methodName .'\');';

+                    foreach ($designer->getComponentEvents($designer->getComponentByName($name))->list as $event)

+                        $eventsCode .= 'Events::setObjectEvent ($GLOBALS[\'__underConstruction\'][\''.$item.'\'][\''.$name.'\'], \''.$event->eventDescriptor->Name.'\', \'VoidEngine\\'.$item.'::'.$event->methodName.'\');';

             }

         }

 

-        dir_clean ($savePath);

-        dir_copy (CORE_DIR, $savePath);

+        dir_clean($savePath);

+        dir_copy(CORE_DIR, $savePath);

         

-        unlink ($savePath .'/script.php');

-        unlink ($savePath .'/VoidCore.exe');

+        unlink($savePath.'/script.php');

+        unlink($savePath.'/VoidCore.exe');

 

-        $errors = VoidEngine::compile ($savePath .'/'. basename ($save), APP_DIR .'/system/icons/Icon.ico', str_replace_assoc (file_get_contents (APP_DIR .'/system/presets/compile_main_preset.php'), [

-            '%VoidEngine%' => VoidStudioBuilder::generateCode ($references),

+        $errors = VoidEngine::compile($savePath.'/'.basename($save), APP_DIR.'/system/icons/Icon.ico', str_replace_assoc(file_get_contents(APP_DIR.'/system/presets/compile_main_preset.php'), [

+            '%VoidEngine%' => VoidStudioBuilder::generateCode($references),

 

-            '%modules%' => (file_exists ($modulesFile = VoidStudioProjectManager::$projectPath .'/modules/Qero.json') && sizeof ($modules = json_decode (file_get_contents ($modulesFile))) ? "require 'qero-packages/autoload.php';\n\n" : "\n\n") . implode ("\n", array_map (function ($module)

+            '%modules%' => (file_exists($modulesFile = VoidStudioProjectManager::$projectPath.'/modules/Qero.json') && sizeof($modules = json_decode(file_get_contents($modulesFile))) ? "require 'qero-packages/autoload.php';\n\n" : "\n\n").implode("\n", array_map(function($module)

             {

-                $module = trim (file_get_contents ($module));

+                $module = trim(file_get_contents($module));

     

-                if (substr ($module, 0, 2) == '<?')

-                    $module = substr ($module, 2);

+                if (substr($module, 0, 2) == '<?')

+                    $module = substr($module, 2);

     

-                if (substr ($module, 0, 3) == 'php')

-                    $module = substr ($module, 3);

+                if (substr($module, 0, 3) == 'php')

+                    $module = substr($module, 3);

     

-                if (substr ($module, -2) == '?>')

-                    $module = substr ($module, 0, -2);

+                if (substr($module, -2) == '?>')

+                    $module = substr($module, 0, -2);

     

                 return "\$module = <<<'__MODULE'\n\n$module\n\n__MODULE;\n\neval (\$module);";

-            }, array_merge (glob (VoidStudioProjectManager::$projectPath .'/modules/*.php'), $debug ? [APP_DIR .'/system/debug/DebugHook.php'] : []))),

+            }, array_merge(glob(VoidStudioProjectManager::$projectPath.'/modules/*.php'), $debug ? [APP_DIR.'/system/debug/DebugHook.php'] : []))),

 

             '%events%'         => $eventsCode,

             '%entering_point%' => $enteringPoint,

-            '%author_id%'      => sha1 (shell_exec ('wmic csproduct'))

-        ]), $settings[0], $settings[1], $settings[2], $settings[3], $settings[4], str_replace_assoc (file_get_contents (APP_DIR .'/system/presets/compile_main_preset.cs'), [

-            '%forms%' => join ('", "', $forms)

+            '%author_id%'      => sha1(shell_exec('wmic csproduct'))

+        ]), $settings[0], $settings[1], $settings[2], $settings[3], $settings[4], str_replace_assoc(file_get_contents(APP_DIR.'/system/presets/compile_main_preset.cs'), [

+            '%forms%' => join('", "', $forms)

         ]), $globalCode);

 

-        if (isset ($modules) && sizeof ($modules) > 0)

+        if (isset ($modules) && sizeof($modules) > 0)

         {

-            dir_delete (APP_DIR .'/Qero/qero-packages');

+            dir_delete(APP_DIR.'/Qero/qero-packages');

 

             $manager = new \Qero\PackagesManager\PackagesManager;

 

             foreach ($modules as $package)

-                $manager->installPackage ($package);

+                $manager->installPackage($package);

 

-            dir_copy (APP_DIR .'/Qero/qero-packages', $savePath .'/qero-packages');

-            dir_delete (APP_DIR .'/Qero/qero-packages');

+            dir_copy(APP_DIR.'/Qero/qero-packages', $savePath.'/qero-packages');

+            dir_delete(APP_DIR.'/Qero/qero-packages');

         }

 

         // pre ($errors);

         // pre ($globalCode->toString ());

 

-        $log = VoidStudioAPI::getObjects ('main')['ToolsPanel__LogList'];

-        $log->items->add ('Проект скомпилирован по пути "'. $save .'". '. (($errorsCount = sizeof ($errors)) > 0 ? ('Обнаружено '. $errorsCount .' ошибок') : 'Ошибок не обнаружено'));

+        $log = VoidStudioAPI::getObjects('main')['ToolsPanel__LogList'];

+        $log->items->add('Проект скомпилирован по пути "'.$save.'". '.(($errorsCount = sizeof($errors)) > 0 ? ('Обнаружено '.$errorsCount.' ошибок') : 'Ошибок не обнаружено'));

 

         if ($errorsCount > 0)

         {

-            $log->items->addRange (array_map (function ($error)

+            $log->items->addRange(array_map(function($error)

             {

-                return "\t". $error;

+                return "\t".$error;

             }, $errors));

 

-            messageBox ('Обнаружено '. $errorsCount .' ошибок', 'Ошибка компиляции', enum ('System.Windows.Forms.MessageBoxButtons.OK'), enum ('System.Windows.Forms.MessageBoxIcon.Error'));

+            messageBox('Обнаружено '.$errorsCount.' ошибок', 'Ошибка компиляции', enum('System.Windows.Forms.MessageBoxButtons.OK'), enum('System.Windows.Forms.MessageBoxIcon.Error'));

         }

 

         elseif ($printSuccessCompile)

-            messageBox ('Проект успешно скомпилирован', 'Успешная компиляция', enum ('System.Windows.Forms.MessageBoxButtons.OK'), enum ('System.Windows.Forms.MessageBoxIcon.Information'));

+            messageBox('Проект успешно скомпилирован', 'Успешная компиляция', enum('System.Windows.Forms.MessageBoxButtons.OK'), enum('System.Windows.Forms.MessageBoxIcon.Information'));

 

         return $errors;

     }

 

-    public static function appendDesignerData (string $code, VoidDesigner $designer): string

+    public static function appendDesignerData(string $code, VoidDesigner $designer): string

     {

         $offset = 0;

 

-        while (($pos = strpos ($code, ')(resources.GetObject("', $offset)) !== false)

+        while (($pos = strpos($code, ')(resources.GetObject("', $offset)) !== false)

         {

             $offset   = $pos + 23;

-            $property = explode ('.', substr ($code, $offset, ($end = strpos ($code, '")));', $offset)) - $offset));

+            $property = explode('.', substr($code, $offset, ($end = strpos($code, '")));', $offset)) - $offset));

 

             $object = $property[0] == '$this' ?

-                $designer->form->selector :

-                $designer->getComponentByName ($property[0]);

+                $designer->form->selector : $designer->getComponentByName($property[0]);

 

-            foreach (array_slice ($property, 1) as $path)

-                $object = VoidEngine::getProperty ($object, $path);

+            foreach (array_slice($property, 1) as $path)

+                $object = VoidEngine::getProperty($object, $path);

 

-            $code = str_replace (substr ($code, $pos + 2, $end - $pos), 'WinForms_PHP.ZendProgram.getResource ("'. VoidEngine::exportObject ($object) .'")', $code);

+            $code = str_replace(substr($code, $pos + 2, $end - $pos), 'WinForms_PHP.ZendProgram.getResource ("'.VoidEngine::exportObject($object).'")', $code);

         }

 

         return $code;

     }

 

-    public static function generateCode (array $references, bool $removeNamespaces = true): string

+    public static function generateCode(array $references, bool $removeNamespaces = true): string

     {

-        return Builder::generateCode ($references, $removeNamespaces);

+        return Builder::generateCode($references, $removeNamespaces);

     }

 

-    public static function getReferences (string $file, bool $parseExtensions = true): array

+    public static function getReferences(string $file, bool $parseExtensions = true): array

     {

-        return Builder::getReferences ($file, $parseExtensions);

+        return Builder::getReferences($file, $parseExtensions);

     }

 }

Braces +26 added lines, -20 removed lines

@@ -13,9 +13,10 @@ 
         $eventsCode = '';

         $forms      = [];

 

-        for ($i = 0; $i < 5; ++$i)

-            if (!isset ($settings[$i]) || !strlen (trim ($settings[$i])))

-                $settings[$i] = null;

+        for ($i = 0; $i < 5; ++$i) {
+                    if (!isset ($settings[$i]) || !strlen (trim ($settings[$i])))

+                $settings[$i] = null;
+        }
 

         $settings = array_slice ($settings, 0, 5);

 

@@ -30,9 +31,10 @@ 
             {

                 $eventsCode .= VoidStudioAPI::$events[$item] ."\n\n";

 

-                foreach ($designer->objects as $name => $objectType)

-                    foreach ($designer->getComponentEvents ($designer->getComponentByName ($name))->list as $event)

-                        $eventsCode .= 'Events::setObjectEvent ($GLOBALS[\'__underConstruction\'][\''. $item .'\'][\''. $name .'\'], \''. $event->eventDescriptor->Name .'\', \'VoidEngine\\'. $item .'::'. $event->methodName .'\');';

+                foreach ($designer->objects as $name => $objectType) {
+                                    foreach ($designer->getComponentEvents ($designer->getComponentByName ($name))->list as $event)

+                        $eventsCode .= 'Events::setObjectEvent ($GLOBALS[\'__underConstruction\'][\''. $item .'\'][\''. $name .'\'], \''. $event->eventDescriptor->Name .'\', \'VoidEngine\\'. $item .'::'. $event->methodName .'\');';
+                }
             }

         }

 

@@ -49,14 +51,17 @@ 
             {

                 $module = trim (file_get_contents ($module));

     

-                if (substr ($module, 0, 2) == '<?')

-                    $module = substr ($module, 2);

+                if (substr ($module, 0, 2) == '<?') {
+                                    $module = substr ($module, 2);
+                }
     

-                if (substr ($module, 0, 3) == 'php')

-                    $module = substr ($module, 3);

+                if (substr ($module, 0, 3) == 'php') {
+                                    $module = substr ($module, 3);
+                }
     

-                if (substr ($module, -2) == '?>')

-                    $module = substr ($module, 0, -2);

+                if (substr ($module, -2) == '?>') {
+                                    $module = substr ($module, 0, -2);
+                }
     

                 return "\$module = <<<'__MODULE'\n\n$module\n\n__MODULE;\n\neval (\$module);";

             }, array_merge (glob (VoidStudioProjectManager::$projectPath .'/modules/*.php'), $debug ? [APP_DIR .'/system/debug/DebugHook.php'] : []))),

@@ -74,8 +79,9 @@ 
 

             $manager = new \Qero\PackagesManager\PackagesManager;

 

-            foreach ($modules as $package)

-                $manager->installPackage ($package);

+            foreach ($modules as $package) {
+                            $manager->installPackage ($package);
+            }
 

             dir_copy (APP_DIR .'/Qero/qero-packages', $savePath .'/qero-packages');

             dir_delete (APP_DIR .'/Qero/qero-packages');

@@ -95,10 +101,9 @@ 
             }, $errors));

 

             messageBox ('Обнаружено '. $errorsCount .' ошибок', 'Ошибка компиляции', enum ('System.Windows.Forms.MessageBoxButtons.OK'), enum ('System.Windows.Forms.MessageBoxIcon.Error'));

-        }

-

-        elseif ($printSuccessCompile)

-            messageBox ('Проект успешно скомпилирован', 'Успешная компиляция', enum ('System.Windows.Forms.MessageBoxButtons.OK'), enum ('System.Windows.Forms.MessageBoxIcon.Information'));

+        } elseif ($printSuccessCompile) {
+                    messageBox ('Проект успешно скомпилирован', 'Успешная компиляция', enum ('System.Windows.Forms.MessageBoxButtons.OK'), enum ('System.Windows.Forms.MessageBoxIcon.Information'));
+        }
 

         return $errors;

     }

@@ -116,8 +121,9 @@ 
                 $designer->form->selector :

                 $designer->getComponentByName ($property[0]);

 

-            foreach (array_slice ($property, 1) as $path)

-                $object = VoidEngine::getProperty ($object, $path);

+            foreach (array_slice ($property, 1) as $path) {
+                            $object = VoidEngine::getProperty ($object, $path);
+            }
 

             $code = str_replace (substr ($code, $pos + 2, $end - $pos), 'WinForms_PHP.ZendProgram.getResource ("'. VoidEngine::exportObject ($object) .'")', $code);

         }