winforms-php / VoidFramework

after_install.php

Indentation +1 added lines, -1 removed lines

@@ -40,4 +40,4 @@
 unlink (__FILE__);
 
 echo '    Configuration completed'. PHP_EOL .
-     '    Thank for installing KRypt0nn/VoidFramework!'. PHP_EOL . PHP_EOL;
+        '    Thank for installing KRypt0nn/VoidFramework!'. PHP_EOL . PHP_EOL;

Spacing +22 added lines, -22 removed lines

@@ -1,43 +1,43 @@
 <?php
 
-echo '    Configuring VoidFramework...'. PHP_EOL;
+echo '    Configuring VoidFramework...'.PHP_EOL;
 
-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;
 }
 
-$info = file_exists (QERO_DIR .'/qero-info.json') ?
-    json_decode (file_get_contents (QERO_DIR .'/qero-info.json'), true) : array ();
+$info = file_exists(QERO_DIR.'/qero-info.json') ?
+    json_decode (file_get_contents(QERO_DIR.'/qero-info.json'), true) : array();
 
-$info['scripts']['start'] = '"qero-packages'. str_replace (dirname (__DIR__, 3), '', __DIR__) .'/core/VoidCore.exe" "app/start.php"';
+$info['scripts']['start'] = '"qero-packages'.str_replace(dirname(__DIR__, 3), '', __DIR__).'/core/VoidCore.exe" "app/start.php"';
 
-file_put_contents (QERO_DIR .'/qero-info.json', json_encode ($info, defined ('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : 0));
-file_put_contents (QERO_DIR .'/start.bat', '@echo off
+file_put_contents(QERO_DIR.'/qero-info.json', json_encode($info, defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : 0));
+file_put_contents(QERO_DIR.'/start.bat', '@echo off
 '. $info['scripts']['start']);
 
-if (!is_dir (QERO_DIR .'/app'))
+if (!is_dir(QERO_DIR.'/app'))
 {
-    echo '    Configuring application...'. PHP_EOL;
+    echo '    Configuring application...'.PHP_EOL;
 
-    mkdir (QERO_DIR .'/app');
-    dir_copy (__DIR__ .'/app_bundle', QERO_DIR .'/app');
+    mkdir(QERO_DIR.'/app');
+    dir_copy(__DIR__.'/app_bundle', QERO_DIR.'/app');
 }
 
-Qero\dir_delete (__DIR__ .'/app_bundle');
-unlink (__FILE__);
+Qero\dir_delete(__DIR__.'/app_bundle');
+unlink(__FILE__);
 
-echo '    Configuration completed'. PHP_EOL .
-     '    Thank for installing KRypt0nn/VoidFramework!'. PHP_EOL . PHP_EOL;
+echo '    Configuration completed'.PHP_EOL.
+     '    Thank for installing KRypt0nn/VoidFramework!'.PHP_EOL.PHP_EOL;

Braces +12 added lines, -7 removed lines

@@ -4,17 +4,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;
 }

app_bundle/start.php

Indentation +3 added lines, -3 removed lines

@@ -8,12 +8,12 @@
 $package = json_decode (@file_get_contents (dirname (__DIR__) .'/qero-packages/packages.json'), true);
 
 define ('VoidEngine\CORE_DIR', isset ($package['github:KRypt0nn/VoidFramework']['basefolder']) ?
-	dirname (__DIR__) .'/qero-packages/KRypt0nn/VoidFramework/'. $package['github:KRypt0nn/VoidFramework']['basefolder'] .'/core' : __DIR__);
+    dirname (__DIR__) .'/qero-packages/KRypt0nn/VoidFramework/'. $package['github:KRypt0nn/VoidFramework']['basefolder'] .'/core' : __DIR__);
 
 # Подгружаем PHP расширения
 foreach (glob (CORE_DIR .'/ext/php_*.dll') as $ext)
-	if (!extension_loaded ($ext = substr (basename ($ext), 4, -4)))
-		dl ($ext);
+    if (!extension_loaded ($ext = substr (basename ($ext), 4, -4)))
+        dl ($ext);
 
 # Подгружаем Qero-пакеты
 require __DIR__ .'/../qero-packages/autoload.php';

Spacing +12 added lines, -12 removed lines

@@ -3,25 +3,25 @@ 
 namespace VoidEngine;
 
 # Объявление констант
-const APP_DIR  = __DIR__;
+const APP_DIR = __DIR__;
 
-$package = json_decode (@file_get_contents (dirname (__DIR__) .'/qero-packages/packages.json'), true);
+$package = json_decode(@file_get_contents(dirname(__DIR__).'/qero-packages/packages.json'), true);
 
-define ('VoidEngine\CORE_DIR', isset ($package['github:KRypt0nn/VoidFramework']['basefolder']) ?
-	dirname (__DIR__) .'/qero-packages/KRypt0nn/VoidFramework/'. $package['github:KRypt0nn/VoidFramework']['basefolder'] .'/core' : __DIR__);
+define('VoidEngine\CORE_DIR', isset ($package['github:KRypt0nn/VoidFramework']['basefolder']) ?
+	dirname (__DIR__).'/qero-packages/KRypt0nn/VoidFramework/'.$package['github:KRypt0nn/VoidFramework']['basefolder'].'/core' : __DIR__);
 
 # Подгружаем PHP расширения
-foreach (glob (CORE_DIR .'/ext/php_*.dll') as $ext)
-	if (!extension_loaded ($ext = substr (basename ($ext), 4, -4)))
-		dl ($ext);
+foreach (glob(CORE_DIR.'/ext/php_*.dll') as $ext)
+	if (!extension_loaded($ext = substr(basename($ext), 4, -4)))
+		dl($ext);
 
 # Подгружаем Qero-пакеты
-require __DIR__ .'/../qero-packages/autoload.php';
+require __DIR__.'/../qero-packages/autoload.php';
 
-chdir (APP_DIR); // Меняем стандартную директорию на директорию приложения
+chdir(APP_DIR); // Меняем стандартную директорию на директорию приложения
 
 # Парсим app.vlf
-$parser = new VLFParser (__DIR__. '/app.vlf', [
+$parser = new VLFParser(__DIR__.'/app.vlf', [
     'strong_line_parser'            => false,
     'ignore_postobject_info'        => true,
     'ignore_unexpected_method_args' => true,
@@ -31,5 +31,5 @@ 
 ]);
 
 # Запускаем приложение
-$objects = VLFInterpreter::run ($parser);
-$APPLICATION->run ($objects['MainForm']);
+$objects = VLFInterpreter::run($parser);
+$APPLICATION->run($objects['MainForm']);

Braces +2 added lines, -1 removed lines

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

engine/extensions/VLF/main.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
     public $name; // Имя объекта
     public $link; // АСД-ссылка на объект
 
-    public function __construct (string $name, int $link)
+    public function __construct(string $name, int $link)
     {
         $this->name = $name;
         $this->link = $link;

engine/extensions/VLF/bin/importer.php

Spacing +7 added lines, -7 removed lines

@@ -4,7 +4,7 @@ 
 
 class VLFImporter
 {
-    static function import (string $vlf, PropertyGrid $propertyGrid, ListBox $eventsList, ComboBox $currentSelectedItem, TabControl $formsList, array $settings = array (
+    static function import(string $vlf, PropertyGrid $propertyGrid, ListBox $eventsList, ComboBox $currentSelectedItem, TabControl $formsList, array $settings = array(
         'strong_line_parser'            => false,
         'ignore_postobject_info'        => true,
         'ignore_unexpected_method_args' => true,
@@ -13,20 +13,20 @@ 
         'debug_mode'  => false
     )): array
     {
-        $objects   = VLFInterpreter::run (new VLFParser ($vlf, $settings));
+        $objects   = VLFInterpreter::run(new VLFParser($vlf, $settings));
         $designers = [];
 
         foreach ($objects as $name => $object)
             if ($object instanceof Form)
             {
-                $page = new TabPage ($name);
-                $designers[$object->selector] = new VoidDesigner ($page, $name, $propertyGrid, $eventsList, $currentSelectedItem, $formsList, $object);
+                $page = new TabPage($name);
+                $designers[$object->selector] = new VoidDesigner($page, $name, $propertyGrid, $eventsList, $currentSelectedItem, $formsList, $object);
 
                 $designers[$object->selector]->form->text = $object->text;
 
-                VoidStudioAPI::addObjects ('main', ['Designer__'. $name .'Designer' => $designers[$object->selector]]);
+                VoidStudioAPI::addObjects('main', ['Designer__'.$name.'Designer' => $designers[$object->selector]]);
 
-                $formsList->items->add ($page);
+                $formsList->items->add($page);
                 $formsList->selectedTab = $page->selector;
             }
 
@@ -38,7 +38,7 @@ 
                         $parent = $parent->parent;
 
                     if (isset ($designers[$parent->selector]))
-                        $designers[$parent->selector]->addComponent ($object->selector, $name);
+                        $designers[$parent->selector]->addComponent($object->selector, $name);
                 }
 
                 catch (\Throwable $e) {}

Braces +14 added lines, -14 removed lines

@@ -16,10 +16,11 @@ 
         $objects   = VLFInterpreter::run (new VLFParser ($vlf, $settings));
         $designers = [];
 
-        foreach ($objects as $name => $object)
-            if ($object instanceof Form)
+        foreach ($objects as $name => $object) {
+                    if ($object instanceof Form)
             {
                 $page = new TabPage ($name);
+        }
                 $designers[$object->selector] = new VoidDesigner ($page, $name, $propertyGrid, $eventsList, $currentSelectedItem, $formsList, $object);
 
                 $designers[$object->selector]->form->text = $object->text;
@@ -28,20 +29,19 @@ 
 
                 $formsList->items->add ($page);
                 $formsList->selectedTab = $page->selector;
-            }
-
-            elseif ($object instanceof Control)
-                try
+            } elseif ($object instanceof Control) {
+                            try
                 {
                     $parent = $object->parent;
-                    while (!isset ($designers[$parent->selector]) && $parent->parent)
-                        $parent = $parent->parent;
-
-                    if (isset ($designers[$parent->selector]))
-                        $designers[$parent->selector]->addComponent ($object->selector, $name);
-                }
-
-                catch (\Throwable $e) {}
+            }
+                    while (!isset ($designers[$parent->selector]) && $parent->parent) {
+                                            $parent = $parent->parent;
+                    }
+
+                    if (isset ($designers[$parent->selector])) {
+                                            $designers[$parent->selector]->addComponent ($object->selector, $name);
+                    }
+                } catch (\Throwable $e) {}
 
         return $designers;
     }

engine/extensions/VLF/bin/interpreter.php

Spacing +55 added lines, -56 removed lines

@@ -20,13 +20,13 @@ 
      * @return array - возвращает список созданных объектов
      */
 
-    public static function run ($syntaxTree, string $resourcesDir = null, array $parent = null): array
+    public static function run($syntaxTree, string $resourcesDir = null, array $parent = null): array
     {
         if ($syntaxTree instanceof VLFParser)
             $syntaxTree = $syntaxTree->tree;
 
-        elseif (!is_array ($syntaxTree) && self::$throw_errors)
-            throw new \Exception ('$syntaxTree argument must be instance of VoidEngine\VLFParser or contains Abstract Syntax Tree - multi-dimensional array');
+        elseif (!is_array($syntaxTree) && self::$throw_errors)
+            throw new \Exception('$syntaxTree argument must be instance of VoidEngine\VLFParser or contains Abstract Syntax Tree - multi-dimensional array');
 
         foreach ($syntaxTree as $id => $syntaxInfo)
             if (isset ($syntaxInfo['type']))
@@ -43,16 +43,16 @@ 
                             $args = $syntaxInfo['info']['arguments'];
 
                             foreach ($args as $arg_id => $arg)
-                                if (is_object ($arg) && $arg instanceof VLFLink)
+                                if (is_object($arg) && $arg instanceof VLFLink)
                                     $args[$arg_id] = isset (self::$objects[$arg->name]) ?
-                                        self::formatLine ($arg->name, self::$objects) : null;
+                                        self::formatLine($arg->name, self::$objects) : null;
 
-                                else $args[$arg_id] = self::formatLine ($arg, self::$objects);
+                                else $args[$arg_id] = self::formatLine($arg, self::$objects);
                         }
 
                         try
                         {
-                            self::$objects[$name] = eval ("namespace VoidEngine; return new $class (". implode (', ', $args) .");");
+                            self::$objects[$name] = eval ("namespace VoidEngine; return new $class (".implode(', ', $args).");");
 
                             try
                             {
@@ -65,12 +65,12 @@ 
                         catch (\Throwable $e)
                         {
                             if (self::$throw_errors)
-                                throw new \Exception ('Interpeter couldn\'t create object "'. $class .'" with name "'. $name .'" at line "'. $syntaxInfo['line'] .'". Exception info:'. "\n\n". (string) $e, 0, $e);
+                                throw new \Exception('Interpeter couldn\'t create object "'.$class.'" with name "'.$name.'" at line "'.$syntaxInfo['line'].'". Exception info:'."\n\n".(string) $e, 0, $e);
                         }
                     break;
 
                     case VLF_SUBOBJECT_DEFINITION:
-                        self::$objects = self::run ((new VLFParser ($syntaxInfo['info']['object_vlf_info']))->tree, null, $syntaxInfo);
+                        self::$objects = self::run((new VLFParser($syntaxInfo['info']['object_vlf_info']))->tree, null, $syntaxInfo);
                     break;
 
                     case VLF_PROPERTY_SET:
@@ -80,34 +80,34 @@ 
                             $propertyValue = $syntaxInfo['info']['property_value'];
                             $preset        = '';
 
-                            if (is_object ($propertyValue) && $propertyValue instanceof VLFLink)
+                            if (is_object($propertyValue) && $propertyValue instanceof VLFLink)
                                 $propertyValue = isset (self::$objects[$propertyValue->name]) ?
-                                    self::formatLine ($propertyValue->name, self::$objects) : null;
+                                    self::formatLine($propertyValue->name, self::$objects) : null;
 
-                            elseif (preg_match ('/function \((.*)\) use \((.*)\)/', $propertyValue))
+                            elseif (preg_match('/function \((.*)\) use \((.*)\)/', $propertyValue))
                             {
-                                $use = substr ($propertyValue, strpos ($propertyValue, 'use'));
-                                $use = $ouse = substr ($use, ($pos = strpos ($use, '(') + 1), strpos ($use, ')') - $pos);
-                                $use = explode (' ', $use);
+                                $use = substr($propertyValue, strpos($propertyValue, 'use'));
+                                $use = $ouse = substr($use, ($pos = strpos($use, '(') + 1), strpos($use, ')') - $pos);
+                                $use = explode(' ', $use);
 
                                 foreach ($use as $id => $useParam)  
                                     if (isset (self::$objects[$useParam]) && $use[$id + 1][0] == '$')
                                     {
                                         $fname = $use[$id + 1];
 
-                                        if (substr ($fname, strlen ($fname) - 1) == ',')
-                                            $fname = substr ($fname, 0, -1);
+                                        if (substr($fname, strlen($fname) - 1) == ',')
+                                            $fname = substr($fname, 0, -1);
 
                                         $preset .= "$fname = $useParam; ";
 
                                         unset ($use[$id]);
                                     }
 
-                                $preset        = self::formatLine ($preset, self::$objects);
-                                $propertyValue = self::formatLine (str_replace ($ouse, join (' ', $use), $propertyValue), self::$objects);
+                                $preset        = self::formatLine($preset, self::$objects);
+                                $propertyValue = self::formatLine(str_replace($ouse, join(' ', $use), $propertyValue), self::$objects);
                             }
 
-                            else $propertyValue = self::formatLine ($propertyValue, self::$objects);
+                            else $propertyValue = self::formatLine($propertyValue, self::$objects);
 
                             try
                             {
@@ -120,8 +120,8 @@ 
                                 {
                                     $propertyValue = $syntaxInfo['info']['property_raw_value'];
 
-                                    if (strpos ($propertyName, '->') !== false)
-                                        eval ('namespace VoidEngine; '. $preset .' _c('. self::$objects[$name]->selector .')->'. $propertyName .' = '. $propertyValue .';');
+                                    if (strpos($propertyName, '->') !== false)
+                                        eval ('namespace VoidEngine; '.$preset.' _c('.self::$objects[$name]->selector.')->'.$propertyName.' = '.$propertyValue.';');
 
                                     else self::$objects[$name]->$propertyName = eval ("namespace VoidEngine; $preset return $propertyValue;");
                                 }
@@ -129,13 +129,13 @@ 
                                 catch (\Throwable $e)
                                 {
                                     if (self::$throw_errors)
-                                        throw new \Exception ('Interpeter couldn\'t set property "'. $propertyName .'" with value "'. $propertyValue .'" at line "'. $syntaxInfo['line'] .'". Exception info:'. "\n\n". (string) $e, 0, $e);
+                                        throw new \Exception('Interpeter couldn\'t set property "'.$propertyName.'" with value "'.$propertyValue.'" at line "'.$syntaxInfo['line'].'". Exception info:'."\n\n".(string) $e, 0, $e);
                                 }
                             }
                         }
 
                         elseif (self::$throw_errors)
-                            throw new \Exception ('Setting property to an non-object at line "'. $syntaxInfo['line']);
+                            throw new \Exception('Setting property to an non-object at line "'.$syntaxInfo['line']);
                     break;
 
                     case VLF_METHOD_CALL:
@@ -145,58 +145,58 @@ 
                             $methodArgs = $syntaxInfo['info']['method_arguments'];
 
                             foreach ($methodArgs as $arg_id => $arg)
-                                if (is_object ($arg) && $arg instanceof VLFLink)
+                                if (is_object($arg) && $arg instanceof VLFLink)
                                     $methodArgs[$arg_id] = isset (self::$objects[$arg->name]) ?
-                                        self::formatLine ($arg->name, self::$objects) : null;
+                                        self::formatLine($arg->name, self::$objects) : null;
 
-                                else $methodArgs[$arg_id] = self::formatLine ($arg, self::$objects);
+                                else $methodArgs[$arg_id] = self::formatLine($arg, self::$objects);
 
                             try
                             {
-                                if (strpos ($methodName, '->') !== false && self::$allow_multimethods_calls)
-                                    eval ('namespace VoidEngine; _c('. self::$objects[$name]->selector .')->'. $methodName .' ('. implode (', ', $methodArgs) .');');
+                                if (strpos($methodName, '->') !== false && self::$allow_multimethods_calls)
+                                    eval ('namespace VoidEngine; _c('.self::$objects[$name]->selector.')->'.$methodName.' ('.implode(', ', $methodArgs).');');
 
-                                else self::$objects[$name]->$methodName (...$methodArgs);
+                                else self::$objects[$name]->$methodName(...$methodArgs);
                             }
 
                             catch (\Throwable $e)
                             {
                                 if (self::$throw_errors)
-                                    throw new \Exception ('Interpeter couldn\'t call method "'. $methodName .'" with arguments '. json_encode ($methodArgs) .' at line "'. $syntaxInfo['line'] .'". Exception info:'. "\n\n". (string) $e, 0, $e);
+                                    throw new \Exception('Interpeter couldn\'t call method "'.$methodName.'" with arguments '.json_encode($methodArgs).' at line "'.$syntaxInfo['line'].'". Exception info:'."\n\n".(string) $e, 0, $e);
                             }
                         }
 
                         elseif (self::$throw_errors)
-                            throw new \Exception ('Calling method to an non-object at line "'. $syntaxInfo['line'] .'"');
+                            throw new \Exception('Calling method to an non-object at line "'.$syntaxInfo['line'].'"');
                     break;
 
                     case VLF_RUNTIME_EXECUTABLE:
-                        eval (self::formatLine ($syntaxInfo['info']['code'], self::$objects));
+                        eval (self::formatLine($syntaxInfo['info']['code'], self::$objects));
                     break;
                 }
 
-                if (isset ($syntaxInfo['syntax_nodes']) && sizeof ($syntaxInfo['syntax_nodes']) > 0)
-                    self::$objects = self::run ($syntaxInfo['syntax_nodes'], null, $syntaxInfo);
+                if (isset ($syntaxInfo['syntax_nodes']) && sizeof($syntaxInfo['syntax_nodes']) > 0)
+                    self::$objects = self::run($syntaxInfo['syntax_nodes'], null, $syntaxInfo);
             }
 
-            else throw new \Exception ('Catched unknown syntax node: "'. json_encode ($syntaxInfo) .'"');
+            else throw new \Exception('Catched unknown syntax node: "'.json_encode($syntaxInfo).'"');
 
-        if (is_dir ($resourcesDir))
-            foreach (glob ($resourcesDir .'/*.vrsf') as $id => $dir)
+        if (is_dir($resourcesDir))
+            foreach (glob($resourcesDir.'/*.vrsf') as $id => $dir)
             {
-                $baseName = basenameNoExt ($dir);
-                $info     = explode ('.', $baseName);
+                $baseName = basenameNoExt($dir);
+                $info     = explode('.', $baseName);
 
                 if (isset (self::$objects[$info[0]]))
                 {
                     if (isset ($info[2]))
                     {
-                        $collection = VoidEngine::getProperty (self::$objects[$info[0]]->selector, $info[1]);
+                        $collection = VoidEngine::getProperty(self::$objects[$info[0]]->selector, $info[1]);
                         
-                        VoidEngine::callMethod ($collection, 'Add', [VoidEngine::importObject (base64_encode (file_get_contents ($dir))), 'object']);
+                        VoidEngine::callMethod($collection, 'Add', [VoidEngine::importObject(base64_encode(file_get_contents($dir))), 'object']);
                     }
                     
-                    else VoidEngine::setProperty (self::$objects[$info[0]]->selector, $info[1], VoidEngine::importObject (base64_encode (file_get_contents ($dir))));
+                    else VoidEngine::setProperty(self::$objects[$info[0]]->selector, $info[1], VoidEngine::importObject(base64_encode(file_get_contents($dir))));
                 }
             }
 
@@ -213,26 +213,25 @@ 
      * @return string - возвращает форматированную строку
      */
 
-    public static function formatLine (string $line, array $objects = []): string
+    public static function formatLine(string $line, array $objects = []): string
     {
-        if (sizeof ($objects) > 0)
+        if (sizeof($objects) > 0)
         {
-            $len     = strlen ($line);
+            $len     = strlen($line);
             $newLine = '';
 
-            $replacement = array_map (function ($object)
+            $replacement = array_map(function($object)
             {
-                return Components::componentExists ($object->selector) !== false ? 
-                    '\VoidEngine\_c('. $object->selector .')' :
-                    'unserialize (\''. serialize ($object) .'\')';
+                return Components::componentExists($object->selector) !== false ? 
+                    '\VoidEngine\_c('.$object->selector.')' : 'unserialize (\''.serialize($object).'\')';
             }, $objects);
 
-            $replacement = array_map (function ($name)
+            $replacement = array_map(function($name)
             {
-                return strlen ($name = trim ($name)) + substr_count ($name, '_');
-            }, $omap = array_flip ($replacement));
+                return strlen($name = trim($name)) + substr_count($name, '_');
+            }, $omap = array_flip($replacement));
 
-            arsort ($replacement);
+            arsort($replacement);
 
             $nReplacement = [];
 
@@ -240,14 +239,14 @@ 
                 $nReplacement[$omap[$replaceTo]] = $replaceTo;
 
             $replacement = $nReplacement;
-            $blacklist   = array_flip (['\'', '"', '$']);
+            $blacklist   = array_flip(['\'', '"', '$']);
 
             for ($i = 0; $i < $len; ++$i)
             {
                 $replaced = false;
 
                 foreach ($replacement as $name => $replaceAt)
-                    if (substr ($line, $i, ($l = strlen ($name))) == $name && !isset ($blacklist[$line[$i - 1]]))
+                    if (substr($line, $i, ($l = strlen($name))) == $name && !isset ($blacklist[$line[$i - 1]]))
                     {
                         $newLine .= $replaceAt;
 

Braces +78 added lines, -72 removed lines

@@ -22,19 +22,20 @@ 
 
     public static function run ($syntaxTree, string $resourcesDir = null, array $parent = null): array
     {
-        if ($syntaxTree instanceof VLFParser)
-            $syntaxTree = $syntaxTree->tree;
-
-        elseif (!is_array ($syntaxTree) && self::$throw_errors)
-            throw new \Exception ('$syntaxTree argument must be instance of VoidEngine\VLFParser or contains Abstract Syntax Tree - multi-dimensional array');
+        if ($syntaxTree instanceof VLFParser) {
+                    $syntaxTree = $syntaxTree->tree;
+        } elseif (!is_array ($syntaxTree) && self::$throw_errors) {
+                    throw new \Exception ('$syntaxTree argument must be instance of VoidEngine\VLFParser or contains Abstract Syntax Tree - multi-dimensional array');
+        }
 
-        foreach ($syntaxTree as $id => $syntaxInfo)
-            if (isset ($syntaxInfo['type']))
+        foreach ($syntaxTree as $id => $syntaxInfo) {
+                    if (isset ($syntaxInfo['type']))
             {
                 switch ($syntaxInfo['type'])
                 {
                     case VLF_OBJECT_DEFINITION:
                         $class = $syntaxInfo['info']['object_class'];
+        }
                         $name  = $syntaxInfo['info']['object_name'];
                         $args  = [];
 
@@ -42,12 +43,15 @@ 
                         {
                             $args = $syntaxInfo['info']['arguments'];
 
-                            foreach ($args as $arg_id => $arg)
-                                if (is_object ($arg) && $arg instanceof VLFLink)
+                            foreach ($args as $arg_id => $arg) {
+                                                            if (is_object ($arg) && $arg instanceof VLFLink)
                                     $args[$arg_id] = isset (self::$objects[$arg->name]) ?
                                         self::formatLine ($arg->name, self::$objects) : null;
+                            }
 
-                                else $args[$arg_id] = self::formatLine ($arg, self::$objects);
+                                else {
+                                    $args[$arg_id] = self::formatLine ($arg, self::$objects);
+                                }
                         }
 
                         try
@@ -57,15 +61,12 @@ 
                             try
                             {
                                 self::$objects[$name]->name = $name;
-                            }
-
-                            catch (\Throwable $e) {}
-                        }
-
-                        catch (\Throwable $e)
+                            } catch (\Throwable $e) {}
+                        } catch (\Throwable $e)
                         {
-                            if (self::$throw_errors)
-                                throw new \Exception ('Interpeter couldn\'t create object "'. $class .'" with name "'. $name .'" at line "'. $syntaxInfo['line'] .'". Exception info:'. "\n\n". (string) $e, 0, $e);
+                            if (self::$throw_errors) {
+                                                            throw new \Exception ('Interpeter couldn\'t create object "'. $class .'" with name "'. $name .'" at line "'. $syntaxInfo['line'] .'". Exception info:'. "\n\n". (string) $e, 0, $e);
+                            }
                         }
                     break;
 
@@ -80,23 +81,24 @@ 
                             $propertyValue = $syntaxInfo['info']['property_value'];
                             $preset        = '';
 
-                            if (is_object ($propertyValue) && $propertyValue instanceof VLFLink)
-                                $propertyValue = isset (self::$objects[$propertyValue->name]) ?
+                            if (is_object ($propertyValue) && $propertyValue instanceof VLFLink) {
+                                                            $propertyValue = isset (self::$objects[$propertyValue->name]) ?
                                     self::formatLine ($propertyValue->name, self::$objects) : null;
-
-                            elseif (preg_match ('/function \((.*)\) use \((.*)\)/', $propertyValue))
+                            } elseif (preg_match ('/function \((.*)\) use \((.*)\)/', $propertyValue))
                             {
                                 $use = substr ($propertyValue, strpos ($propertyValue, 'use'));
                                 $use = $ouse = substr ($use, ($pos = strpos ($use, '(') + 1), strpos ($use, ')') - $pos);
                                 $use = explode (' ', $use);
 
-                                foreach ($use as $id => $useParam)  
-                                    if (isset (self::$objects[$useParam]) && $use[$id + 1][0] == '$')
+                                foreach ($use as $id => $useParam) {
+                                                                    if (isset (self::$objects[$useParam]) && $use[$id + 1][0] == '$')
                                     {
                                         $fname = $use[$id + 1];
+                                }
 
-                                        if (substr ($fname, strlen ($fname) - 1) == ',')
-                                            $fname = substr ($fname, 0, -1);
+                                        if (substr ($fname, strlen ($fname) - 1) == ',') {
+                                                                                    $fname = substr ($fname, 0, -1);
+                                        }
 
                                         $preset .= "$fname = $useParam; ";
 
@@ -105,37 +107,34 @@ 
 
                                 $preset        = self::formatLine ($preset, self::$objects);
                                 $propertyValue = self::formatLine (str_replace ($ouse, join (' ', $use), $propertyValue), self::$objects);
+                            } else {
+                                $propertyValue = self::formatLine ($propertyValue, self::$objects);
                             }
 
-                            else $propertyValue = self::formatLine ($propertyValue, self::$objects);
-
                             try
                             {
                                 self::$objects[$name]->$propertyName = eval ("namespace VoidEngine; $preset return $propertyValue;");
-                            }
-
-                            catch (\Throwable $e)
+                            } catch (\Throwable $e)
                             {
                                 try
                                 {
                                     $propertyValue = $syntaxInfo['info']['property_raw_value'];
 
-                                    if (strpos ($propertyName, '->') !== false)
-                                        eval ('namespace VoidEngine; '. $preset .' _c('. self::$objects[$name]->selector .')->'. $propertyName .' = '. $propertyValue .';');
-
-                                    else self::$objects[$name]->$propertyName = eval ("namespace VoidEngine; $preset return $propertyValue;");
-                                }
-
-                                catch (\Throwable $e)
+                                    if (strpos ($propertyName, '->') !== false) {
+                                                                            eval ('namespace VoidEngine; '. $preset .' _c('. self::$objects[$name]->selector .')->'. $propertyName .' = '. $propertyValue .';');
+                                    } else {
+                                        self::$objects[$name]->$propertyName = eval ("namespace VoidEngine; $preset return $propertyValue;");
+                                    }
+                                } catch (\Throwable $e)
                                 {
-                                    if (self::$throw_errors)
-                                        throw new \Exception ('Interpeter couldn\'t set property "'. $propertyName .'" with value "'. $propertyValue .'" at line "'. $syntaxInfo['line'] .'". Exception info:'. "\n\n". (string) $e, 0, $e);
+                                    if (self::$throw_errors) {
+                                                                            throw new \Exception ('Interpeter couldn\'t set property "'. $propertyName .'" with value "'. $propertyValue .'" at line "'. $syntaxInfo['line'] .'". Exception info:'. "\n\n". (string) $e, 0, $e);
+                                    }
                                 }
                             }
+                        } elseif (self::$throw_errors) {
+                                                    throw new \Exception ('Setting property to an non-object at line "'. $syntaxInfo['line']);
                         }
-
-                        elseif (self::$throw_errors)
-                            throw new \Exception ('Setting property to an non-object at line "'. $syntaxInfo['line']);
                     break;
 
                     case VLF_METHOD_CALL:
@@ -144,30 +143,32 @@ 
                             $methodName = $syntaxInfo['info']['method_name'];
                             $methodArgs = $syntaxInfo['info']['method_arguments'];
 
-                            foreach ($methodArgs as $arg_id => $arg)
-                                if (is_object ($arg) && $arg instanceof VLFLink)
+                            foreach ($methodArgs as $arg_id => $arg) {
+                                                            if (is_object ($arg) && $arg instanceof VLFLink)
                                     $methodArgs[$arg_id] = isset (self::$objects[$arg->name]) ?
                                         self::formatLine ($arg->name, self::$objects) : null;
+                            }
 
-                                else $methodArgs[$arg_id] = self::formatLine ($arg, self::$objects);
+                                else {
+                                    $methodArgs[$arg_id] = self::formatLine ($arg, self::$objects);
+                                }
 
                             try
                             {
-                                if (strpos ($methodName, '->') !== false && self::$allow_multimethods_calls)
-                                    eval ('namespace VoidEngine; _c('. self::$objects[$name]->selector .')->'. $methodName .' ('. implode (', ', $methodArgs) .');');
-
-                                else self::$objects[$name]->$methodName (...$methodArgs);
-                            }
-
-                            catch (\Throwable $e)
+                                if (strpos ($methodName, '->') !== false && self::$allow_multimethods_calls) {
+                                                                    eval ('namespace VoidEngine; _c('. self::$objects[$name]->selector .')->'. $methodName .' ('. implode (', ', $methodArgs) .');');
+                                } else {
+                                    self::$objects[$name]->$methodName (...$methodArgs);
+                                }
+                            } catch (\Throwable $e)
                             {
-                                if (self::$throw_errors)
-                                    throw new \Exception ('Interpeter couldn\'t call method "'. $methodName .'" with arguments '. json_encode ($methodArgs) .' at line "'. $syntaxInfo['line'] .'". Exception info:'. "\n\n". (string) $e, 0, $e);
+                                if (self::$throw_errors) {
+                                                                    throw new \Exception ('Interpeter couldn\'t call method "'. $methodName .'" with arguments '. json_encode ($methodArgs) .' at line "'. $syntaxInfo['line'] .'". Exception info:'. "\n\n". (string) $e, 0, $e);
+                                }
                             }
+                        } elseif (self::$throw_errors) {
+                                                    throw new \Exception ('Calling method to an non-object at line "'. $syntaxInfo['line'] .'"');
                         }
-
-                        elseif (self::$throw_errors)
-                            throw new \Exception ('Calling method to an non-object at line "'. $syntaxInfo['line'] .'"');
                     break;
 
                     case VLF_RUNTIME_EXECUTABLE:
@@ -175,16 +176,18 @@ 
                     break;
                 }
 
-                if (isset ($syntaxInfo['syntax_nodes']) && sizeof ($syntaxInfo['syntax_nodes']) > 0)
-                    self::$objects = self::run ($syntaxInfo['syntax_nodes'], null, $syntaxInfo);
+                if (isset ($syntaxInfo['syntax_nodes']) && sizeof ($syntaxInfo['syntax_nodes']) > 0) {
+                                    self::$objects = self::run ($syntaxInfo['syntax_nodes'], null, $syntaxInfo);
+                }
+            } else {
+                throw new \Exception ('Catched unknown syntax node: "'. json_encode ($syntaxInfo) .'"');
             }
 
-            else throw new \Exception ('Catched unknown syntax node: "'. json_encode ($syntaxInfo) .'"');
-
-        if (is_dir ($resourcesDir))
-            foreach (glob ($resourcesDir .'/*.vrsf') as $id => $dir)
+        if (is_dir ($resourcesDir)) {
+                    foreach (glob ($resourcesDir .'/*.vrsf') as $id => $dir)
             {
                 $baseName = basenameNoExt ($dir);
+        }
                 $info     = explode ('.', $baseName);
 
                 if (isset (self::$objects[$info[0]]))
@@ -194,9 +197,9 @@ 
                         $collection = VoidEngine::getProperty (self::$objects[$info[0]]->selector, $info[1]);
                         
                         VoidEngine::callMethod ($collection, 'Add', [VoidEngine::importObject (base64_encode (file_get_contents ($dir))), 'object']);
+                    } else {
+                        VoidEngine::setProperty (self::$objects[$info[0]]->selector, $info[1], VoidEngine::importObject (base64_encode (file_get_contents ($dir))));
                     }
-                    
-                    else VoidEngine::setProperty (self::$objects[$info[0]]->selector, $info[1], VoidEngine::importObject (base64_encode (file_get_contents ($dir))));
                 }
             }
 
@@ -236,8 +239,9 @@ 
 
             $nReplacement = [];
 
-            foreach ($replacement as $replaceTo => $nLn)
-                $nReplacement[$omap[$replaceTo]] = $replaceTo;
+            foreach ($replacement as $replaceTo => $nLn) {
+                            $nReplacement[$omap[$replaceTo]] = $replaceTo;
+            }
 
             $replacement = $nReplacement;
             $blacklist   = array_flip (['\'', '"', '$']);
@@ -246,10 +250,11 @@ 
             {
                 $replaced = false;
 
-                foreach ($replacement as $name => $replaceAt)
-                    if (substr ($line, $i, ($l = strlen ($name))) == $name && !isset ($blacklist[$line[$i - 1]]))
+                foreach ($replacement as $name => $replaceAt) {
+                                    if (substr ($line, $i, ($l = strlen ($name))) == $name && !isset ($blacklist[$line[$i - 1]]))
                     {
                         $newLine .= $replaceAt;
+                }
 
                         $i += $l - 1;
                         $replaced = true;
@@ -257,8 +262,9 @@ 
                         break;
                     }
 
-                if (!$replaced)
-                    $newLine .= $line[$i];
+                if (!$replaced) {
+                                    $newLine .= $line[$i];
+                }
             }
 
             $line = $newLine;

engine/extensions/WinAPI/main.php

Spacing +9 added lines, -9 removed lines

@@ -29,7 +29,7 @@ 
 {
     protected $WinAPI;
 
-    public function __construct ()
+    public function __construct()
     {
         /**
          * Большинство функций было взято из класса "WinAPI" проекта "DevelStudio XL"
@@ -40,7 +40,7 @@ 
          * 
          */
 
-        $this->WinAPI = \FFI::cdef ('
+        $this->WinAPI = \FFI::cdef('
             struct LPCTSTR
             {
                 char string;
@@ -76,25 +76,25 @@ 
         ', 'User32.dll');
     }
 
-    public function __call ($method, $args)
+    public function __call($method, $args)
     {
-        if (method_exists ($this, $method))
-            return $this->$method (...$args);
+        if (method_exists($this, $method))
+            return $this->$method(...$args);
         
         else try
         {
-            return $this->WinAPI->$method (...$args);
+            return $this->WinAPI->$method(...$args);
         }
 
         catch (\Throwable $e)
         {
-            throw new \Exception ('Method "'. $method .'" not found or return an exception. Exception info: '. "\n\n". (string) $e);
+            throw new \Exception('Method "'.$method.'" not found or return an exception. Exception info: '."\n\n".(string) $e);
         }
     }
 
-    public function findWindow (string $caption, string $class = null): ?int
+    public function findWindow(string $caption, string $class = null): ?int
     {
-        return $this->FindWindowA ($class, $caption);
+        return $this->FindWindowA($class, $caption);
     }
 
     /*public function getWindowCaption (int $handle)

Braces +5 added lines, -6 removed lines

@@ -78,15 +78,14 @@
 
     public function __call ($method, $args)
     {
-        if (method_exists ($this, $method))
-            return $this->$method (...$args);
-        
-        else try
+        if (method_exists ($this, $method)) {
+                    return $this->$method (...$args);
+        } else {
+            try
         {
             return $this->WinAPI->$method (...$args);
         }
-
-        catch (\Throwable $e)
+        } catch (\Throwable $e)
         {
             throw new \Exception ('Method "'. $method .'" not found or return an exception. Exception info: '. "\n\n". (string) $e);
         }

engine/common/Globals.php

Spacing +21 added lines, -21 removed lines

@@ -7,43 +7,43 @@ 
     public $application;
     public $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;
     }
@@ -53,14 +53,14 @@ 
 {
     public $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':
@@ -78,7 +78,7 @@ 
         }
     }
     
-    public function __debugInfo (): array
+    public function __debugInfo(): array
     {
         return [
             $this->w,

Braces +9 added lines, -10 removed lines

@@ -15,16 +15,15 @@
     
     public function run ($form = null): void
     {
-        if ($form instanceof WFObject)
-            $this->application->run ($form->selector);
-        
-        elseif (is_int ($form) && VoidEngine::objectExists ($form))
-            $this->application->run ($form);
-        
-        elseif ($form === null)
-            $this->application->run ();
-
-        else throw new \Exception ('$form param must be instance of "VoidEngine\WFObject" ("VoidEngine\Form"), be null or object selector');
+        if ($form instanceof WFObject) {
+                    $this->application->run ($form->selector);
+        } elseif (is_int ($form) && VoidEngine::objectExists ($form)) {
+                    $this->application->run ($form);
+        } elseif ($form === null) {
+                    $this->application->run ();
+        } else {
+            throw new \Exception ('$form param must be instance of "VoidEngine\WFObject" ("VoidEngine\Form"), be null or object selector');
+        }
     }
     
     public function restart (): void

engine/common/EngineInterfaces.php

Indentation +54 added lines, -54 removed lines

@@ -108,14 +108,14 @@ 
     }
 
     /**
-    * * Создание экземпляра типа объекта
-    * 
-    * @param mixed $objectName - полное название объекта
-    * [@param mixed $objectGroup = null] - полное пространство имён объекта
-    * 
-    * @return mixed - возвращает указатель на объект типа объекта или false в случае ошибки
-    * 
-    */
+     * * Создание экземпляра типа объекта
+     * 
+     * @param mixed $objectName - полное название объекта
+     * [@param mixed $objectGroup = null] - полное пространство имён объекта
+     * 
+     * @return mixed - возвращает указатель на объект типа объекта или false в случае ошибки
+     * 
+     */
 
     public static function objectType ($objectName, $objectGroup = null)
     {
@@ -547,7 +547,7 @@ 
     }
     
     public function __get ($name)
-	{
+    {
         if (method_exists ($this, $method = "get_$name"))
             $value = $this->$method ();
 
@@ -576,7 +576,7 @@ 
                 $size = $this->count;
                 $list = [];
                 
-				for ($i = 0; $i < $size; ++$i)
+                for ($i = 0; $i < $size; ++$i)
                     $list[] = EngineAdditions::coupleSelector (VoidEngine::getArrayValue ($this->selector, $i));
                 
                 return $list;
@@ -606,10 +606,10 @@ 
         }
 
         return EngineAdditions::coupleSelector ($value, $this->selector);
-	}
+    }
 	
-	public function __set ($name, $value)
-	{
+    public function __set ($name, $value)
+    {
         if (method_exists ($this, $method = "set_$name"))
             try
             {
@@ -631,8 +631,8 @@ 
         else $this->setProperty ($name, EngineAdditions::uncoupleSelector ($value));
     }
 	
-	public function __call ($method, $args)
-	{
+    public function __call ($method, $args)
+    {
         $args = array_map (function ($arg)
         {
             return EngineAdditions::uncoupleSelector ($arg);
@@ -648,7 +648,7 @@ 
     }
     
     public function offsetSet ($index, $value)
-	{
+    {
         try
         {
             return $index === null ?
@@ -664,14 +664,14 @@ 
         }
     }
 	
-	public function offsetGet ($index)
-	{
-		return EngineAdditions::coupleSelector (VoidEngine::getArrayValue ($this->selector, $index), $this->selector);
+    public function offsetGet ($index)
+    {
+        return EngineAdditions::coupleSelector (VoidEngine::getArrayValue ($this->selector, $index), $this->selector);
     }
 	
-	public function offsetUnset ($index): void
-	{
-		$this->callMethod ('RemoveAt', $index);
+    public function offsetUnset ($index): void
+    {
+        $this->callMethod ('RemoveAt', $index);
     }
     
     public function offsetExists ($index): bool
@@ -689,19 +689,19 @@ 
         return true;
     }
 	
-	public function indexOf ($value): int
-	{
-		return $this->callMethod ('IndexOf', EngineAdditions::uncoupleSelector ($value));
+    public function indexOf ($value): int
+    {
+        return $this->callMethod ('IndexOf', EngineAdditions::uncoupleSelector ($value));
     }
     
     public function lastIndexOf ($value): int
-	{
-		return $this->callMethod ('LastIndexOf', EngineAdditions::uncoupleSelector ($value));
-	}
+    {
+        return $this->callMethod ('LastIndexOf', EngineAdditions::uncoupleSelector ($value));
+    }
 	
-	public function contains ($value): bool
-	{
-		return $this->callMethod ('Contains', EngineAdditions::uncoupleSelector ($value));
+    public function contains ($value): bool
+    {
+        return $this->callMethod ('Contains', EngineAdditions::uncoupleSelector ($value));
     }
 
     public function foreach (\Closure $callback, string $type = null): void
@@ -755,45 +755,45 @@ 
         return VoidEngine::callMethod ($this->selector, $method, ...$args);
     }
 	
-	protected function getArrayProperty ($name, string $type = null)
-	{
+    protected function getArrayProperty ($name, string $type = null)
+    {
         $array  = $this->getProperty ($name);
         $size   = VoidEngine::getProperty ($array, 'Length');
         $return = [];
 
-		for ($i = 0; $i < $size; ++$i)
+        for ($i = 0; $i < $size; ++$i)
             $return[] = VoidEngine::getArrayValue ($array, $type === null ? $i : [$i, $type]);
         
         VoidEngine::removeObjects ($array);
         
-		return $return;
+        return $return;
     }
 
     public function get_name ()
-	{
-		try
-		{
-			return $this->getProperty ('Name');
+    {
+        try
+        {
+            return $this->getProperty ('Name');
         }
         
-		catch (\Throwable $e)
-		{
-			return $this->name;
-		}
-	}
+        catch (\Throwable $e)
+        {
+            return $this->name;
+        }
+    }
 	
-	public function set_name (string $name)
-	{
-		try
-		{
-			$this->setProperty ('Name', $name);
+    public function set_name (string $name)
+    {
+        try
+        {
+            $this->setProperty ('Name', $name);
         }
         
-		catch (\Throwable $e)
-		{
-			$this->name = $name;
-		}
-	}
+        catch (\Throwable $e)
+        {
+            $this->name = $name;
+        }
+    }
 
     public function __toString (): string
     {

Spacing +144 added lines, -146 removed lines

@@ -17,9 +17,9 @@ 
      * 
      */
 
-    public static function createObject ($objectName, $objectGroup = null, ...$args): int
+    public static function createObject($objectName, $objectGroup = null, ...$args): int
     {
-        return \VoidCore::createObject ($objectName, $objectGroup, ...$args);
+        return \VoidCore::createObject($objectName, $objectGroup, ...$args);
     }
 
     /**
@@ -34,9 +34,9 @@ 
      * 
      */
 
-    public static function removeObjects (int ...$selectors): void
+    public static function removeObjects(int ...$selectors): void
     {
-        \VoidCore::removeObjects (...$selectors);
+        \VoidCore::removeObjects(...$selectors);
     }
 
     /**
@@ -51,9 +51,9 @@ 
      * 
      */
 
-    public static function destructObject (int $selector): bool
+    public static function destructObject(int $selector): bool
     {
-        return \VoidCore::destructObject ($selector);
+        return \VoidCore::destructObject($selector);
     }
 
     /**
@@ -68,9 +68,9 @@ 
      * 
      */
 
-    public static function createClass ($className, $classGroup = null): int
+    public static function createClass($className, $classGroup = null): int
     {
-        return \VoidCore::getClass ($className, $classGroup);
+        return \VoidCore::getClass($className, $classGroup);
     }
 
     /**
@@ -83,9 +83,9 @@ 
      * 
      */
 
-    public static function createDelegate (string $type, string $code): int
+    public static function createDelegate(string $type, string $code): int
     {
-        return \VoidCore::createDelegate ($type, $code);
+        return \VoidCore::createDelegate($type, $code);
     }
 
     /**
@@ -102,9 +102,9 @@ 
      * 
      */
 
-    public static function objectExists (int $selector): bool
+    public static function objectExists(int $selector): bool
     {
-        return \VoidCore::objectExists ($selector);
+        return \VoidCore::objectExists($selector);
     }
 
     /**
@@ -117,9 +117,9 @@ 
     * 
     */
 
-    public static function objectType ($objectName, $objectGroup = null)
+    public static function objectType($objectName, $objectGroup = null)
     {
-        return \VoidCore::typeof ($objectName, $objectGroup);
+        return \VoidCore::typeof($objectName, $objectGroup);
     }
 
     /**
@@ -140,9 +140,9 @@ 
      * 
      */
 
-    public static function getProperty (int $selector, $propertyName)
+    public static function getProperty(int $selector, $propertyName)
     {
-        return \VoidCore::getProp ($selector, $propertyName);
+        return \VoidCore::getProp($selector, $propertyName);
     }
 
     /**
@@ -162,9 +162,9 @@ 
      * 
      */
 
-    public static function setProperty (int $selector, string $propertyName, $value): void
+    public static function setProperty(int $selector, string $propertyName, $value): void
     {
-        \VoidCore::setProp ($selector, $propertyName, $value);
+        \VoidCore::setProp($selector, $propertyName, $value);
     }
 
     /**
@@ -184,9 +184,9 @@ 
      * 
      */
 
-    public static function getField (int $selector, $fieldName)
+    public static function getField(int $selector, $fieldName)
     {
-        return \VoidCore::getField ($selector, $fieldName);
+        return \VoidCore::getField($selector, $fieldName);
     }
 
     /**
@@ -201,9 +201,9 @@ 
      * 
      */
 
-    public static function setField (int $selector, string $fieldName, $value): void
+    public static function setField(int $selector, string $fieldName, $value): void
     {
-        \VoidCore::setField ($selector, $fieldName, $value);
+        \VoidCore::setField($selector, $fieldName, $value);
     }
 
     /**
@@ -227,9 +227,9 @@ 
      * 
      */
 
-    public static function callMethod (int $selector, $methodName, ...$args)
+    public static function callMethod(int $selector, $methodName, ...$args)
     {
-        return \VoidCore::callMethod ($selector, $methodName, ...$args);
+        return \VoidCore::callMethod($selector, $methodName, ...$args);
     }
 
     /**
@@ -245,9 +245,9 @@ 
      * 
      */
 
-    public static function getArrayValue (int $selector, $index)
+    public static function getArrayValue(int $selector, $index)
     {
-        return \VoidCore::getArrayValue ($selector, $index);
+        return \VoidCore::getArrayValue($selector, $index);
     }
 
     /**
@@ -265,9 +265,9 @@ 
      * 
      */
 
-    public static function setArrayValue (int $selector, $index, $value): void
+    public static function setArrayValue(int $selector, $index, $value): void
     {
-        \VoidCore::setArrayValue ($selector, $index, $value);
+        \VoidCore::setArrayValue($selector, $index, $value);
     }
 
     /**
@@ -282,13 +282,13 @@ 
      * 
      */
 
-    public static function setObjectEvent (int $selector, string $eventName, string $code): void
+    public static function setObjectEvent(int $selector, string $eventName, string $code): void
     {
-        if (self::eventExists ($selector, $eventName))
-            self::removeObjectEvent ($selector, $eventName);
+        if (self::eventExists($selector, $eventName))
+            self::removeObjectEvent($selector, $eventName);
 
-        \VoidCore::setEvent ($selector, $eventName, $code);
-        Components::setComponentEvent ($selector, $eventName, $code);
+        \VoidCore::setEvent($selector, $eventName, $code);
+        Components::setComponentEvent($selector, $eventName, $code);
     }
 
     /**
@@ -306,9 +306,9 @@ 
      * 
      */
 
-    public static function eventExists (int $selector, string $eventName): bool
+    public static function eventExists(int $selector, string $eventName): bool
     {
-        return \VoidCore::eventExists ($selector, $eventName);
+        return \VoidCore::eventExists($selector, $eventName);
     }
 
     /**
@@ -325,10 +325,10 @@ 
      * 
      */
 
-    public static function removeObjectEvent (int $selector, string $eventName): void
+    public static function removeObjectEvent(int $selector, string $eventName): void
     {
-        \VoidCore::removeEvent ($selector, $eventName);
-        Components::removeComponentEvent ($selector, $eventName);
+        \VoidCore::removeEvent($selector, $eventName);
+        Components::removeComponentEvent($selector, $eventName);
     }
 
     /**
@@ -340,9 +340,9 @@ 
      * 
      */
 
-    public static function importObject (string $data): int
+    public static function importObject(string $data): int
     {
-        return \VoidCore::importObject ($data);
+        return \VoidCore::importObject($data);
     }
 
     /**
@@ -354,9 +354,9 @@ 
      * 
      */
 
-    public static function exportObject (int $selector): string
+    public static function exportObject(int $selector): string
     {
-        return \VoidCore::exportObject ($selector);
+        return \VoidCore::exportObject($selector);
     }
 
     /**
@@ -380,20 +380,20 @@ 
      * 
      */
 
-    public static function compile (string $savePath, string $iconPath, string $phpCode, string $productDescription = null, string $productName = null, string $productVersion = null, string $companyName = null, string $copyright = null, string $callSharpCode = '', string $declareSharpCode = '', WFObject $dictionary = null, WFObject $assemblies = null): array
+    public static function compile(string $savePath, string $iconPath, string $phpCode, string $productDescription = null, string $productName = null, string $productVersion = null, string $companyName = null, string $copyright = null, string $callSharpCode = '', string $declareSharpCode = '', WFObject $dictionary = null, WFObject $assemblies = null): array
     {
         if ($dictionary === null)
-            $dictionary = new WFObject ('System.Collections.Generic.Dictionary`2[System.String,System.String]', null);
+            $dictionary = new WFObject('System.Collections.Generic.Dictionary`2[System.String,System.String]', null);
 
         if ($assemblies === null)
-            $assemblies = getNetArray ('System.String', [
+            $assemblies = getNetArray('System.String', [
                 // CORE_DIR .'/CefSharp.dll',
-                CORE_DIR .'/FastColoredTextBox.dll',
-                CORE_DIR .'/ScintillaNET.dll'
+                CORE_DIR.'/FastColoredTextBox.dll',
+                CORE_DIR.'/ScintillaNET.dll'
             ]);
 
         if ($productName === null)
-            $productName = basenameNoExt ($savePath);
+            $productName = basenameNoExt($savePath);
 
         if ($productDescription === null)
             $productDescription = $productName;
@@ -405,19 +405,19 @@ 
             $companyName = 'Company N';
 
         if ($copyright === null)
-            $copyright = $companyName .' copyright (c) '. date ('Y');
+            $copyright = $companyName.' copyright (c) '.date('Y');
 
-        return (new WFClass ('WinForms_PHP.WFCompiler', null))->compile ($savePath, $iconPath, $phpCode, $productDescription, $productName, $productVersion, $companyName, $copyright, $callSharpCode, $declareSharpCode, $dictionary, $assemblies)->names;
+        return (new WFClass('WinForms_PHP.WFCompiler', null))->compile($savePath, $iconPath, $phpCode, $productDescription, $productName, $productVersion, $companyName, $copyright, $callSharpCode, $declareSharpCode, $dictionary, $assemblies)->names;
     }
 }
 
 class EngineAdditions
 {
-    public static function loadModule (string $path): bool
+    public static function loadModule(string $path): bool
     {
         try
         {
-            (new WFClass ('System.Reflection.Assembly', 'mscorlib'))->loadFrom ($path);
+            (new WFClass('System.Reflection.Assembly', 'mscorlib'))->loadFrom($path);
         }
 
         catch (\Throwable $e)
@@ -428,16 +428,16 @@ 
         return true;
     }
 
-    public static function getProperty (int $selector, string $name): array
+    public static function getProperty(int $selector, string $name): array
     {
-        $property = VoidEngine::callMethod (VoidEngine::callMethod ($selector, 'GetType'), 'GetProperty', $name);
+        $property = VoidEngine::callMethod(VoidEngine::callMethod($selector, 'GetType'), 'GetProperty', $name);
 
-        if (!is_int ($property))
+        if (!is_int($property))
             return false;
 
         try
         {
-            $propertyType = VoidEngine::getProperty ($property, ['PropertyType', 'string']);
+            $propertyType = VoidEngine::getProperty($property, ['PropertyType', 'string']);
 
             switch ($propertyType)
             {
@@ -473,7 +473,7 @@ 
                 default:
                     try
                     {
-                        VoidEngine::getProperty ($selector, [$name, 'int']);
+                        VoidEngine::getProperty($selector, [$name, 'int']);
 
                         $property = 'int';
                     }
@@ -482,7 +482,7 @@ 
                     {
                         return [
                             'type'  => 'vrsf',
-                            'value' => VoidEngine::exportObject (VoidEngine::getProperty ($selector, [$name, 'object']))
+                            'value' => VoidEngine::exportObject(VoidEngine::getProperty($selector, [$name, 'object']))
                         ];
                     }
                 break;
@@ -496,30 +496,30 @@ 
 
         return [
             'type'  => $property,
-            'value' => VoidEngine::getProperty ($selector, [$name, $property])
+            'value' => VoidEngine::getProperty($selector, [$name, $property])
         ];
     }
 
-    public static function getObjectEvents (int $object): array
+    public static function getObjectEvents(int $object): array
     {
         $events = [];
 
-        $props = VoidEngine::callMethod (VoidEngine::callMethod ($object, 'GetType'), 'GetEvents');
-        $len   = VoidEngine::getProperty ($props, 'Length');
+        $props = VoidEngine::callMethod(VoidEngine::callMethod($object, 'GetType'), 'GetEvents');
+        $len   = VoidEngine::getProperty($props, 'Length');
 
         for ($i = 0; $i < $len; ++$i)
-            $events[] = VoidEngine::getProperty (VoidEngine::getArrayValue ($props, $i), 'Name');
+            $events[] = VoidEngine::getProperty(VoidEngine::getArrayValue($props, $i), 'Name');
 
         return $events;
     }
 
-    public static function coupleSelector ($value, int $selfSelector = null)
+    public static function coupleSelector($value, int $selfSelector = null)
     {
-        return is_int ($value) && VoidEngine::objectExists ($value) && $value != $selfSelector ?
-            new WFObject ($value) : $value;
+        return is_int($value) && VoidEngine::objectExists($value) && $value != $selfSelector ?
+            new WFObject($value) : $value;
     }
 
-    public static function uncoupleSelector ($value)
+    public static function uncoupleSelector($value)
     {
         return $value instanceof WFObject ?
             $value->selector : $value;
@@ -531,44 +531,44 @@ 
     protected $selector;
     protected $name;
 
-    public function __construct ($object, ?string $classGroup = 'auto', ...$args)
+    public function __construct($object, ?string $classGroup = 'auto', ...$args)
     {
         foreach ($args as $id => $arg)
-            $args[$id] = ngineAdditions::uncoupleSelector ($arg);
+            $args[$id] = ngineAdditions::uncoupleSelector($arg);
 
-        if (is_string ($object))
-            $this->selector = VoidEngine::createObject ($object, $classGroup == 'auto' ?
-                substr ($object, 0, strrpos ($object, '.')) : $classGroup, ...$args);
+        if (is_string($object))
+            $this->selector = VoidEngine::createObject($object, $classGroup == 'auto' ?
+                substr ($object, 0, strrpos($object, '.')) : $classGroup, ...$args);
 
-        elseif (is_int ($object) && VoidEngine::objectExists ($object))
+        elseif (is_int($object) && VoidEngine::objectExists($object))
             $this->selector = $object;
 
-        else throw new \Exception ('$object parameter must be string or object selector');
+        else throw new \Exception('$object parameter must be string or object selector');
     }
     
-    public function __get ($name)
+    public function __get($name)
 	{
-        if (method_exists ($this, $method = "get_$name"))
-            $value = $this->$method ();
+        if (method_exists($this, $method = "get_$name"))
+            $value = $this->$method();
 
-        elseif (substr ($name, -5) == 'Event')
-            $value = Events::getObjectEvent ($this->selector, substr ($name, 0, -5));
+        elseif (substr($name, -5) == 'Event')
+            $value = Events::getObjectEvent($this->selector, substr($name, 0, -5));
 
-        elseif (property_exists ($this, $name))
+        elseif (property_exists($this, $name))
             $value = $this->$name;
 
-        else switch (strtolower ($name))
+        else switch (strtolower($name))
         {
             case 'count':
             case 'length':
                 try
                 {
-                    return $this->getProperty ('Count');
+                    return $this->getProperty('Count');
                 }
 
                 catch (\Throwable $e)
                 {
-                    return $this->getProperty ('Length');
+                    return $this->getProperty('Length');
                 }
             break;
 
@@ -577,7 +577,7 @@ 
                 $list = [];
                 
 				for ($i = 0; $i < $size; ++$i)
-                    $list[] = EngineAdditions::coupleSelector (VoidEngine::getArrayValue ($this->selector, $i));
+                    $list[] = EngineAdditions::coupleSelector(VoidEngine::getArrayValue($this->selector, $i));
                 
                 return $list;
             break;
@@ -589,31 +589,31 @@ 
                 for ($i = 0; $i < $size; ++$i)
                     try
                     {
-                        $names[] = VoidEngine::getProperty (VoidEngine::getArrayValue ($this->selector, [$i, 'object']), 'Text');
+                        $names[] = VoidEngine::getProperty(VoidEngine::getArrayValue($this->selector, [$i, 'object']), 'Text');
                     }
 
                     catch (\Throwable $e)
                     {
-                        $names[] = VoidEngine::getArrayValue ($this->selector, [$i, 'string']);
+                        $names[] = VoidEngine::getArrayValue($this->selector, [$i, 'string']);
                     }
                 
                 return $names;
             break;
 
             default:
-                $value = $this->getProperty ($name);
+                $value = $this->getProperty($name);
             break;
         }
 
-        return EngineAdditions::coupleSelector ($value, $this->selector);
+        return EngineAdditions::coupleSelector($value, $this->selector);
 	}
 	
-	public function __set ($name, $value)
+	public function __set($name, $value)
 	{
-        if (method_exists ($this, $method = "set_$name"))
+        if (method_exists($this, $method = "set_$name"))
             try
             {
-                return $this->$method ($value);
+                return $this->$method($value);
             }
 
             # Метод "set_$name" может принимать в качестве параметра объект WFObject
@@ -622,63 +622,61 @@ 
             catch (\Throwable $e)
             {
                 return $value instanceof WFObject ?
-                    $this->$method ($value->selector) : null;
+                    $this->$method($value->selector) : null;
             }
 
-        elseif (substr ($name, -5) == 'Event')
-            Events::setObjectEvent ($this->selector, substr ($name, 0, -5), $value);
+        elseif (substr($name, -5) == 'Event')
+            Events::setObjectEvent($this->selector, substr($name, 0, -5), $value);
         
-        else $this->setProperty ($name, EngineAdditions::uncoupleSelector ($value));
+        else $this->setProperty($name, EngineAdditions::uncoupleSelector($value));
     }
 	
-	public function __call ($method, $args)
+	public function __call($method, $args)
 	{
-        $args = array_map (function ($arg)
+        $args = array_map(function($arg)
         {
-            return EngineAdditions::uncoupleSelector ($arg);
+            return EngineAdditions::uncoupleSelector($arg);
         }, $args);
 
-        return EngineAdditions::coupleSelector ($this->callMethod ($method, ...$args), $this->selector);
+        return EngineAdditions::coupleSelector($this->callMethod($method, ...$args), $this->selector);
     }
 
-    public function addRange (array $values, $assoc = false): void
+    public function addRange(array $values, $assoc = false): void
     {
         foreach ($values as $id => $value)
-            $this->offsetSet ($assoc ? $id : null, $value);
+            $this->offsetSet($assoc ? $id : null, $value);
     }
     
-    public function offsetSet ($index, $value)
+    public function offsetSet($index, $value)
 	{
         try
         {
             return $index === null ?
-                $this->callMethod ('Add', EngineAdditions::uncoupleSelector ($value)) :
-                $this->callMethod ('Insert', $index, EngineAdditions::uncoupleSelector ($value));
+                $this->callMethod('Add', EngineAdditions::uncoupleSelector($value)) : $this->callMethod('Insert', $index, EngineAdditions::uncoupleSelector($value));
         }
 
         catch (\Throwable $e)
         {
             return $index === null ?
-                VoidEngine::setArrayValue ($this->selector, $this->count, $value) :
-                VoidEngine::setArrayValue ($this->selector, $index, $value);
+                VoidEngine::setArrayValue($this->selector, $this->count, $value) : VoidEngine::setArrayValue($this->selector, $index, $value);
         }
     }
 	
-	public function offsetGet ($index)
+	public function offsetGet($index)
 	{
-		return EngineAdditions::coupleSelector (VoidEngine::getArrayValue ($this->selector, $index), $this->selector);
+		return EngineAdditions::coupleSelector(VoidEngine::getArrayValue($this->selector, $index), $this->selector);
     }
 	
-	public function offsetUnset ($index): void
+	public function offsetUnset($index): void
 	{
-		$this->callMethod ('RemoveAt', $index);
+		$this->callMethod('RemoveAt', $index);
     }
     
-    public function offsetExists ($index): bool
+    public function offsetExists($index): bool
     {
         try
         {
-            $this->offsetGet ($index);
+            $this->offsetGet($index);
         }
 
         catch (\Exception $e)
@@ -689,19 +687,19 @@ 
         return true;
     }
 	
-	public function indexOf ($value): int
+	public function indexOf($value): int
 	{
-		return $this->callMethod ('IndexOf', EngineAdditions::uncoupleSelector ($value));
+		return $this->callMethod('IndexOf', EngineAdditions::uncoupleSelector($value));
     }
     
-    public function lastIndexOf ($value): int
+    public function lastIndexOf($value): int
 	{
-		return $this->callMethod ('LastIndexOf', EngineAdditions::uncoupleSelector ($value));
+		return $this->callMethod('LastIndexOf', EngineAdditions::uncoupleSelector($value));
 	}
 	
-	public function contains ($value): bool
+	public function contains($value): bool
 	{
-		return $this->callMethod ('Contains', EngineAdditions::uncoupleSelector ($value));
+		return $this->callMethod('Contains', EngineAdditions::uncoupleSelector($value));
     }
 
     public function foreach (\Closure $callback, string $type = null): void
@@ -709,71 +707,71 @@ 
         $size = $this->count;
 
         for ($i = 0; $i < $size; ++$i)
-            $callback (EngineAdditions::coupleSelector (VoidEngine::getArrayValue ($this->selector, $type !== null ? [$i, $type] : $i), $this->selector), $i);
+            $callback(EngineAdditions::coupleSelector(VoidEngine::getArrayValue($this->selector, $type !== null ? [$i, $type] : $i), $this->selector), $i);
     }
 
-    public function where (\Closure $comparator, string $type = null): array
+    public function where(\Closure $comparator, string $type = null): array
     {
         $size   = $this->count;
         $return = [];
 
         for ($i = 0; $i < $size; ++$i)
-            if ($comparator ($value = EngineAdditions::coupleSelector (VoidEngine::getArrayValue ($this->selector, $type !== null ? [$i, $type] : $i), $this->selector), $i))
+            if ($comparator($value = EngineAdditions::coupleSelector(VoidEngine::getArrayValue($this->selector, $type !== null ? [$i, $type] : $i), $this->selector), $i))
                 $return[] = $value;
 
         return $return;
     }
 	
-    protected function getProperty ($name)
+    protected function getProperty($name)
     {
         try
         {
-            return VoidEngine::getProperty ($this->selector, $name);
+            return VoidEngine::getProperty($this->selector, $name);
         }
 
         catch (\Throwable $e)
         {
-            return VoidEngine::getField ($this->selector, $name);
+            return VoidEngine::getField($this->selector, $name);
         }
     }
 
-    protected function setProperty ($name, $value)
+    protected function setProperty($name, $value)
     {
         try
         {
-            VoidEngine::setProperty ($this->selector, $name, $value);
+            VoidEngine::setProperty($this->selector, $name, $value);
         }
 
         catch (\Throwable $e)
         {
-            VoidEngine::setField ($this->selector, $name, $value);
+            VoidEngine::setField($this->selector, $name, $value);
         }
     }
 	
-    protected function callMethod ($method, ...$args)
+    protected function callMethod($method, ...$args)
     {
-        return VoidEngine::callMethod ($this->selector, $method, ...$args);
+        return VoidEngine::callMethod($this->selector, $method, ...$args);
     }
 	
-	protected function getArrayProperty ($name, string $type = null)
+	protected function getArrayProperty($name, string $type = null)
 	{
-        $array  = $this->getProperty ($name);
-        $size   = VoidEngine::getProperty ($array, 'Length');
+        $array  = $this->getProperty($name);
+        $size   = VoidEngine::getProperty($array, 'Length');
         $return = [];
 
 		for ($i = 0; $i < $size; ++$i)
-            $return[] = VoidEngine::getArrayValue ($array, $type === null ? $i : [$i, $type]);
+            $return[] = VoidEngine::getArrayValue($array, $type === null ? $i : [$i, $type]);
         
-        VoidEngine::removeObjects ($array);
+        VoidEngine::removeObjects($array);
         
 		return $return;
     }
 
-    public function get_name ()
+    public function get_name()
 	{
 		try
 		{
-			return $this->getProperty ('Name');
+			return $this->getProperty('Name');
         }
         
 		catch (\Throwable $e)
@@ -782,11 +780,11 @@ 
 		}
 	}
 	
-	public function set_name (string $name)
+	public function set_name(string $name)
 	{
 		try
 		{
-			$this->setProperty ('Name', $name);
+			$this->setProperty('Name', $name);
         }
         
 		catch (\Throwable $e)
@@ -795,9 +793,9 @@ 
 		}
 	}
 
-    public function __toString (): string
+    public function __toString(): string
     {
-        return $this->callMethod ('ToString');
+        return $this->callMethod('ToString');
     }
 }
 
@@ -805,16 +803,16 @@ 
 {
     protected $selector;
 
-    public function __construct ($class, ?string $classGroup = 'auto')
+    public function __construct($class, ?string $classGroup = 'auto')
     {
-        if (is_string ($class))
-            $this->selector = VoidEngine::createClass ($class, $classGroup == 'auto' ?
-                substr ($class, 0, strrpos ($class, '.')) : $classGroup
+        if (is_string($class))
+            $this->selector = VoidEngine::createClass($class, $classGroup == 'auto' ?
+                substr ($class, 0, strrpos($class, '.')) : $classGroup
             );
 
-        elseif (is_int ($class) && VoidEngine::objectExists ($class))
+        elseif (is_int($class) && VoidEngine::objectExists($class))
             $this->selector = $class;
 
-        else throw new \Exception ('$class parameter must be string or class selector');
+        else throw new \Exception('$class parameter must be string or class selector');
     }
 }

Braces +93 added lines, -99 removed lines

@@ -284,8 +284,9 @@ 
 
     public static function setObjectEvent (int $selector, string $eventName, string $code): void
     {
-        if (self::eventExists ($selector, $eventName))
-            self::removeObjectEvent ($selector, $eventName);
+        if (self::eventExists ($selector, $eventName)) {
+                    self::removeObjectEvent ($selector, $eventName);
+        }
 
         \VoidCore::setEvent ($selector, $eventName, $code);
         Components::setComponentEvent ($selector, $eventName, $code);
@@ -382,30 +383,37 @@ 
 
     public static function compile (string $savePath, string $iconPath, string $phpCode, string $productDescription = null, string $productName = null, string $productVersion = null, string $companyName = null, string $copyright = null, string $callSharpCode = '', string $declareSharpCode = '', WFObject $dictionary = null, WFObject $assemblies = null): array
     {
-        if ($dictionary === null)
-            $dictionary = new WFObject ('System.Collections.Generic.Dictionary`2[System.String,System.String]', null);
+        if ($dictionary === null) {
+                    $dictionary = new WFObject ('System.Collections.Generic.Dictionary`2[System.String,System.String]', null);
+        }
 
-        if ($assemblies === null)
-            $assemblies = getNetArray ('System.String', [
+        if ($assemblies === null) {
+                    $assemblies = getNetArray ('System.String', [
                 // CORE_DIR .'/CefSharp.dll',
                 CORE_DIR .'/FastColoredTextBox.dll',
                 CORE_DIR .'/ScintillaNET.dll'
             ]);
+        }
 
-        if ($productName === null)
-            $productName = basenameNoExt ($savePath);
+        if ($productName === null) {
+                    $productName = basenameNoExt ($savePath);
+        }
 
-        if ($productDescription === null)
-            $productDescription = $productName;
+        if ($productDescription === null) {
+                    $productDescription = $productName;
+        }
 
-        if ($productVersion === null)
-            $productVersion = '1.0';
+        if ($productVersion === null) {
+                    $productVersion = '1.0';
+        }
 
-        if ($companyName === null)
-            $companyName = 'Company N';
+        if ($companyName === null) {
+                    $companyName = 'Company N';
+        }
 
-        if ($copyright === null)
-            $copyright = $companyName .' copyright (c) '. date ('Y');
+        if ($copyright === null) {
+                    $copyright = $companyName .' copyright (c) '. date ('Y');
+        }
 
         return (new WFClass ('WinForms_PHP.WFCompiler', null))->compile ($savePath, $iconPath, $phpCode, $productDescription, $productName, $productVersion, $companyName, $copyright, $callSharpCode, $declareSharpCode, $dictionary, $assemblies)->names;
     }
@@ -418,9 +426,7 @@ 
         try
         {
             (new WFClass ('System.Reflection.Assembly', 'mscorlib'))->loadFrom ($path);
-        }
-
-        catch (\Throwable $e)
+        } catch (\Throwable $e)
         {
             return false;
         }
@@ -432,8 +438,9 @@ 
     {
         $property = VoidEngine::callMethod (VoidEngine::callMethod ($selector, 'GetType'), 'GetProperty', $name);
 
-        if (!is_int ($property))
-            return false;
+        if (!is_int ($property)) {
+                    return false;
+        }
 
         try
         {
@@ -476,9 +483,7 @@ 
                         VoidEngine::getProperty ($selector, [$name, 'int']);
 
                         $property = 'int';
-                    }
-
-                    catch (\Throwable $e)
+                    } catch (\Throwable $e)
                     {
                         return [
                             'type'  => 'vrsf',
@@ -487,9 +492,7 @@ 
                     }
                 break;
             }
-        }
-
-        catch (\Throwable $e)
+        } catch (\Throwable $e)
         {
             $property = 'object';
         }
@@ -507,8 +510,9 @@ 
         $props = VoidEngine::callMethod (VoidEngine::callMethod ($object, 'GetType'), 'GetEvents');
         $len   = VoidEngine::getProperty ($props, 'Length');
 
-        for ($i = 0; $i < $len; ++$i)
-            $events[] = VoidEngine::getProperty (VoidEngine::getArrayValue ($props, $i), 'Name');
+        for ($i = 0; $i < $len; ++$i) {
+                    $events[] = VoidEngine::getProperty (VoidEngine::getArrayValue ($props, $i), 'Name');
+        }
 
         return $events;
     }
@@ -533,40 +537,38 @@ 
 
     public function __construct ($object, ?string $classGroup = 'auto', ...$args)
     {
-        foreach ($args as $id => $arg)
-            $args[$id] = ngineAdditions::uncoupleSelector ($arg);
+        foreach ($args as $id => $arg) {
+                    $args[$id] = ngineAdditions::uncoupleSelector ($arg);
+        }
 
-        if (is_string ($object))
-            $this->selector = VoidEngine::createObject ($object, $classGroup == 'auto' ?
+        if (is_string ($object)) {
+                    $this->selector = VoidEngine::createObject ($object, $classGroup == 'auto' ?
                 substr ($object, 0, strrpos ($object, '.')) : $classGroup, ...$args);
-
-        elseif (is_int ($object) && VoidEngine::objectExists ($object))
-            $this->selector = $object;
-
-        else throw new \Exception ('$object parameter must be string or object selector');
+        } elseif (is_int ($object) && VoidEngine::objectExists ($object)) {
+                    $this->selector = $object;
+        } else {
+            throw new \Exception ('$object parameter must be string or object selector');
+        }
     }
     
     public function __get ($name)
 	{
-        if (method_exists ($this, $method = "get_$name"))
-            $value = $this->$method ();
-
-        elseif (substr ($name, -5) == 'Event')
-            $value = Events::getObjectEvent ($this->selector, substr ($name, 0, -5));
-
-        elseif (property_exists ($this, $name))
-            $value = $this->$name;
-
-        else switch (strtolower ($name))
+        if (method_exists ($this, $method = "get_$name")) {
+                    $value = $this->$method ();
+        } elseif (substr ($name, -5) == 'Event') {
+                    $value = Events::getObjectEvent ($this->selector, substr ($name, 0, -5));
+        } elseif (property_exists ($this, $name)) {
+                    $value = $this->$name;
+        } else {
+            switch (strtolower ($name))
         {
             case 'count':
             case 'length':
                 try
                 {
                     return $this->getProperty ('Count');
-                }
-
-                catch (\Throwable $e)
+        }
+                } catch (\Throwable $e)
                 {
                     return $this->getProperty ('Length');
                 }
@@ -576,8 +578,9 @@ 
                 $size = $this->count;
                 $list = [];
                 
-				for ($i = 0; $i < $size; ++$i)
-                    $list[] = EngineAdditions::coupleSelector (VoidEngine::getArrayValue ($this->selector, $i));
+				for ($i = 0; $i < $size; ++$i) {
+				                    $list[] = EngineAdditions::coupleSelector (VoidEngine::getArrayValue ($this->selector, $i));
+				}
                 
                 return $list;
             break;
@@ -586,13 +589,12 @@ 
                 $size = $this->count;
                 $names = [];
                 
-                for ($i = 0; $i < $size; ++$i)
-                    try
+                for ($i = 0; $i < $size; ++$i) {
+                                    try
                     {
                         $names[] = VoidEngine::getProperty (VoidEngine::getArrayValue ($this->selector, [$i, 'object']), 'Text');
-                    }
-
-                    catch (\Throwable $e)
+                }
+                    } catch (\Throwable $e)
                     {
                         $names[] = VoidEngine::getArrayValue ($this->selector, [$i, 'string']);
                     }
@@ -610,10 +612,11 @@ 
 	
 	public function __set ($name, $value)
 	{
-        if (method_exists ($this, $method = "set_$name"))
-            try
+        if (method_exists ($this, $method = "set_$name")) {
+                    try
             {
                 return $this->$method ($value);
+        }
             }
 
             # Метод "set_$name" может принимать в качестве параметра объект WFObject
@@ -623,12 +626,11 @@ 
             {
                 return $value instanceof WFObject ?
                     $this->$method ($value->selector) : null;
-            }
-
-        elseif (substr ($name, -5) == 'Event')
-            Events::setObjectEvent ($this->selector, substr ($name, 0, -5), $value);
-        
-        else $this->setProperty ($name, EngineAdditions::uncoupleSelector ($value));
+            } elseif (substr ($name, -5) == 'Event') {
+                    Events::setObjectEvent ($this->selector, substr ($name, 0, -5), $value);
+        } else {
+            $this->setProperty ($name, EngineAdditions::uncoupleSelector ($value));
+        }
     }
 	
 	public function __call ($method, $args)
@@ -643,8 +645,9 @@ 
 
     public function addRange (array $values, $assoc = false): void
     {
-        foreach ($values as $id => $value)
-            $this->offsetSet ($assoc ? $id : null, $value);
+        foreach ($values as $id => $value) {
+                    $this->offsetSet ($assoc ? $id : null, $value);
+        }
     }
     
     public function offsetSet ($index, $value)
@@ -654,9 +657,7 @@ 
             return $index === null ?
                 $this->callMethod ('Add', EngineAdditions::uncoupleSelector ($value)) :
                 $this->callMethod ('Insert', $index, EngineAdditions::uncoupleSelector ($value));
-        }
-
-        catch (\Throwable $e)
+        } catch (\Throwable $e)
         {
             return $index === null ?
                 VoidEngine::setArrayValue ($this->selector, $this->count, $value) :
@@ -679,9 +680,7 @@ 
         try
         {
             $this->offsetGet ($index);
-        }
-
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             return false;
         }
@@ -708,8 +707,9 @@ 
     {
         $size = $this->count;
 
-        for ($i = 0; $i < $size; ++$i)
-            $callback (EngineAdditions::coupleSelector (VoidEngine::getArrayValue ($this->selector, $type !== null ? [$i, $type] : $i), $this->selector), $i);
+        for ($i = 0; $i < $size; ++$i) {
+                    $callback (EngineAdditions::coupleSelector (VoidEngine::getArrayValue ($this->selector, $type !== null ? [$i, $type] : $i), $this->selector), $i);
+        }
     }
 
     public function where (\Closure $comparator, string $type = null): array
@@ -717,9 +717,10 @@ 
         $size   = $this->count;
         $return = [];
 
-        for ($i = 0; $i < $size; ++$i)
-            if ($comparator ($value = EngineAdditions::coupleSelector (VoidEngine::getArrayValue ($this->selector, $type !== null ? [$i, $type] : $i), $this->selector), $i))
+        for ($i = 0; $i < $size; ++$i) {
+                    if ($comparator ($value = EngineAdditions::coupleSelector (VoidEngine::getArrayValue ($this->selector, $type !== null ? [$i, $type] : $i), $this->selector), $i))
                 $return[] = $value;
+        }
 
         return $return;
     }
@@ -729,9 +730,7 @@ 
         try
         {
             return VoidEngine::getProperty ($this->selector, $name);
-        }
-
-        catch (\Throwable $e)
+        } catch (\Throwable $e)
         {
             return VoidEngine::getField ($this->selector, $name);
         }
@@ -742,9 +741,7 @@ 
         try
         {
             VoidEngine::setProperty ($this->selector, $name, $value);
-        }
-
-        catch (\Throwable $e)
+        } catch (\Throwable $e)
         {
             VoidEngine::setField ($this->selector, $name, $value);
         }
@@ -761,8 +758,9 @@ 
         $size   = VoidEngine::getProperty ($array, 'Length');
         $return = [];
 
-		for ($i = 0; $i < $size; ++$i)
-            $return[] = VoidEngine::getArrayValue ($array, $type === null ? $i : [$i, $type]);
+		for ($i = 0; $i < $size; ++$i) {
+		            $return[] = VoidEngine::getArrayValue ($array, $type === null ? $i : [$i, $type]);
+		}
         
         VoidEngine::removeObjects ($array);
         
@@ -774,9 +772,7 @@ 
 		try
 		{
 			return $this->getProperty ('Name');
-        }
-        
-		catch (\Throwable $e)
+        } catch (\Throwable $e)
 		{
 			return $this->name;
 		}
@@ -787,9 +783,7 @@ 
 		try
 		{
 			$this->setProperty ('Name', $name);
-        }
-        
-		catch (\Throwable $e)
+        } catch (\Throwable $e)
 		{
 			$this->name = $name;
 		}
@@ -807,14 +801,14 @@ 
 
     public function __construct ($class, ?string $classGroup = 'auto')
     {
-        if (is_string ($class))
-            $this->selector = VoidEngine::createClass ($class, $classGroup == 'auto' ?
+        if (is_string ($class)) {
+                    $this->selector = VoidEngine::createClass ($class, $classGroup == 'auto' ?
                 substr ($class, 0, strrpos ($class, '.')) : $classGroup
             );
-
-        elseif (is_int ($class) && VoidEngine::objectExists ($class))
-            $this->selector = $class;
-
-        else throw new \Exception ('$class parameter must be string or class selector');
+        } elseif (is_int ($class) && VoidEngine::objectExists ($class)) {
+                    $this->selector = $class;
+        } else {
+            throw new \Exception ('$class parameter must be string or class selector');
+        }
     }
 }

engine/common/Events.php

Spacing +13 added lines, -13 removed lines

@@ -6,42 +6,42 @@
 {
     static $events = [];
 
-    static function setObjectEvent (int $object, string $eventName, $function)
+    static function setObjectEvent(int $object, string $eventName, $function)
     {
-        $eventName = strtolower ($eventName);
+        $eventName = strtolower($eventName);
         self::$events[$object][$eventName] = $function;
 
-        VoidEngine::setObjectEvent ($object, $eventName, "
+        VoidEngine::setObjectEvent($object, $eventName, "
             if (VoidEngine\Events::getObjectEvent ('$object', '$eventName') !== false)
                 VoidEngine\Events::getObjectEvent ('$object', '$eventName') (VoidEngine\_c('$object'),
                     isset (\$args) ? (is_int (\$args) && VoidEngine\VoidEngine::objectExists (\$args) && VoidEngine\VoidEngine::objectExists (\$argsSelector = VoidCore::getArrayValue (\$args, 1)) ?
                         new VoidEngine\WFObject (\$argsSelector) : \$args) : null);");
     }
 
-    static function reserveObjectEvent (int $object, string $eventName)
+    static function reserveObjectEvent(int $object, string $eventName)
     {
-        $eventName = strtolower ($eventName);
-        self::$events[$object][$eventName] = function ($self) {};
+        $eventName = strtolower($eventName);
+        self::$events[$object][$eventName] = function($self) {};
 
-        VoidEngine::setObjectEvent ($object, $eventName, '');
+        VoidEngine::setObjectEvent($object, $eventName, '');
     }
 
-    static function removeObjectEvent (int $object, string $eventName)
+    static function removeObjectEvent(int $object, string $eventName)
     {
-        $eventName = strtolower ($eventName);
-        VoidEngine::removeObjectEvent ($object, $eventName);
+        $eventName = strtolower($eventName);
+        VoidEngine::removeObjectEvent($object, $eventName);
 
         unset (self::$events[$object][$eventName]);
     }
 
-    static function getObjectEvent (int $object, string $eventName)
+    static function getObjectEvent(int $object, string $eventName)
     {
-        $eventName = strtolower ($eventName);
+        $eventName = strtolower($eventName);
         
         return self::$events[$object][$eventName] ?: false;
     }
 
-    static function getObjectEvents (int $object)
+    static function getObjectEvents(int $object)
     {
         return self::$events[$object] ?: false;
     }