winforms-php / VoidFramework

engine/components/Image.php

Indentation +7 added lines, -7 removed lines

@@ -31,14 +31,14 @@
     }
 
     public function applyToObject (int $selector): void
-	{
-		\VoidCore::setProperty ($selector, 'Icon', $this->selector);
-	}
+    {
+        \VoidCore::setProperty ($selector, 'Icon', $this->selector);
+    }
 	
-	public function saveToFile (string $file): void
-	{
-		\VoidCore::callMethod ($this->selector, 'Save', $file);
-	}
+    public function saveToFile (string $file): void
+    {
+        \VoidCore::callMethod ($this->selector, 'Save', $file);
+    }
 }
 
 class Bitmap extends WFObject

Spacing +13 added lines, -13 removed lines

@@ -7,14 +7,14 @@ 
     public $class     = 'System.Drawing.Image';
     public $namespace = 'System.Drawing';
 
-    public function __construct ()
+    public function __construct()
     {
-        parent::__construct ($this->class);
+        parent::__construct($this->class);
     }
 
-    public function loadFromFile (string $path)
+    public function loadFromFile(string $path)
     {
-        return $this->fromFile ($path);
+        return $this->fromFile($path);
     }
 }
 
@@ -23,21 +23,21 @@ 
     public $class     = 'System.Drawing.Icon';
     public $namespace = 'System.Drawing';
 
-    public function __construct (string $file)
+    public function __construct(string $file)
     {
-        parent::__construct ($this->class);
+        parent::__construct($this->class);
 
-        $this->fromFile ($file);
+        $this->fromFile($file);
     }
 
-    public function applyToObject (int $selector): void
+    public function applyToObject(int $selector): void
 	{
-		\VoidCore::setProperty ($selector, 'Icon', $this->selector);
+		\VoidCore::setProperty($selector, 'Icon', $this->selector);
 	}
 	
-	public function saveToFile (string $file): void
+	public function saveToFile(string $file): void
 	{
-		\VoidCore::callMethod ($this->selector, 'Save', $file);
+		\VoidCore::callMethod($this->selector, 'Save', $file);
 	}
 }
 
@@ -46,8 +46,8 @@ 
     public $class     = 'System.Drawing.Bitmap';
     public $namespace = 'System.Drawing';
 
-    public function __construct (string $filename)
+    public function __construct(string $filename)
     {
-        parent::__construct ($this->class, $this->namespace, [$filename, 'string']);
+        parent::__construct($this->class, $this->namespace, [$filename, 'string']);
     }
 }

engine/components/PictureBox.php

Indentation +28 added lines, -28 removed lines

@@ -4,48 +4,48 @@
 
 class PictureBox extends Control
 {
-	public $class = 'System.Windows.Forms.PictureBox';
+    public $class = 'System.Windows.Forms.PictureBox';
 
-	protected $image;
+    protected $image;
 	
-	public function __construct (Component $parent = null)
-	{
+    public function __construct (Component $parent = null)
+    {
         parent::__construct ($parent, $this->class);
         
-		$this->image = new PictureBoxImage ($this->selector);
-	}
+        $this->image = new PictureBoxImage ($this->selector);
+    }
 }
 
 class PictureBoxImage
 {
-	protected $selector;
+    protected $selector;
     protected $pictureBoxSelector;
     protected $clipboard;
     
-	public function __construct (int $pictureBoxSelector)
-	{
-		$this->pictureBoxSelector = $pictureBoxSelector;
-		$this->selector			  = \VoidCore::getProperty ($pictureBoxSelector, 'Image');
-		$this->clipboard		  = new WFClass ('System.Windows.Forms.Clipboard');
-	}
+    public function __construct (int $pictureBoxSelector)
+    {
+        $this->pictureBoxSelector = $pictureBoxSelector;
+        $this->selector			  = \VoidCore::getProperty ($pictureBoxSelector, 'Image');
+        $this->clipboard		  = new WFClass ('System.Windows.Forms.Clipboard');
+    }
 	
-	public function loadFromFile (string $file)
-	{
+    public function loadFromFile (string $file)
+    {
         \VoidCore::setProperty ($this->pictureBoxSelector, 'Image', (new Image ())->loadFromFile ($file)->selector);
-	}
+    }
 	
-	public function saveToFile (string $file)
-	{
-		\VoidCore::callMethod ($this->selector, 'Save', $file);
-	}
+    public function saveToFile (string $file)
+    {
+        \VoidCore::callMethod ($this->selector, 'Save', $file);
+    }
 	
-	public function loadFromClipboard ()
-	{
-		\VoidCore::setProperty ($this->pictureBoxSelector, 'Image', $this->clipboard->getImage ());
-	}
+    public function loadFromClipboard ()
+    {
+        \VoidCore::setProperty ($this->pictureBoxSelector, 'Image', $this->clipboard->getImage ());
+    }
 	
-	public function saveToClipboard ()
-	{
-		$this->clipboard->setImage (\VoidCore::getProperty ($this->pictureBoxSelector, 'Image'));
-	}
+    public function saveToClipboard ()
+    {
+        $this->clipboard->setImage (\VoidCore::getProperty ($this->pictureBoxSelector, 'Image'));
+    }
 }

Spacing +14 added lines, -14 removed lines

@@ -8,11 +8,11 @@ 
 
 	protected $image;
 	
-	public function __construct (Component $parent = null)
+	public function __construct(Component $parent = null)
 	{
-        parent::__construct ($parent, $this->class);
+        parent::__construct($parent, $this->class);
         
-		$this->image = new PictureBoxImage ($this->selector);
+		$this->image = new PictureBoxImage($this->selector);
 	}
 }
 
@@ -22,30 +22,30 @@ 
     protected $pictureBoxSelector;
     protected $clipboard;
     
-	public function __construct (int $pictureBoxSelector)
+	public function __construct(int $pictureBoxSelector)
 	{
 		$this->pictureBoxSelector = $pictureBoxSelector;
-		$this->selector			  = \VoidCore::getProperty ($pictureBoxSelector, 'Image');
-		$this->clipboard		  = new WFClass ('System.Windows.Forms.Clipboard');
+		$this->selector			  = \VoidCore::getProperty($pictureBoxSelector, 'Image');
+		$this->clipboard		  = new WFClass('System.Windows.Forms.Clipboard');
 	}
 	
-	public function loadFromFile (string $file)
+	public function loadFromFile(string $file)
 	{
-        \VoidCore::setProperty ($this->pictureBoxSelector, 'Image', (new Image ())->loadFromFile ($file)->selector);
+        \VoidCore::setProperty($this->pictureBoxSelector, 'Image', (new Image())->loadFromFile($file)->selector);
 	}
 	
-	public function saveToFile (string $file)
+	public function saveToFile(string $file)
 	{
-		\VoidCore::callMethod ($this->selector, 'Save', $file);
+		\VoidCore::callMethod($this->selector, 'Save', $file);
 	}
 	
-	public function loadFromClipboard ()
+	public function loadFromClipboard()
 	{
-		\VoidCore::setProperty ($this->pictureBoxSelector, 'Image', $this->clipboard->getImage ());
+		\VoidCore::setProperty($this->pictureBoxSelector, 'Image', $this->clipboard->getImage());
 	}
 	
-	public function saveToClipboard ()
+	public function saveToClipboard()
 	{
-		$this->clipboard->setImage (\VoidCore::getProperty ($this->pictureBoxSelector, 'Image'));
+		$this->clipboard->setImage(\VoidCore::getProperty($this->pictureBoxSelector, 'Image'));
 	}
 }

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 = \VoidCore::createClass ($this->class, $this->namespace);
 
-		if ($pid !== null)
+        if ($pid !== null)
             $this->selector = $pid == getmypid () ?
                 \VoidCore::callMethod ($this->selector, 'GetCurrentProcess') :
                 \VoidCore::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 = \VoidCore::createClass ($this->class, $this->namespace);
+        $this->selector = \VoidCore::createClass($this->class, $this->namespace);
 
 		if ($pid !== null)
-            $this->selector = $pid == getmypid () ?
-                \VoidCore::callMethod ($this->selector, 'GetCurrentProcess') :
-                \VoidCore::callMethod ($this->selector, 'GetProcessById', $pid);
+            $this->selector = $pid == getmypid() ?
+                \VoidCore::callMethod($this->selector, 'GetCurrentProcess') : \VoidCore::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 = \VoidCore::createClass ($this->class, $this->namespace);
 
-		if ($pid !== null)
-            $this->selector = $pid == getmypid () ?
+		if ($pid !== null) {
+		            $this->selector = $pid == getmypid () ?
                 \VoidCore::callMethod ($this->selector, 'GetCurrentProcess') :
                 \VoidCore::callMethod ($this->selector, 'GetProcessById', $pid);
+		}
 
 		Components::addComponent ($this->selector, $this);
 	}

engine/components/Form.php

Indentation +28 added lines, -28 removed lines

@@ -4,37 +4,37 @@ 
 
 class Form extends Control
 {
-	public $class = 'System.Windows.Forms.Form';
+    public $class = 'System.Windows.Forms.Form';
 
-	public function get_icon ()
-	{
-		return new FormIcon ($this->selector);
-	}
+    public function get_icon ()
+    {
+        return new FormIcon ($this->selector);
+    }
 	
-	public function get_clientSize ()
-	{
-		$size = $this->getProperty ('ClientSize');
+    public function get_clientSize ()
+    {
+        $size = $this->getProperty ('ClientSize');
 		
-		return [
-			\VoidCore::getProperty ($size, 'Width'),
-			\VoidCore::getProperty ($size, 'Height')
-		];
-	}
+        return [
+            \VoidCore::getProperty ($size, 'Width'),
+            \VoidCore::getProperty ($size, 'Height')
+        ];
+    }
 	
-	public function set_clientSize ($size)
-	{
-		if (is_array ($size))
-		{
-			$clientSize = $this->getProperty ('ClientSize');
+    public function set_clientSize ($size)
+    {
+        if (is_array ($size))
+        {
+            $clientSize = $this->getProperty ('ClientSize');
 
-			\VoidCore::setProperty ($clientSize, 'Width', array_shift ($size));
-			\VoidCore::setProperty ($clientSize, 'Height', array_shift ($size));
+            \VoidCore::setProperty ($clientSize, 'Width', array_shift ($size));
+            \VoidCore::setProperty ($clientSize, 'Height', array_shift ($size));
 
-			$this->setProperty ('ClientSize', $clientSize);
-		}
+            $this->setProperty ('ClientSize', $clientSize);
+        }
 
-		else $this->setProperty ('ClientSize', EngineAdditions::uncoupleSelector ($size));
-	}
+        else $this->setProperty ('ClientSize', EngineAdditions::uncoupleSelector ($size));
+    }
 }
 
 class FormIcon extends Icon
@@ -47,12 +47,12 @@ 
     }
 
     public function loadFromFile (string $file)
-	{
+    {
         $icon = \VoidCore::createObject ('System.Drawing.Icon', 'System.Drawing', $file);
         
         \VoidCore::setProperty ($this->formSelector, 'Icon', $icon);
 
-		if (!isset ($this->selector))
-		    $this->selector = $icon;
-	}
+        if (!isset ($this->selector))
+            $this->selector = $icon;
+    }
 }

Spacing +17 added lines, -17 removed lines

@@ -6,34 +6,34 @@ 
 {
 	public $class = 'System.Windows.Forms.Form';
 
-	public function get_icon ()
+	public function get_icon()
 	{
-		return new FormIcon ($this->selector);
+		return new FormIcon($this->selector);
 	}
 	
-	public function get_clientSize ()
+	public function get_clientSize()
 	{
-		$size = $this->getProperty ('ClientSize');
+		$size = $this->getProperty('ClientSize');
 		
 		return [
-			\VoidCore::getProperty ($size, 'Width'),
-			\VoidCore::getProperty ($size, 'Height')
+			\VoidCore::getProperty($size, 'Width'),
+			\VoidCore::getProperty($size, 'Height')
 		];
 	}
 	
-	public function set_clientSize ($size)
+	public function set_clientSize($size)
 	{
-		if (is_array ($size))
+		if (is_array($size))
 		{
-			$clientSize = $this->getProperty ('ClientSize');
+			$clientSize = $this->getProperty('ClientSize');
 
-			\VoidCore::setProperty ($clientSize, 'Width', array_shift ($size));
-			\VoidCore::setProperty ($clientSize, 'Height', array_shift ($size));
+			\VoidCore::setProperty($clientSize, 'Width', array_shift($size));
+			\VoidCore::setProperty($clientSize, 'Height', array_shift($size));
 
-			$this->setProperty ('ClientSize', $clientSize);
+			$this->setProperty('ClientSize', $clientSize);
 		}
 
-		else $this->setProperty ('ClientSize', EngineAdditions::uncoupleSelector ($size));
+		else $this->setProperty('ClientSize', EngineAdditions::uncoupleSelector($size));
 	}
 }
 
@@ -41,16 +41,16 @@ 
 {
     protected $formSelector;
 
-    public function __construct (int $formSelector)
+    public function __construct(int $formSelector)
     {
         $this->formSelector = $formSelector;
     }
 
-    public function loadFromFile (string $file)
+    public function loadFromFile(string $file)
 	{
-        $icon = \VoidCore::createObject ('System.Drawing.Icon', 'System.Drawing', $file);
+        $icon = \VoidCore::createObject('System.Drawing.Icon', 'System.Drawing', $file);
         
-        \VoidCore::setProperty ($this->formSelector, 'Icon', $icon);
+        \VoidCore::setProperty($this->formSelector, 'Icon', $icon);
 
 		if (!isset ($this->selector))
 		    $this->selector = $icon;

Braces +5 added lines, -4 removed lines

@@ -31,9 +31,9 @@ 
 			\VoidCore::setProperty ($clientSize, 'Height', array_shift ($size));
 
 			$this->setProperty ('ClientSize', $clientSize);
+		} else {
+		    $this->setProperty ('ClientSize', EngineAdditions::uncoupleSelector ($size));
 		}
-
-		else $this->setProperty ('ClientSize', EngineAdditions::uncoupleSelector ($size));
 	}
 }
 
@@ -52,7 +52,8 @@ 
         
         \VoidCore::setProperty ($this->formSelector, 'Icon', $icon);
 
-		if (!isset ($this->selector))
-		    $this->selector = $icon;
+		if (!isset ($this->selector)) {
+				    $this->selector = $icon;
+		}
 	}
 }

engine/components/Scintilla.php

Spacing +28 added lines, -28 removed lines

@@ -2,7 +2,7 @@ 
 
 namespace VoidEngine;
 
-EngineAdditions::loadModule ('ScintillaNET.dll');
+EngineAdditions::loadModule('ScintillaNET.dll');
 
 class Scintilla extends NoVisual
 {
@@ -11,71 +11,71 @@ 
 
     protected $styles;
 
-    public function __construct (Component $parent = null)
+    public function __construct(Component $parent = null)
 	{
-        parent::__construct ($parent, $this->class);
+        parent::__construct($parent, $this->class);
 
-        $this->styles = $this->getProperty ('Styles');
+        $this->styles = $this->getProperty('Styles');
 	}
 
-    public function resetSyntax ()
+    public function resetSyntax()
     {
-        $this->callMethod ('StyleResetDefault');
+        $this->callMethod('StyleResetDefault');
     }
 
-    public function clearSyntax ()
+    public function clearSyntax()
     {
-        $this->callMethod ('StyleClearAll');
+        $this->callMethod('StyleClearAll');
     }
 
-    public function setKeywords (int $index, string $keywords)
+    public function setKeywords(int $index, string $keywords)
     {
-        $this->callMethod ('SetKeywords', [$index, 'int'], [$keywords, 'string']);
+        $this->callMethod('SetKeywords', [$index, 'int'], [$keywords, 'string']);
     }
 
-    public function propertyInit (string $propertyName, $propertyValue)
+    public function propertyInit(string $propertyName, $propertyValue)
     {
-        $this->callMethod ('SetProperty', [$propertyName, 'string'], [$propertyValue, 'string']);
+        $this->callMethod('SetProperty', [$propertyName, 'string'], [$propertyValue, 'string']);
     }
 
-    public function set_syntax ($syntax)
+    public function set_syntax($syntax)
     {
-        if (file_exists ($syntax))
-            $syntax = file_get_contents ($syntax);
+        if (file_exists($syntax))
+            $syntax = file_get_contents($syntax);
 
-        $syntax = json_decode ($syntax, true);
+        $syntax = json_decode($syntax, true);
 
         if (
-            !is_array ($syntax['syntax']) ||
-            !is_array ($syntax['references']) ||
+            !is_array($syntax['syntax']) ||
+            !is_array($syntax['references']) ||
             !isset ($syntax['lexer'])
         ) return false;
 
         else
         {
-            $this->resetSyntax ();
-            $this->clearSyntax ();
+            $this->resetSyntax();
+            $this->clearSyntax();
             
             foreach ($syntax['references'] as $name => $value)
                 if (isset ($syntax['syntax'][$name]))
                 {
-                    $element = \VoidCore::getArrayValue ($this->styles, $value);
+                    $element = \VoidCore::getArrayValue($this->styles, $value);
                     $color   = $syntax['syntax'][$name];
 
-                    if (defined ($color))
-                        $color = constant ($color);
+                    if (defined($color))
+                        $color = constant($color);
                     
-                    \VoidCore::setProperty ($element, 'ForeColor', [$color, 'color']);
+                    \VoidCore::setProperty($element, 'ForeColor', [$color, 'color']);
                 }
 
             $this->lexer = $syntax['lexer'];
 
-            if (is_array ($syntax['keywords']))
+            if (is_array($syntax['keywords']))
                 foreach ($syntax['keywords'] as $id => $keywords)
-                    $this->setKeywords ($id, $keywords);
+                    $this->setKeywords($id, $keywords);
 
-            $this->propertyInit ('fold', 1);
-            $this->propertyInit ('fold.compact', 1);
+            $this->propertyInit('fold', 1);
+            $this->propertyInit('fold.compact', 1);
 
             return true;
         }

Braces +15 added lines, -11 removed lines

@@ -40,8 +40,9 @@ 
 
     public function set_syntax ($syntax)
     {
-        if (file_exists ($syntax))
-            $syntax = file_get_contents ($syntax);
+        if (file_exists ($syntax)) {
+                    $syntax = file_get_contents ($syntax);
+        }
 
         $syntax = json_decode ($syntax, true);
 
@@ -49,30 +50,33 @@ 
             !is_array ($syntax['syntax']) ||
             !is_array ($syntax['references']) ||
             !isset ($syntax['lexer'])
-        ) return false;
-
-        else
+        ) {
+            return false;
+        } else
         {
             $this->resetSyntax ();
             $this->clearSyntax ();
             
-            foreach ($syntax['references'] as $name => $value)
-                if (isset ($syntax['syntax'][$name]))
+            foreach ($syntax['references'] as $name => $value) {
+                            if (isset ($syntax['syntax'][$name]))
                 {
                     $element = \VoidCore::getArrayValue ($this->styles, $value);
+            }
                     $color   = $syntax['syntax'][$name];
 
-                    if (defined ($color))
-                        $color = constant ($color);
+                    if (defined ($color)) {
+                                            $color = constant ($color);
+                    }
                     
                     \VoidCore::setProperty ($element, 'ForeColor', [$color, 'color']);
                 }
 
             $this->lexer = $syntax['lexer'];
 
-            if (is_array ($syntax['keywords']))
-                foreach ($syntax['keywords'] as $id => $keywords)
+            if (is_array ($syntax['keywords'])) {
+                            foreach ($syntax['keywords'] as $id => $keywords)
                     $this->setKeywords ($id, $keywords);
+            }
 
             $this->propertyInit ('fold', 1);
             $this->propertyInit ('fold.compact', 1);

engine/components/Control.php

Spacing +51 added lines, -52 removed lines

@@ -6,101 +6,100 @@ 
 {
     public $class = 'System.Windows.Forms.Control';
 
-    public function __construct (Component $parent = null, $className = null, ...$args)
+    public function __construct(Component $parent = null, $className = null, ...$args)
     {
-        parent::__construct ($className, ...$args);
+        parent::__construct($className, ...$args);
 
         if ($parent)
             $this->parent = $parent;
     }
 	
-    public function get_caption (): string
+    public function get_caption(): string
     {
         return $this->text;
     }
 	
-    public function set_caption (string $caption)
+    public function set_caption(string $caption)
     {
         $this->text = $caption;
     }
 	
-	public function set_font ($font): void
+	public function set_font($font): void
 	{
-        if (is_array ($font))
+        if (is_array($font))
         {
-            $font = array_values ($font);
+            $font = array_values($font);
 
             $obj = isset ($font[2]) ?
-                \VoidCore::createObject ('System.Drawing.Font', 'System.Drawing', $font[0], $font[1], [$font[2], 'System.Drawing.FontStyle, System.Drawing']) :
-                \VoidCore::createObject ('System.Drawing.Font', 'System.Drawing', $font[0], $font[1]);
+                \VoidCore::createObject('System.Drawing.Font', 'System.Drawing', $font[0], $font[1], [$font[2], 'System.Drawing.FontStyle, System.Drawing']) : \VoidCore::createObject('System.Drawing.Font', 'System.Drawing', $font[0], $font[1]);
             
-            $this->setProperty ('Font', $obj);
+            $this->setProperty('Font', $obj);
         }
 
-        else $this->setProperty ('Font', EngineAdditions::uncoupleSelector ($font));
+        else $this->setProperty('Font', EngineAdditions::uncoupleSelector($font));
     }
 	
-    public function get_backgroundColor ()
+    public function get_backgroundColor()
     {
-        return $this->getProperty (['BackColor', 'color']);
+        return $this->getProperty(['BackColor', 'color']);
     }
 	
-    public function set_backgroundColor ($color)
+    public function set_backgroundColor($color)
     {
-        $this->setProperty ('BackColor', $color);
+        $this->setProperty('BackColor', $color);
     }
 	
-    public function get_foregroundColor ()
+    public function get_foregroundColor()
     {
-        return $this->getProperty (['ForeColor', 'color']);
+        return $this->getProperty(['ForeColor', 'color']);
     }
 	
-    public function set_foregroundColor ($color)
+    public function set_foregroundColor($color)
     {
-        $this->setProperty ('ForeColor', $color);
+        $this->setProperty('ForeColor', $color);
     }
 	
-    public function get_w (): int
+    public function get_w(): int
     {
         return $this->width;
     }
 	
-    public function set_w (int $w)
+    public function set_w(int $w)
     {
         $this->width = $w;
     }
 	
-    public function get_h (): int
+    public function get_h(): int
     {
         return $this->height;
     }
 	
-    public function set_h (int $h)
+    public function set_h(int $h)
     {
         $this->height = $h;
     }
 	
-    public function get_x (): int
+    public function get_x(): int
     {
         return $this->left;
     }
 	
-    public function set_x (int $x)
+    public function set_x(int $x)
     {
         $this->left = $x;
     }
 	
-    public function get_y (): int
+    public function get_y(): int
     {
         return $this->top;
     }
 	
-    public function set_y (int $y)
+    public function set_y(int $y)
     {
         $this->top = $y;
     }
 
-    public function get_bounds (): array
+    public function get_bounds(): array
     {
         return [
             $this->left,
@@ -110,11 +109,11 @@ 
         ];
     }
 	
-    public function set_bounds ($bounds)
+    public function set_bounds($bounds)
     {
-        if (is_array ($bounds))
+        if (is_array($bounds))
         {
-            $bounds = array_values ($bounds);
+            $bounds = array_values($bounds);
             
             $this->left   = (int) $bounds[0];
             $this->top    = (int) $bounds[1];
@@ -122,10 +121,10 @@ 
             $this->height = (int) $bounds[3];
         }
 
-        else $this->setProperty ('Bounds', EngineAdditions::uncoupleSelector ($bounds));
+        else $this->setProperty('Bounds', EngineAdditions::uncoupleSelector($bounds));
     }
 	
-    public function get_location (): array
+    public function get_location(): array
     {
         return [
             $this->left,
@@ -133,20 +132,20 @@ 
         ];
     }
 	
-    public function set_location ($location)
+    public function set_location($location)
     {
-        if (is_array ($location))
+        if (is_array($location))
         {
-            $location = array_values ($location);
+            $location = array_values($location);
             
             $this->left = $location[0];
             $this->top  = $location[1];
         }
 
-        else $this->setProperty ('Location', EngineAdditions::uncoupleSelector ($location));
+        else $this->setProperty('Location', EngineAdditions::uncoupleSelector($location));
     }
 	
-    public function get_size (): array
+    public function get_size(): array
     {
         return [
             $this->width,
@@ -154,42 +153,42 @@ 
         ];
     }
 	
-    public function set_size ($size)
+    public function set_size($size)
     {
-        if (is_array ($size))
+        if (is_array($size))
         {
-            $size = array_values ($size);
+            $size = array_values($size);
             
             $this->width  = (int) $size[0];
             $this->height = (int) $size[1];
         }
 
-        else $this->setProperty ('Size', EngineAdditions::uncoupleSelector ($size));
+        else $this->setProperty('Size', EngineAdditions::uncoupleSelector($size));
     }
 	
-    public function setBounds (int $x, int $y, int $w, int $h)
+    public function setBounds(int $x, int $y, int $w, int $h)
     {
-        $this->set_bounds ([$x, $y, $w, $h]);
+        $this->set_bounds([$x, $y, $w, $h]);
     }
 	
-    public function setLocation (int $x, int $y)
+    public function setLocation(int $x, int $y)
     {
-        $this->set_location ([$x, $y]);
+        $this->set_location([$x, $y]);
     }
 	
-    public function setSize (int $w, int $h)
+    public function setSize(int $w, int $h)
     {
-        $this->set_size ([$w, $h]);
+        $this->set_size([$w, $h]);
     }
 	
-    public function toBack ()
+    public function toBack()
     {
-        $this->callMethod ('SendToBack');
+        $this->callMethod('SendToBack');
     }
 	
-    public function toFront ()
+    public function toFront()
     {
-        $this->callMethod ('BringToFront');
+        $this->callMethod('BringToFront');
     }
 }
 

Braces +11 added lines, -10 removed lines

@@ -10,8 +10,9 @@ 
     {
         parent::__construct ($className, ...$args);
 
-        if ($parent)
-            $this->parent = $parent;
+        if ($parent) {
+                    $this->parent = $parent;
+        }
     }
 	
     public function get_caption (): string
@@ -35,9 +36,9 @@ 
                 \VoidCore::createObject ('System.Drawing.Font', 'System.Drawing', $font[0], $font[1]);
             
             $this->setProperty ('Font', $obj);
+        } else {
+            $this->setProperty ('Font', EngineAdditions::uncoupleSelector ($font));
         }
-
-        else $this->setProperty ('Font', EngineAdditions::uncoupleSelector ($font));
     }
 	
     public function get_backgroundColor ()
@@ -120,9 +121,9 @@ 
             $this->top    = (int) $bounds[1];
             $this->width  = (int) $bounds[2];
             $this->height = (int) $bounds[3];
+        } else {
+            $this->setProperty ('Bounds', EngineAdditions::uncoupleSelector ($bounds));
         }
-
-        else $this->setProperty ('Bounds', EngineAdditions::uncoupleSelector ($bounds));
     }
 	
     public function get_location (): array
@@ -141,9 +142,9 @@ 
             
             $this->left = $location[0];
             $this->top  = $location[1];
+        } else {
+            $this->setProperty ('Location', EngineAdditions::uncoupleSelector ($location));
         }
-
-        else $this->setProperty ('Location', EngineAdditions::uncoupleSelector ($location));
     }
 	
     public function get_size (): array
@@ -162,9 +163,9 @@ 
             
             $this->width  = (int) $size[0];
             $this->height = (int) $size[1];
+        } else {
+            $this->setProperty ('Size', EngineAdditions::uncoupleSelector ($size));
         }
-
-        else $this->setProperty ('Size', EngineAdditions::uncoupleSelector ($size));
     }
 	
     public function setBounds (int $x, int $y, int $w, int $h)

engine/components/Component.php

Spacing +27 added lines, -27 removed lines

@@ -9,81 +9,81 @@
     public $class     = 'System.Windows.Forms.Component';
     public $namespace = 'System.Windows.Forms';
 
-    public function __construct ($className = null, ...$args)
+    public function __construct($className = null, ...$args)
     {
-        parent::__construct (
+        parent::__construct(
             $className === null ? $this->class : $className,
             $this->namespace ?? false,
             ...$args
         );
         
-        Components::addComponent ($this->selector, $this);
+        Components::addComponent($this->selector, $this);
     }
 	
-    public function __debugInfo (): array
+    public function __debugInfo(): array
     {
         return [
-            'description' => @$this->__toString (),
+            'description' => @$this->__toString(),
             'selector'    => @$this->selector,
             'name'        => @$this->name,
-            'objectInfo'  => @json_encode ($this, JSON_PRETTY_PRINT)
+            'objectInfo'  => @json_encode($this, JSON_PRETTY_PRINT)
         ];
     }
 
-    public function __unset ($name)
+    public function __unset($name)
     {
         if (isset ($this->$name))
         {
-            if (is_int ($this->$name))
+            if (is_int($this->$name))
             {
-                Components::removeComponent ($this->$name);
+                Components::removeComponent($this->$name);
 
-                if (\VoidCore::objectExists ($this->$name))
-                    \VoidCore::removeObjects ($this->$name);
+                if (\VoidCore::objectExists($this->$name))
+                    \VoidCore::removeObjects($this->$name);
             }
 
             elseif ($this->$name instanceof Component)
-                $this->$name->dispose ();
+                $this->$name->dispose();
         }
 
         unset ($this->$name);
     }
 
-    public function dispose (): void
+    public function dispose(): void
 	{
-        foreach (array_diff (get_object_vars ($this), ['selector']) as $param => $value)
+        foreach (array_diff(get_object_vars($this), ['selector']) as $param => $value)
         {
-            if (is_int ($value))
+            if (is_int($value))
             {
-                Components::removeComponent ($value);
+                Components::removeComponent($value);
 
-                if (\VoidCore::objectExists ($value))
-                    \VoidCore::removeObjects ($value);
+                if (\VoidCore::objectExists($value))
+                    \VoidCore::removeObjects($value);
             }
 
             elseif ($value instanceof Component)
-                $value->dispose ();
+                $value->dispose();
 
             unset ($this->$param);
         }
 
         if (isset ($this->selector))
         {
-            if (\VoidCore::objectExists ($this->selector))
-                \VoidCore::removeObjects ($this->selector);
+            if (\VoidCore::objectExists($this->selector))
+                \VoidCore::removeObjects($this->selector);
             
-            Components::removeComponent ($this->selector);
+            Components::removeComponent($this->selector);
         }
 
-        Components::cleanJunk ();
+        Components::cleanJunk();
     }
 
-    public function __destruct ()
+    public function __destruct()
     {
-        if (isset ($this->selector) && \VoidCore::destructObject ($this->selector))
+        if (isset ($this->selector) && \VoidCore::destructObject($this->selector))
         {
-            \VoidCore::removeObjects ($this->selector);
-            Components::removeComponent ($this->selector);
+            \VoidCore::removeObjects($this->selector);
+            Components::removeComponent($this->selector);
         }
     }
 }

Braces +13 added lines, -12 removed lines

@@ -38,12 +38,12 @@ 
             {
                 Components::removeComponent ($this->$name);
 
-                if (\VoidCore::objectExists ($this->$name))
-                    \VoidCore::removeObjects ($this->$name);
+                if (\VoidCore::objectExists ($this->$name)) {
+                                    \VoidCore::removeObjects ($this->$name);
+                }
+            } elseif ($this->$name instanceof Component) {
+                            $this->$name->dispose ();
             }
-
-            elseif ($this->$name instanceof Component)
-                $this->$name->dispose ();
         }
 
         unset ($this->$name);
@@ -57,20 +57,21 @@ 
             {
                 Components::removeComponent ($value);
 
-                if (\VoidCore::objectExists ($value))
-                    \VoidCore::removeObjects ($value);
+                if (\VoidCore::objectExists ($value)) {
+                                    \VoidCore::removeObjects ($value);
+                }
+            } elseif ($value instanceof Component) {
+                            $value->dispose ();
             }
 
-            elseif ($value instanceof Component)
-                $value->dispose ();
-
             unset ($this->$param);
         }
 
         if (isset ($this->selector))
         {
-            if (\VoidCore::objectExists ($this->selector))
-                \VoidCore::removeObjects ($this->selector);
+            if (\VoidCore::objectExists ($this->selector)) {
+                            \VoidCore::removeObjects ($this->selector);
+            }
             
             Components::removeComponent ($this->selector);
         }

engine/common/Others.php

Spacing +125 added lines, -126 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,216 +12,216 @@ 
     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 enum_parse (string $baseType, string $value)
+function enum_parse(string $baseType, string $value)
 {
     try
     {
-        return \VoidCore::callMethod (\VoidCore::getClass ('System.Enum',''), ['parse', 'object'], \VoidCore::typeof ($baseType), $value, true);
+        return \VoidCore::callMethod(\VoidCore::getClass('System.Enum', ''), ['parse', 'object'], \VoidCore::typeof($baseType), $value, true);
     }
 
     catch (\WinFormsException $e)
     {
-        return (new WFClass ($baseType))->$value;
+        return (new WFClass($baseType))->$value;
     }
 }
 
-function getNetArray (string $type, array $items = []): WFObject
+function getNetArray(string $type, array $items = []): WFObject
 {
-    $array = (new WFClass ('System.Array', null))
-        ->createInstance (\VoidCore::typeof ($type), $size = sizeof ($items));
+    $array = (new WFClass('System.Array', null))
+        ->createInstance(\VoidCore::typeof($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: более строгие правила очистки мусорных объектов
         
@@ -229,46 +229,46 @@ 
         {
             try
             {
-                if ($object->getType ()->isSubclassOf (\VoidCore::typeof ('System.Windows.Forms.Form', 'System.Windows.Forms')))
+                if ($object->getType()->isSubclassOf(\VoidCore::typeof('System.Windows.Forms.Form', 'System.Windows.Forms')))
                     continue;
             }
 
             catch (\Exception $e) {}
             
-            \VoidCore::destructObject ($selector);
+            \VoidCore::destructObject($selector);
 
-            if (!\VoidCore::objectExists ($selector))
+            if (!\VoidCore::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;
@@ -302,18 +302,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 (\VoidCore::typeof ('System.Windows.Forms.Form', 'System.Windows.Forms')) && $parent->name == $path[0])
+                            if ($parent->getType()->isSubclassOf(\VoidCore::typeof('System.Windows.Forms.Form', 'System.Windows.Forms')) && $parent->name == $path[0])
                                 return $objects[$id];
 
                             else $object = $parent;
@@ -331,70 +331,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);
-        \VoidCore::removeObjects ($collection->selector);
+        (new WFClass('System.Windows.Forms.Clipboard'))->setFileDropList($collection);
+        \VoidCore::removeObjects($collection->selector);
     }
 }
 
@@ -402,14 +402,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', false, $handle) :
-            $this->cursor = new WFClass ('System.Windows.Forms.Cursor');
+            $this->cursor = new WFObject('System.Windows.Forms.Cursor', false, $handle) : $this->cursor = new WFClass('System.Windows.Forms.Cursor');
     }
 
-    public function getPosition (): array
+    public function getPosition(): array
     {
         $pos = $this->cursor->position;
 
@@ -420,22 +419,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? Да, мог
     // Почему не сделал? Скорость важнее
@@ -458,7 +457,7 @@ 
     ];
 
     if ($GLOBALS['__debug']['error_status'])
-        message ([
+        message([
             'type'      => $errarr[$no],
             'text'      => $str,
             'file'      => $file,

Braces +82 added lines, -75 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,9 +66,7 @@ 
     try
     {
         return \VoidCore::callMethod (\VoidCore::getClass ('System.Enum',''), ['parse', 'object'], \VoidCore::typeof ($baseType), $value, true);
-    }
-
-    catch (\WinFormsException $e)
+    } catch (\WinFormsException $e)
     {
         return (new WFClass ($baseType))->$value;
     }
@@ -80,34 +77,39 @@ 
     $array = (new WFClass ('System.Array', null))
         ->createInstance (\VoidCore::typeof ($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;
@@ -121,17 +123,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;
 }
@@ -229,16 +236,16 @@ 
         {
             try
             {
-                if ($object->getType ()->isSubclassOf (\VoidCore::typeof ('System.Windows.Forms.Form', 'System.Windows.Forms')))
-                    continue;
-            }
-
-            catch (\Exception $e) {}
+                if ($object->getType ()->isSubclassOf (\VoidCore::typeof ('System.Windows.Forms.Form', 'System.Windows.Forms'))) {
+                                    continue;
+                }
+            } catch (\Exception $e) {}
             
             \VoidCore::destructObject ($selector);
 
-            if (!\VoidCore::objectExists ($selector))
-                unset (self::$components[$selector]);
+            if (!\VoidCore::objectExists ($selector)) {
+                            unset (self::$components[$selector]);
+            }
         }
     }
 }
@@ -250,16 +257,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))
                 {
@@ -272,32 +278,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;
             }
@@ -308,31 +312,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 (\VoidCore::typeof ('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;
+        }
     }
 }
 
@@ -390,8 +395,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);
         \VoidCore::removeObjects ($collection->selector);
@@ -457,11 +463,12 @@ 
         16384 => 'E_USER_DEPRECATED'
     ];
 
-    if ($GLOBALS['__debug']['error_status'])
-        message ([
+    if ($GLOBALS['__debug']['error_status']) {
+            message ([
             'type'      => $errarr[$no],
             'text'      => $str,
             'file'      => $file,
             'line'      => $line
         ], 'PHP Script Error');
-});
+    }
+    });

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)
     {
         \VoidCore::setEvent ($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)
     {
-        \VoidCore::setEvent ($object, $eventName, function ($sender, ...$args) use ($function)
+        \VoidCore::setEvent($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)
     {
-        \VoidCore::removeObjectEvent ($object, $eventName);
+        \VoidCore::removeObjectEvent($object, $eventName);
     }
 }