winforms-php / VoidFramework

engine/components/Process.php

Indentation +15 added lines, -15 removed lines

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

Spacing +10 added lines, -11 removed lines

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

Braces +3 added lines, -2 removed lines

@@ -11,10 +11,11 @@
 	{
         $this->selector = VoidEngine::createClass ($this->class, $this->namespace);
 
-		if ($pid !== null)
-            $this->selector = $pid == getmypid () ?
+		if ($pid !== null) {
+		            $this->selector = $pid == getmypid () ?
                 VoidEngine::callMethod ($this->selector, 'GetCurrentProcess') :
                 VoidEngine::callMethod ($this->selector, 'GetProcessById', $pid);
+		}
 
 		Components::addComponent ($this->selector, $this);
 	}

engine/VoidEngine.php

Braces +2 added lines, -1 removed lines

@@ -105,7 +105,8 @@
 require 'components/FastColoredTextBox.php';
 require 'components/Scintilla.php';
 
-if (is_dir ('extensions'))
+if (is_dir ('extensions')) {
     foreach (scandir ('extensions') as $ext)
         if (is_dir ('extensions/'. $ext) && file_exists ($ext = 'extensions/'. $ext .'/main.php'))
             require $ext;
+}

Spacing +8 added lines, -8 removed lines

@@ -36,17 +36,17 @@ 
 const ENGINE_VERSION = '3.4.1 build-2019/09/07';
 const ENGINE_DIR = __DIR__;
 
-chdir (ENGINE_DIR);
+chdir(ENGINE_DIR);
 
 $GLOBALS['error_status'] = true;
 
 $GLOBALS['__debug'] = [
-    'start_time' => microtime (true)
+    'start_time' => microtime(true)
 ];
 
-$GLOBALS['__ub_write_handler'] = function (...$args)
+$GLOBALS['__ub_write_handler'] = function(...$args)
 {
-    pre (...$args);
+    pre(...$args);
 };
 
 require 'common/EngineInterfaces.php';
@@ -55,7 +55,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';
@@ -104,7 +104,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/common/EngineInterfaces.php

Indentation +54 added lines, -54 removed lines

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

Spacing +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 $selector;
     protected $name;
 
-    public function __construct ($object, ?string $classGroup = 'auto', ...$args)
+    public function __construct($object, ?string $classGroup = 'auto', ...$args)
     {
         foreach ($args as $id => $arg)
-            $args[$id] = 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,9 +796,9 @@ 
 		}
 	}
 
-    public function __toString (): string
+    public function __toString(): string
     {
-        return $this->callMethod ('ToString');
+        return $this->callMethod('ToString');
     }
 }
 
@@ -808,16 +806,16 @@ 
 {
     protected $selector;
 
-    public function __construct ($class, ?string $classGroup = 'auto')
+    public function __construct($class, ?string $classGroup = 'auto')
     {
-        if (is_string ($class))
-            $this->selector = VoidEngine::createClass ($class, $classGroup == 'auto' ?
-                substr ($class, 0, strrpos ($class, '.')) : $classGroup
+        if (is_string($class))
+            $this->selector = VoidEngine::createClass($class, $classGroup == 'auto' ?
+                substr ($class, 0, strrpos($class, '.')) : $classGroup
             );
 
-        elseif (is_int ($class) && VoidEngine::objectExists ($class))
+        elseif (is_int($class) && VoidEngine::objectExists($class))
             $this->selector = $class;
 
-        else throw new \Exception ('$class parameter must be string or class selector');
+        else throw new \Exception('$class parameter must be string or class selector');
     }
 }

Braces +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;
 		}
@@ -810,14 +803,14 @@ 
 
     public function __construct ($class, ?string $classGroup = 'auto')
     {
-        if (is_string ($class))
-            $this->selector = VoidEngine::createClass ($class, $classGroup == 'auto' ?
+        if (is_string ($class)) {
+                    $this->selector = VoidEngine::createClass ($class, $classGroup == 'auto' ?
                 substr ($class, 0, strrpos ($class, '.')) : $classGroup
             );
-
-        elseif (is_int ($class) && VoidEngine::objectExists ($class))
-            $this->selector = $class;
-
-        else throw new \Exception ('$class parameter must be string or class selector');
+        } elseif (is_int ($class) && VoidEngine::objectExists ($class)) {
+                    $this->selector = $class;
+        } else {
+            throw new \Exception ('$class parameter must be string or class selector');
+        }
     }
 }

engine/common/Events.php

Indentation +4 added lines, -4 removed lines

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

Spacing +14 added lines, -14 removed lines

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

Braces +4 added lines, -5 removed lines

@@ -10,14 +10,13 @@
 		{
             try
 			{
-                foreach ($args as $id => $arg)
-                    $args[$id] = EngineAdditions::coupleSelector ($arg);
+                foreach ($args as $id => $arg) {
+                                    $args[$id] = EngineAdditions::coupleSelector ($arg);
+                }
                 
                 return $function (($e = _c($sender)) !== false ?
                     $e : new WFObject ($sender), ...$args);
-            }
-            
-			catch (\Throwable $e)
+            } catch (\Throwable $e)
 			{
                 message ([
                     'type'  => get_class ($e),

core/script.php

Indentation +5 added lines, -5 removed lines

@@ -8,18 +8,18 @@
 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;

Spacing +10 added lines, -10 removed lines

@@ -2,24 +2,24 @@
 
 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;

Braces +9 added lines, -7 removed lines

@@ -7,19 +7,21 @@
 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;
+}

app_bundle/start.php

Indentation +3 added lines, -3 removed lines

@@ -8,12 +8,12 @@
 $package = json_decode (@file_get_contents (dirname (__DIR__) .'/qero-packages/packages.json'), true);
 
 define ('VoidEngine\CORE_DIR', isset ($package['github:winforms-php/VoidFramework']['basefolder']) ?
-	dirname (__DIR__) .'/qero-packages/winforms-php/VoidFramework/'. $package['github:winforms-php/VoidFramework']['basefolder'] .'/core' : __DIR__);
+    dirname (__DIR__) .'/qero-packages/winforms-php/VoidFramework/'. $package['github:winforms-php/VoidFramework']['basefolder'] .'/core' : __DIR__);
 
 # Подгружаем PHP расширения
 foreach (glob (CORE_DIR .'/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);
 
 # Подгружаем Qero-пакеты
 require __DIR__ .'/../qero-packages/autoload.php';

Spacing +11 added lines, -11 removed lines

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

Braces +2 added lines, -1 removed lines

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