winforms-php / VoidFramework

engine/VoidEngine.php

Spacing +6 added lines, -6 removed lines

@@ -34,7 +34,7 @@ 
 const ENGINE_VERSION = '4.0.0rc3';
 const ENGINE_DIR = __DIR__;
 
-chdir (ENGINE_DIR);
+chdir(ENGINE_DIR);
 
 require 'common/Events.php';
 require 'common/EngineInterfaces.php';
@@ -43,15 +43,15 @@ 
 require 'common/Components.php';
 require 'common/Others.php';
 
-define ('VoidEngine\CORE_VERSION', $APPLICATION->productVersion);
+define('VoidEngine\CORE_VERSION', $APPLICATION->productVersion);
 
 require 'components/Component.php';
 require 'components/Control.php';
 
-foreach (glob ('components/*/*.php') as $name)
+foreach (glob('components/*/*.php') as $name)
     require $name;
 
-if (file_exists ('extensions'))
-    foreach (scandir ('extensions') as $ext)
-        if (file_exists ($ext = 'extensions/'. $ext .'/main.php'))
+if (file_exists('extensions'))
+    foreach (scandir('extensions') as $ext)
+        if (file_exists($ext = 'extensions/'.$ext.'/main.php'))
             require $ext;

engine/common/Others.php

Spacing +64 added lines, -64 removed lines

@@ -4,176 +4,176 @@ 
 
 use VoidCore;
 
-function dn (...$args): NetObject
+function dn(...$args): NetObject
 {
     try
     {
-        $object = new NetObject (...$args);
+        $object = new NetObject(...$args);
     }
 
     catch (\WinformsException $e)
     {
-        if (VoidCore::callMethod ($e->getNetException (), 'ToString') == 'System.MemberAccessException')
+        if (VoidCore::callMethod($e->getNetException(), 'ToString') == 'System.MemberAccessException')
             throw $e;
         
-        $object = new NetClass (...$args);
+        $object = new NetClass(...$args);
     }
 
     return $object;
 }
 
-function thread (callable $callable): NetObject
+function thread(callable $callable): NetObject
 {
-    return new NetObject (VoidCore::createThread ($callable));
+    return new NetObject(VoidCore::createThread($callable));
 }
 
-function enum (string $baseType, string $value)
+function enum(string $baseType, string $value)
 {
     try
     {
-        return VoidCore::callMethod (VoidCore::getClass ('System.Enum'), ['parse', VC_OBJECT], VoidCore::typeof ($baseType), $value, true);
+        return VoidCore::callMethod(VoidCore::getClass('System.Enum'), ['parse', VC_OBJECT], VoidCore::typeof($baseType), $value, true);
     }
 
     catch (\WinformsException $e)
     {
-        return (new NetClass ($baseType))->$value;
+        return (new NetClass($baseType))->$value;
     }
 }
 
-function dnArray (string $type, array $items = []): NetObject
+function dnArray(string $type, array $items = []): NetObject
 {
-    $array = (new NetClass ('System.Array'))
-        ->createInstance (VoidCore::typeof ($type), $size = sizeof ($items));
+    $array = (new NetClass('System.Array'))
+        ->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 argb (string $color)
+function argb(string $color)
 {
-    return (new NetClass ('System.Drawing.ColorTranslator'))->fromHtml ($color);
+    return (new NetClass('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 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): int
+function messageBox(string $message, string $caption = '', ...$args): int
 {
-    return (new MessageBox)->show ($message, $caption, ...$args);
+    return (new MessageBox)->show($message, $caption, ...$args);
 }
 
-function run (string $path, ...$args)
+function run(string $path, ...$args)
 {
-    return (new Process)->start ($path, ...$args);
+    return (new Process)->start($path, ...$args);
 }
 
-function setTimer (int $interval, callable $function): Timer
+function setTimer(int $interval, callable $function): Timer
 {
     $timer = new Timer;
     $timer->interval  = $interval;
-    $timer->tickEvent = fn ($self) => $function ($self);
+    $timer->tickEvent = fn($self) => $function($self);
     
-	$timer->start ();
+	$timer->start();
     
     return $timer;
 }
 
-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)
     {
-        $self->stop ();
+        $self->stop();
 
-        $function ($self);
+        $function($self);
     };
     
-	$timer->start ();
+	$timer->start();
     
 	return $timer;
 }
 
-set_error_handler (function ($no, $str, $file, $line)
+set_error_handler(function($no, $str, $file, $line)
 {
     // Мог ли я здесь сделать более адекватный код с использованием pow/sqrt? Да, мог
     // Почему не сделал? Скорость важнее
@@ -195,7 +195,7 @@ 
         16384 => 'E_USER_DEPRECATED'
     ];
 
-    message ([
+    message([
         'type'      => $errarr[$no],
         'text'      => $str,
         'file'      => $file,

engine/common/Components.php

Spacing +16 added lines, -16 removed lines

@@ -6,62 +6,62 @@
 {
     protected static array $objects = [];
 
-    public static function add (NetObject $object): void
+    public static function add(NetObject $object): void
     {
-        self::$objects[$object->selector] = \WeakReference::create ($object);
+        self::$objects[$object->selector] = \WeakReference::create($object);
     }
 
-    public static function get (int $selector): ?NetObject
+    public static function get(int $selector): ?NetObject
     {
         if (!isset (self::$objects[$selector]))
             return null;
         
-        $object = self::$objects[$selector]->get ();
+        $object = self::$objects[$selector]->get();
 
         if ($object === null)
-            self::remove ($selector);
+            self::remove($selector);
 
         return $object;
     }
 
-    public static function exists (int $selector): bool
+    public static function exists(int $selector): bool
     {
         return isset (self::$objects[$selector]);
     }
 
-    public static function getObjects (): array
+    public static function getObjects(): array
     {
         return self::$objects;
     }
 
-    public static function remove (int $selector): void
+    public static function remove(int $selector): void
     {
         unset (self::$objects[$selector]);
     }
 
-    public static function clean (): void
+    public static function clean(): void
     {
         foreach (self::$objects as $selector => $reference)
-            if ($reference->get () === null)
+            if ($reference->get() === null)
                 unset (self::$objects[$selector]);
     }
 }
 
-function _c (int $selector): ?NetObject
+function _c(int $selector): ?NetObject
 {
-    return Components::get ($selector);
+    return Components::get($selector);
 }
 
 // TODO: поддержка многоуровневых ссылок вида родитель->родитель->объект
 // VoidCore::getPrevClass
-function c (string $name): ?NetObject
+function c(string $name): ?NetObject
 {
-    if (is_int ($name) && ($object = _c($name)) !== null)
+    if (is_int($name) && ($object = _c($name)) !== null)
         return $object;
 
-    foreach (Components::getObjects () as $selector => $reference)
+    foreach (Components::getObjects() as $selector => $reference)
     {
-        $object = $reference->get ();
+        $object = $reference->get();
 
         if ($object === null)
             continue;

engine/common/EngineInterfaces.php

Spacing +69 added lines, -71 removed lines

@@ -10,44 +10,44 @@ 
     protected ?string $name = null;
     // protected bool $isCollection = false;
 
-    public function __construct ($name, $assembly = false, ...$args)
+    public function __construct($name, $assembly = false, ...$args)
     {
         foreach ($args as $id => $arg)
-            $args[$id] = EngineAdditions::uncoupleSelector ($arg);
+            $args[$id] = EngineAdditions::uncoupleSelector($arg);
         
-        if (is_int ($name) && VoidCore::objectExists ($name))
+        if (is_int($name) && VoidCore::objectExists($name))
             $this->selector = $name;
 
-        elseif (is_string ($name))
-            $this->selector = VoidCore::createObject ($name, $assembly, ...$args);
+        elseif (is_string($name))
+            $this->selector = VoidCore::createObject($name, $assembly, ...$args);
 
-        else throw new \Exception ('Incorrect params passed');
+        else throw new \Exception('Incorrect params passed');
 
         /*$this->isCollection = $this->getType ()
             ->isSubclassOf (VoidCore::typeof ('System.Collectons.Generic.ICollection'));*/
     }
 
-    public function dispose (): void
+    public function dispose(): void
     {
-        VoidCore::removeObjects ($this->selector);
+        VoidCore::removeObjects($this->selector);
     }
 
     # Основные магические методы
 
-    public function __get (string $name)
+    public function __get(string $name)
     {
-        switch (strtolower ($name))
+        switch (strtolower($name))
         {
             case 'count':
             case 'length':
                 try
                 {
-                    return $this->getProperty ('Count');
+                    return $this->getProperty('Count');
                 }
 
                 catch (\WinformsException $e)
                 {
-                    return $this->getProperty ('Length');
+                    return $this->getProperty('Length');
                 }
             break;
 
@@ -56,7 +56,7 @@ 
                 $list = [];
                 
 				for ($i = 0; $i < $size; ++$i)
-                    $list[] = EngineAdditions::coupleSelector (VoidCore::getArrayValue ($this->selector, $i));
+                    $list[] = EngineAdditions::coupleSelector(VoidCore::getArrayValue($this->selector, $i));
                 
                 return $list;
             break;
@@ -68,93 +68,91 @@ 
                 for ($i = 0; $i < $size; ++$i)
                     try
                     {
-                        $names[] = VoidCore::getProperty (VoidCore::getArrayValue ($this->selector, [$i, VC_OBJECT]), 'Text');
+                        $names[] = VoidCore::getProperty(VoidCore::getArrayValue($this->selector, [$i, VC_OBJECT]), 'Text');
                     }
 
                     catch (\WinformsException $e)
                     {
-                        $names[] = VoidCore::getArrayValue ($this->selector, [$i, VC_STRING]);
+                        $names[] = VoidCore::getArrayValue($this->selector, [$i, VC_STRING]);
                     }
                 
                 return $names;
             break;
         }
 
-        if (method_exists ($this, $method = 'get_'. $name))
-            return $this->$method ();
+        if (method_exists($this, $method = 'get_'.$name))
+            return $this->$method();
 
         return isset ($this->$name) ?
-            $this->$name : EngineAdditions::coupleSelector ($this->getProperty ($name));
+            $this->$name : EngineAdditions::coupleSelector($this->getProperty($name));
     }
 
-    public function __set (string $name, $value): void
+    public function __set(string $name, $value): void
     {
-        if (substr ($name, -5) == 'Event')
-            Events::setEvent ($this->selector, substr ($name, 0, -5), $value);
+        if (substr($name, -5) == 'Event')
+            Events::setEvent($this->selector, substr($name, 0, -5), $value);
 
-        elseif (method_exists ($this, $method = 'set_'. $name))
-            $this->$method ($value);
+        elseif (method_exists($this, $method = 'set_'.$name))
+            $this->$method($value);
         
-        else $this->setProperty ($name, EngineAdditions::uncoupleSelector ($value));
+        else $this->setProperty($name, EngineAdditions::uncoupleSelector($value));
     }
 
-    public function __call (string $name, array $args)
+    public function __call(string $name, array $args)
     {
-        return EngineAdditions::coupleSelector ($this->callMethod ($name,
-            array_map ('VoidEngine\\EngineAdditions::uncoupleSelector', $args)));
+        return EngineAdditions::coupleSelector($this->callMethod($name,
+            array_map('VoidEngine\\EngineAdditions::uncoupleSelector', $args)));
     }
 
     # Управление VoidCore
 
-    protected function getProperty ($name)
+    protected function getProperty($name)
     {
-        return VoidCore::getProperty ($this->selector, $name);
+        return VoidCore::getProperty($this->selector, $name);
     }
 
-    protected function setProperty (string $name, $value): void
+    protected function setProperty(string $name, $value): void
     {
-        VoidCore::setProperty ($this->selector, $name, $value);
+        VoidCore::setProperty($this->selector, $name, $value);
     }
 
-    protected function callMethod (string $name, array $args = [])
+    protected function callMethod(string $name, array $args = [])
     {
-        return VoidCore::callMethod ($this->selector, $name, ...$args);
+        return VoidCore::callMethod($this->selector, $name, ...$args);
     }
 
     # ArrayAccess
 
-    public function offsetSet ($index, $value)
+    public function offsetSet($index, $value)
 	{
         try
         {
             $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)
         {
             $index === null ?
-                VoidCore::setArrayValue ($this->selector, $this->count, EngineAdditions::uncoupleSelector ($value)) :
-                VoidCore::setArrayValue ($this->selector, $index, EngineAdditions::uncoupleSelector ($value));
+                VoidCore::setArrayValue($this->selector, $this->count, EngineAdditions::uncoupleSelector($value)) : VoidCore::setArrayValue($this->selector, $index, EngineAdditions::uncoupleSelector($value));
         }
     }
 	
-	public function offsetGet ($index)
+	public function offsetGet($index)
 	{
-		return EngineAdditions::coupleSelector (VoidCore::getArrayValue ($this->selector, $index), $this->selector);
+		return EngineAdditions::coupleSelector(VoidCore::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 (\WinformsException $e)
@@ -172,16 +170,16 @@ 
         $size = $this->count;
 
         for ($i = 0; $i < $size; ++$i)
-            $callback (EngineAdditions::coupleSelector (VoidCore::getArrayValue ($this->selector, $type !== null ? [$i, $type] : $i), $this->selector), $i);
+            $callback(EngineAdditions::coupleSelector(VoidCore::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 (VoidCore::getArrayValue ($this->selector, $type !== null ? [$i, $type] : $i), $this->selector), $i))
+            if ($comparator($value = EngineAdditions::coupleSelector(VoidCore::getArrayValue($this->selector, $type !== null ? [$i, $type] : $i), $this->selector), $i))
                 $return[] = $value;
 
         return $return;
@@ -189,30 +187,30 @@ 
 
     # Магические методы
 
-    public function __destruct ()
+    public function __destruct()
     {
-        VoidCore::destructObject ($this->selector);
+        VoidCore::destructObject($this->selector);
     }
 
-    public function __toString (): string
+    public function __toString(): string
     {
         return $this->selector;
     }
 
-    public function __debugInfo (): array
+    public function __debugInfo(): array
     {
         $info = ['selector' => $this->selector];
 
         try
         {
-            $info['name'] = $this->getProperty ('Name');
+            $info['name'] = $this->getProperty('Name');
         }
 
         catch (\WinformsException $e) {}
 
         try
         {
-            $info['info'] = $this->callMethod ('ToString');
+            $info['info'] = $this->callMethod('ToString');
         }
 
         catch (\WinformsException $e) {}
@@ -223,15 +221,15 @@ 
 
 class NetClass extends NetObject
 {
-    public function __construct ($name, $assembly = false)
+    public function __construct($name, $assembly = false)
     {
-        if (is_int ($name) && VoidCore::objectExists ($name))
+        if (is_int($name) && VoidCore::objectExists($name))
             $this->selector = $name;
 
-        elseif (is_string ($name))
-            $this->selector = VoidCore::getClass ($name, $assembly);
+        elseif (is_string($name))
+            $this->selector = VoidCore::getClass($name, $assembly);
 
-        else throw new \Exception ('Incorrect params passed');
+        else throw new \Exception('Incorrect params passed');
     }
 }
 
@@ -256,16 +254,16 @@ 
      * 
      * @return 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 = '', NetObject $dictionary = null, NetObject $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 = '', NetObject $dictionary = null, NetObject $assemblies = null): array
     {
         if ($dictionary === null)
-            $dictionary = new NetObject ('System.Collections.Generic.Dictionary`2[System.String,System.String]', null);
+            $dictionary = new NetObject('System.Collections.Generic.Dictionary`2[System.String,System.String]', null);
 
         if ($assemblies === null)
-            $assemblies = dnArray ('System.String', []);
+            $assemblies = dnArray('System.String', []);
 
         if ($productName === null)
-            $productName = basenameNoExt ($savePath);
+            $productName = basenameNoExt($savePath);
 
         if ($productDescription === null)
             $productDescription = $productName;
@@ -277,16 +275,16 @@ 
             $companyName = 'Company N';
 
         if ($copyright === null)
-            $copyright = $companyName .' copyright (c) '. date ('Y');
+            $copyright = $companyName.' copyright (c) '.date('Y');
 
-        return (new NetClass ('WinForms_PHP.WFCompiler', null))->compile ($savePath, $iconPath, $phpCode, $productDescription, $productName, $productVersion, $companyName, $copyright, $callSharpCode, $declareSharpCode, $dictionary, $assemblies)->names;
+        return (new NetClass('WinForms_PHP.WFCompiler', null))->compile($savePath, $iconPath, $phpCode, $productDescription, $productName, $productVersion, $companyName, $copyright, $callSharpCode, $declareSharpCode, $dictionary, $assemblies)->names;
     }
 
-    public static function loadModule (string $path): bool
+    public static function loadModule(string $path): bool
     {
         try
         {
-            (new NetClass ('System.Reflection.Assembly', 'mscorlib'))->loadFrom ($path);
+            (new NetClass('System.Reflection.Assembly', 'mscorlib'))->loadFrom($path);
         }
 
         catch (\WinformsException $e)
@@ -297,15 +295,15 @@ 
         return true;
     }
 	
-    public static function coupleSelector ($selector)
+    public static function coupleSelector($selector)
     {
-        return is_int ($selector) && VoidCore::objectExists ($selector) ?
-            new NetObject ($selector) : $selector;
+        return is_int($selector) && VoidCore::objectExists($selector) ?
+            new NetObject($selector) : $selector;
     }
 
-    public static function uncoupleSelector ($object)
+    public static function uncoupleSelector($object)
     {
-        return is_object ($object) && $object instanceof NetObject ?
+        return is_object($object) && $object instanceof NetObject ?
             $object->selector : $object;
     }
 }

app_bundle/start.php

Spacing +9 added lines, -9 removed lines

@@ -10,20 +10,20 @@
 # Объявление констант
 const APP_DIR = __DIR__;
 
-define ('VoidEngine\CORE_DIR',
-	file_exists ($dir = dirname (__DIR__) .'/qero-packages/winforms-php/VoidFramework/core') ? $dir : __DIR__);
+define('VoidEngine\CORE_DIR',
+	file_exists($dir = dirname(__DIR__).'/qero-packages/winforms-php/VoidFramework/core') ? $dir : __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 и запускаем приложение
-$objects = Interpreter::run (Parser::parse ('app.vlf'));
+$objects = Interpreter::run(Parser::parse('app.vlf'));
 
-$APPLICATION->run ($objects['MainForm']);
+$APPLICATION->run($objects['MainForm']);