winforms-php / VoidStudio

bin/app/system/debug/DebugHook.php

Spacing +31 added lines, -31 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,41 +42,41 @@ 
     }
 };
 
-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;
 
-    $components = crc32 (serialize (Components::$components));
-    Components::cleanJunk ();
+    $components = crc32(serialize(Components::$components));
+    Components::cleanJunk();
 
-    if (crc32 (serialize (Components::$components)) != $components)
-        $debugger::debugOutput ([
+    if (crc32(serialize(Components::$components)) != $components)
+        $debugger::debugOutput([
             'type' => 'beginJunkCatching'
         ], true);
 
-    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'])
         {
@@ -88,15 +88,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
@@ -109,9 +109,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)
@@ -124,7 +124,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)
@@ -137,7 +137,7 @@ 
                     foreach ($request['arguments']['selectors'] as $selector)
                         try
                         {
-                            VoidEngine::callMethod ($selector, 'Dispose');
+                            VoidEngine::callMethod($selector, 'Dispose');
                         }
                         
                         catch (\Throwable $e)
@@ -145,7 +145,7 @@ 
                             continue;
                         }
 
-                    VoidEngine::removeObjects (...$request['arguments']['selectors']);
+                    VoidEngine::removeObjects(...$request['arguments']['selectors']);
                 break;
             }
         }

Braces +25 added lines, -28 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,18 +61,18 @@ 
 {
     $debug = &$GLOBALS['__DEBUG'];
 
-    if (!isset ($debug['last_timestamp']))
-        $debug['last_timestamp'] = 0;
+    if (!isset ($debug['last_timestamp'])) {
+            $debug['last_timestamp'] = 0;
+    }
 
     $components = crc32 (serialize (Components::$components));
     Components::cleanJunk ();
 
-    if (crc32 (serialize (Components::$components)) != $components)
-        $debugger::debugOutput ([
+    if (crc32 (serialize (Components::$components)) != $components) {
+            $debugger::debugOutput ([
             'type' => 'beginJunkCatching'
         ], true);
-
-    elseif (file_exists ('__debug_request'))
+    } elseif (file_exists ('__debug_request'))
     {
         $request = unserialize (file_get_contents ('__debug_request'));
         unlink ('__debug_request');
@@ -87,9 +86,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')) ? 
+                    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)
@@ -105,42 +105,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']);
+                    }
 
                             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)
+                    }
+                        } 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)
+                    }
+                        } catch (\Throwable $e)
                         {
                             continue;
                         }

bin/app/forms/viewPackage.php

Spacing +3 added lines, -3 removed lines

@@ -2,9 +2,9 @@ 
 
 namespace VoidEngine;
 
-$name = basenameNoExt (__FILE__);
+$name = basenameNoExt(__FILE__);
 
-$parser = new VLFParser (__DIR__. '/'. $name .'.vlf', [
+$parser = new VLFParser(__DIR__.'/'.$name.'.vlf', [
     'strong_line_parser'            => false,
     'ignore_postobject_info'        => true,
     'ignore_unexpected_method_args' => true,
@@ -15,4 +15,4 @@ 
 
 // file_put_contents ('SyntaxTree__'. $name .'.json', json_encode ($parser->tree, JSON_PRETTY_PRINT));
 
-VoidStudioAPI::addObjects ($name, VLFInterpreter::run ($parser));
+VoidStudioAPI::addObjects($name, VLFInterpreter::run($parser));

bin/app/forms/modules.php

Indentation +10 added lines, -10 removed lines

@@ -7,23 +7,23 @@
     $source  = VoidStudioAPI::getObjects ('addPackage')['Package__Source'];
     $version = VoidStudioAPI::getObjects ('addPackage')['Package__Version'];
 
-	$source = $source->selectedItem != 'github' ?
+    $source = $source->selectedItem != 'github' ?
         $source->selectedItem .':' : '';
 	
-	$version = $version->text != 'latest' && $version->text ?
-		'@'. $version->text : '';
+    $version = $version->text != 'latest' && $version->text ?
+        '@'. $version->text : '';
 	
     VoidStudioAPI::getObjects ('addPackage')['Package__Path']->caption = ($package = $source . VoidStudioAPI::getObjects ('addPackage')['Package__Author']->text .'/'. VoidStudioAPI::getObjects ('addPackage')['Package__Name']->text) . $version;
 
-	VoidStudioAPI::getObjects ('addPackage')['Package__Add']->enabled = true;
+    VoidStudioAPI::getObjects ('addPackage')['Package__Add']->enabled = true;
 	
-	foreach (VoidStudioAPI::getObjects ('modules')['ModulesList__QeroPackages']->items->list as $line)
-		if ((($pos = strrpos ($line, '@')) !== false && substr ($line, 0, $pos) == $package) || ($pos === false && $line == $package))
-		{
-			VoidStudioAPI::getObjects ('addPackage')['Package__Add']->enabled = false;
+    foreach (VoidStudioAPI::getObjects ('modules')['ModulesList__QeroPackages']->items->list as $line)
+        if ((($pos = strrpos ($line, '@')) !== false && substr ($line, 0, $pos) == $package) || ($pos === false && $line == $package))
+        {
+            VoidStudioAPI::getObjects ('addPackage')['Package__Add']->enabled = false;
 
-			break;
-		}
+            break;
+        }
 }
 
 function packages__update ()

Spacing +21 added lines, -21 removed lines

@@ -2,57 +2,57 @@ 
 
 namespace VoidEngine;
 
-function packages__updateCaption ()
+function packages__updateCaption()
 {
-    $source  = VoidStudioAPI::getObjects ('addPackage')['Package__Source'];
-    $version = VoidStudioAPI::getObjects ('addPackage')['Package__Version'];
+    $source  = VoidStudioAPI::getObjects('addPackage')['Package__Source'];
+    $version = VoidStudioAPI::getObjects('addPackage')['Package__Version'];
 
 	$source = $source->selectedItem != 'github' ?
-        $source->selectedItem .':' : '';
+        $source->selectedItem.':' : '';
 	
 	$version = $version->text != 'latest' && $version->text ?
-		'@'. $version->text : '';
+		'@'.$version->text : '';
 	
-    VoidStudioAPI::getObjects ('addPackage')['Package__Path']->caption = ($package = $source . VoidStudioAPI::getObjects ('addPackage')['Package__Author']->text .'/'. VoidStudioAPI::getObjects ('addPackage')['Package__Name']->text) . $version;
+    VoidStudioAPI::getObjects('addPackage')['Package__Path']->caption = ($package = $source.VoidStudioAPI::getObjects('addPackage')['Package__Author']->text.'/'.VoidStudioAPI::getObjects('addPackage')['Package__Name']->text).$version;
 
-	VoidStudioAPI::getObjects ('addPackage')['Package__Add']->enabled = true;
+	VoidStudioAPI::getObjects('addPackage')['Package__Add']->enabled = true;
 	
-	foreach (VoidStudioAPI::getObjects ('modules')['ModulesList__QeroPackages']->items->list as $line)
-		if ((($pos = strrpos ($line, '@')) !== false && substr ($line, 0, $pos) == $package) || ($pos === false && $line == $package))
+	foreach (VoidStudioAPI::getObjects('modules')['ModulesList__QeroPackages']->items->list as $line)
+		if ((($pos = strrpos($line, '@')) !== false && substr($line, 0, $pos) == $package) || ($pos === false && $line == $package))
 		{
-			VoidStudioAPI::getObjects ('addPackage')['Package__Add']->enabled = false;
+			VoidStudioAPI::getObjects('addPackage')['Package__Add']->enabled = false;
 
 			break;
 		}
 }
 
-function packages__update ()
+function packages__update()
 {
     global $controller;
 
-    $controller->manager->updateManager ();
+    $controller->manager->updateManager();
 
-    $modulesList = VoidStudioAPI::getObjects ('modules')['ModulesList'];
-    $modulesList->items->clear ();
+    $modulesList = VoidStudioAPI::getObjects('modules')['ModulesList'];
+    $modulesList->items->clear();
 
     $imageList = new ImageList;
-    $qeroGroup = VoidStudioAPI::getObjects ('modules')['ModulesListGroup__QeroPackage'];
+    $qeroGroup = VoidStudioAPI::getObjects('modules')['ModulesListGroup__QeroPackage'];
     $index = 0;
 
     foreach ($controller->manager->packages as $package)
     {
-        $item = new ListViewItem ('  '. $package->name);
+        $item = new ListViewItem('  '.$package->name);
         $item->group      = $qeroGroup;
         $item->imageIndex = $index++;
 
-        $imageList->images->add ((new Image)->loadFromFile (APP_DIR .'/components/icons/Library_16x.png'));
-        $modulesList->items->add ($item);
+        $imageList->images->add((new Image)->loadFromFile(APP_DIR.'/components/icons/Library_16x.png'));
+        $modulesList->items->add($item);
     }
 } 
 
-$name = basenameNoExt (__FILE__);
+$name = basenameNoExt(__FILE__);
 
-$parser = new VLFParser (__DIR__. '/'. $name .'.vlf', [
+$parser = new VLFParser(__DIR__.'/'.$name.'.vlf', [
     'strong_line_parser'            => false,
     'ignore_postobject_info'        => true,
     'ignore_unexpected_method_args' => true,
@@ -63,4 +63,4 @@ 
 
 // file_put_contents ('SyntaxTree__'. $name .'.json', json_encode ($parser->tree, JSON_PRETTY_PRINT));
 
-VoidStudioAPI::addObjects ($name, VLFInterpreter::run ($parser));
+VoidStudioAPI::addObjects($name, VLFInterpreter::run($parser));

Braces +3 added lines, -2 removed lines

@@ -17,10 +17,11 @@
 
 	VoidStudioAPI::getObjects ('addPackage')['Package__Add']->enabled = true;
 	
-	foreach (VoidStudioAPI::getObjects ('modules')['ModulesList__QeroPackages']->items->list as $line)
-		if ((($pos = strrpos ($line, '@')) !== false && substr ($line, 0, $pos) == $package) || ($pos === false && $line == $package))
+	foreach (VoidStudioAPI::getObjects ('modules')['ModulesList__QeroPackages']->items->list as $line) {
+			if ((($pos = strrpos ($line, '@')) !== false && substr ($line, 0, $pos) == $package) || ($pos === false && $line == $package))
 		{
 			VoidStudioAPI::getObjects ('addPackage')['Package__Add']->enabled = false;
+	}
 
 			break;
 		}

bin/app/forms/main.php

Spacing +21 added lines, -21 removed lines

@@ -2,9 +2,9 @@ 
 
 namespace VoidEngine;
 
-$name = basenameNoExt (__FILE__);
+$name = basenameNoExt(__FILE__);
 
-$parser = new VLFParser (__DIR__. '/'. $name .'.vlf', [
+$parser = new VLFParser(__DIR__.'/'.$name.'.vlf', [
     'strong_line_parser'            => false,
     'ignore_postobject_info'        => true,
     'ignore_unexpected_method_args' => true,
@@ -15,52 +15,52 @@ 
 
 // file_put_contents ('SyntaxTree__'. $name .'.json', json_encode ($parser->tree, JSON_PRETTY_PRINT));
 
-VoidStudioAPI::addObjects ($name, VLFInterpreter::run ($parser));
+VoidStudioAPI::addObjects($name, VLFInterpreter::run($parser));
 
-$componentsList = VoidStudioAPI::getObjects ('main')['ComponentsList'];
+$componentsList = VoidStudioAPI::getObjects('main')['ComponentsList'];
 $imageList      = new ImageList;
-$components     = json_decode (file_get_contents ('components/components.json'), true);
+$components     = json_decode(file_get_contents('components/components.json'), true);
 $index          = 0;
 
-$controlGroup = new ListViewGroup ('Управление');
-$componentsList->groups->add ($controlGroup);
+$controlGroup = new ListViewGroup('Управление');
+$componentsList->groups->add($controlGroup);
 
 foreach ($components as $groupName => $comps)
 {
     if ($groupName[0] != '-')
     {
-        $group = new ListViewGroup ($groupName);
-        $componentsList->groups->add ($group);
+        $group = new ListViewGroup($groupName);
+        $componentsList->groups->add($group);
 
         foreach ($comps as $component)
         {
-            $item = new ListViewItem ('  '. $component);
+            $item = new ListViewItem('  '.$component);
             $item->group      = $group;
             $item->imageIndex = $index++;
 
-            $path = APP_DIR .'/components/icons/'. $component .'_16x.png';
+            $path = APP_DIR.'/components/icons/'.$component.'_16x.png';
 
-            if (!file_exists ($path))
-                $path = APP_DIR .'/components/icons/Unknown_16x.png';
+            if (!file_exists($path))
+                $path = APP_DIR.'/components/icons/Unknown_16x.png';
 
-            $imageList->images->add ((new Image)->loadFromFile ($path));
-            $componentsList->items->add ($item);
+            $imageList->images->add((new Image)->loadFromFile($path));
+            $componentsList->items->add($item);
         }
     }
 
     else
     {
-        $item = new ListViewItem ('  '. $comps);
+        $item = new ListViewItem('  '.$comps);
         $item->group      = $controlGroup;
         $item->imageIndex = $index++;
 
-        $path = APP_DIR .'/components/icons/'. substr ($groupName, 1) .'_16x.png';
+        $path = APP_DIR.'/components/icons/'.substr($groupName, 1).'_16x.png';
 
-        if (!file_exists ($path))
-            $path = APP_DIR .'/components/icons/Unknown_16x.png';
+        if (!file_exists($path))
+            $path = APP_DIR.'/components/icons/Unknown_16x.png';
 
-        $imageList->images->add ((new Image)->loadFromFile ($path));
-        $componentsList->items->add ($item);
+        $imageList->images->add((new Image)->loadFromFile($path));
+        $componentsList->items->add($item);
     }
 }
 

Braces +7 added lines, -7 removed lines

@@ -40,15 +40,14 @@ 
 
             $path = APP_DIR .'/components/icons/'. $component .'_16x.png';
 
-            if (!file_exists ($path))
-                $path = APP_DIR .'/components/icons/Unknown_16x.png';
+            if (!file_exists ($path)) {
+                            $path = APP_DIR .'/components/icons/Unknown_16x.png';
+            }
 
             $imageList->images->add ((new Image)->loadFromFile ($path));
             $componentsList->items->add ($item);
         }
-    }
-
-    else
+    } else
     {
         $item = new ListViewItem ('  '. $comps);
         $item->group      = $controlGroup;
@@ -56,8 +55,9 @@ 
 
         $path = APP_DIR .'/components/icons/'. substr ($groupName, 1) .'_16x.png';
 
-        if (!file_exists ($path))
-            $path = APP_DIR .'/components/icons/Unknown_16x.png';
+        if (!file_exists ($path)) {
+                    $path = APP_DIR .'/components/icons/Unknown_16x.png';
+        }
 
         $imageList->images->add ((new Image)->loadFromFile ($path));
         $componentsList->items->add ($item);

bin/app/php/Designer.php

Indentation +4 added lines, -4 removed lines

@@ -56,9 +56,9 @@ 
             $this->eventsList->selectedObject   = $object;
             $this->currentSelectedItem->selectedItem = $this->getComponentName ($object);
 
-			if (isset (VoidStudioAPI::$events[$object]))
-				foreach (VoidStudioAPI::$events[$object] as $eventName => $code)
-					$this->eventsList->getEventByName ($eventName)->value = '(добавлено)';
+            if (isset (VoidStudioAPI::$events[$object]))
+                foreach (VoidStudioAPI::$events[$object] as $eventName => $code)
+                    $this->eventsList->getEventByName ($eventName)->value = '(добавлено)';
 
             $this->eventsList->refresh ();
         };
@@ -68,7 +68,7 @@ 
     {
         $this->componentAddedEvent = function ($self, $args)
         {
-			if (isset ($GLOBALS['new_component']))
+            if (isset ($GLOBALS['new_component']))
             {
                 $this->setComponentToHistory ($GLOBALS['new_component'][1], $GLOBALS['new_component'][0]);
                 $components = VoidStudioAPI::getObjects ('main')['PropertiesPanel__SelectedComponent'];

Spacing +89 added lines, -90 removed lines

@@ -13,21 +13,20 @@ 
     protected $currentSelectedItem;
     protected $formsList;
 
-    public function __construct (Component $parent, string $formName = 'form', PropertyGrid $propertyGrid, EventGrid $eventsList, ComboBox $currentSelectedItem, TabControl $formsList, $form = null)
+    public function __construct(Component $parent, string $formName = 'form', PropertyGrid $propertyGrid, EventGrid $eventsList, 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->eventsList          = $eventsList;
         $this->currentSelectedItem = $currentSelectedItem;
         $this->formsList           = $formsList;
 
-        $this->selector = VoidEngine::createObject ('WinForms_PHP.FormDesigner4', null, $this->form->selector, $formName);
-        Components::addComponent ($this->selector, $this);
+        $this->selector = VoidEngine::createObject('WinForms_PHP.FormDesigner4', null, $this->form->selector, $formName);
+        Components::addComponent($this->selector, $this);
 
         $this->form->name = $formName;
 
@@ -37,181 +36,181 @@ 
             $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);
 
-        Events::setObjectEvent ($this->control, 'KeyDown', function ($self, $args)
+        Events::setObjectEvent($this->control, 'KeyDown', function($self, $args)
         {
             if ($args->keycode == 46)
-                $this->removeSelected ();
+                $this->removeSelected();
         });
 
-        $this->selectionChangedEvent = function ()
+        $this->selectionChangedEvent = function()
         {
-            $object = $this->getSelectedComponents ()[0]->selector;
+            $object = $this->getSelectedComponents()[0]->selector;
             
             $this->propertyGrid->selectedObject = $object;
             $this->eventsList->selectedObject   = $object;
-            $this->currentSelectedItem->selectedItem = $this->getComponentName ($object);
+            $this->currentSelectedItem->selectedItem = $this->getComponentName($object);
 
 			if (isset (VoidStudioAPI::$events[$object]))
 				foreach (VoidStudioAPI::$events[$object] as $eventName => $code)
-					$this->eventsList->getEventByName ($eventName)->value = '(добавлено)';
+					$this->eventsList->getEventByName($eventName)->value = '(добавлено)';
 
-            $this->eventsList->refresh ();
+            $this->eventsList->refresh();
         };
     }
 
-    public function initDesigner (): void
+    public function initDesigner(): void
     {
-        $this->componentAddedEvent = function ($self, $args)
+        $this->componentAddedEvent = function($self, $args)
         {
 			if (isset ($GLOBALS['new_component']))
             {
-                $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->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->clickEvent = function () use ($self)
+            $delItem = new ToolStripMenuItem('Удалить');
+            $delItem->image = (new Image)->loadFromFile(APP_DIR.'/system/icons/Delete_16x.png');
+            $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->clickEvent = function () use ($self)
+            $toFrontItem = new ToolStripMenuItem('На передний план');
+            $toFrontItem->image = (new Image)->loadFromFile(APP_DIR.'/system/icons/Front_16x.png');
+            $toFrontItem->clickEvent = function() use ($self)
             {
-                $self->bringToFrontSelected ();
+                $self->bringToFrontSelected();
             };
 
-            $toBackItem = new ToolStripMenuItem ('На задний план');
-            $toBackItem->image = (new Image)->loadFromFile (APP_DIR .'/system/icons/Back_16x.png');
-            $toBackItem->clickEvent = function () use ($self)
+            $toBackItem = new ToolStripMenuItem('На задний план');
+            $toBackItem->image = (new Image)->loadFromFile(APP_DIR.'/system/icons/Back_16x.png');
+            $toBackItem->clickEvent = function() use ($self)
             {
-                $self->sendToBackSelected ();
+                $self->sendToBackSelected();
             };
 
-            $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 ($value->getType ()->toString () == 'System.Windows.Forms.Form')
                     // if ($value->getType ()->isSubclassOf (VoidEngine::objectType ('System.Windows.Forms.Form', 'System.Windows.Forms')))
-                        pre ($self->getSharpCode ($self->form->name));
+                        pre($self->getSharpCode($self->form->name));
                 });
             };
 
             $menu = new ContextMenuStrip;
-            $menu->items->addRange ([
+            $menu->items->addRange([
                 $delItem, '-',
                 $toFrontItem, $toBackItem, '-',
                 $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;
                     }
@@ -219,7 +218,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;
                 }
@@ -229,52 +228,52 @@ 
         foreach ($toUnset as $name)
             unset ($this->objects[$name]);
 
-        $this->callMethod ('DeleteSelected');
+        $this->callMethod('DeleteSelected');
 
         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->items->clear();
+        $this->currentSelectedItem->items->addRange(array_keys($this->objects));
         $this->currentSelectedItem->selectedItem = $this->form->name;
     }
 
-    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 +25 added lines, -21 removed lines

@@ -18,8 +18,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->eventsList          = $eventsList;
@@ -44,8 +45,9 @@ 
 
         Events::setObjectEvent ($this->control, 'KeyDown', function ($self, $args)
         {
-            if ($args->keycode == 46)
-                $this->removeSelected ();
+            if ($args->keycode == 46) {
+                            $this->removeSelected ();
+            }
         });
 
         $this->selectionChangedEvent = function ()
@@ -56,9 +58,10 @@ 
             $this->eventsList->selectedObject   = $object;
             $this->currentSelectedItem->selectedItem = $this->getComponentName ($object);
 
-			if (isset (VoidStudioAPI::$events[$object]))
-				foreach (VoidStudioAPI::$events[$object] as $eventName => $code)
+			if (isset (VoidStudioAPI::$events[$object])) {
+							foreach (VoidStudioAPI::$events[$object] as $eventName => $code)
 					$this->eventsList->getEventByName ($eventName)->value = '(добавлено)';
+			}
 
             $this->eventsList->refresh ();
         };
@@ -188,17 +191,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)]]);
 
@@ -215,9 +218,7 @@ 
 
                         return;
                     }
-                }
-
-                else
+                } else
                 {
                     messageBox ('Нельзя удалить единственную форму проекта', 'Ошибка удаления', enum ('System.Windows.Forms.MessageBoxButtons.OK'), enum ('System.Windows.Forms.MessageBoxIcon.Error'));
 
@@ -226,14 +227,16 @@ 
             }
         }
 
-        foreach ($toUnset as $name)
-            unset ($this->objects[$name]);
+        foreach ($toUnset as $name) {
+                    unset ($this->objects[$name]);
+        }
 
         $this->callMethod ('DeleteSelected');
 
-        foreach ($this->objects as $objectName => $object)
-            if (!is_int ($this->getComponentByName ($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));
@@ -242,8 +245,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 +48 added lines, -48 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,105 +43,105 @@ 
             '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] = (string) VoidStudioBuilder::appendDesignerData ($designer->getSharpCode ($item, true), $designer);
-            $info['objects'][$item] = array_keys ($designer->objects);
+            $info['forms'][$item] = (string) VoidStudioBuilder::appendDesignerData($designer->getSharpCode($item, true), $designer);
+            $info['objects'][$item] = array_keys($designer->objects);
 
             foreach ($designer->objects as $name => $objectType)
-                if (isset (Components::$events[$designer->getComponentByName ($name)]) && sizeof (Components::$events[$designer->getComponentByName ($name)]) > 0)
-                    $info['events'][$item][$name] = Components::$events[$designer->getComponentByName ($name)];
+                if (isset (Components::$events[$designer->getComponentByName($name)]) && sizeof(Components::$events[$designer->getComponentByName($name)]) > 0)
+                    $info['events'][$item][$name] = Components::$events[$designer->getComponentByName($name)];
         }
 
-        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');
 
         $objects['PropertiesList__List']->selectedObject = null;
-        $objects['Designer__FormsList']->items->foreach (function ($value)
+        $objects['Designer__FormsList']->items->foreach(function($value)
         {
             try
             {
-                $designer = VoidStudioAPI::$objects['main']['Designer__'. $value->text .'Designer'];
+                $designer = VoidStudioAPI::$objects['main']['Designer__'.$value->text.'Designer'];
 
-                $designer->form->dispose ();
-                $designer->control->dispose ();
+                $designer->form->dispose();
+                $designer->control->dispose();
 
-                unset ($designer, VoidStudioAPI::$objects['main']['Designer__'. $value->text .'Designer']);
+                unset ($designer, VoidStudioAPI::$objects['main']['Designer__'.$value->text.'Designer']);
             }
 
             catch (\Throwable $e) {}
         });
 
-        $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;
 
-            $designer = new VoidDesigner ($page, $formName, $objects['PropertiesList__List'], $objects['EventsList__ActiveEvents'], $objects['PropertiesPanel__SelectedComponent'], $objects['Designer__FormsList'], $sourceForm);
-            $designer->initDesigner ();
+            $designer = new VoidDesigner($page, $formName, $objects['PropertiesList__List'], $objects['EventsList__ActiveEvents'], $objects['PropertiesPanel__SelectedComponent'], $objects['Designer__FormsList'], $sourceForm);
+            $designer->initDesigner();
 
             foreach ($form as $name => $selector)
             {
-                $designer->addComponent ($selector, $name);
+                $designer->addComponent($selector, $name);
 
                 if (isset ($info['events'][$formName][$name]))
                     foreach ($info['events'][$formName][$name] as $eventName => $event)
                     {
-                        Events::reserveObjectEvent ($selector, $eventName);
-                        VoidEngine::setObjectEvent ($selector, $eventName, $event);
+                        Events::reserveObjectEvent($selector, $eventName);
+                        VoidEngine::setObjectEvent($selector, $eventName, $event);
                     }
             }
 
             if (isset ($info['events'][$formName][$formName]))
                 foreach ($info['events'][$formName][$formName] as $eventName => $event)
                 {
-                    Events::reserveObjectEvent ($designer->form->selector, $eventName);
-                    VoidEngine::setObjectEvent ($designer->form->selector, $eventName, $event);
+                    Events::reserveObjectEvent($designer->form->selector, $eventName);
+                    VoidEngine::setObjectEvent($designer->form->selector, $eventName, $event);
                 }
 
-            $objects['Designer__FormsList']->items->add ($page);
+            $objects['Designer__FormsList']->items->add($page);
         }
 
         // 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 +26 added lines, -21 removed lines

@@ -8,19 +8,21 @@ 
 
     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;
+            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';
@@ -50,15 +52,17 @@ 
             $info['forms'][$item] = (string) VoidStudioBuilder::appendDesignerData ($designer->getSharpCode ($item, true), $designer);
             $info['objects'][$item] = array_keys ($designer->objects);
 
-            foreach ($designer->objects as $name => $objectType)
-                if (isset (Components::$events[$designer->getComponentByName ($name)]) && sizeof (Components::$events[$designer->getComponentByName ($name)]) > 0)
+            foreach ($designer->objects as $name => $objectType) {
+                            if (isset (Components::$events[$designer->getComponentByName ($name)]) && sizeof (Components::$events[$designer->getComponentByName ($name)]) > 0)
                     $info['events'][$item][$name] = Components::$events[$designer->getComponentByName ($name)];
+            }
         }
 
         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 ('Проект успешно сохранён');
     }
@@ -83,9 +87,7 @@ 
                 $designer->control->dispose ();
 
                 unset ($designer, VoidStudioAPI::$objects['main']['Designer__'. $value->text .'Designer']);
-            }
-
-            catch (\Throwable $e) {}
+            } catch (\Throwable $e) {}
         });
 
         $objects['Designer__FormsList']->items->clear ();
@@ -99,9 +101,10 @@ 
 
             $formObjects = array_flip ($info['objects'][$formName]);
 
-            foreach ($form as $name => $selector)
-                if (!isset ($formObjects[$name]))
+            foreach ($form as $name => $selector) {
+                            if (!isset ($formObjects[$name]))
                     unset ($form[$name]);
+            }
 
             $page = new TabPage ($formName);
             $page->backgroundColor = clWhite;
@@ -113,18 +116,20 @@ 
             {
                 $designer->addComponent ($selector, $name);
 
-                if (isset ($info['events'][$formName][$name]))
-                    foreach ($info['events'][$formName][$name] as $eventName => $event)
+                if (isset ($info['events'][$formName][$name])) {
+                                    foreach ($info['events'][$formName][$name] as $eventName => $event)
                     {
                         Events::reserveObjectEvent ($selector, $eventName);
+                }
                         VoidEngine::setObjectEvent ($selector, $eventName, $event);
                     }
             }
 
-            if (isset ($info['events'][$formName][$formName]))
-                foreach ($info['events'][$formName][$formName] as $eventName => $event)
+            if (isset ($info['events'][$formName][$formName])) {
+                            foreach ($info['events'][$formName][$formName] as $eventName => $event)
                 {
                     Events::reserveObjectEvent ($designer->form->selector, $eventName);
+            }
                     VoidEngine::setObjectEvent ($designer->form->selector, $eventName, $event);
                 }
 

bin/app/php/Debugger.php

Spacing +16 added lines, -16 removed lines

@@ -7,44 +7,44 @@
     public WFObject $process;
     protected int $lastTimestamp = 0;
 
-    public function __construct (WFObject $process)
+    public function __construct(WFObject $process)
     {
-        if ($process->getType ()->toString () == 'System.Diagnostics.Process')
+        if ($process->getType()->toString() == 'System.Diagnostics.Process')
             $this->process = $process;
 
-        else throw new \Exception ('$process argument must be an "Process" object');
+        else throw new \Exception('$process argument must be an "Process" object');
     }
 
-    public function dump (string $savePath, string $properties = '', bool $waitForExit = true)
+    public function dump(string $savePath, string $properties = '', bool $waitForExit = true)
     {
-        $process = run ('"'. APP_DIR .'/system/procdump/procdump.exe"', $properties .' '. $this->process->id .' "'. filepathNoExt ($savePath) .'"');
+        $process = run('"'.APP_DIR.'/system/procdump/procdump.exe"', $properties.' '.$this->process->id.' "'.filepathNoExt($savePath).'"');
 
         if ($waitForExit)
             while (!$process->hasExited)
-                usleep (200);
+                usleep(200);
     }
 
-    public function debugRequest (string $command, array $arguments = [])
+    public function debugRequest(string $command, array $arguments = [])
     {
-        file_put_contents (VoidStudioProjectManager::$projectPath .'/build/__debug_request', serialize ([
-            'timestamp' => time (),
+        file_put_contents(VoidStudioProjectManager::$projectPath.'/build/__debug_request', serialize([
+            'timestamp' => time(),
             'command'   => $command,
             'arguments' => $arguments
         ]));
     }
 
-    public function readDebugAnswer (bool $wait = false)
+    public function readDebugAnswer(bool $wait = false)
     {
-        $file = VoidStudioProjectManager::$projectPath .'/build/__debug_answer';
+        $file = VoidStudioProjectManager::$projectPath.'/build/__debug_answer';
 
         if ($wait)
-            while (!file_exists ($file))
-                usleep (100);
+            while (!file_exists($file))
+                usleep(100);
 
-        if (file_exists ($file))
+        if (file_exists($file))
         {
-            $answer = unserialize (file_get_contents ($file));
-            unlink ($file);
+            $answer = unserialize(file_get_contents($file));
+            unlink($file);
 
             if ($answer['timestamp'] > $this->lastTimestamp)
             {

Braces +11 added lines, -8 removed lines

@@ -9,19 +9,21 @@ 
 
     public function __construct (WFObject $process)
     {
-        if ($process->getType ()->toString () == 'System.Diagnostics.Process')
-            $this->process = $process;
-
-        else throw new \Exception ('$process argument must be an "Process" object');
+        if ($process->getType ()->toString () == 'System.Diagnostics.Process') {
+                    $this->process = $process;
+        } else {
+            throw new \Exception ('$process argument must be an "Process" object');
+        }
     }
 
     public function dump (string $savePath, string $properties = '', bool $waitForExit = true)
     {
         $process = run ('"'. APP_DIR .'/system/procdump/procdump.exe"', $properties .' '. $this->process->id .' "'. filepathNoExt ($savePath) .'"');
 
-        if ($waitForExit)
-            while (!$process->hasExited)
+        if ($waitForExit) {
+                    while (!$process->hasExited)
                 usleep (200);
+        }
     }
 
     public function debugRequest (string $command, array $arguments = [])
@@ -37,9 +39,10 @@ 
     {
         $file = VoidStudioProjectManager::$projectPath .'/build/__debug_answer';
 
-        if ($wait)
-            while (!file_exists ($file))
+        if ($wait) {
+                    while (!file_exists ($file))
                 usleep (100);
+        }
 
         if (file_exists ($file))
         {

bin/app/php/VoidStudio API.php

Spacing +15 added lines, -16 removed lines

@@ -8,58 +8,57 @@
     public static array $events  = [];
     public static $project;
 
-    public static function addObjects (string $group, array $objects)
+    public static function addObjects(string $group, array $objects)
     {
-        self::$objects[$group] = array_merge
-        (
+        self::$objects[$group] = array_merge(
             self::$objects[$group] ?? [],
             $objects
         );
     }
 
-    public static function getObjects (string $group)
+    public static function getObjects(string $group)
     {
         return isset (self::$objects[$group]) ?
             self::$objects[$group] : false;
     }
 
-    public static function openEventEditor (int $component, string $event, VoidDesigner $designer = null)
+    public static function openEventEditor(int $component, string $event, VoidDesigner $designer = null)
     {
-        $objects = self::getObjects ('editor');
+        $objects = self::getObjects('editor');
         $form    = $objects['MainForm'];
         $editor  = $objects['Editor'];
 
         $editor->helpStorage = [$component, $event];
         $editor->text = self::$events[$component][$event] ?? '';
 
-        $form->caption = 'Событие "'. $event .'", объект "'. ($designer === null ? VoidEngine::getProperty ($component, 'Name') : $designer->getComponentName ($component)) .'"';
+        $form->caption = 'Событие "'.$event.'", объект "'.($designer === null ? VoidEngine::getProperty($component, 'Name') : $designer->getComponentName($component)).'"';
 
-        $form->showDialog ();
+        $form->showDialog();
     }
 
-    public static function stopProject ()
+    public static function stopProject()
     {
         if (self::$project instanceof WFObject && !self::$project->hasExited)
         {
-            self::$project->kill ();
-            self::$project->waitForExit ();
+            self::$project->kill();
+            self::$project->waitForExit();
         }
     }
 
-    public static function startProject (TabControl $formsList, bool $debug = true): ?WFObject
+    public static function startProject(TabControl $formsList, bool $debug = true): ?WFObject
     {
-        self::stopProject ();
+        self::stopProject();
 
         try
         {
-            VoidStudioBuilder::compileProject (VoidStudioProjectManager::$projectPath .'/build.exe', $formsList->items[0]->text, VoidStudioBuilder::getReferences (ENGINE_DIR .'/VoidEngine.php'), [], false, $debug);
+            VoidStudioBuilder::compileProject(VoidStudioProjectManager::$projectPath.'/build.exe', $formsList->items[0]->text, VoidStudioBuilder::getReferences(ENGINE_DIR.'/VoidEngine.php'), [], false, $debug);
 
-            self::$project = run (VoidStudioProjectManager::$projectPath .'/build/build.exe');
+            self::$project = run(VoidStudioProjectManager::$projectPath.'/build/build.exe');
         }
 
         catch (\Throwable $e)
         {
-            messageBox ('Нельзя сохранить проект или произошла ошибка компиляции' ."\n\nПодробнее:\n\n". print_r ($e, true), 'Ошибка запуска проекта', enum ('System.Windows.Forms.MessageBoxButtons.OK'), enum ('System.Windows.Forms.MessageBoxIcon.Error'));
+            messageBox('Нельзя сохранить проект или произошла ошибка компиляции'."\n\nПодробнее:\n\n".print_r($e, true), 'Ошибка запуска проекта', enum('System.Windows.Forms.MessageBoxButtons.OK'), enum('System.Windows.Forms.MessageBoxIcon.Error'));
 
             return null;
         }

Braces +1 added lines, -3 removed lines

@@ -55,9 +55,7 @@
             VoidStudioBuilder::compileProject (VoidStudioProjectManager::$projectPath .'/build.exe', $formsList->items[0]->text, VoidStudioBuilder::getReferences (ENGINE_DIR .'/VoidEngine.php'), [], false, $debug);
 
             self::$project = run (VoidStudioProjectManager::$projectPath .'/build/build.exe');
-        }
-
-        catch (\Throwable $e)
+        } catch (\Throwable $e)
         {
             messageBox ('Нельзя сохранить проект или произошла ошибка компиляции' ."\n\nПодробнее:\n\n". print_r ($e, true), 'Ошибка запуска проекта', enum ('System.Windows.Forms.MessageBoxButtons.OK'), enum ('System.Windows.Forms.MessageBoxIcon.Error'));
 

bin/app/forms/about.php

Spacing +3 added lines, -3 removed lines

@@ -2,9 +2,9 @@ 
 
 namespace VoidEngine;
 
-$name = basenameNoExt (__FILE__);
+$name = basenameNoExt(__FILE__);
 
-$parser = new VLFParser (__DIR__. '/'. $name .'.vlf', [
+$parser = new VLFParser(__DIR__.'/'.$name.'.vlf', [
     'strong_line_parser'            => false,
     'ignore_postobject_info'        => true,
     'ignore_unexpected_method_args' => true,
@@ -15,4 +15,4 @@ 
 
 // file_put_contents ('SyntaxTree__'. $name .'.json', json_encode ($parser->tree, JSON_PRETTY_PRINT));
 
-VoidStudioAPI::addObjects ($name, VLFInterpreter::run ($parser));
+VoidStudioAPI::addObjects($name, VLFInterpreter::run($parser));