winforms-php / VoidFramework

engine/common/EngineInterfaces.php

Spacing +140 added lines, -142 removed lines

@@ -17,9 +17,9 @@ 
      * 
      */
 
-    public static function createObject ($objectName, $objectGroup = null, ...$args): int
+    public static function createObject($objectName, $objectGroup = null, ...$args): int
     {
-        return \VoidCore::createObject ($objectName, $objectGroup, ...$args);
+        return \VoidCore::createObject($objectName, $objectGroup, ...$args);
     }
 
     /**
@@ -34,9 +34,9 @@ 
      * 
      */
 
-    public static function removeObjects (int ...$selectors): void
+    public static function removeObjects(int ...$selectors): void
     {
-        \VoidCore::removeObjects (...$selectors);
+        \VoidCore::removeObjects(...$selectors);
     }
 
     /**
@@ -51,9 +51,9 @@ 
      * 
      */
 
-    public static function destructObject (int $selector): bool
+    public static function destructObject(int $selector): bool
     {
-        return \VoidCore::destructObject ($selector);
+        return \VoidCore::destructObject($selector);
     }
 
     /**
@@ -68,9 +68,9 @@ 
      * 
      */
 
-    public static function createClass ($className, $classGroup = null): int
+    public static function createClass($className, $classGroup = null): int
     {
-        return \VoidCore::getClass ($className, $classGroup);
+        return \VoidCore::getClass($className, $classGroup);
     }
 
     /**
@@ -83,9 +83,9 @@ 
      * 
      */
 
-    public static function createDelegate (string $type, string $code): int
+    public static function createDelegate(string $type, string $code): int
     {
-        return \VoidCore::createDelegate ($type, $code);
+        return \VoidCore::createDelegate($type, $code);
     }
 
     /**
@@ -102,9 +102,9 @@ 
      * 
      */
 
-    public static function objectExists (int $selector): bool
+    public static function objectExists(int $selector): bool
     {
-        return \VoidCore::objectExists ($selector);
+        return \VoidCore::objectExists($selector);
     }
 
     /**
@@ -117,9 +117,9 @@ 
     * 
     */
 
-    public static function objectType ($objectName, $objectGroup = null)
+    public static function objectType($objectName, $objectGroup = null)
     {
-        return \VoidCore::typeof ($objectName, $objectGroup);
+        return \VoidCore::typeof($objectName, $objectGroup);
     }
 
     /**
@@ -140,9 +140,9 @@ 
      * 
      */
 
-    public static function getProperty (int $selector, $propertyName)
+    public static function getProperty(int $selector, $propertyName)
     {
-        return \VoidCore::getProp ($selector, $propertyName);
+        return \VoidCore::getProp($selector, $propertyName);
     }
 
     /**
@@ -162,9 +162,9 @@ 
      * 
      */
 
-    public static function setProperty (int $selector, string $propertyName, $value): void
+    public static function setProperty(int $selector, string $propertyName, $value): void
     {
-        \VoidCore::setProp ($selector, $propertyName, $value);
+        \VoidCore::setProp($selector, $propertyName, $value);
     }
 
     /**
@@ -184,9 +184,9 @@ 
      * 
      */
 
-    public static function getField (int $selector, $fieldName)
+    public static function getField(int $selector, $fieldName)
     {
-        return \VoidCore::getField ($selector, $fieldName);
+        return \VoidCore::getField($selector, $fieldName);
     }
 
     /**
@@ -201,9 +201,9 @@ 
      * 
      */
 
-    public static function setField (int $selector, string $fieldName, $value): void
+    public static function setField(int $selector, string $fieldName, $value): void
     {
-        \VoidCore::setField ($selector, $fieldName, $value);
+        \VoidCore::setField($selector, $fieldName, $value);
     }
 
     /**
@@ -227,9 +227,9 @@ 
      * 
      */
 
-    public static function callMethod (int $selector, $methodName, ...$args)
+    public static function callMethod(int $selector, $methodName, ...$args)
     {
-        return \VoidCore::callMethod ($selector, $methodName, ...$args);
+        return \VoidCore::callMethod($selector, $methodName, ...$args);
     }
 
     /**
@@ -245,9 +245,9 @@ 
      * 
      */
 
-    public static function getArrayValue (int $selector, $index)
+    public static function getArrayValue(int $selector, $index)
     {
-        return \VoidCore::getArrayValue ($selector, $index);
+        return \VoidCore::getArrayValue($selector, $index);
     }
 
     /**
@@ -265,9 +265,9 @@ 
      * 
      */
 
-    public static function setArrayValue (int $selector, $index, $value): void
+    public static function setArrayValue(int $selector, $index, $value): void
     {
-        \VoidCore::setArrayValue ($selector, $index, $value);
+        \VoidCore::setArrayValue($selector, $index, $value);
     }
 
     /**
@@ -282,12 +282,12 @@ 
      * 
      */
 
-    public static function setObjectEvent (int $selector, string $eventName, callable $event): void
+    public static function setObjectEvent(int $selector, string $eventName, callable $event): void
     {
         /*if (self::eventExists ($selector, $eventName))
             self::removeObjectEvent ($selector, $eventName);*/
 
-        \VoidCore::setEvent ($selector, $eventName, $event);
+        \VoidCore::setEvent($selector, $eventName, $event);
     }
 
     /**
@@ -305,9 +305,9 @@ 
      * 
      */
 
-    public static function eventExists (int $selector, string $eventName): bool
+    public static function eventExists(int $selector, string $eventName): bool
     {
-        return \VoidCore::eventExists ($selector, $eventName);
+        return \VoidCore::eventExists($selector, $eventName);
     }
 
     /**
@@ -324,9 +324,9 @@ 
      * 
      */
 
-    public static function removeObjectEvent (int $selector, string $eventName): void
+    public static function removeObjectEvent(int $selector, string $eventName): void
     {
-        \VoidCore::removeEvent ($selector, $eventName);
+        \VoidCore::removeEvent($selector, $eventName);
     }
 
     /**
@@ -338,9 +338,9 @@ 
      * 
      */
 
-    public static function importObject (string $data): int
+    public static function importObject(string $data): int
     {
-        return \VoidCore::importObject ($data);
+        return \VoidCore::importObject($data);
     }
 
     /**
@@ -352,9 +352,9 @@ 
      * 
      */
 
-    public static function exportObject (int $selector): string
+    public static function exportObject(int $selector): string
     {
-        return \VoidCore::exportObject ($selector);
+        return \VoidCore::exportObject($selector);
     }
 
     /**
@@ -378,20 +378,20 @@ 
      * 
      */
 
-    public static function compile (string $savePath, string $iconPath, string $phpCode, string $productDescription = null, string $productName = null, string $productVersion = null, string $companyName = null, string $copyright = null, string $callSharpCode = '', string $declareSharpCode = '', WFObject $dictionary = null, WFObject $assemblies = null): array
+    public static function compile(string $savePath, string $iconPath, string $phpCode, string $productDescription = null, string $productName = null, string $productVersion = null, string $companyName = null, string $copyright = null, string $callSharpCode = '', string $declareSharpCode = '', WFObject $dictionary = null, WFObject $assemblies = null): array
     {
         if ($dictionary === null)
-            $dictionary = new WFObject ('System.Collections.Generic.Dictionary`2[System.String,System.String]', null);
+            $dictionary = new WFObject('System.Collections.Generic.Dictionary`2[System.String,System.String]', null);
 
         if ($assemblies === null)
-            $assemblies = getNetArray ('System.String', [
+            $assemblies = getNetArray('System.String', [
                 // CORE_DIR .'/CefSharp.dll',
-                CORE_DIR .'/FastColoredTextBox.dll',
-                CORE_DIR .'/ScintillaNET.dll'
+                CORE_DIR.'/FastColoredTextBox.dll',
+                CORE_DIR.'/ScintillaNET.dll'
             ]);
 
         if ($productName === null)
-            $productName = basenameNoExt ($savePath);
+            $productName = basenameNoExt($savePath);
 
         if ($productDescription === null)
             $productDescription = $productName;
@@ -403,19 +403,19 @@ 
             $companyName = 'Company N';
 
         if ($copyright === null)
-            $copyright = $companyName .' copyright (c) '. date ('Y');
+            $copyright = $companyName.' copyright (c) '.date('Y');
 
-        return (new WFClass ('WinForms_PHP.WFCompiler', null))->compile ($savePath, $iconPath, $phpCode, $productDescription, $productName, $productVersion, $companyName, $copyright, $callSharpCode, $declareSharpCode, $dictionary, $assemblies)->names;
+        return (new WFClass('WinForms_PHP.WFCompiler', null))->compile($savePath, $iconPath, $phpCode, $productDescription, $productName, $productVersion, $companyName, $copyright, $callSharpCode, $declareSharpCode, $dictionary, $assemblies)->names;
     }
 }
 
 class EngineAdditions
 {
-    public static function loadModule (string $path): bool
+    public static function loadModule(string $path): bool
     {
         try
         {
-            (new WFClass ('System.Reflection.Assembly', 'mscorlib'))->loadFrom ($path);
+            (new WFClass('System.Reflection.Assembly', 'mscorlib'))->loadFrom($path);
         }
 
         catch (\Throwable $e)
@@ -426,16 +426,16 @@ 
         return true;
     }
 
-    public static function getProperty (int $selector, string $name): array
+    public static function getProperty(int $selector, string $name): array
     {
-        $property = VoidEngine::callMethod (VoidEngine::callMethod ($selector, 'GetType'), 'GetProperty', $name);
+        $property = VoidEngine::callMethod(VoidEngine::callMethod($selector, 'GetType'), 'GetProperty', $name);
 
-        if (!is_int ($property))
+        if (!is_int($property))
             return false;
 
         try
         {
-            $propertyType = VoidEngine::getProperty ($property, ['PropertyType', 'string']);
+            $propertyType = VoidEngine::getProperty($property, ['PropertyType', 'string']);
 
             switch ($propertyType)
             {
@@ -471,7 +471,7 @@ 
                 default:
                     try
                     {
-                        VoidEngine::getProperty ($selector, [$name, 'int']);
+                        VoidEngine::getProperty($selector, [$name, 'int']);
 
                         $property = 'int';
                     }
@@ -480,7 +480,7 @@ 
                     {
                         return [
                             'type'  => 'vrsf',
-                            'value' => VoidEngine::exportObject (VoidEngine::getProperty ($selector, [$name, 'object']))
+                            'value' => VoidEngine::exportObject(VoidEngine::getProperty($selector, [$name, 'object']))
                         ];
                     }
                 break;
@@ -494,19 +494,19 @@ 
 
         return [
             'type'  => $property,
-            'value' => VoidEngine::getProperty ($selector, [$name, $property])
+            'value' => VoidEngine::getProperty($selector, [$name, $property])
         ];
     }
 
-    public static function getObjectEvents (int $object): array
+    public static function getObjectEvents(int $object): array
     {
         $events = [];
 
-        $props = VoidEngine::callMethod (VoidEngine::callMethod ($object, 'GetType'), 'GetEvents');
-        $len   = VoidEngine::getProperty ($props, 'Length');
+        $props = VoidEngine::callMethod(VoidEngine::callMethod($object, 'GetType'), 'GetEvents');
+        $len   = VoidEngine::getProperty($props, 'Length');
 
         for ($i = 0; $i < $len; ++$i)
-            $events[] = VoidEngine::getProperty (VoidEngine::getArrayValue ($props, $i), 'Name');
+            $events[] = VoidEngine::getProperty(VoidEngine::getArrayValue($props, $i), 'Name');
 
         return $events;
     }
@@ -516,13 +516,13 @@ 
      * Тогда получается бесконечный цикл вида object->selector->selector->selector->...
      * Чтобы этого избежать нужно добавить исключение - переменную $selfSelector
      */
-    public static function coupleSelector ($value, int $selfSelector = null)
+    public static function coupleSelector($value, int $selfSelector = null)
     {
-        return is_int ($value) && VoidEngine::objectExists ($value) && $value != $selfSelector ?
-            new WFObject ($value) : $value;
+        return is_int($value) && VoidEngine::objectExists($value) && $value != $selfSelector ?
+            new WFObject($value) : $value;
     }
 
-    public static function uncoupleSelector ($value)
+    public static function uncoupleSelector($value)
     {
         return $value instanceof WFObject ?
             $value->selector : $value;
@@ -534,44 +534,44 @@ 
     protected int $selector = 0;
     protected $name;
 
-    public function __construct ($object, ?string $classGroup = 'auto', ...$args)
+    public function __construct($object, ?string $classGroup = 'auto', ...$args)
     {
         foreach ($args as $id => $arg)
-            $args[$id] = EngineAdditions::uncoupleSelector ($arg);
+            $args[$id] = EngineAdditions::uncoupleSelector($arg);
 
-        if (is_string ($object))
-            $this->selector = VoidEngine::createObject ($object, $classGroup == 'auto' ?
-                substr ($object, 0, strrpos ($object, '.')) : $classGroup, ...$args);
+        if (is_string($object))
+            $this->selector = VoidEngine::createObject($object, $classGroup == 'auto' ?
+                substr ($object, 0, strrpos($object, '.')) : $classGroup, ...$args);
 
-        elseif (is_int ($object) && VoidEngine::objectExists ($object))
+        elseif (is_int($object) && VoidEngine::objectExists($object))
             $this->selector = $object;
 
-        else throw new \Exception ('$object parameter must be string or object selector');
+        else throw new \Exception('$object parameter must be string or object selector');
     }
     
-    public function __get ($name)
+    public function __get($name)
 	{
-        if (method_exists ($this, $method = "get_$name"))
-            $value = $this->$method ();
+        if (method_exists($this, $method = "get_$name"))
+            $value = $this->$method();
 
-        elseif (substr ($name, -5) == 'Event')
-            $value = Events::getObjectEvent ($this->selector, substr ($name, 0, -5));
+        elseif (substr($name, -5) == 'Event')
+            $value = Events::getObjectEvent($this->selector, substr($name, 0, -5));
 
-        elseif (property_exists ($this, $name))
+        elseif (property_exists($this, $name))
             $value = $this->$name;
 
-        else switch (strtolower ($name))
+        else switch (strtolower($name))
         {
             case 'count':
             case 'length':
                 try
                 {
-                    return $this->getProperty ('Count');
+                    return $this->getProperty('Count');
                 }
 
                 catch (\Throwable $e)
                 {
-                    return $this->getProperty ('Length');
+                    return $this->getProperty('Length');
                 }
             break;
 
@@ -580,7 +580,7 @@ 
                 $list = [];
                 
 				for ($i = 0; $i < $size; ++$i)
-                    $list[] = EngineAdditions::coupleSelector (VoidEngine::getArrayValue ($this->selector, $i));
+                    $list[] = EngineAdditions::coupleSelector(VoidEngine::getArrayValue($this->selector, $i));
                 
                 return $list;
             break;
@@ -592,31 +592,31 @@ 
                 for ($i = 0; $i < $size; ++$i)
                     try
                     {
-                        $names[] = VoidEngine::getProperty (VoidEngine::getArrayValue ($this->selector, [$i, 'object']), 'Text');
+                        $names[] = VoidEngine::getProperty(VoidEngine::getArrayValue($this->selector, [$i, 'object']), 'Text');
                     }
 
                     catch (\Throwable $e)
                     {
-                        $names[] = VoidEngine::getArrayValue ($this->selector, [$i, 'string']);
+                        $names[] = VoidEngine::getArrayValue($this->selector, [$i, 'string']);
                     }
                 
                 return $names;
             break;
 
             default:
-                $value = $this->getProperty ($name);
+                $value = $this->getProperty($name);
             break;
         }
 
-        return EngineAdditions::coupleSelector ($value, $this->selector);
+        return EngineAdditions::coupleSelector($value, $this->selector);
 	}
 	
-	public function __set ($name, $value)
+	public function __set($name, $value)
 	{
-        if (method_exists ($this, $method = "set_$name"))
+        if (method_exists($this, $method = "set_$name"))
             try
             {
-                return $this->$method ($value);
+                return $this->$method($value);
             }
 
             # Метод "set_$name" может принимать в качестве параметра объект WFObject
@@ -625,63 +625,61 @@ 
             catch (\Throwable $e)
             {
                 return $value instanceof WFObject ?
-                    $this->$method ($value->selector) : null;
+                    $this->$method($value->selector) : null;
             }
 
-        elseif (substr ($name, -5) == 'Event')
-            Events::setObjectEvent ($this->selector, substr ($name, 0, -5), $value);
+        elseif (substr($name, -5) == 'Event')
+            Events::setObjectEvent($this->selector, substr($name, 0, -5), $value);
         
-        else $this->setProperty ($name, EngineAdditions::uncoupleSelector ($value));
+        else $this->setProperty($name, EngineAdditions::uncoupleSelector($value));
     }
 	
-	public function __call ($method, $args)
+	public function __call($method, $args)
 	{
-        $args = array_map (function ($arg)
+        $args = array_map(function($arg)
         {
-            return EngineAdditions::uncoupleSelector ($arg);
+            return EngineAdditions::uncoupleSelector($arg);
         }, $args);
 
-        return EngineAdditions::coupleSelector ($this->callMethod ($method, ...$args), $this->selector);
+        return EngineAdditions::coupleSelector($this->callMethod($method, ...$args), $this->selector);
     }
 
-    public function addRange (array $values, $assoc = false): void
+    public function addRange(array $values, $assoc = false): void
     {
         foreach ($values as $id => $value)
-            $this->offsetSet ($assoc ? $id : null, $value);
+            $this->offsetSet($assoc ? $id : null, $value);
     }
     
-    public function offsetSet ($index, $value)
+    public function offsetSet($index, $value)
 	{
         try
         {
             return $index === null ?
-                $this->callMethod ('Add', EngineAdditions::uncoupleSelector ($value)) :
-                $this->callMethod ('Insert', $index, EngineAdditions::uncoupleSelector ($value));
+                $this->callMethod('Add', EngineAdditions::uncoupleSelector($value)) : $this->callMethod('Insert', $index, EngineAdditions::uncoupleSelector($value));
         }
 
         catch (\Throwable $e)
         {
             return $index === null ?
-                VoidEngine::setArrayValue ($this->selector, $this->count, $value) :
-                VoidEngine::setArrayValue ($this->selector, $index, $value);
+                VoidEngine::setArrayValue($this->selector, $this->count, $value) : VoidEngine::setArrayValue($this->selector, $index, $value);
         }
     }
 	
-	public function offsetGet ($index)
+	public function offsetGet($index)
 	{
-		return EngineAdditions::coupleSelector (VoidEngine::getArrayValue ($this->selector, $index), $this->selector);
+		return EngineAdditions::coupleSelector(VoidEngine::getArrayValue($this->selector, $index), $this->selector);
     }
 	
-	public function offsetUnset ($index): void
+	public function offsetUnset($index): void
 	{
-		$this->callMethod ('RemoveAt', $index);
+		$this->callMethod('RemoveAt', $index);
     }
     
-    public function offsetExists ($index): bool
+    public function offsetExists($index): bool
     {
         try
         {
-            $this->offsetGet ($index);
+            $this->offsetGet($index);
         }
 
         catch (\Exception $e)
@@ -692,19 +690,19 @@ 
         return true;
     }
 	
-	public function indexOf ($value): int
+	public function indexOf($value): int
 	{
-		return $this->callMethod ('IndexOf', EngineAdditions::uncoupleSelector ($value));
+		return $this->callMethod('IndexOf', EngineAdditions::uncoupleSelector($value));
     }
     
-    public function lastIndexOf ($value): int
+    public function lastIndexOf($value): int
 	{
-		return $this->callMethod ('LastIndexOf', EngineAdditions::uncoupleSelector ($value));
+		return $this->callMethod('LastIndexOf', EngineAdditions::uncoupleSelector($value));
 	}
 	
-	public function contains ($value): bool
+	public function contains($value): bool
 	{
-		return $this->callMethod ('Contains', EngineAdditions::uncoupleSelector ($value));
+		return $this->callMethod('Contains', EngineAdditions::uncoupleSelector($value));
     }
 
     public function foreach (callable $callback, string $type = null): void
@@ -712,71 +710,71 @@ 
         $size = $this->count;
 
         for ($i = 0; $i < $size; ++$i)
-            $callback (EngineAdditions::coupleSelector (VoidEngine::getArrayValue ($this->selector, $type !== null ? [$i, $type] : $i), $this->selector), $i);
+            $callback(EngineAdditions::coupleSelector(VoidEngine::getArrayValue($this->selector, $type !== null ? [$i, $type] : $i), $this->selector), $i);
     }
 
-    public function where (callable $comparator, string $type = null): array
+    public function where(callable $comparator, string $type = null): array
     {
         $size   = $this->count;
         $return = [];
 
         for ($i = 0; $i < $size; ++$i)
-            if ($comparator ($value = EngineAdditions::coupleSelector (VoidEngine::getArrayValue ($this->selector, $type !== null ? [$i, $type] : $i), $this->selector), $i))
+            if ($comparator($value = EngineAdditions::coupleSelector(VoidEngine::getArrayValue($this->selector, $type !== null ? [$i, $type] : $i), $this->selector), $i))
                 $return[] = $value;
 
         return $return;
     }
 	
-    protected function getProperty ($name)
+    protected function getProperty($name)
     {
         try
         {
-            return VoidEngine::getProperty ($this->selector, $name);
+            return VoidEngine::getProperty($this->selector, $name);
         }
 
         catch (\Throwable $e)
         {
-            return VoidEngine::getField ($this->selector, $name);
+            return VoidEngine::getField($this->selector, $name);
         }
     }
 
-    protected function setProperty ($name, $value)
+    protected function setProperty($name, $value)
     {
         try
         {
-            VoidEngine::setProperty ($this->selector, $name, $value);
+            VoidEngine::setProperty($this->selector, $name, $value);
         }
 
         catch (\Throwable $e)
         {
-            VoidEngine::setField ($this->selector, $name, $value);
+            VoidEngine::setField($this->selector, $name, $value);
         }
     }
 	
-    protected function callMethod ($method, ...$args)
+    protected function callMethod($method, ...$args)
     {
-        return VoidEngine::callMethod ($this->selector, $method, ...$args);
+        return VoidEngine::callMethod($this->selector, $method, ...$args);
     }
 	
-	protected function getArrayProperty ($name, string $type = null)
+	protected function getArrayProperty($name, string $type = null)
 	{
-        $array  = $this->getProperty ($name);
-        $size   = VoidEngine::getProperty ($array, 'Length');
+        $array  = $this->getProperty($name);
+        $size   = VoidEngine::getProperty($array, 'Length');
         $return = [];
 
 		for ($i = 0; $i < $size; ++$i)
-            $return[] = VoidEngine::getArrayValue ($array, $type === null ? $i : [$i, $type]);
+            $return[] = VoidEngine::getArrayValue($array, $type === null ? $i : [$i, $type]);
         
-        VoidEngine::removeObjects ($array);
+        VoidEngine::removeObjects($array);
         
 		return $return;
     }
 
-    public function get_name ()
+    public function get_name()
 	{
 		try
 		{
-			return $this->getProperty ('Name');
+			return $this->getProperty('Name');
         }
         
 		catch (\Throwable $e)
@@ -785,11 +783,11 @@ 
 		}
 	}
 	
-	public function set_name (string $name)
+	public function set_name(string $name)
 	{
 		try
 		{
-			$this->setProperty ('Name', $name);
+			$this->setProperty('Name', $name);
         }
         
 		catch (\Throwable $e)
@@ -798,24 +796,24 @@ 
 		}
 	}
 
-    public function __toString (): string
+    public function __toString(): string
     {
-        return $this->callMethod ('ToString');
+        return $this->callMethod('ToString');
     }
 }
 
 class WFClass extends WFObject
 {
-    public function __construct ($class, ?string $classGroup = 'auto')
+    public function __construct($class, ?string $classGroup = 'auto')
     {
-        if (is_string ($class))
-            $this->selector = VoidEngine::createClass ($class, $classGroup == 'auto' ?
-                substr ($class, 0, strrpos ($class, '.')) : $classGroup
+        if (is_string($class))
+            $this->selector = VoidEngine::createClass($class, $classGroup == 'auto' ?
+                substr ($class, 0, strrpos($class, '.')) : $classGroup
             );
 
-        elseif (is_int ($class) && VoidEngine::objectExists ($class))
+        elseif (is_int($class) && VoidEngine::objectExists($class))
             $this->selector = $class;
 
-        else throw new \Exception ('$class parameter must be string or class selector');
+        else throw new \Exception('$class parameter must be string or class selector');
     }
 }

engine/VoidEngine.php

Spacing +6 added lines, -6 removed lines

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

engine/extensions/VLF/bin/parser.php

Braces +106 added lines, -87 removed lines

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