winforms-php / VoidFramework

engine/common/Others.php

Spacing +123 added lines, -124 removed lines

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

Braces +81 added lines, -72 removed lines

@@ -6,8 +6,9 @@ 
 {
     $oldStatus = $GLOBALS['__debug']['error_status'];
 
-    if ($status !== null)
-        $GLOBALS['__debug']['error_status'] = $status;
+    if ($status !== null) {
+            $GLOBALS['__debug']['error_status'] = $status;
+    }
 
     return $oldStatus;
 }
@@ -41,9 +42,7 @@ 
     try
     {
         eval ('return; '. $code);
-    }
-
-    catch (\Throwable $e)
+    } catch (\Throwable $e)
     {
         return [
             'text' => $e->getMessage (), 
@@ -67,34 +66,39 @@ 
     $array = (new WFClass ('System.Array', null))
         ->createInstance (VoidEngine::objectType ($type), $size = sizeof ($items));
 
-    for ($i = 0; $i < $size; ++$i)
-        $array[$i] = array_shift ($items);
+    for ($i = 0; $i < $size; ++$i) {
+            $array[$i] = array_shift ($items);
+    }
     
     return $array;
 }
 
 function dir_create (string $path, int $mode = 0777): void
 {
-    if (!is_dir ($path))
-        mkdir ($path, $mode, true);
-}
+    if (!is_dir ($path)) {
+            mkdir ($path, $mode, true);
+    }
+    }
 
 function dir_delete (string $path): bool
 {
-    if (!is_dir ($path))
-        return false;
+    if (!is_dir ($path)) {
+            return false;
+    }
 
-    foreach (array_slice (scandir ($path), 2) as $file)
-        if (is_dir ($file = $path .'/'. $file))
+    foreach (array_slice (scandir ($path), 2) as $file) {
+            if (is_dir ($file = $path .'/'. $file))
         {
             dir_delete ($file);
+    }
 
-            if (is_dir ($file))
-                rmdir ($file);
+            if (is_dir ($file)) {
+                            rmdir ($file);
+            }
+        } else {
+            unlink ($file);
         }
 
-        else unlink ($file);
-
     rmdir ($path);
 
     return true;
@@ -108,17 +112,22 @@ 
 
 function dir_copy (string $from, string $to): bool
 {
-    if (!is_dir ($from))
-        return false;
+    if (!is_dir ($from)) {
+            return false;
+    }
 
-    if (!is_dir ($to))
-        dir_create ($to);
+    if (!is_dir ($to)) {
+            dir_create ($to);
+    }
 
-    foreach (array_slice (scandir ($from), 2) as $file)
-        if (is_dir ($f = $from .'/'. $file))
+    foreach (array_slice (scandir ($from), 2) as $file) {
+            if (is_dir ($f = $from .'/'. $file))
             dir_copy ($f, $to .'/'. $file);
+    }
 
-        else copy ($f, $to .'/'. $file);
+        else {
+            copy ($f, $to .'/'. $file);
+        }
 
     return true;
 }
@@ -216,16 +225,16 @@ 
         {
             try
             {
-                if ($object->getType ()->isSubclassOf (VoidEngine::objectType ('System.Windows.Forms.Form', 'System.Windows.Forms')))
-                    continue;
-            }
-
-            catch (\Exception $e) {}
+                if ($object->getType ()->isSubclassOf (VoidEngine::objectType ('System.Windows.Forms.Form', 'System.Windows.Forms'))) {
+                                    continue;
+                }
+            } catch (\Exception $e) {}
             
             VoidEngine::destructObject ($selector);
 
-            if (!VoidEngine::objectExists ($selector))
-                unset (self::$components[$selector]);
+            if (!VoidEngine::objectExists ($selector)) {
+                            unset (self::$components[$selector]);
+            }
         }
     }
 }
@@ -237,16 +246,15 @@ 
 
 function c ($name, bool $returnAllSimilarObjects = false)
 {
-    if (is_int ($name) && is_object ($object = _c ($name)))
-        return $object;
-
-    else
+    if (is_int ($name) && is_object ($object = _c ($name))) {
+            return $object;
+    } else
     {
         $path    = explode ('->', $name);
         $similar = [];
 
-        foreach (Components::$components as $object)
-            try
+        foreach (Components::$components as $object) {
+                    try
             {
                 if ($object->name == end ($path))
                 {
@@ -259,32 +267,30 @@ 
                                 {
                                     if ($returnAllSimilarObjects)
                                         $similar[] = $object;
+        }
 
-                                    else return $object;
+                                    else {
+                                        return $object;
+                                    }
+                                } else {
+                                    continue;
                                 }
-
-                                else continue;
+                            } else {
+                                continue;
                             }
-
-                            else continue;
-                        }
-
-                        catch (\Throwable $e)
+                        } catch (\Throwable $e)
                         {
                             continue;
-                        }
-
-                    else
+                        } else
                     {
-                        if ($returnAllSimilarObjects)
-                            $similar[] = $object;
-
-                        else return $object;
+                        if ($returnAllSimilarObjects) {
+                                                    $similar[] = $object;
+                        } else {
+                            return $object;
+                        }
                     }
                 }
-            }
-
-            catch (\Exception $e)
+            } catch (\Exception $e)
             {
                 continue;
             }
@@ -295,31 +301,32 @@ 
 
             if (is_array ($objects))
             {
-                foreach ($objects as $id => $object)
-                    try
+                foreach ($objects as $id => $object) {
+                                    try
                     {
                         while (is_object ($parent = _c($object->parent->selector)))
                         {
                             if ($parent->getType ()->isSubclassOf (VoidEngine::objectType ('System.Windows.Forms.Form', 'System.Windows.Forms')) && $parent->name == $path[0])
                                 return $objects[$id];
+                }
 
-                            else $object = $parent;
+                            else {
+                                $object = $parent;
+                            }
                         }
-                    }
-
-                    catch (\Throwable $e)
+                    } catch (\Throwable $e)
 					{
 						continue;
 					}
 
                 return false;
+            } else {
+                return false;
             }
-
-            else return false;
-        }
-
-        else return $returnAllSimilarObjects && sizeof ($similar) > 0 ?
+        } else {
+            return $returnAllSimilarObjects && sizeof ($similar) > 0 ?
             $similar : false;
+        }
     }
 }
 
@@ -377,8 +384,9 @@ 
     {
         $collection = new WFObject ('System.Collections.Specialized.StringCollection');
 
-        foreach ($files as $file)
-            $collection->add ((string) $file);
+        foreach ($files as $file) {
+                    $collection->add ((string) $file);
+        }
 
         (new WFClass ('System.Windows.Forms.Clipboard'))->setFileDropList ($collection);
         VoidEngine::removeObjects ($collection->selector);
@@ -444,12 +452,13 @@ 
         16384 => 'E_USER_DEPRECATED'
     ];
 
-    if ($GLOBALS['__debug']['error_status'])
-        message ([
+    if ($GLOBALS['__debug']['error_status']) {
+            message ([
             'type'      => $errarr[$no],
             'text'      => $str,
             'file'      => $file,
             'line'      => $line,
             'backtrace' => debug_backtrace ()
         ], 'PHP Script Error');
-});
+    }
+    });

engine/common/EngineInterfaces.php

Spacing +140 added lines, -142 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,12 +282,12 @@ 
      * 
      */
 
-    public static function setObjectEvent (int $selector, string $eventName, callable $event): void
+    public static function setObjectEvent(int $selector, string $eventName, callable $event): void
     {
         /*if (self::eventExists ($selector, $eventName))
             self::removeObjectEvent ($selector, $eventName);*/
 
-        \VoidCore::setEvent ($selector, $eventName, $event);
+        \VoidCore::setEvent($selector, $eventName, $event);
     }
 
     /**
@@ -305,9 +305,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);
     }
 
     /**
@@ -324,9 +324,9 @@ 
      * 
      */
 
-    public static function removeObjectEvent (int $selector, string $eventName): void
+    public static function removeObjectEvent(int $selector, string $eventName): void
     {
-        \VoidCore::removeEvent ($selector, $eventName);
+        \VoidCore::removeEvent($selector, $eventName);
     }
 
     /**
@@ -338,9 +338,9 @@ 
      * 
      */
 
-    public static function importObject (string $data): int
+    public static function importObject(string $data): int
     {
-        return \VoidCore::importObject ($data);
+        return \VoidCore::importObject($data);
     }
 
     /**
@@ -352,9 +352,9 @@ 
      * 
      */
 
-    public static function exportObject (int $selector): string
+    public static function exportObject(int $selector): string
     {
-        return \VoidCore::exportObject ($selector);
+        return \VoidCore::exportObject($selector);
     }
 
     /**
@@ -378,20 +378,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;
@@ -403,19 +403,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)
@@ -426,16 +426,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)
             {
@@ -471,7 +471,7 @@ 
                 default:
                     try
                     {
-                        VoidEngine::getProperty ($selector, [$name, 'int']);
+                        VoidEngine::getProperty($selector, [$name, 'int']);
 
                         $property = 'int';
                     }
@@ -480,7 +480,7 @@ 
                     {
                         return [
                             'type'  => 'vrsf',
-                            'value' => VoidEngine::exportObject (VoidEngine::getProperty ($selector, [$name, 'object']))
+                            'value' => VoidEngine::exportObject(VoidEngine::getProperty($selector, [$name, 'object']))
                         ];
                     }
                 break;
@@ -494,19 +494,19 @@ 
 
         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;
     }
@@ -516,13 +516,13 @@ 
      * Тогда получается бесконечный цикл вида object->selector->selector->selector->...
      * Чтобы этого избежать нужно добавить исключение - переменную $selfSelector
      */
-    public static function coupleSelector ($value, int $selfSelector = null)
+    public static function coupleSelector($value, int $selfSelector = null)
     {
-        return is_int ($value) && 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;
@@ -534,44 +534,44 @@ 
     protected int $selector = 0;
     protected ?string $name;
 
-    public function __construct ($object, ?string $classGroup = 'auto', ...$args)
+    public function __construct($object, ?string $classGroup = 'auto', ...$args)
     {
         foreach ($args as $id => $arg)
-            $args[$id] = EngineAdditions::uncoupleSelector ($arg);
+            $args[$id] = EngineAdditions::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;
 
@@ -580,7 +580,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;
@@ -592,31 +592,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
@@ -625,63 +625,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)
@@ -692,19 +690,19 @@ 
         return true;
     }
 	
-	public function indexOf ($value): int
+	public function indexOf($value): int
 	{
-		return $this->callMethod ('IndexOf', EngineAdditions::uncoupleSelector ($value));
+		return $this->callMethod('IndexOf', EngineAdditions::uncoupleSelector($value));
     }
     
-    public function lastIndexOf ($value): int
+    public function lastIndexOf($value): int
 	{
-		return $this->callMethod ('LastIndexOf', EngineAdditions::uncoupleSelector ($value));
+		return $this->callMethod('LastIndexOf', EngineAdditions::uncoupleSelector($value));
 	}
 	
-	public function contains ($value): bool
+	public function contains($value): bool
 	{
-		return $this->callMethod ('Contains', EngineAdditions::uncoupleSelector ($value));
+		return $this->callMethod('Contains', EngineAdditions::uncoupleSelector($value));
     }
 
     public function foreach (callable $callback, string $type = null): void
@@ -712,71 +710,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 (callable $comparator, string $type = null): array
+    public function where(callable $comparator, string $type = null): array
     {
         $size   = $this->count;
         $return = [];
 
         for ($i = 0; $i < $size; ++$i)
-            if ($comparator ($value = EngineAdditions::coupleSelector (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)
@@ -785,11 +783,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)
@@ -798,24 +796,24 @@ 
 		}
 	}
 
-    public function __toString (): string
+    public function __toString(): string
     {
-        return $this->callMethod ('ToString');
+        return $this->callMethod('ToString');
     }
 }
 
 class WFClass extends WFObject
 {
-    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 +90 added lines, -97 removed lines

@@ -380,30 +380,37 @@ 
 
     public static function compile (string $savePath, string $iconPath, string $phpCode, string $productDescription = null, string $productName = null, string $productVersion = null, string $companyName = null, string $copyright = null, string $callSharpCode = '', string $declareSharpCode = '', WFObject $dictionary = null, WFObject $assemblies = null): array
     {
-        if ($dictionary === null)
-            $dictionary = new WFObject ('System.Collections.Generic.Dictionary`2[System.String,System.String]', null);
+        if ($dictionary === null) {
+                    $dictionary = new WFObject ('System.Collections.Generic.Dictionary`2[System.String,System.String]', null);
+        }
 
-        if ($assemblies === null)
-            $assemblies = getNetArray ('System.String', [
+        if ($assemblies === null) {
+                    $assemblies = getNetArray ('System.String', [
                 // CORE_DIR .'/CefSharp.dll',
                 CORE_DIR .'/FastColoredTextBox.dll',
                 CORE_DIR .'/ScintillaNET.dll'
             ]);
+        }
 
-        if ($productName === null)
-            $productName = basenameNoExt ($savePath);
+        if ($productName === null) {
+                    $productName = basenameNoExt ($savePath);
+        }
 
-        if ($productDescription === null)
-            $productDescription = $productName;
+        if ($productDescription === null) {
+                    $productDescription = $productName;
+        }
 
-        if ($productVersion === null)
-            $productVersion = '1.0';
+        if ($productVersion === null) {
+                    $productVersion = '1.0';
+        }
 
-        if ($companyName === null)
-            $companyName = 'Company N';
+        if ($companyName === null) {
+                    $companyName = 'Company N';
+        }
 
-        if ($copyright === null)
-            $copyright = $companyName .' copyright (c) '. date ('Y');
+        if ($copyright === null) {
+                    $copyright = $companyName .' copyright (c) '. date ('Y');
+        }
 
         return (new WFClass ('WinForms_PHP.WFCompiler', null))->compile ($savePath, $iconPath, $phpCode, $productDescription, $productName, $productVersion, $companyName, $copyright, $callSharpCode, $declareSharpCode, $dictionary, $assemblies)->names;
     }
@@ -416,9 +423,7 @@ 
         try
         {
             (new WFClass ('System.Reflection.Assembly', 'mscorlib'))->loadFrom ($path);
-        }
-
-        catch (\Throwable $e)
+        } catch (\Throwable $e)
         {
             return false;
         }
@@ -430,8 +435,9 @@ 
     {
         $property = VoidEngine::callMethod (VoidEngine::callMethod ($selector, 'GetType'), 'GetProperty', $name);
 
-        if (!is_int ($property))
-            return false;
+        if (!is_int ($property)) {
+                    return false;
+        }
 
         try
         {
@@ -474,9 +480,7 @@ 
                         VoidEngine::getProperty ($selector, [$name, 'int']);
 
                         $property = 'int';
-                    }
-
-                    catch (\Throwable $e)
+                    } catch (\Throwable $e)
                     {
                         return [
                             'type'  => 'vrsf',
@@ -485,9 +489,7 @@ 
                     }
                 break;
             }
-        }
-
-        catch (\Throwable $e)
+        } catch (\Throwable $e)
         {
             $property = 'object';
         }
@@ -505,8 +507,9 @@ 
         $props = VoidEngine::callMethod (VoidEngine::callMethod ($object, 'GetType'), 'GetEvents');
         $len   = VoidEngine::getProperty ($props, 'Length');
 
-        for ($i = 0; $i < $len; ++$i)
-            $events[] = VoidEngine::getProperty (VoidEngine::getArrayValue ($props, $i), 'Name');
+        for ($i = 0; $i < $len; ++$i) {
+                    $events[] = VoidEngine::getProperty (VoidEngine::getArrayValue ($props, $i), 'Name');
+        }
 
         return $events;
     }
@@ -536,40 +539,38 @@ 
 
     public function __construct ($object, ?string $classGroup = 'auto', ...$args)
     {
-        foreach ($args as $id => $arg)
-            $args[$id] = EngineAdditions::uncoupleSelector ($arg);
+        foreach ($args as $id => $arg) {
+                    $args[$id] = EngineAdditions::uncoupleSelector ($arg);
+        }
 
-        if (is_string ($object))
-            $this->selector = VoidEngine::createObject ($object, $classGroup == 'auto' ?
+        if (is_string ($object)) {
+                    $this->selector = VoidEngine::createObject ($object, $classGroup == 'auto' ?
                 substr ($object, 0, strrpos ($object, '.')) : $classGroup, ...$args);
-
-        elseif (is_int ($object) && VoidEngine::objectExists ($object))
-            $this->selector = $object;
-
-        else throw new \Exception ('$object parameter must be string or object selector');
+        } elseif (is_int ($object) && VoidEngine::objectExists ($object)) {
+                    $this->selector = $object;
+        } else {
+            throw new \Exception ('$object parameter must be string or object selector');
+        }
     }
     
     public function __get ($name)
 	{
-        if (method_exists ($this, $method = "get_$name"))
-            $value = $this->$method ();
-
-        elseif (substr ($name, -5) == 'Event')
-            $value = Events::getObjectEvent ($this->selector, substr ($name, 0, -5));
-
-        elseif (property_exists ($this, $name))
-            $value = $this->$name;
-
-        else switch (strtolower ($name))
+        if (method_exists ($this, $method = "get_$name")) {
+                    $value = $this->$method ();
+        } elseif (substr ($name, -5) == 'Event') {
+                    $value = Events::getObjectEvent ($this->selector, substr ($name, 0, -5));
+        } elseif (property_exists ($this, $name)) {
+                    $value = $this->$name;
+        } else {
+            switch (strtolower ($name))
         {
             case 'count':
             case 'length':
                 try
                 {
                     return $this->getProperty ('Count');
-                }
-
-                catch (\Throwable $e)
+        }
+                } catch (\Throwable $e)
                 {
                     return $this->getProperty ('Length');
                 }
@@ -579,8 +580,9 @@ 
                 $size = $this->count;
                 $list = [];
                 
-				for ($i = 0; $i < $size; ++$i)
-                    $list[] = EngineAdditions::coupleSelector (VoidEngine::getArrayValue ($this->selector, $i));
+				for ($i = 0; $i < $size; ++$i) {
+				                    $list[] = EngineAdditions::coupleSelector (VoidEngine::getArrayValue ($this->selector, $i));
+				}
                 
                 return $list;
             break;
@@ -589,13 +591,12 @@ 
                 $size = $this->count;
                 $names = [];
                 
-                for ($i = 0; $i < $size; ++$i)
-                    try
+                for ($i = 0; $i < $size; ++$i) {
+                                    try
                     {
                         $names[] = VoidEngine::getProperty (VoidEngine::getArrayValue ($this->selector, [$i, 'object']), 'Text');
-                    }
-
-                    catch (\Throwable $e)
+                }
+                    } catch (\Throwable $e)
                     {
                         $names[] = VoidEngine::getArrayValue ($this->selector, [$i, 'string']);
                     }
@@ -613,10 +614,11 @@ 
 	
 	public function __set ($name, $value)
 	{
-        if (method_exists ($this, $method = "set_$name"))
-            try
+        if (method_exists ($this, $method = "set_$name")) {
+                    try
             {
                 return $this->$method ($value);
+        }
             }
 
             # Метод "set_$name" может принимать в качестве параметра объект WFObject
@@ -626,12 +628,11 @@ 
             {
                 return $value instanceof WFObject ?
                     $this->$method ($value->selector) : null;
-            }
-
-        elseif (substr ($name, -5) == 'Event')
-            Events::setObjectEvent ($this->selector, substr ($name, 0, -5), $value);
-        
-        else $this->setProperty ($name, EngineAdditions::uncoupleSelector ($value));
+            } elseif (substr ($name, -5) == 'Event') {
+                    Events::setObjectEvent ($this->selector, substr ($name, 0, -5), $value);
+        } else {
+            $this->setProperty ($name, EngineAdditions::uncoupleSelector ($value));
+        }
     }
 	
 	public function __call ($method, $args)
@@ -646,8 +647,9 @@ 
 
     public function addRange (array $values, $assoc = false): void
     {
-        foreach ($values as $id => $value)
-            $this->offsetSet ($assoc ? $id : null, $value);
+        foreach ($values as $id => $value) {
+                    $this->offsetSet ($assoc ? $id : null, $value);
+        }
     }
     
     public function offsetSet ($index, $value)
@@ -657,9 +659,7 @@ 
             return $index === null ?
                 $this->callMethod ('Add', EngineAdditions::uncoupleSelector ($value)) :
                 $this->callMethod ('Insert', $index, EngineAdditions::uncoupleSelector ($value));
-        }
-
-        catch (\Throwable $e)
+        } catch (\Throwable $e)
         {
             return $index === null ?
                 VoidEngine::setArrayValue ($this->selector, $this->count, $value) :
@@ -682,9 +682,7 @@ 
         try
         {
             $this->offsetGet ($index);
-        }
-
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             return false;
         }
@@ -711,8 +709,9 @@ 
     {
         $size = $this->count;
 
-        for ($i = 0; $i < $size; ++$i)
-            $callback (EngineAdditions::coupleSelector (VoidEngine::getArrayValue ($this->selector, $type !== null ? [$i, $type] : $i), $this->selector), $i);
+        for ($i = 0; $i < $size; ++$i) {
+                    $callback (EngineAdditions::coupleSelector (VoidEngine::getArrayValue ($this->selector, $type !== null ? [$i, $type] : $i), $this->selector), $i);
+        }
     }
 
     public function where (callable $comparator, string $type = null): array
@@ -720,9 +719,10 @@ 
         $size   = $this->count;
         $return = [];
 
-        for ($i = 0; $i < $size; ++$i)
-            if ($comparator ($value = EngineAdditions::coupleSelector (VoidEngine::getArrayValue ($this->selector, $type !== null ? [$i, $type] : $i), $this->selector), $i))
+        for ($i = 0; $i < $size; ++$i) {
+                    if ($comparator ($value = EngineAdditions::coupleSelector (VoidEngine::getArrayValue ($this->selector, $type !== null ? [$i, $type] : $i), $this->selector), $i))
                 $return[] = $value;
+        }
 
         return $return;
     }
@@ -732,9 +732,7 @@ 
         try
         {
             return VoidEngine::getProperty ($this->selector, $name);
-        }
-
-        catch (\Throwable $e)
+        } catch (\Throwable $e)
         {
             return VoidEngine::getField ($this->selector, $name);
         }
@@ -745,9 +743,7 @@ 
         try
         {
             VoidEngine::setProperty ($this->selector, $name, $value);
-        }
-
-        catch (\Throwable $e)
+        } catch (\Throwable $e)
         {
             VoidEngine::setField ($this->selector, $name, $value);
         }
@@ -764,8 +760,9 @@ 
         $size   = VoidEngine::getProperty ($array, 'Length');
         $return = [];
 
-		for ($i = 0; $i < $size; ++$i)
-            $return[] = VoidEngine::getArrayValue ($array, $type === null ? $i : [$i, $type]);
+		for ($i = 0; $i < $size; ++$i) {
+		            $return[] = VoidEngine::getArrayValue ($array, $type === null ? $i : [$i, $type]);
+		}
         
         VoidEngine::removeObjects ($array);
         
@@ -777,9 +774,7 @@ 
 		try
 		{
 			return $this->getProperty ('Name');
-        }
-        
-		catch (\Throwable $e)
+        } catch (\Throwable $e)
 		{
 			return $this->name;
 		}
@@ -790,9 +785,7 @@ 
 		try
 		{
 			$this->setProperty ('Name', $name);
-        }
-        
-		catch (\Throwable $e)
+        } catch (\Throwable $e)
 		{
 			$this->name = $name;
 		}
@@ -808,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/Globals.php

Spacing +21 added lines, -21 removed lines

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

engine/VoidEngine.php

Spacing +6 added lines, -6 removed lines

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

engine/extensions/VLF/main.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
     public string $name; // Имя объекта
     public int $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/interpreter.php

Spacing +57 added lines, -58 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,61 +145,61 @@ 
                             $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).');');
 
-                                elseif (sizeof ($methodArgs) > 0)
-                                    self::$objects[$name]->$methodName (...eval ('namespace VoidEngine; return ['. implode (', ', $methodArgs) .'];'));
+                                elseif (sizeof($methodArgs) > 0)
+                                    self::$objects[$name]->$methodName(...eval ('namespace VoidEngine; return ['.implode(', ', $methodArgs).'];'));
 
-                                else self::$objects[$name]->$methodName ();
+                                else self::$objects[$name]->$methodName();
                             }
 
                             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))));
                 }
             }
 
@@ -216,26 +216,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 = [];
 
@@ -243,14 +242,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 +80 added lines, -75 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,33 +143,34 @@ 
                             $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) .');');
-
-                                elseif (sizeof ($methodArgs) > 0)
-                                    self::$objects[$name]->$methodName (...eval ('namespace VoidEngine; return ['. implode (', ', $methodArgs) .'];'));
-
-                                else self::$objects[$name]->$methodName ();
-                            }
-
-                            catch (\Throwable $e)
+                                if (strpos ($methodName, '->') !== false && self::$allow_multimethods_calls) {
+                                                                    eval ('namespace VoidEngine; _c('. self::$objects[$name]->selector .')->'. $methodName .' ('. implode (', ', $methodArgs) .');');
+                                } elseif (sizeof ($methodArgs) > 0) {
+                                                                    self::$objects[$name]->$methodName (...eval ('namespace VoidEngine; return ['. implode (', ', $methodArgs) .'];'));
+                                } else {
+                                    self::$objects[$name]->$methodName ();
+                                }
+                            } 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:
@@ -178,16 +178,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]]))
@@ -197,9 +199,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))));
                 }
             }
 
@@ -239,8 +241,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 (['\'', '"', '$']);
@@ -249,10 +252,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;
@@ -260,8 +264,9 @@ 
                         break;
                     }
 
-                if (!$replaced)
-                    $newLine .= $line[$i];
+                if (!$replaced) {
+                                    $newLine .= $line[$i];
+                }
             }
 
             $line = $newLine;

engine/extensions/VLF/bin/parser.php

Spacing +81 added lines, -83 removed lines

@@ -23,10 +23,10 @@ 
      * @param string $content - VLF разметка или путь до файла разметки
      * [@param array $settings = []] - список настроек и их значений (настройка => значение)
      */
-    public function __construct (string $content, array $settings = [])
+    public function __construct(string $content, array $settings = [])
     {
-        if (file_exists ($content))
-            $content = file_get_contents ($content);
+        if (file_exists($content))
+            $content = file_get_contents($content);
 
         // Зачем? Так надо!
         $content = "# VLF begin\n\n$content\n\n# VLF end";
@@ -36,14 +36,14 @@ 
             if (isset ($this->$name))
                 $this->$name = $setting;
 
-            else throw new \Exception ('Trying to setting up undefined property "'. $name .'"');
+            else throw new \Exception('Trying to setting up undefined property "'.$name.'"');
         }
 
-        if ($this->use_caching && file_exists ($file = VLF_EXT_DIR .'/cache/'. sha1 ($content) .'.cache'))
+        if ($this->use_caching && file_exists($file = VLF_EXT_DIR.'/cache/'.sha1($content).'.cache'))
         {
-            $info = unserialize (gzinflate (file_get_contents ($file)));
+            $info = unserialize(gzinflate(file_get_contents($file)));
 
-            if ($info[0] == sha1 (file_get_contents (__FILE__)))
+            if ($info[0] == sha1(file_get_contents(__FILE__)))
             {
                 $this->tree  = $info[1][0];
                 $this->links = $info[1][1];
@@ -51,20 +51,20 @@ 
                 return;
             }
 
-            else unlink ($file);
+            else unlink($file);
         }
 
-        $info = $this->generateSyntaxTree ($content);
+        $info = $this->generateSyntaxTree($content);
 
         $this->tree  = $info[0];
         $this->links = $info[1];
 
         if ($this->use_caching)
         {
-            if (!is_dir (dirname (__DIR__) .'/cache'))
-                mkdir (dirname (__DIR__) .'/cache');
+            if (!is_dir(dirname(__DIR__).'/cache'))
+                mkdir(dirname(__DIR__).'/cache');
 
-            file_put_contents (VLF_EXT_DIR .'/cache/'. sha1 ($content) .'.cache', gzdeflate (serialize ([sha1 (file_get_contents (__FILE__)), $info])));
+            file_put_contents(VLF_EXT_DIR.'/cache/'.sha1($content).'.cache', gzdeflate(serialize([sha1(file_get_contents(__FILE__)), $info])));
         }
     }
 
@@ -76,9 +76,9 @@ 
      * 
      * @return array - возвращает АСД
      */
-    protected function generateSyntaxTree (string $content): array
+    protected function generateSyntaxTree(string $content): array
     {
-        $lines          = $this->linesFilter ($untouched_lines = explode ($this->divider, $content));
+        $lines          = $this->linesFilter($untouched_lines = explode($this->divider, $content));
         $current_object = null;
         $parent_objects = [];
         $skip_at        = -1;
@@ -86,18 +86,18 @@ 
         $links          = [];
 
         if ($this->debug_mode)
-            pre ($lines);
+            pre($lines);
 
         foreach ($lines as $id => $line)
         {
             if ($skip_at > $id)
                 continue;
 
-            $height = $this->getLineHeight ($line);
-            $words  = $this->linesFilter (explode (' ', $line));
+            $height = $this->getLineHeight($line);
+            $words  = $this->linesFilter(explode(' ', $line));
 
             if ($this->debug_mode)
-                pre ($words);
+                pre($words);
 
             /**
              * Высокоинтеллектуальный фикс
@@ -119,7 +119,7 @@ 
                 $updated = false;
 
                 if ($this->debug_mode)
-                    pre ($current_object);
+                    pre($current_object);
 
                 while (isset ($tree[$current_object]['info']['subparent_link']) && $tree[$link = $tree[$current_object]['info']['subparent_link']->link]['hard'] < $tree[$current_object]['hard'])
                 {
@@ -127,7 +127,7 @@ 
                     $updated        = true;
 
                     if ($this->debug_mode)
-                        pre ($current_object);
+                        pre($current_object);
                 }
 
                 if (
@@ -142,16 +142,16 @@ 
                     break;
 
                 if ($this->debug_mode)
-                    pre ($current_object);
+                    pre($current_object);
             }
 
             /**
              * Button ...
              */
-            if (class_exists ($words[0]) || class_exists ('\VoidEngine\\'. $words[0]))
+            if (class_exists($words[0]) || class_exists('\VoidEngine\\'.$words[0]))
             {
                 if (!isset ($words[1]))
-                    throw new \Exception ('Object name mustn\'t be empty at line "'. $line .'"');
+                    throw new \Exception('Object name mustn\'t be empty at line "'.$line.'"');
 
                 /**
                  * Button NewButton
@@ -197,40 +197,39 @@ 
                         'syntax_nodes' => []
                     ];
 
-                    if (($begin = strpos ($line, '(')) !== false)
+                    if (($begin = strpos($line, '(')) !== false)
                     {
                         ++$begin;
                         
-                        $end = strrpos ($line, ')');
+                        $end = strrpos($line, ')');
 
                         if ($end === false)
-                            throw new \Exception ('Line "'. $line .'" have arguments list initialization, but not have list ending');
+                            throw new \Exception('Line "'.$line.'" have arguments list initialization, but not have list ending');
 
                         elseif ($begin < $end)
                         {
                             $arguments = [];
                             // $parsed    = explode (',', substr ($line, $begin, $end - $begin));
-                            $parsed    = $this->parseArguments (substr ($line, $begin, $end - $begin));
+                            $parsed    = $this->parseArguments(substr($line, $begin, $end - $begin));
 
                             foreach ($parsed as $argument_id => $argument)
                             {
-                                $argument = trim ($argument);
+                                $argument = trim($argument);
 
-                                if (strlen ($argument) > 0)
+                                if (strlen($argument) > 0)
                                     $arguments[] = isset ($links[$argument]) ?
-                                        new VLFLink ($argument, $links[$argument]) :
-                                        $argument;
+                                        new VLFLink($argument, $links[$argument]) : $argument;
 
-                                else throw new \Exception ('Argument '. ($argument_id + 1) .' mustn\'t have zero length at line "'. $line .'"');
+                                else throw new \Exception('Argument '.($argument_id + 1).' mustn\'t have zero length at line "'.$line.'"');
                             }
 
                             $tree[$id]['info']['arguments'] = $arguments;
 
-                            if (!$this->ignore_postobject_info && trim (substr ($line, $end)) > 0)
-                                throw new \Exception ('You mustn\'t write any chars after arguments definition');
+                            if (!$this->ignore_postobject_info && trim(substr($line, $end)) > 0)
+                                throw new \Exception('You mustn\'t write any chars after arguments definition');
                         }
 
-                        $tree[$id]['info']['subparent_link'] = new VLFLink ($tree[$current_object]['info']['object_name'], $current_object);
+                        $tree[$id]['info']['subparent_link'] = new VLFLink($tree[$current_object]['info']['object_name'], $current_object);
                     }
 
                     /**
@@ -240,7 +239,7 @@ 
                     elseif ($current_object !== null && $tree[$current_object]['hard'] < $height)
                     {
                         $tree[$id]['info']['arguments'] = [
-                            new VLFLink ($tree[$current_object]['info']['object_name'], $current_object)
+                            new VLFLink($tree[$current_object]['info']['object_name'], $current_object)
                         ];
 
                         $parent_objects[$id] = $current_object;
@@ -287,17 +286,17 @@ 
                 {
                     if ($words[0][1] == '^')
                     {
-                        $parsed = $this->parseSubText ($untouched_lines, $id, $height);
+                        $parsed = $this->parseSubText($untouched_lines, $id, $height);
 
                         $comment .= $parsed[0];
                         $skip_at  = $parsed[1];
                     }
 
-                    else throw new \Exception ('Unknown char founded after syntax-control symbol at line "'. $line .'"');
+                    else throw new \Exception('Unknown char founded after syntax-control symbol at line "'.$line.'"');
                 }
                 
                 if ($this->debug_mode)
-                    pre ("Comment:\n\n$comment");
+                    pre("Comment:\n\n$comment");
             }
 
             /**
@@ -309,19 +308,19 @@ 
              */
             elseif ($words[0][0] == '%')
             {
-                $code = substr ($line, strlen ($words[0]));
+                $code = substr($line, strlen($words[0]));
 
                 if (isset ($words[0][1]))
                 {
                     if ($words[0][1] == '^')
                     {
-                        $parsed = $this->parseSubText ($untouched_lines, $id, $height);
+                        $parsed = $this->parseSubText($untouched_lines, $id, $height);
 
                         $code   .= $parsed[0];
                         $skip_at = $parsed[1];
                     }
 
-                    else throw new \Exception ('Unknown char founded after syntax-control symbol at line "'. $line .'"');
+                    else throw new \Exception('Unknown char founded after syntax-control symbol at line "'.$line.'"');
                 }
                 
                 $tree[$id] = [
@@ -346,7 +345,7 @@ 
              * Form MyForm
              *     Button MyButton
              */
-            elseif (is_int ($current_object) && isset ($tree[$current_object]['hard']))
+            elseif (is_int($current_object) && isset ($tree[$current_object]['hard']))
             {
                 if ($height <= $tree[$current_object]['hard'] && isset ($parent_objects[$current_object]))
                 {
@@ -372,16 +371,16 @@ 
                 /**
                  * property_name: property_value
                  */
-                $postChar = substr ($words[0], strlen ($words[0]) - 1);
+                $postChar = substr($words[0], strlen($words[0]) - 1);
 
                 if ($postChar == ':' || $postChar == '^')
                 {
                     if (!isset ($words[1]))
-                        throw new \Exception ('Property value mustn\'t be empty at line "'. $line .'"');
+                        throw new \Exception('Property value mustn\'t be empty at line "'.$line.'"');
 
-                    $propertyName     = substr ($words[0], 0, -1);
-                    $propertyValue    = implode (' ', array_slice ($words, 1));
-                    $propertyRawValue = ltrim (substr ($line, strlen ($words[0])));
+                    $propertyName     = substr($words[0], 0, -1);
+                    $propertyValue    = implode(' ', array_slice($words, 1));
+                    $propertyRawValue = ltrim(substr($line, strlen($words[0])));
 
                     /**
                      * property_name:^ property_value_1
@@ -389,10 +388,10 @@ 
                      */
                     if ($postChar == '^')
                     {
-                        $parsed = $this->parseSubText ($untouched_lines, $id, $height);
+                        $parsed = $this->parseSubText($untouched_lines, $id, $height);
 
                         $skip_at           = $parsed[1];
-                        $propertyName      = substr ($propertyName, 0, -1);
+                        $propertyName      = substr($propertyName, 0, -1);
                         $propertyRawValue .= $parsed[0];
                         $propertyValue     = $propertyRawValue;
                     }
@@ -413,7 +412,7 @@ 
                     ];
 
                     if (isset ($links[$info['info']['property_value']]))
-                        $info['info']['property_value'] = new VLFLink ($info['info']['property_value'], $links[$info['info']['property_value']]);
+                        $info['info']['property_value'] = new VLFLink($info['info']['property_value'], $links[$info['info']['property_value']]);
 
                     $tree[$current_object]['syntax_nodes'][] = $info;
                 }
@@ -421,38 +420,37 @@ 
                 /**
                  * ->method_name ([method_arguments])
                  */
-                elseif (substr ($words[0], 0, 2) == '->')
+                elseif (substr($words[0], 0, 2) == '->')
                 {
                     $arguments = [];
                     
-                    if (($begin = strpos ($line, '(')) !== false)
+                    if (($begin = strpos($line, '(')) !== false)
                     {
                         ++$begin;
                         
-                        $end = strrpos ($line, ')');
+                        $end = strrpos($line, ')');
 
                         if ($end === false)
-                            throw new \Exception ('Line "'. $line .'" have arguments list initialization, but not have list ending');
+                            throw new \Exception('Line "'.$line.'" have arguments list initialization, but not have list ending');
 
                         elseif ($begin < $end)
                         {
                             // $parsed = explode (',', substr ($line, $begin, $end - $begin));
-                            $parsed = $this->parseArguments (substr ($line, $begin, $end - $begin));
+                            $parsed = $this->parseArguments(substr($line, $begin, $end - $begin));
 
                             foreach ($parsed as $argument_id => $argument)
                             {
-                                $argument = trim ($argument);
+                                $argument = trim($argument);
 
-                                if (strlen ($argument) > 0)
+                                if (strlen($argument) > 0)
                                     $arguments[] = isset ($links[$argument]) ?
-                                        new VLFLink ($argument, $links[$argument]) :
-                                        $argument;
+                                        new VLFLink($argument, $links[$argument]) : $argument;
 
-                                else throw new \Exception ('Argument '. ($argument_id + 1) .' mustn\'t have zero length at line "'. $line .'"');
+                                else throw new \Exception('Argument '.($argument_id + 1).' mustn\'t have zero length at line "'.$line.'"');
                             }
 
-                            if (!$this->ignore_postobject_info && trim (substr ($line, $end)) > 0)
-                                throw new \Exception ('You mustn\'t write any chars after arguments definition');
+                            if (!$this->ignore_postobject_info && trim(substr($line, $end)) > 0)
+                                throw new \Exception('You mustn\'t write any chars after arguments definition');
                         }
                     }
 
@@ -460,7 +458,7 @@ 
                      * ->show
                      */
                     elseif (!$this->ignore_unexpected_method_args)
-                        throw new \Exception ('Unexpected method arguments list at line "'. $line .'"');
+                        throw new \Exception('Unexpected method arguments list at line "'.$line.'"');
 
                     $tree[$current_object]['syntax_nodes'][] = [
                         'type'  => VLF_METHOD_CALL,
@@ -469,7 +467,7 @@ 
                         'words' => $words,
 
                         'info' => [
-                            'method_name'      => substr ($words[0], 2),
+                            'method_name'      => substr($words[0], 2),
                             'method_arguments' => $arguments
                         ],
 
@@ -492,7 +490,7 @@ 
                  */
                 else
                 {
-                    $parsed  = $this->parseSubText ($untouched_lines, $id, $height);
+                    $parsed  = $this->parseSubText($untouched_lines, $id, $height);
                     $skip_at = $parsed[1];
                     
                     $tree[$id] = [
@@ -502,7 +500,7 @@ 
                         'words' => $words,
 
                         'info' => [
-                            'object_vlf_info' => $line ."\n". $parsed[0]
+                            'object_vlf_info' => $line."\n".$parsed[0]
                         ],
 
                         'syntax_nodes' => []
@@ -513,7 +511,7 @@ 
             /**
              * Что-то загадочное, таинственное, неизвестное человечеству
              */
-            else throw new \Exception ('Unknown structures founded at line "'. $line .'"');
+            else throw new \Exception('Unknown structures founded at line "'.$line.'"');
         }
 
         return [$tree, $links];
@@ -529,7 +527,7 @@ 
      * 
      * @return array - возвращает спарсенные подстроки
      */
-    protected function parseSubText (array $lines, $begin_id, int $down_height): array
+    protected function parseSubText(array $lines, $begin_id, int $down_height): array
     {
         $parsed = "\n";
 
@@ -538,17 +536,17 @@ 
             if ($line_id <= $begin_id)
                 continue;
 
-            if (!(bool)(trim ($line)))
+            if (!(bool) (trim($line)))
             {
                 $parsed .= "\n";
             
                 continue;
             }
 
-            $height = $this->getLineHeight ($line);
+            $height = $this->getLineHeight($line);
 
             if ($this->debug_mode)
-                pre ("$height, $down_height, $line");
+                pre("$height, $down_height, $line");
 
             if ($height > $down_height)
                 $parsed .= "$line\n";
@@ -559,7 +557,7 @@ 
         return [$parsed, $line_id];
     }
 
-    public function __get ($name) // Возвращалка переменных парсера
+    public function __get($name) // Возвращалка переменных парсера
     {
         return isset ($this->$name) ?
             $this->$name : false;
@@ -573,14 +571,14 @@ 
      * 
      * @return int - высота строки
      */
-    protected function getLineHeight (string &$line): int
+    protected function getLineHeight(string &$line): int
     {
         $i = 0;
 
         while (isset ($line[$i]) && $line[$i] == "\t")
             ++$i;
         
-        return strlen ($line = str_repeat ('    ', $i) . substr ($line, $i)) - strlen ($line = trim ($line));
+        return strlen($line = str_repeat('    ', $i).substr($line, $i)) - strlen($line = trim($line));
     }
 
     /**
@@ -591,18 +589,18 @@ 
      * 
      * @return array - возвращает очищенный массив
      */
-    protected function linesFilter (array $segments): array
+    protected function linesFilter(array $segments): array
     {
-        return array_filter ($segments, function ($text)
+        return array_filter($segments, function($text)
         {
-            if ($this->strong_line_parser && preg_match ('/[^a-z0-9]/i', $text))
-                throw new \Exception  ('Line "'. $text .'" mustn\'t have any not-alphabet or not-numeric characters');
+            if ($this->strong_line_parser && preg_match('/[^a-z0-9]/i', $text))
+                throw new \Exception('Line "'.$text.'" mustn\'t have any not-alphabet or not-numeric characters');
             
-            return strlen (trim ($text)) > 0;
+            return strlen(trim($text)) > 0;
         });
     }
 
-    protected function parseArguments (string $arguments): array
+    protected function parseArguments(string $arguments): array
     {
         $args = [];
 
@@ -610,7 +608,7 @@ 
         $split2   = false;
         $canSplit = -1;
 
-        $len = strlen ($arguments);
+        $len = strlen($arguments);
         $t   = '';
 
         for ($i = 0; $i < $len; ++$i)
@@ -630,7 +628,7 @@ 
 
                 elseif (!$split1 && !$split2 && $arguments[$i] == ',')
                 {
-                    $args[] = substr ($t, 0, -1);
+                    $args[] = substr($t, 0, -1);
                     $t = '';
                 }
             }

Braces +106 added lines, -85 removed lines

@@ -25,18 +25,20 @@ 
      */
     public function __construct (string $content, array $settings = [])
     {
-        if (file_exists ($content))
-            $content = file_get_contents ($content);
+        if (file_exists ($content)) {
+                    $content = file_get_contents ($content);
+        }
 
         // Зачем? Так надо!
         $content = "# VLF begin\n\n$content\n\n# VLF end";
 
         foreach ($settings as $name => $setting)
         {
-            if (isset ($this->$name))
-                $this->$name = $setting;
-
-            else throw new \Exception ('Trying to setting up undefined property "'. $name .'"');
+            if (isset ($this->$name)) {
+                            $this->$name = $setting;
+            } else {
+                throw new \Exception ('Trying to setting up undefined property "'. $name .'"');
+            }
         }
 
         if ($this->use_caching && file_exists ($file = VLF_EXT_DIR .'/cache/'. sha1 ($content) .'.cache'))
@@ -49,9 +51,9 @@ 
                 $this->links = $info[1][1];
 
                 return;
+            } else {
+                unlink ($file);
             }
-
-            else unlink ($file);
         }
 
         $info = $this->generateSyntaxTree ($content);
@@ -61,8 +63,9 @@ 
 
         if ($this->use_caching)
         {
-            if (!is_dir (dirname (__DIR__) .'/cache'))
-                mkdir (dirname (__DIR__) .'/cache');
+            if (!is_dir (dirname (__DIR__) .'/cache')) {
+                            mkdir (dirname (__DIR__) .'/cache');
+            }
 
             file_put_contents (VLF_EXT_DIR .'/cache/'. sha1 ($content) .'.cache', gzdeflate (serialize ([sha1 (file_get_contents (__FILE__)), $info])));
         }
@@ -85,19 +88,22 @@ 
         $tree           = [];
         $links          = [];
 
-        if ($this->debug_mode)
-            pre ($lines);
+        if ($this->debug_mode) {
+                    pre ($lines);
+        }
 
         foreach ($lines as $id => $line)
         {
-            if ($skip_at > $id)
-                continue;
+            if ($skip_at > $id) {
+                            continue;
+            }
 
             $height = $this->getLineHeight ($line);
             $words  = $this->linesFilter (explode (' ', $line));
 
-            if ($this->debug_mode)
-                pre ($words);
+            if ($this->debug_mode) {
+                            pre ($words);
+            }
 
             /**
              * Высокоинтеллектуальный фикс
@@ -118,16 +124,18 @@ 
             {
                 $updated = false;
 
-                if ($this->debug_mode)
-                    pre ($current_object);
+                if ($this->debug_mode) {
+                                    pre ($current_object);
+                }
 
                 while (isset ($tree[$current_object]['info']['subparent_link']) && $tree[$link = $tree[$current_object]['info']['subparent_link']->link]['hard'] < $tree[$current_object]['hard'])
                 {
                     $current_object = $link;
                     $updated        = true;
 
-                    if ($this->debug_mode)
-                        pre ($current_object);
+                    if ($this->debug_mode) {
+                                            pre ($current_object);
+                    }
                 }
 
                 if (
@@ -136,13 +144,15 @@ 
                     isset ($tree[$current_object]['info']['arguments'][0]) &&
                     $tree[$current_object]['info']['arguments'][0] instanceof VLFLink &&
                     $tree[$tree[$current_object]['info']['arguments'][0]->link]['hard'] < $tree[$current_object]['hard']
-                ) $current_object = $tree[$current_object]['info']['arguments'][0]->link;
-
-                elseif (!$updated)
-                    break;
+                ) {
+                    $current_object = $tree[$current_object]['info']['arguments'][0]->link;
+                } elseif (!$updated) {
+                                    break;
+                }
 
-                if ($this->debug_mode)
-                    pre ($current_object);
+                if ($this->debug_mode) {
+                                    pre ($current_object);
+                }
             }
 
             /**
@@ -150,8 +160,9 @@ 
              */
             if (class_exists ($words[0]) || class_exists ('\VoidEngine\\'. $words[0]))
             {
-                if (!isset ($words[1]))
-                    throw new \Exception ('Object name mustn\'t be empty at line "'. $line .'"');
+                if (!isset ($words[1])) {
+                                    throw new \Exception ('Object name mustn\'t be empty at line "'. $line .'"');
+                }
 
                 /**
                  * Button NewButton
@@ -179,9 +190,7 @@ 
                     $current_object = $id;
 
                     continue;
-                }
-
-                else
+                } else
                 {
                     $tree[$id] = [
                         'type'  => VLF_OBJECT_DEFINITION,
@@ -203,10 +212,9 @@ 
                         
                         $end = strrpos ($line, ')');
 
-                        if ($end === false)
-                            throw new \Exception ('Line "'. $line .'" have arguments list initialization, but not have list ending');
-
-                        elseif ($begin < $end)
+                        if ($end === false) {
+                                                    throw new \Exception ('Line "'. $line .'" have arguments list initialization, but not have list ending');
+                        } elseif ($begin < $end)
                         {
                             $arguments = [];
                             // $parsed    = explode (',', substr ($line, $begin, $end - $begin));
@@ -216,18 +224,20 @@ 
                             {
                                 $argument = trim ($argument);
 
-                                if (strlen ($argument) > 0)
-                                    $arguments[] = isset ($links[$argument]) ?
+                                if (strlen ($argument) > 0) {
+                                                                    $arguments[] = isset ($links[$argument]) ?
                                         new VLFLink ($argument, $links[$argument]) :
                                         $argument;
-
-                                else throw new \Exception ('Argument '. ($argument_id + 1) .' mustn\'t have zero length at line "'. $line .'"');
+                                } else {
+                                    throw new \Exception ('Argument '. ($argument_id + 1) .' mustn\'t have zero length at line "'. $line .'"');
+                                }
                             }
 
                             $tree[$id]['info']['arguments'] = $arguments;
 
-                            if (!$this->ignore_postobject_info && trim (substr ($line, $end)) > 0)
-                                throw new \Exception ('You mustn\'t write any chars after arguments definition');
+                            if (!$this->ignore_postobject_info && trim (substr ($line, $end)) > 0) {
+                                                            throw new \Exception ('You mustn\'t write any chars after arguments definition');
+                            }
                         }
 
                         $tree[$id]['info']['subparent_link'] = new VLFLink ($tree[$current_object]['info']['object_name'], $current_object);
@@ -291,13 +301,14 @@ 
 
                         $comment .= $parsed[0];
                         $skip_at  = $parsed[1];
+                    } else {
+                        throw new \Exception ('Unknown char founded after syntax-control symbol at line "'. $line .'"');
                     }
-
-                    else throw new \Exception ('Unknown char founded after syntax-control symbol at line "'. $line .'"');
                 }
                 
-                if ($this->debug_mode)
-                    pre ("Comment:\n\n$comment");
+                if ($this->debug_mode) {
+                                    pre ("Comment:\n\n$comment");
+                }
             }
 
             /**
@@ -319,9 +330,9 @@ 
 
                         $code   .= $parsed[0];
                         $skip_at = $parsed[1];
+                    } else {
+                        throw new \Exception ('Unknown char founded after syntax-control symbol at line "'. $line .'"');
                     }
-
-                    else throw new \Exception ('Unknown char founded after syntax-control symbol at line "'. $line .'"');
                 }
                 
                 $tree[$id] = [
@@ -376,8 +387,9 @@ 
 
                 if ($postChar == ':' || $postChar == '^')
                 {
-                    if (!isset ($words[1]))
-                        throw new \Exception ('Property value mustn\'t be empty at line "'. $line .'"');
+                    if (!isset ($words[1])) {
+                                            throw new \Exception ('Property value mustn\'t be empty at line "'. $line .'"');
+                    }
 
                     $propertyName     = substr ($words[0], 0, -1);
                     $propertyValue    = implode (' ', array_slice ($words, 1));
@@ -412,8 +424,9 @@ 
                         'syntax_nodes' => []
                     ];
 
-                    if (isset ($links[$info['info']['property_value']]))
-                        $info['info']['property_value'] = new VLFLink ($info['info']['property_value'], $links[$info['info']['property_value']]);
+                    if (isset ($links[$info['info']['property_value']])) {
+                                            $info['info']['property_value'] = new VLFLink ($info['info']['property_value'], $links[$info['info']['property_value']]);
+                    }
 
                     $tree[$current_object]['syntax_nodes'][] = $info;
                 }
@@ -431,10 +444,9 @@ 
                         
                         $end = strrpos ($line, ')');
 
-                        if ($end === false)
-                            throw new \Exception ('Line "'. $line .'" have arguments list initialization, but not have list ending');
-
-                        elseif ($begin < $end)
+                        if ($end === false) {
+                                                    throw new \Exception ('Line "'. $line .'" have arguments list initialization, but not have list ending');
+                        } elseif ($begin < $end)
                         {
                             // $parsed = explode (',', substr ($line, $begin, $end - $begin));
                             $parsed = $this->parseArguments (substr ($line, $begin, $end - $begin));
@@ -443,24 +455,27 @@ 
                             {
                                 $argument = trim ($argument);
 
-                                if (strlen ($argument) > 0)
-                                    $arguments[] = isset ($links[$argument]) ?
+                                if (strlen ($argument) > 0) {
+                                                                    $arguments[] = isset ($links[$argument]) ?
                                         new VLFLink ($argument, $links[$argument]) :
                                         $argument;
-
-                                else throw new \Exception ('Argument '. ($argument_id + 1) .' mustn\'t have zero length at line "'. $line .'"');
+                                } else {
+                                    throw new \Exception ('Argument '. ($argument_id + 1) .' mustn\'t have zero length at line "'. $line .'"');
+                                }
                             }
 
-                            if (!$this->ignore_postobject_info && trim (substr ($line, $end)) > 0)
-                                throw new \Exception ('You mustn\'t write any chars after arguments definition');
+                            if (!$this->ignore_postobject_info && trim (substr ($line, $end)) > 0) {
+                                                            throw new \Exception ('You mustn\'t write any chars after arguments definition');
+                            }
                         }
                     }
 
                     /**
                      * ->show
                      */
-                    elseif (!$this->ignore_unexpected_method_args)
-                        throw new \Exception ('Unexpected method arguments list at line "'. $line .'"');
+                    elseif (!$this->ignore_unexpected_method_args) {
+                                            throw new \Exception ('Unexpected method arguments list at line "'. $line .'"');
+                    }
 
                     $tree[$current_object]['syntax_nodes'][] = [
                         'type'  => VLF_METHOD_CALL,
@@ -513,7 +528,9 @@ 
             /**
              * Что-то загадочное, таинственное, неизвестное человечеству
              */
-            else throw new \Exception ('Unknown structures founded at line "'. $line .'"');
+            else {
+                throw new \Exception ('Unknown structures founded at line "'. $line .'"');
+            }
         }
 
         return [$tree, $links];
@@ -535,8 +552,9 @@ 
 
         foreach ($lines as $line_id => $line)
         {
-            if ($line_id <= $begin_id)
-                continue;
+            if ($line_id <= $begin_id) {
+                            continue;
+            }
 
             if (!(bool)(trim ($line)))
             {
@@ -547,13 +565,15 @@ 
 
             $height = $this->getLineHeight ($line);
 
-            if ($this->debug_mode)
-                pre ("$height, $down_height, $line");
-
-            if ($height > $down_height)
-                $parsed .= "$line\n";
+            if ($this->debug_mode) {
+                            pre ("$height, $down_height, $line");
+            }
 
-            else break;
+            if ($height > $down_height) {
+                            $parsed .= "$line\n";
+            } else {
+                break;
+            }
         }
 
         return [$parsed, $line_id];
@@ -577,8 +597,9 @@ 
     {
         $i = 0;
 
-        while (isset ($line[$i]) && $line[$i] == "\t")
-            ++$i;
+        while (isset ($line[$i]) && $line[$i] == "\t") {
+                    ++$i;
+        }
         
         return strlen ($line = str_repeat ('    ', $i) . substr ($line, $i)) - strlen ($line = trim ($line));
     }
@@ -595,8 +616,9 @@ 
     {
         return array_filter ($segments, function ($text)
         {
-            if ($this->strong_line_parser && preg_match ('/[^a-z0-9]/i', $text))
-                throw new \Exception  ('Line "'. $text .'" mustn\'t have any not-alphabet or not-numeric characters');
+            if ($this->strong_line_parser && preg_match ('/[^a-z0-9]/i', $text)) {
+                            throw new \Exception  ('Line "'. $text .'" mustn\'t have any not-alphabet or not-numeric characters');
+            }
             
             return strlen (trim ($text)) > 0;
         });
@@ -617,18 +639,17 @@ 
         {
             $t .= $arguments[$i];
 
-            if ($arguments[$i] == '\\')
-                $canSplit = $i + 1;
+            if ($arguments[$i] == '\\') {
+                            $canSplit = $i + 1;
+            }
 
             if ($canSplit < $i)
             {
-                if ($arguments[$i] == '\'' && !$split2)
-                    $split1 = !$split1;
-
-                elseif ($arguments[$i] == '"' && !$split1)
-                    $split2 = !$split2;
-
-                elseif (!$split1 && !$split2 && $arguments[$i] == ',')
+                if ($arguments[$i] == '\'' && !$split2) {
+                                    $split1 = !$split1;
+                } elseif ($arguments[$i] == '"' && !$split1) {
+                                    $split2 = !$split2;
+                } elseif (!$split1 && !$split2 && $arguments[$i] == ',')
                 {
                     $args[] = substr ($t, 0, -1);
                     $t = '';

core/script.php

Indentation +5 added lines, -5 removed lines

@@ -8,20 +8,20 @@
 chdir (CORE_DIR);
 
 foreach (glob ('ext/php_*.dll') as $ext)
-	if (!extension_loaded (substr (basename ($ext), 4, -4)))
-		load_extension ($ext);
+    if (!extension_loaded (substr (basename ($ext), 4, -4)))
+        load_extension ($ext);
 
 if (file_exists ('../engine/VoidEngine.php'))
-	require '../engine/VoidEngine.php';
+    require '../engine/VoidEngine.php';
 
 elseif (file_exists (FRAMEWORK_DIR .'/engine/VoidEngine.php'))
-	require FRAMEWORK_DIR .'/engine/VoidEngine.php';
+    require FRAMEWORK_DIR .'/engine/VoidEngine.php';
 
 else message ('VoidEngine not founded');
 
 $app = '../../app/start.php';
 
 if (file_exists ($app))
-	require $app;
+    require $app;
 
 else \VoidCore::callMethod (\VoidCore::createObject ('WinForms_PHP.DebugForm', null), 'ShowDialog');

Spacing +11 added lines, -11 removed lines

@@ -2,26 +2,26 @@
 
 namespace VoidEngine;
 
-define ('VoidEngine\FRAMEWORK_DIR', getenv ('AppData') .'\VoidFramework');
+define('VoidEngine\FRAMEWORK_DIR', getenv('AppData').'\VoidFramework');
 
 const CORE_DIR = __DIR__;
-chdir (CORE_DIR);
+chdir(CORE_DIR);
 
-foreach (glob ('ext/php_*.dll') as $ext)
-	if (!extension_loaded (substr (basename ($ext), 4, -4)))
-		load_extension ($ext);
+foreach (glob('ext/php_*.dll') as $ext)
+	if (!extension_loaded(substr(basename($ext), 4, -4)))
+		load_extension($ext);
 
-if (file_exists ('../engine/VoidEngine.php'))
+if (file_exists('../engine/VoidEngine.php'))
 	require '../engine/VoidEngine.php';
 
-elseif (file_exists (FRAMEWORK_DIR .'/engine/VoidEngine.php'))
-	require FRAMEWORK_DIR .'/engine/VoidEngine.php';
+elseif (file_exists(FRAMEWORK_DIR.'/engine/VoidEngine.php'))
+	require FRAMEWORK_DIR.'/engine/VoidEngine.php';
 
-else message ('VoidEngine not founded');
+else message('VoidEngine not founded');
 
 $app = '../../app/start.php';
 
-if (file_exists ($app))
+if (file_exists($app))
 	require $app;
 
-else \VoidCore::callMethod (\VoidCore::createObject ('WinForms_PHP.DebugForm', null), 'ShowDialog');
+else \VoidCore::callMethod(\VoidCore::createObject('WinForms_PHP.DebugForm', null), 'ShowDialog');

Braces +11 added lines, -9 removed lines

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