@@ -6,7 +6,7 @@ discard block |
||
| 6 | 6 | { |
| 7 | 7 | public $class = 'System.Windows.Forms.TreeView'; |
| 8 | 8 | |
| 9 | - public function get_path () |
|
| 9 | + public function get_path() |
|
| 10 | 10 | { |
| 11 | 11 | try |
| 12 | 12 | { |
@@ -26,15 +26,15 @@ discard block |
||
| 26 | 26 | { |
| 27 | 27 | public $class = 'System.Windows.Forms.TreeNode'; |
| 28 | 28 | |
| 29 | - public function __construct (string $text = '') |
|
| 29 | + public function __construct(string $text = '') |
|
| 30 | 30 | { |
| 31 | - parent::__construct (null, $this->class); |
|
| 31 | + parent::__construct(null, $this->class); |
|
| 32 | 32 | |
| 33 | 33 | $this->text = $text; |
| 34 | 34 | } |
| 35 | 35 | |
| 36 | - public function get_path () |
|
| 36 | + public function get_path() |
|
| 37 | 37 | { |
| 38 | - return $this->getProperty ('FullPath'); |
|
| 38 | + return $this->getProperty('FullPath'); |
|
| 39 | 39 | } |
| 40 | 40 | } |
@@ -11,9 +11,7 @@ |
||
| 11 | 11 | try |
| 12 | 12 | { |
| 13 | 13 | $node = $this->selectedNode; |
| 14 | - } |
|
| 15 | - |
|
| 16 | - catch (\WinFormsException $e) |
|
| 14 | + } catch (\WinFormsException $e) |
|
| 17 | 15 | { |
| 18 | 16 | return false; |
| 19 | 17 | } |
@@ -105,7 +105,8 @@ |
||
| 105 | 105 | require 'components/FastColoredTextBox.php'; |
| 106 | 106 | require 'components/Scintilla.php'; |
| 107 | 107 | |
| 108 | -if (is_dir ('extensions')) |
|
| 108 | +if (is_dir ('extensions')) { |
|
| 109 | 109 | foreach (scandir ('extensions') as $ext) |
| 110 | 110 | if (is_dir ('extensions/'. $ext) && file_exists ($ext = 'extensions/'. $ext .'/main.php')) |
| 111 | 111 | require $ext; |
| 112 | +} |
|
@@ -36,10 +36,10 @@ discard block |
||
| 36 | 36 | const ENGINE_VERSION = '3.5.8 build-2019/09/22'; |
| 37 | 37 | const ENGINE_DIR = __DIR__; |
| 38 | 38 | |
| 39 | -chdir (ENGINE_DIR); |
|
| 39 | +chdir(ENGINE_DIR); |
|
| 40 | 40 | |
| 41 | 41 | $GLOBALS['__debug'] = [ |
| 42 | - 'start_time' => microtime (true), |
|
| 42 | + 'start_time' => microtime(true), |
|
| 43 | 43 | 'error_status' => true |
| 44 | 44 | ]; |
| 45 | 45 | |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | require 'common/Others.php'; |
| 50 | 50 | require 'common/Events.php'; |
| 51 | 51 | |
| 52 | -define ('VoidEngine\CORE_VERSION', $APPLICATION->productVersion); |
|
| 52 | +define('VoidEngine\CORE_VERSION', $APPLICATION->productVersion); |
|
| 53 | 53 | |
| 54 | 54 | require 'components/Component.php'; |
| 55 | 55 | require 'components/Control.php'; |
@@ -96,7 +96,7 @@ discard block |
||
| 96 | 96 | require 'components/FastColoredTextBox.php'; |
| 97 | 97 | require 'components/Scintilla.php'; |
| 98 | 98 | |
| 99 | -if (is_dir ('extensions')) |
|
| 100 | - foreach (scandir ('extensions') as $ext) |
|
| 101 | - if (is_dir ('extensions/'. $ext) && file_exists ($ext = 'extensions/'. $ext .'/main.php')) |
|
| 99 | +if (is_dir('extensions')) |
|
| 100 | + foreach (scandir('extensions') as $ext) |
|
| 101 | + if (is_dir('extensions/'.$ext) && file_exists($ext = 'extensions/'.$ext.'/main.php')) |
|
| 102 | 102 | require $ext; |
@@ -10,14 +10,13 @@ |
||
| 10 | 10 | { |
| 11 | 11 | try |
| 12 | 12 | { |
| 13 | - foreach ($args as $id => $arg) |
|
| 14 | - $args[$id] = EngineAdditions::coupleSelector ($arg); |
|
| 13 | + foreach ($args as $id => $arg) { |
|
| 14 | + $args[$id] = EngineAdditions::coupleSelector ($arg); |
|
| 15 | + } |
|
| 15 | 16 | |
| 16 | 17 | return $function (($e = _c($sender)) !== false ? |
| 17 | 18 | $e : new WFObject ($sender), ...$args); |
| 18 | - } |
|
| 19 | - |
|
| 20 | - catch (\Throwable $e) |
|
| 19 | + } catch (\Throwable $e) |
|
| 21 | 20 | { |
| 22 | 21 | message ([ |
| 23 | 22 | 'type' => get_class ($e), |
@@ -7,9 +7,9 @@ discard block |
||
| 7 | 7 | public static function setObjectEvent (int $object, string $eventName, callable $function) |
| 8 | 8 | { |
| 9 | 9 | \VoidCore::setEvent ($object, $eventName, function ($sender, ...$args) use ($function) |
| 10 | - { |
|
| 10 | + { |
|
| 11 | 11 | try |
| 12 | - { |
|
| 12 | + { |
|
| 13 | 13 | foreach ($args as $id => $arg) |
| 14 | 14 | $args[$id] = EngineAdditions::coupleSelector ($arg); |
| 15 | 15 | |
@@ -17,8 +17,8 @@ discard block |
||
| 17 | 17 | $e : new WFObject ($sender), ...$args); |
| 18 | 18 | } |
| 19 | 19 | |
| 20 | - catch (\Throwable $e) |
|
| 21 | - { |
|
| 20 | + catch (\Throwable $e) |
|
| 21 | + { |
|
| 22 | 22 | message ([ |
| 23 | 23 | 'type' => get_class ($e), |
| 24 | 24 | 'text' => $e->getMessage (), |
@@ -4,35 +4,35 @@ |
||
| 4 | 4 | |
| 5 | 5 | class Events |
| 6 | 6 | { |
| 7 | - public static function setObjectEvent (int $object, string $eventName, callable $function) |
|
| 7 | + public static function setObjectEvent(int $object, string $eventName, callable $function) |
|
| 8 | 8 | { |
| 9 | - \VoidCore::setEvent ($object, $eventName, function ($sender, ...$args) use ($function) |
|
| 9 | + \VoidCore::setEvent($object, $eventName, function($sender, ...$args) use ($function) |
|
| 10 | 10 | { |
| 11 | 11 | try |
| 12 | 12 | { |
| 13 | 13 | foreach ($args as $id => $arg) |
| 14 | - $args[$id] = EngineAdditions::coupleSelector ($arg); |
|
| 14 | + $args[$id] = EngineAdditions::coupleSelector($arg); |
|
| 15 | 15 | |
| 16 | - return $function (($e = _c($sender)) !== false ? |
|
| 17 | - $e : new WFObject ($sender), ...$args); |
|
| 16 | + return $function(($e = _c($sender)) !== false ? |
|
| 17 | + $e : new WFObject($sender), ...$args); |
|
| 18 | 18 | } |
| 19 | 19 | |
| 20 | 20 | catch (\Throwable $e) |
| 21 | 21 | { |
| 22 | - message ([ |
|
| 23 | - 'type' => get_class ($e), |
|
| 24 | - 'text' => $e->getMessage (), |
|
| 25 | - 'file' => $e->getFile (), |
|
| 26 | - 'line' => $e->getLine (), |
|
| 27 | - 'code' => $e->getCode (), |
|
| 28 | - 'trace' => $e->getTraceAsString () |
|
| 22 | + message([ |
|
| 23 | + 'type' => get_class($e), |
|
| 24 | + 'text' => $e->getMessage(), |
|
| 25 | + 'file' => $e->getFile(), |
|
| 26 | + 'line' => $e->getLine(), |
|
| 27 | + 'code' => $e->getCode(), |
|
| 28 | + 'trace' => $e->getTraceAsString() |
|
| 29 | 29 | ], 'PHP Critical Error'); |
| 30 | 30 | } |
| 31 | 31 | }); |
| 32 | 32 | } |
| 33 | 33 | |
| 34 | - public static function removeObjectEvent (int $object, string $eventName) |
|
| 34 | + public static function removeObjectEvent(int $object, string $eventName) |
|
| 35 | 35 | { |
| 36 | - \VoidCore::removeEvent ($object, $eventName); |
|
| 36 | + \VoidCore::removeEvent($object, $eventName); |
|
| 37 | 37 | } |
| 38 | 38 | } |
@@ -42,7 +42,7 @@ |
||
| 42 | 42 | public string $name; // Имя объекта |
| 43 | 43 | public int $link; // АСД-ссылка на объект |
| 44 | 44 | |
| 45 | - public function __construct (string $name, int $link) |
|
| 45 | + public function __construct(string $name, int $link) |
|
| 46 | 46 | { |
| 47 | 47 | $this->name = $name; |
| 48 | 48 | $this->link = $link; |
@@ -8,20 +8,20 @@ |
||
| 8 | 8 | chdir (CORE_DIR); |
| 9 | 9 | |
| 10 | 10 | foreach (glob ('ext/php_*.dll') as $ext) |
| 11 | - if (!extension_loaded (substr (basename ($ext), 4, -4))) |
|
| 12 | - load_extension ($ext); |
|
| 11 | + if (!extension_loaded (substr (basename ($ext), 4, -4))) |
|
| 12 | + load_extension ($ext); |
|
| 13 | 13 | |
| 14 | 14 | if (file_exists ('../engine/VoidEngine.php')) |
| 15 | - require '../engine/VoidEngine.php'; |
|
| 15 | + require '../engine/VoidEngine.php'; |
|
| 16 | 16 | |
| 17 | 17 | elseif (file_exists (FRAMEWORK_DIR .'/engine/VoidEngine.php')) |
| 18 | - require FRAMEWORK_DIR .'/engine/VoidEngine.php'; |
|
| 18 | + require FRAMEWORK_DIR .'/engine/VoidEngine.php'; |
|
| 19 | 19 | |
| 20 | 20 | else message ('VoidEngine not founded'); |
| 21 | 21 | |
| 22 | 22 | $app = '../../app/start.php'; |
| 23 | 23 | |
| 24 | 24 | if (file_exists ($app)) |
| 25 | - require $app; |
|
| 25 | + require $app; |
|
| 26 | 26 | |
| 27 | 27 | else \VoidCore::callMethod (\VoidCore::createObject ('WinForms_PHP.DebugForm', null), 'ShowDialog'); |
@@ -2,26 +2,26 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace VoidEngine; |
| 4 | 4 | |
| 5 | -define ('VoidEngine\FRAMEWORK_DIR', getenv ('AppData') .'\VoidFramework'); |
|
| 5 | +define('VoidEngine\FRAMEWORK_DIR', getenv('AppData').'\VoidFramework'); |
|
| 6 | 6 | |
| 7 | 7 | const CORE_DIR = __DIR__; |
| 8 | -chdir (CORE_DIR); |
|
| 8 | +chdir(CORE_DIR); |
|
| 9 | 9 | |
| 10 | -foreach (glob ('ext/php_*.dll') as $ext) |
|
| 11 | - if (!extension_loaded (substr (basename ($ext), 4, -4))) |
|
| 12 | - load_extension ($ext); |
|
| 10 | +foreach (glob('ext/php_*.dll') as $ext) |
|
| 11 | + if (!extension_loaded(substr(basename($ext), 4, -4))) |
|
| 12 | + load_extension($ext); |
|
| 13 | 13 | |
| 14 | -if (file_exists ('../engine/VoidEngine.php')) |
|
| 14 | +if (file_exists('../engine/VoidEngine.php')) |
|
| 15 | 15 | require '../engine/VoidEngine.php'; |
| 16 | 16 | |
| 17 | -elseif (file_exists (FRAMEWORK_DIR .'/engine/VoidEngine.php')) |
|
| 18 | - require FRAMEWORK_DIR .'/engine/VoidEngine.php'; |
|
| 17 | +elseif (file_exists(FRAMEWORK_DIR.'/engine/VoidEngine.php')) |
|
| 18 | + require FRAMEWORK_DIR.'/engine/VoidEngine.php'; |
|
| 19 | 19 | |
| 20 | -else message ('VoidEngine not founded'); |
|
| 20 | +else message('VoidEngine not founded'); |
|
| 21 | 21 | |
| 22 | 22 | $app = '../../app/start.php'; |
| 23 | 23 | |
| 24 | -if (file_exists ($app)) |
|
| 24 | +if (file_exists($app)) |
|
| 25 | 25 | require $app; |
| 26 | 26 | |
| 27 | -else \VoidCore::callMethod (\VoidCore::createObject ('WinForms_PHP.DebugForm', null), 'ShowDialog'); |
|
| 27 | +else \VoidCore::callMethod(\VoidCore::createObject('WinForms_PHP.DebugForm', null), 'ShowDialog'); |
|
@@ -7,21 +7,23 @@ |
||
| 7 | 7 | const CORE_DIR = __DIR__; |
| 8 | 8 | chdir (CORE_DIR); |
| 9 | 9 | |
| 10 | -foreach (glob ('ext/php_*.dll') as $ext) |
|
| 10 | +foreach (glob ('ext/php_*.dll') as $ext) { |
|
| 11 | 11 | if (!extension_loaded (substr (basename ($ext), 4, -4))) |
| 12 | 12 | load_extension ($ext); |
| 13 | +} |
|
| 13 | 14 | |
| 14 | -if (file_exists ('../engine/VoidEngine.php')) |
|
| 15 | +if (file_exists ('../engine/VoidEngine.php')) { |
|
| 15 | 16 | require '../engine/VoidEngine.php'; |
| 16 | - |
|
| 17 | -elseif (file_exists (FRAMEWORK_DIR .'/engine/VoidEngine.php')) |
|
| 17 | +} elseif (file_exists (FRAMEWORK_DIR .'/engine/VoidEngine.php')) { |
|
| 18 | 18 | require FRAMEWORK_DIR .'/engine/VoidEngine.php'; |
| 19 | - |
|
| 20 | -else message ('VoidEngine not founded'); |
|
| 19 | +} else { |
|
| 20 | + message ('VoidEngine not founded'); |
|
| 21 | +} |
|
| 21 | 22 | |
| 22 | 23 | $app = '../../app/start.php'; |
| 23 | 24 | |
| 24 | -if (file_exists ($app)) |
|
| 25 | +if (file_exists ($app)) { |
|
| 25 | 26 | require $app; |
| 26 | - |
|
| 27 | -else \VoidCore::callMethod (\VoidCore::createObject ('WinForms_PHP.DebugForm', null), 'ShowDialog'); |
|
| 27 | +} else { |
|
| 28 | + \VoidCore::callMethod (\VoidCore::createObject ('WinForms_PHP.DebugForm', null), 'ShowDialog'); |
|
| 29 | +} |
|
@@ -25,18 +25,20 @@ discard block |
||
| 25 | 25 | */ |
| 26 | 26 | public function __construct (string $content, array $settings = []) |
| 27 | 27 | { |
| 28 | - if (file_exists ($content)) |
|
| 29 | - $content = file_get_contents ($content); |
|
| 28 | + if (file_exists ($content)) { |
|
| 29 | + $content = file_get_contents ($content); |
|
| 30 | + } |
|
| 30 | 31 | |
| 31 | 32 | // Зачем? Так надо! |
| 32 | 33 | $content = "# VLF begin\n\n$content\n\n# VLF end"; |
| 33 | 34 | |
| 34 | 35 | foreach ($settings as $name => $setting) |
| 35 | 36 | { |
| 36 | - if (isset ($this->$name)) |
|
| 37 | - $this->$name = $setting; |
|
| 38 | - |
|
| 39 | - else throw new \Exception ('Trying to setting up undefined property "'. $name .'"'); |
|
| 37 | + if (isset ($this->$name)) { |
|
| 38 | + $this->$name = $setting; |
|
| 39 | + } else { |
|
| 40 | + throw new \Exception ('Trying to setting up undefined property "'. $name .'"'); |
|
| 41 | + } |
|
| 40 | 42 | } |
| 41 | 43 | |
| 42 | 44 | if ($this->use_caching && file_exists ($file = VLF_EXT_DIR .'/cache/'. sha1 ($content) .'.cache')) |
@@ -49,9 +51,9 @@ discard block |
||
| 49 | 51 | $this->links = $info[1][1]; |
| 50 | 52 | |
| 51 | 53 | return; |
| 54 | + } else { |
|
| 55 | + unlink ($file); |
|
| 52 | 56 | } |
| 53 | - |
|
| 54 | - else unlink ($file); |
|
| 55 | 57 | } |
| 56 | 58 | |
| 57 | 59 | $info = $this->generateSyntaxTree ($content); |
@@ -61,8 +63,9 @@ discard block |
||
| 61 | 63 | |
| 62 | 64 | if ($this->use_caching) |
| 63 | 65 | { |
| 64 | - if (!is_dir (dirname (__DIR__) .'/cache')) |
|
| 65 | - mkdir (dirname (__DIR__) .'/cache'); |
|
| 66 | + if (!is_dir (dirname (__DIR__) .'/cache')) { |
|
| 67 | + mkdir (dirname (__DIR__) .'/cache'); |
|
| 68 | + } |
|
| 66 | 69 | |
| 67 | 70 | file_put_contents (VLF_EXT_DIR .'/cache/'. sha1 ($content) .'.cache', gzdeflate (serialize ([sha1 (file_get_contents (__FILE__)), $info]))); |
| 68 | 71 | } |
@@ -85,19 +88,22 @@ discard block |
||
| 85 | 88 | $tree = []; |
| 86 | 89 | $links = []; |
| 87 | 90 | |
| 88 | - if ($this->debug_mode) |
|
| 89 | - pre ($lines); |
|
| 91 | + if ($this->debug_mode) { |
|
| 92 | + pre ($lines); |
|
| 93 | + } |
|
| 90 | 94 | |
| 91 | 95 | foreach ($lines as $id => $line) |
| 92 | 96 | { |
| 93 | - if ($skip_at > $id) |
|
| 94 | - continue; |
|
| 97 | + if ($skip_at > $id) { |
|
| 98 | + continue; |
|
| 99 | + } |
|
| 95 | 100 | |
| 96 | 101 | $height = $this->getLineHeight ($line); |
| 97 | 102 | $words = $this->linesFilter (explode (' ', $line)); |
| 98 | 103 | |
| 99 | - if ($this->debug_mode) |
|
| 100 | - pre ($words); |
|
| 104 | + if ($this->debug_mode) { |
|
| 105 | + pre ($words); |
|
| 106 | + } |
|
| 101 | 107 | |
| 102 | 108 | /** |
| 103 | 109 | * Высокоинтеллектуальный фикс |
@@ -118,16 +124,18 @@ discard block |
||
| 118 | 124 | { |
| 119 | 125 | $updated = false; |
| 120 | 126 | |
| 121 | - if ($this->debug_mode) |
|
| 122 | - pre ($current_object); |
|
| 127 | + if ($this->debug_mode) { |
|
| 128 | + pre ($current_object); |
|
| 129 | + } |
|
| 123 | 130 | |
| 124 | 131 | while (isset ($tree[$current_object]['info']['subparent_link']) && $tree[$link = $tree[$current_object]['info']['subparent_link']->link]['hard'] < $tree[$current_object]['hard']) |
| 125 | 132 | { |
| 126 | 133 | $current_object = $link; |
| 127 | 134 | $updated = true; |
| 128 | 135 | |
| 129 | - if ($this->debug_mode) |
|
| 130 | - pre ($current_object); |
|
| 136 | + if ($this->debug_mode) { |
|
| 137 | + pre ($current_object); |
|
| 138 | + } |
|
| 131 | 139 | } |
| 132 | 140 | |
| 133 | 141 | if ( |
@@ -136,13 +144,15 @@ discard block |
||
| 136 | 144 | isset ($tree[$current_object]['info']['arguments'][0]) && |
| 137 | 145 | $tree[$current_object]['info']['arguments'][0] instanceof VLFLink && |
| 138 | 146 | $tree[$tree[$current_object]['info']['arguments'][0]->link]['hard'] < $tree[$current_object]['hard'] |
| 139 | - ) $current_object = $tree[$current_object]['info']['arguments'][0]->link; |
|
| 140 | - |
|
| 141 | - elseif (!$updated) |
|
| 142 | - break; |
|
| 147 | + ) { |
|
| 148 | + $current_object = $tree[$current_object]['info']['arguments'][0]->link; |
|
| 149 | + } elseif (!$updated) { |
|
| 150 | + break; |
|
| 151 | + } |
|
| 143 | 152 | |
| 144 | - if ($this->debug_mode) |
|
| 145 | - pre ($current_object); |
|
| 153 | + if ($this->debug_mode) { |
|
| 154 | + pre ($current_object); |
|
| 155 | + } |
|
| 146 | 156 | } |
| 147 | 157 | |
| 148 | 158 | /** |
@@ -150,8 +160,9 @@ discard block |
||
| 150 | 160 | */ |
| 151 | 161 | if (class_exists ($words[0]) || class_exists ('\VoidEngine\\'. $words[0])) |
| 152 | 162 | { |
| 153 | - if (!isset ($words[1])) |
|
| 154 | - throw new \Exception ('Object name mustn\'t be empty at line "'. $line .'"'); |
|
| 163 | + if (!isset ($words[1])) { |
|
| 164 | + throw new \Exception ('Object name mustn\'t be empty at line "'. $line .'"'); |
|
| 165 | + } |
|
| 155 | 166 | |
| 156 | 167 | /** |
| 157 | 168 | * Button NewButton |
@@ -179,9 +190,7 @@ discard block |
||
| 179 | 190 | $current_object = $id; |
| 180 | 191 | |
| 181 | 192 | continue; |
| 182 | - } |
|
| 183 | - |
|
| 184 | - else |
|
| 193 | + } else |
|
| 185 | 194 | { |
| 186 | 195 | $tree[$id] = [ |
| 187 | 196 | 'type' => VLF_OBJECT_DEFINITION, |
@@ -203,10 +212,9 @@ discard block |
||
| 203 | 212 | |
| 204 | 213 | $end = strrpos ($line, ')'); |
| 205 | 214 | |
| 206 | - if ($end === false) |
|
| 207 | - throw new \Exception ('Line "'. $line .'" have arguments list initialization, but not have list ending'); |
|
| 208 | - |
|
| 209 | - elseif ($begin < $end) |
|
| 215 | + if ($end === false) { |
|
| 216 | + throw new \Exception ('Line "'. $line .'" have arguments list initialization, but not have list ending'); |
|
| 217 | + } elseif ($begin < $end) |
|
| 210 | 218 | { |
| 211 | 219 | $arguments = []; |
| 212 | 220 | // $parsed = explode (',', substr ($line, $begin, $end - $begin)); |
@@ -216,18 +224,20 @@ discard block |
||
| 216 | 224 | { |
| 217 | 225 | $argument = trim ($argument); |
| 218 | 226 | |
| 219 | - if (strlen ($argument) > 0) |
|
| 220 | - $arguments[] = isset ($links[$argument]) ? |
|
| 227 | + if (strlen ($argument) > 0) { |
|
| 228 | + $arguments[] = isset ($links[$argument]) ? |
|
| 221 | 229 | new VLFLink ($argument, $links[$argument]) : |
| 222 | 230 | $argument; |
| 223 | - |
|
| 224 | - else throw new \Exception ('Argument '. ($argument_id + 1) .' mustn\'t have zero length at line "'. $line .'"'); |
|
| 231 | + } else { |
|
| 232 | + throw new \Exception ('Argument '. ($argument_id + 1) .' mustn\'t have zero length at line "'. $line .'"'); |
|
| 233 | + } |
|
| 225 | 234 | } |
| 226 | 235 | |
| 227 | 236 | $tree[$id]['info']['arguments'] = $arguments; |
| 228 | 237 | |
| 229 | - if (!$this->ignore_postobject_info && trim (substr ($line, $end)) > 0) |
|
| 230 | - throw new \Exception ('You mustn\'t write any chars after arguments definition'); |
|
| 238 | + if (!$this->ignore_postobject_info && trim (substr ($line, $end)) > 0) { |
|
| 239 | + throw new \Exception ('You mustn\'t write any chars after arguments definition'); |
|
| 240 | + } |
|
| 231 | 241 | } |
| 232 | 242 | |
| 233 | 243 | $tree[$id]['info']['subparent_link'] = new VLFLink ($tree[$current_object]['info']['object_name'], $current_object); |
@@ -291,13 +301,14 @@ discard block |
||
| 291 | 301 | |
| 292 | 302 | $comment .= $parsed[0]; |
| 293 | 303 | $skip_at = $parsed[1]; |
| 304 | + } else { |
|
| 305 | + throw new \Exception ('Unknown char founded after syntax-control symbol at line "'. $line .'"'); |
|
| 294 | 306 | } |
| 295 | - |
|
| 296 | - else throw new \Exception ('Unknown char founded after syntax-control symbol at line "'. $line .'"'); |
|
| 297 | 307 | } |
| 298 | 308 | |
| 299 | - if ($this->debug_mode) |
|
| 300 | - pre ("Comment:\n\n$comment"); |
|
| 309 | + if ($this->debug_mode) { |
|
| 310 | + pre ("Comment:\n\n$comment"); |
|
| 311 | + } |
|
| 301 | 312 | } |
| 302 | 313 | |
| 303 | 314 | /** |
@@ -319,9 +330,9 @@ discard block |
||
| 319 | 330 | |
| 320 | 331 | $code .= $parsed[0]; |
| 321 | 332 | $skip_at = $parsed[1]; |
| 333 | + } else { |
|
| 334 | + throw new \Exception ('Unknown char founded after syntax-control symbol at line "'. $line .'"'); |
|
| 322 | 335 | } |
| 323 | - |
|
| 324 | - else throw new \Exception ('Unknown char founded after syntax-control symbol at line "'. $line .'"'); |
|
| 325 | 336 | } |
| 326 | 337 | |
| 327 | 338 | $tree[$id] = [ |
@@ -376,8 +387,9 @@ discard block |
||
| 376 | 387 | |
| 377 | 388 | if ($postChar == ':' || $postChar == '^') |
| 378 | 389 | { |
| 379 | - if (!isset ($words[1])) |
|
| 380 | - throw new \Exception ('Property value mustn\'t be empty at line "'. $line .'"'); |
|
| 390 | + if (!isset ($words[1])) { |
|
| 391 | + throw new \Exception ('Property value mustn\'t be empty at line "'. $line .'"'); |
|
| 392 | + } |
|
| 381 | 393 | |
| 382 | 394 | $propertyName = substr ($words[0], 0, -1); |
| 383 | 395 | $propertyValue = implode (' ', array_slice ($words, 1)); |
@@ -412,8 +424,9 @@ discard block |
||
| 412 | 424 | 'syntax_nodes' => [] |
| 413 | 425 | ]; |
| 414 | 426 | |
| 415 | - if (isset ($links[$info['info']['property_value']])) |
|
| 416 | - $info['info']['property_value'] = new VLFLink ($info['info']['property_value'], $links[$info['info']['property_value']]); |
|
| 427 | + if (isset ($links[$info['info']['property_value']])) { |
|
| 428 | + $info['info']['property_value'] = new VLFLink ($info['info']['property_value'], $links[$info['info']['property_value']]); |
|
| 429 | + } |
|
| 417 | 430 | |
| 418 | 431 | $tree[$current_object]['syntax_nodes'][] = $info; |
| 419 | 432 | } |
@@ -431,10 +444,9 @@ discard block |
||
| 431 | 444 | |
| 432 | 445 | $end = strrpos ($line, ')'); |
| 433 | 446 | |
| 434 | - if ($end === false) |
|
| 435 | - throw new \Exception ('Line "'. $line .'" have arguments list initialization, but not have list ending'); |
|
| 436 | - |
|
| 437 | - elseif ($begin < $end) |
|
| 447 | + if ($end === false) { |
|
| 448 | + throw new \Exception ('Line "'. $line .'" have arguments list initialization, but not have list ending'); |
|
| 449 | + } elseif ($begin < $end) |
|
| 438 | 450 | { |
| 439 | 451 | // $parsed = explode (',', substr ($line, $begin, $end - $begin)); |
| 440 | 452 | $parsed = $this->parseArguments (substr ($line, $begin, $end - $begin)); |
@@ -443,24 +455,27 @@ discard block |
||
| 443 | 455 | { |
| 444 | 456 | $argument = trim ($argument); |
| 445 | 457 | |
| 446 | - if (strlen ($argument) > 0) |
|
| 447 | - $arguments[] = isset ($links[$argument]) ? |
|
| 458 | + if (strlen ($argument) > 0) { |
|
| 459 | + $arguments[] = isset ($links[$argument]) ? |
|
| 448 | 460 | new VLFLink ($argument, $links[$argument]) : |
| 449 | 461 | $argument; |
| 450 | - |
|
| 451 | - else throw new \Exception ('Argument '. ($argument_id + 1) .' mustn\'t have zero length at line "'. $line .'"'); |
|
| 462 | + } else { |
|
| 463 | + throw new \Exception ('Argument '. ($argument_id + 1) .' mustn\'t have zero length at line "'. $line .'"'); |
|
| 464 | + } |
|
| 452 | 465 | } |
| 453 | 466 | |
| 454 | - if (!$this->ignore_postobject_info && trim (substr ($line, $end)) > 0) |
|
| 455 | - throw new \Exception ('You mustn\'t write any chars after arguments definition'); |
|
| 467 | + if (!$this->ignore_postobject_info && trim (substr ($line, $end)) > 0) { |
|
| 468 | + throw new \Exception ('You mustn\'t write any chars after arguments definition'); |
|
| 469 | + } |
|
| 456 | 470 | } |
| 457 | 471 | } |
| 458 | 472 | |
| 459 | 473 | /** |
| 460 | 474 | * ->show |
| 461 | 475 | */ |
| 462 | - elseif (!$this->ignore_unexpected_method_args) |
|
| 463 | - throw new \Exception ('Unexpected method arguments list at line "'. $line .'"'); |
|
| 476 | + elseif (!$this->ignore_unexpected_method_args) { |
|
| 477 | + throw new \Exception ('Unexpected method arguments list at line "'. $line .'"'); |
|
| 478 | + } |
|
| 464 | 479 | |
| 465 | 480 | $tree[$current_object]['syntax_nodes'][] = [ |
| 466 | 481 | 'type' => VLF_METHOD_CALL, |
@@ -513,7 +528,9 @@ discard block |
||
| 513 | 528 | /** |
| 514 | 529 | * Что-то загадочное, таинственное, неизвестное человечеству |
| 515 | 530 | */ |
| 516 | - else throw new \Exception ('Unknown structures founded at line "'. $line .'"'); |
|
| 531 | + else { |
|
| 532 | + throw new \Exception ('Unknown structures founded at line "'. $line .'"'); |
|
| 533 | + } |
|
| 517 | 534 | } |
| 518 | 535 | |
| 519 | 536 | return [$tree, $links]; |
@@ -535,8 +552,9 @@ discard block |
||
| 535 | 552 | |
| 536 | 553 | foreach ($lines as $line_id => $line) |
| 537 | 554 | { |
| 538 | - if ($line_id <= $begin_id) |
|
| 539 | - continue; |
|
| 555 | + if ($line_id <= $begin_id) { |
|
| 556 | + continue; |
|
| 557 | + } |
|
| 540 | 558 | |
| 541 | 559 | if (!(bool)(trim ($line))) |
| 542 | 560 | { |
@@ -547,13 +565,15 @@ discard block |
||
| 547 | 565 | |
| 548 | 566 | $height = $this->getLineHeight ($line); |
| 549 | 567 | |
| 550 | - if ($this->debug_mode) |
|
| 551 | - pre ("$height, $down_height, $line"); |
|
| 552 | - |
|
| 553 | - if ($height > $down_height) |
|
| 554 | - $parsed .= "$line\n"; |
|
| 568 | + if ($this->debug_mode) { |
|
| 569 | + pre ("$height, $down_height, $line"); |
|
| 570 | + } |
|
| 555 | 571 | |
| 556 | - else break; |
|
| 572 | + if ($height > $down_height) { |
|
| 573 | + $parsed .= "$line\n"; |
|
| 574 | + } else { |
|
| 575 | + break; |
|
| 576 | + } |
|
| 557 | 577 | } |
| 558 | 578 | |
| 559 | 579 | return [$parsed, $line_id]; |
@@ -577,8 +597,9 @@ discard block |
||
| 577 | 597 | { |
| 578 | 598 | $i = 0; |
| 579 | 599 | |
| 580 | - while (isset ($line[$i]) && $line[$i] == "\t") |
|
| 581 | - ++$i; |
|
| 600 | + while (isset ($line[$i]) && $line[$i] == "\t") { |
|
| 601 | + ++$i; |
|
| 602 | + } |
|
| 582 | 603 | |
| 583 | 604 | return strlen ($line = str_repeat (' ', $i) . substr ($line, $i)) - strlen ($line = trim ($line)); |
| 584 | 605 | } |
@@ -595,8 +616,9 @@ discard block |
||
| 595 | 616 | { |
| 596 | 617 | return array_filter ($segments, function ($text) |
| 597 | 618 | { |
| 598 | - if ($this->strong_line_parser && preg_match ('/[^a-z0-9]/i', $text)) |
|
| 599 | - throw new \Exception ('Line "'. $text .'" mustn\'t have any not-alphabet or not-numeric characters'); |
|
| 619 | + if ($this->strong_line_parser && preg_match ('/[^a-z0-9]/i', $text)) { |
|
| 620 | + throw new \Exception ('Line "'. $text .'" mustn\'t have any not-alphabet or not-numeric characters'); |
|
| 621 | + } |
|
| 600 | 622 | |
| 601 | 623 | return strlen (trim ($text)) > 0; |
| 602 | 624 | }); |
@@ -617,18 +639,15 @@ discard block |
||
| 617 | 639 | { |
| 618 | 640 | $t .= $arguments[$i]; |
| 619 | 641 | |
| 620 | - if ($arguments[$i] == '\\') |
|
| 621 | - $canSplit = $i + 1; |
|
| 622 | - |
|
| 623 | - elseif ($canSplit < $i) |
|
| 642 | + if ($arguments[$i] == '\\') { |
|
| 643 | + $canSplit = $i + 1; |
|
| 644 | + } elseif ($canSplit < $i) |
|
| 624 | 645 | { |
| 625 | - if ($arguments[$i] == '\'' && !$split2) |
|
| 626 | - $split1 = !$split1; |
|
| 627 | - |
|
| 628 | - elseif ($arguments[$i] == '"' && !$split1) |
|
| 629 | - $split2 = !$split2; |
|
| 630 | - |
|
| 631 | - elseif (!$split1 && !$split2 && $arguments[$i] == ',') |
|
| 646 | + if ($arguments[$i] == '\'' && !$split2) { |
|
| 647 | + $split1 = !$split1; |
|
| 648 | + } elseif ($arguments[$i] == '"' && !$split1) { |
|
| 649 | + $split2 = !$split2; |
|
| 650 | + } elseif (!$split1 && !$split2 && $arguments[$i] == ',') |
|
| 632 | 651 | { |
| 633 | 652 | $args[] = substr ($t, 0, -1); |
| 634 | 653 | $t = ''; |
@@ -23,10 +23,10 @@ discard block |
||
| 23 | 23 | * @param string $content - VLF разметка или путь до файла разметки |
| 24 | 24 | * [@param array $settings = []] - список настроек и их значений (настройка => значение) |
| 25 | 25 | */ |
| 26 | - public function __construct (string $content, array $settings = []) |
|
| 26 | + public function __construct(string $content, array $settings = []) |
|
| 27 | 27 | { |
| 28 | - if (file_exists ($content)) |
|
| 29 | - $content = file_get_contents ($content); |
|
| 28 | + if (file_exists($content)) |
|
| 29 | + $content = file_get_contents($content); |
|
| 30 | 30 | |
| 31 | 31 | // Зачем? Так надо! |
| 32 | 32 | $content = "# VLF begin\n\n$content\n\n# VLF end"; |
@@ -36,14 +36,14 @@ discard block |
||
| 36 | 36 | if (isset ($this->$name)) |
| 37 | 37 | $this->$name = $setting; |
| 38 | 38 | |
| 39 | - else throw new \Exception ('Trying to setting up undefined property "'. $name .'"'); |
|
| 39 | + else throw new \Exception('Trying to setting up undefined property "'.$name.'"'); |
|
| 40 | 40 | } |
| 41 | 41 | |
| 42 | - if ($this->use_caching && file_exists ($file = VLF_EXT_DIR .'/cache/'. sha1 ($content) .'.cache')) |
|
| 42 | + if ($this->use_caching && file_exists($file = VLF_EXT_DIR.'/cache/'.sha1($content).'.cache')) |
|
| 43 | 43 | { |
| 44 | - $info = unserialize (gzinflate (file_get_contents ($file))); |
|
| 44 | + $info = unserialize(gzinflate(file_get_contents($file))); |
|
| 45 | 45 | |
| 46 | - if ($info[0] == sha1 (file_get_contents (__FILE__))) |
|
| 46 | + if ($info[0] == sha1(file_get_contents(__FILE__))) |
|
| 47 | 47 | { |
| 48 | 48 | $this->tree = $info[1][0]; |
| 49 | 49 | $this->links = $info[1][1]; |
@@ -51,20 +51,20 @@ discard block |
||
| 51 | 51 | return; |
| 52 | 52 | } |
| 53 | 53 | |
| 54 | - else unlink ($file); |
|
| 54 | + else unlink($file); |
|
| 55 | 55 | } |
| 56 | 56 | |
| 57 | - $info = $this->generateSyntaxTree ($content); |
|
| 57 | + $info = $this->generateSyntaxTree($content); |
|
| 58 | 58 | |
| 59 | 59 | $this->tree = $info[0]; |
| 60 | 60 | $this->links = $info[1]; |
| 61 | 61 | |
| 62 | 62 | if ($this->use_caching) |
| 63 | 63 | { |
| 64 | - if (!is_dir (dirname (__DIR__) .'/cache')) |
|
| 65 | - mkdir (dirname (__DIR__) .'/cache'); |
|
| 64 | + if (!is_dir(dirname(__DIR__).'/cache')) |
|
| 65 | + mkdir(dirname(__DIR__).'/cache'); |
|
| 66 | 66 | |
| 67 | - file_put_contents (VLF_EXT_DIR .'/cache/'. sha1 ($content) .'.cache', gzdeflate (serialize ([sha1 (file_get_contents (__FILE__)), $info]))); |
|
| 67 | + file_put_contents(VLF_EXT_DIR.'/cache/'.sha1($content).'.cache', gzdeflate(serialize([sha1(file_get_contents(__FILE__)), $info]))); |
|
| 68 | 68 | } |
| 69 | 69 | } |
| 70 | 70 | |
@@ -76,9 +76,9 @@ discard block |
||
| 76 | 76 | * |
| 77 | 77 | * @return array - возвращает АСД |
| 78 | 78 | */ |
| 79 | - protected function generateSyntaxTree (string $content): array |
|
| 79 | + protected function generateSyntaxTree(string $content): array |
|
| 80 | 80 | { |
| 81 | - $lines = $this->linesFilter ($untouched_lines = explode ($this->divider, $content)); |
|
| 81 | + $lines = $this->linesFilter($untouched_lines = explode($this->divider, $content)); |
|
| 82 | 82 | $current_object = null; |
| 83 | 83 | $parent_objects = []; |
| 84 | 84 | $skip_at = -1; |
@@ -86,18 +86,18 @@ discard block |
||
| 86 | 86 | $links = []; |
| 87 | 87 | |
| 88 | 88 | if ($this->debug_mode) |
| 89 | - pre ($lines); |
|
| 89 | + pre($lines); |
|
| 90 | 90 | |
| 91 | 91 | foreach ($lines as $id => $line) |
| 92 | 92 | { |
| 93 | 93 | if ($skip_at > $id) |
| 94 | 94 | continue; |
| 95 | 95 | |
| 96 | - $height = $this->getLineHeight ($line); |
|
| 97 | - $words = $this->linesFilter (explode (' ', $line)); |
|
| 96 | + $height = $this->getLineHeight($line); |
|
| 97 | + $words = $this->linesFilter(explode(' ', $line)); |
|
| 98 | 98 | |
| 99 | 99 | if ($this->debug_mode) |
| 100 | - pre ($words); |
|
| 100 | + pre($words); |
|
| 101 | 101 | |
| 102 | 102 | /** |
| 103 | 103 | * Высокоинтеллектуальный фикс |
@@ -119,7 +119,7 @@ discard block |
||
| 119 | 119 | $updated = false; |
| 120 | 120 | |
| 121 | 121 | if ($this->debug_mode) |
| 122 | - pre ($current_object); |
|
| 122 | + pre($current_object); |
|
| 123 | 123 | |
| 124 | 124 | while (isset ($tree[$current_object]['info']['subparent_link']) && $tree[$link = $tree[$current_object]['info']['subparent_link']->link]['hard'] < $tree[$current_object]['hard']) |
| 125 | 125 | { |
@@ -127,7 +127,7 @@ discard block |
||
| 127 | 127 | $updated = true; |
| 128 | 128 | |
| 129 | 129 | if ($this->debug_mode) |
| 130 | - pre ($current_object); |
|
| 130 | + pre($current_object); |
|
| 131 | 131 | } |
| 132 | 132 | |
| 133 | 133 | if ( |
@@ -142,16 +142,16 @@ discard block |
||
| 142 | 142 | break; |
| 143 | 143 | |
| 144 | 144 | if ($this->debug_mode) |
| 145 | - pre ($current_object); |
|
| 145 | + pre($current_object); |
|
| 146 | 146 | } |
| 147 | 147 | |
| 148 | 148 | /** |
| 149 | 149 | * Button ... |
| 150 | 150 | */ |
| 151 | - if (class_exists ($words[0]) || class_exists ('\VoidEngine\\'. $words[0])) |
|
| 151 | + if (class_exists($words[0]) || class_exists('\VoidEngine\\'.$words[0])) |
|
| 152 | 152 | { |
| 153 | 153 | if (!isset ($words[1])) |
| 154 | - throw new \Exception ('Object name mustn\'t be empty at line "'. $line .'"'); |
|
| 154 | + throw new \Exception('Object name mustn\'t be empty at line "'.$line.'"'); |
|
| 155 | 155 | |
| 156 | 156 | /** |
| 157 | 157 | * Button NewButton |
@@ -197,40 +197,39 @@ discard block |
||
| 197 | 197 | 'syntax_nodes' => [] |
| 198 | 198 | ]; |
| 199 | 199 | |
| 200 | - if (($begin = strpos ($line, '(')) !== false) |
|
| 200 | + if (($begin = strpos($line, '(')) !== false) |
|
| 201 | 201 | { |
| 202 | 202 | ++$begin; |
| 203 | 203 | |
| 204 | - $end = strrpos ($line, ')'); |
|
| 204 | + $end = strrpos($line, ')'); |
|
| 205 | 205 | |
| 206 | 206 | if ($end === false) |
| 207 | - throw new \Exception ('Line "'. $line .'" have arguments list initialization, but not have list ending'); |
|
| 207 | + throw new \Exception('Line "'.$line.'" have arguments list initialization, but not have list ending'); |
|
| 208 | 208 | |
| 209 | 209 | elseif ($begin < $end) |
| 210 | 210 | { |
| 211 | 211 | $arguments = []; |
| 212 | 212 | // $parsed = explode (',', substr ($line, $begin, $end - $begin)); |
| 213 | - $parsed = $this->parseArguments (substr ($line, $begin, $end - $begin)); |
|
| 213 | + $parsed = $this->parseArguments(substr($line, $begin, $end - $begin)); |
|
| 214 | 214 | |
| 215 | 215 | foreach ($parsed as $argument_id => $argument) |
| 216 | 216 | { |
| 217 | - $argument = trim ($argument); |
|
| 217 | + $argument = trim($argument); |
|
| 218 | 218 | |
| 219 | - if (strlen ($argument) > 0) |
|
| 219 | + if (strlen($argument) > 0) |
|
| 220 | 220 | $arguments[] = isset ($links[$argument]) ? |
| 221 | - new VLFLink ($argument, $links[$argument]) : |
|
| 222 | - $argument; |
|
| 221 | + new VLFLink($argument, $links[$argument]) : $argument; |
|
| 223 | 222 | |
| 224 | - else throw new \Exception ('Argument '. ($argument_id + 1) .' mustn\'t have zero length at line "'. $line .'"'); |
|
| 223 | + else throw new \Exception('Argument '.($argument_id + 1).' mustn\'t have zero length at line "'.$line.'"'); |
|
| 225 | 224 | } |
| 226 | 225 | |
| 227 | 226 | $tree[$id]['info']['arguments'] = $arguments; |
| 228 | 227 | |
| 229 | - if (!$this->ignore_postobject_info && trim (substr ($line, $end)) > 0) |
|
| 230 | - throw new \Exception ('You mustn\'t write any chars after arguments definition'); |
|
| 228 | + if (!$this->ignore_postobject_info && trim(substr($line, $end)) > 0) |
|
| 229 | + throw new \Exception('You mustn\'t write any chars after arguments definition'); |
|
| 231 | 230 | } |
| 232 | 231 | |
| 233 | - $tree[$id]['info']['subparent_link'] = new VLFLink ($tree[$current_object]['info']['object_name'], $current_object); |
|
| 232 | + $tree[$id]['info']['subparent_link'] = new VLFLink($tree[$current_object]['info']['object_name'], $current_object); |
|
| 234 | 233 | } |
| 235 | 234 | |
| 236 | 235 | /** |
@@ -240,7 +239,7 @@ discard block |
||
| 240 | 239 | elseif ($current_object !== null && $tree[$current_object]['hard'] < $height) |
| 241 | 240 | { |
| 242 | 241 | $tree[$id]['info']['arguments'] = [ |
| 243 | - new VLFLink ($tree[$current_object]['info']['object_name'], $current_object) |
|
| 242 | + new VLFLink($tree[$current_object]['info']['object_name'], $current_object) |
|
| 244 | 243 | ]; |
| 245 | 244 | |
| 246 | 245 | $parent_objects[$id] = $current_object; |
@@ -287,17 +286,17 @@ discard block |
||
| 287 | 286 | { |
| 288 | 287 | if ($words[0][1] == '^') |
| 289 | 288 | { |
| 290 | - $parsed = $this->parseSubText ($untouched_lines, $id, $height); |
|
| 289 | + $parsed = $this->parseSubText($untouched_lines, $id, $height); |
|
| 291 | 290 | |
| 292 | 291 | $comment .= $parsed[0]; |
| 293 | 292 | $skip_at = $parsed[1]; |
| 294 | 293 | } |
| 295 | 294 | |
| 296 | - else throw new \Exception ('Unknown char founded after syntax-control symbol at line "'. $line .'"'); |
|
| 295 | + else throw new \Exception('Unknown char founded after syntax-control symbol at line "'.$line.'"'); |
|
| 297 | 296 | } |
| 298 | 297 | |
| 299 | 298 | if ($this->debug_mode) |
| 300 | - pre ("Comment:\n\n$comment"); |
|
| 299 | + pre("Comment:\n\n$comment"); |
|
| 301 | 300 | } |
| 302 | 301 | |
| 303 | 302 | /** |
@@ -309,19 +308,19 @@ discard block |
||
| 309 | 308 | */ |
| 310 | 309 | elseif ($words[0][0] == '%') |
| 311 | 310 | { |
| 312 | - $code = substr ($line, strlen ($words[0])); |
|
| 311 | + $code = substr($line, strlen($words[0])); |
|
| 313 | 312 | |
| 314 | 313 | if (isset ($words[0][1])) |
| 315 | 314 | { |
| 316 | 315 | if ($words[0][1] == '^') |
| 317 | 316 | { |
| 318 | - $parsed = $this->parseSubText ($untouched_lines, $id, $height); |
|
| 317 | + $parsed = $this->parseSubText($untouched_lines, $id, $height); |
|
| 319 | 318 | |
| 320 | 319 | $code .= $parsed[0]; |
| 321 | 320 | $skip_at = $parsed[1]; |
| 322 | 321 | } |
| 323 | 322 | |
| 324 | - else throw new \Exception ('Unknown char founded after syntax-control symbol at line "'. $line .'"'); |
|
| 323 | + else throw new \Exception('Unknown char founded after syntax-control symbol at line "'.$line.'"'); |
|
| 325 | 324 | } |
| 326 | 325 | |
| 327 | 326 | $tree[$id] = [ |
@@ -346,7 +345,7 @@ discard block |
||
| 346 | 345 | * Form MyForm |
| 347 | 346 | * Button MyButton |
| 348 | 347 | */ |
| 349 | - elseif (is_int ($current_object) && isset ($tree[$current_object]['hard'])) |
|
| 348 | + elseif (is_int($current_object) && isset ($tree[$current_object]['hard'])) |
|
| 350 | 349 | { |
| 351 | 350 | if ($height <= $tree[$current_object]['hard'] && isset ($parent_objects[$current_object])) |
| 352 | 351 | { |
@@ -372,16 +371,16 @@ discard block |
||
| 372 | 371 | /** |
| 373 | 372 | * property_name: property_value |
| 374 | 373 | */ |
| 375 | - $postChar = substr ($words[0], strlen ($words[0]) - 1); |
|
| 374 | + $postChar = substr($words[0], strlen($words[0]) - 1); |
|
| 376 | 375 | |
| 377 | 376 | if ($postChar == ':' || $postChar == '^') |
| 378 | 377 | { |
| 379 | 378 | if (!isset ($words[1])) |
| 380 | - throw new \Exception ('Property value mustn\'t be empty at line "'. $line .'"'); |
|
| 379 | + throw new \Exception('Property value mustn\'t be empty at line "'.$line.'"'); |
|
| 381 | 380 | |
| 382 | - $propertyName = substr ($words[0], 0, -1); |
|
| 383 | - $propertyValue = implode (' ', array_slice ($words, 1)); |
|
| 384 | - $propertyRawValue = ltrim (substr ($line, strlen ($words[0]))); |
|
| 381 | + $propertyName = substr($words[0], 0, -1); |
|
| 382 | + $propertyValue = implode(' ', array_slice($words, 1)); |
|
| 383 | + $propertyRawValue = ltrim(substr($line, strlen($words[0]))); |
|
| 385 | 384 | |
| 386 | 385 | /** |
| 387 | 386 | * property_name:^ property_value_1 |
@@ -389,10 +388,10 @@ discard block |
||
| 389 | 388 | */ |
| 390 | 389 | if ($postChar == '^') |
| 391 | 390 | { |
| 392 | - $parsed = $this->parseSubText ($untouched_lines, $id, $height); |
|
| 391 | + $parsed = $this->parseSubText($untouched_lines, $id, $height); |
|
| 393 | 392 | |
| 394 | 393 | $skip_at = $parsed[1]; |
| 395 | - $propertyName = substr ($propertyName, 0, -1); |
|
| 394 | + $propertyName = substr($propertyName, 0, -1); |
|
| 396 | 395 | $propertyRawValue .= $parsed[0]; |
| 397 | 396 | $propertyValue = $propertyRawValue; |
| 398 | 397 | } |
@@ -413,7 +412,7 @@ discard block |
||
| 413 | 412 | ]; |
| 414 | 413 | |
| 415 | 414 | if (isset ($links[$info['info']['property_value']])) |
| 416 | - $info['info']['property_value'] = new VLFLink ($info['info']['property_value'], $links[$info['info']['property_value']]); |
|
| 415 | + $info['info']['property_value'] = new VLFLink($info['info']['property_value'], $links[$info['info']['property_value']]); |
|
| 417 | 416 | |
| 418 | 417 | $tree[$current_object]['syntax_nodes'][] = $info; |
| 419 | 418 | } |
@@ -421,38 +420,37 @@ discard block |
||
| 421 | 420 | /** |
| 422 | 421 | * ->method_name ([method_arguments]) |
| 423 | 422 | */ |
| 424 | - elseif (substr ($words[0], 0, 2) == '->') |
|
| 423 | + elseif (substr($words[0], 0, 2) == '->') |
|
| 425 | 424 | { |
| 426 | 425 | $arguments = []; |
| 427 | 426 | |
| 428 | - if (($begin = strpos ($line, '(')) !== false) |
|
| 427 | + if (($begin = strpos($line, '(')) !== false) |
|
| 429 | 428 | { |
| 430 | 429 | ++$begin; |
| 431 | 430 | |
| 432 | - $end = strrpos ($line, ')'); |
|
| 431 | + $end = strrpos($line, ')'); |
|
| 433 | 432 | |
| 434 | 433 | if ($end === false) |
| 435 | - throw new \Exception ('Line "'. $line .'" have arguments list initialization, but not have list ending'); |
|
| 434 | + throw new \Exception('Line "'.$line.'" have arguments list initialization, but not have list ending'); |
|
| 436 | 435 | |
| 437 | 436 | elseif ($begin < $end) |
| 438 | 437 | { |
| 439 | 438 | // $parsed = explode (',', substr ($line, $begin, $end - $begin)); |
| 440 | - $parsed = $this->parseArguments (substr ($line, $begin, $end - $begin)); |
|
| 439 | + $parsed = $this->parseArguments(substr($line, $begin, $end - $begin)); |
|
| 441 | 440 | |
| 442 | 441 | foreach ($parsed as $argument_id => $argument) |
| 443 | 442 | { |
| 444 | - $argument = trim ($argument); |
|
| 443 | + $argument = trim($argument); |
|
| 445 | 444 | |
| 446 | - if (strlen ($argument) > 0) |
|
| 445 | + if (strlen($argument) > 0) |
|
| 447 | 446 | $arguments[] = isset ($links[$argument]) ? |
| 448 | - new VLFLink ($argument, $links[$argument]) : |
|
| 449 | - $argument; |
|
| 447 | + new VLFLink($argument, $links[$argument]) : $argument; |
|
| 450 | 448 | |
| 451 | - else throw new \Exception ('Argument '. ($argument_id + 1) .' mustn\'t have zero length at line "'. $line .'"'); |
|
| 449 | + else throw new \Exception('Argument '.($argument_id + 1).' mustn\'t have zero length at line "'.$line.'"'); |
|
| 452 | 450 | } |
| 453 | 451 | |
| 454 | - if (!$this->ignore_postobject_info && trim (substr ($line, $end)) > 0) |
|
| 455 | - throw new \Exception ('You mustn\'t write any chars after arguments definition'); |
|
| 452 | + if (!$this->ignore_postobject_info && trim(substr($line, $end)) > 0) |
|
| 453 | + throw new \Exception('You mustn\'t write any chars after arguments definition'); |
|
| 456 | 454 | } |
| 457 | 455 | } |
| 458 | 456 | |
@@ -460,7 +458,7 @@ discard block |
||
| 460 | 458 | * ->show |
| 461 | 459 | */ |
| 462 | 460 | elseif (!$this->ignore_unexpected_method_args) |
| 463 | - throw new \Exception ('Unexpected method arguments list at line "'. $line .'"'); |
|
| 461 | + throw new \Exception('Unexpected method arguments list at line "'.$line.'"'); |
|
| 464 | 462 | |
| 465 | 463 | $tree[$current_object]['syntax_nodes'][] = [ |
| 466 | 464 | 'type' => VLF_METHOD_CALL, |
@@ -469,7 +467,7 @@ discard block |
||
| 469 | 467 | 'words' => $words, |
| 470 | 468 | |
| 471 | 469 | 'info' => [ |
| 472 | - 'method_name' => substr ($words[0], 2), |
|
| 470 | + 'method_name' => substr($words[0], 2), |
|
| 473 | 471 | 'method_arguments' => $arguments |
| 474 | 472 | ], |
| 475 | 473 | |
@@ -492,7 +490,7 @@ discard block |
||
| 492 | 490 | */ |
| 493 | 491 | else |
| 494 | 492 | { |
| 495 | - $parsed = $this->parseSubText ($untouched_lines, $id, $height); |
|
| 493 | + $parsed = $this->parseSubText($untouched_lines, $id, $height); |
|
| 496 | 494 | $skip_at = $parsed[1]; |
| 497 | 495 | |
| 498 | 496 | $tree[$id] = [ |
@@ -502,7 +500,7 @@ discard block |
||
| 502 | 500 | 'words' => $words, |
| 503 | 501 | |
| 504 | 502 | 'info' => [ |
| 505 | - 'object_vlf_info' => $line ."\n". $parsed[0] |
|
| 503 | + 'object_vlf_info' => $line."\n".$parsed[0] |
|
| 506 | 504 | ], |
| 507 | 505 | |
| 508 | 506 | 'syntax_nodes' => [] |
@@ -513,7 +511,7 @@ discard block |
||
| 513 | 511 | /** |
| 514 | 512 | * Что-то загадочное, таинственное, неизвестное человечеству |
| 515 | 513 | */ |
| 516 | - else throw new \Exception ('Unknown structures founded at line "'. $line .'"'); |
|
| 514 | + else throw new \Exception('Unknown structures founded at line "'.$line.'"'); |
|
| 517 | 515 | } |
| 518 | 516 | |
| 519 | 517 | return [$tree, $links]; |
@@ -529,7 +527,7 @@ discard block |
||
| 529 | 527 | * |
| 530 | 528 | * @return array - возвращает спарсенные подстроки |
| 531 | 529 | */ |
| 532 | - protected function parseSubText (array $lines, $begin_id, int $down_height): array |
|
| 530 | + protected function parseSubText(array $lines, $begin_id, int $down_height): array |
|
| 533 | 531 | { |
| 534 | 532 | $parsed = "\n"; |
| 535 | 533 | |
@@ -538,17 +536,17 @@ discard block |
||
| 538 | 536 | if ($line_id <= $begin_id) |
| 539 | 537 | continue; |
| 540 | 538 | |
| 541 | - if (!(bool)(trim ($line))) |
|
| 539 | + if (!(bool) (trim($line))) |
|
| 542 | 540 | { |
| 543 | 541 | $parsed .= "\n"; |
| 544 | 542 | |
| 545 | 543 | continue; |
| 546 | 544 | } |
| 547 | 545 | |
| 548 | - $height = $this->getLineHeight ($line); |
|
| 546 | + $height = $this->getLineHeight($line); |
|
| 549 | 547 | |
| 550 | 548 | if ($this->debug_mode) |
| 551 | - pre ("$height, $down_height, $line"); |
|
| 549 | + pre("$height, $down_height, $line"); |
|
| 552 | 550 | |
| 553 | 551 | if ($height > $down_height) |
| 554 | 552 | $parsed .= "$line\n"; |
@@ -559,7 +557,7 @@ discard block |
||
| 559 | 557 | return [$parsed, $line_id]; |
| 560 | 558 | } |
| 561 | 559 | |
| 562 | - public function __get ($name) // Возвращалка переменных парсера |
|
| 560 | + public function __get($name) // Возвращалка переменных парсера |
|
| 563 | 561 | { |
| 564 | 562 | return isset ($this->$name) ? |
| 565 | 563 | $this->$name : false; |
@@ -573,14 +571,14 @@ discard block |
||
| 573 | 571 | * |
| 574 | 572 | * @return int - высота строки |
| 575 | 573 | */ |
| 576 | - protected function getLineHeight (string &$line): int |
|
| 574 | + protected function getLineHeight(string &$line): int |
|
| 577 | 575 | { |
| 578 | 576 | $i = 0; |
| 579 | 577 | |
| 580 | 578 | while (isset ($line[$i]) && $line[$i] == "\t") |
| 581 | 579 | ++$i; |
| 582 | 580 | |
| 583 | - return strlen ($line = str_repeat (' ', $i) . substr ($line, $i)) - strlen ($line = trim ($line)); |
|
| 581 | + return strlen($line = str_repeat(' ', $i).substr($line, $i)) - strlen($line = trim($line)); |
|
| 584 | 582 | } |
| 585 | 583 | |
| 586 | 584 | /** |
@@ -591,18 +589,18 @@ discard block |
||
| 591 | 589 | * |
| 592 | 590 | * @return array - возвращает очищенный массив |
| 593 | 591 | */ |
| 594 | - protected function linesFilter (array $segments): array |
|
| 592 | + protected function linesFilter(array $segments): array |
|
| 595 | 593 | { |
| 596 | - return array_filter ($segments, function ($text) |
|
| 594 | + return array_filter($segments, function($text) |
|
| 597 | 595 | { |
| 598 | - if ($this->strong_line_parser && preg_match ('/[^a-z0-9]/i', $text)) |
|
| 599 | - throw new \Exception ('Line "'. $text .'" mustn\'t have any not-alphabet or not-numeric characters'); |
|
| 596 | + if ($this->strong_line_parser && preg_match('/[^a-z0-9]/i', $text)) |
|
| 597 | + throw new \Exception('Line "'.$text.'" mustn\'t have any not-alphabet or not-numeric characters'); |
|
| 600 | 598 | |
| 601 | - return strlen (trim ($text)) > 0; |
|
| 599 | + return strlen(trim($text)) > 0; |
|
| 602 | 600 | }); |
| 603 | 601 | } |
| 604 | 602 | |
| 605 | - protected function parseArguments (string $arguments): array |
|
| 603 | + protected function parseArguments(string $arguments): array |
|
| 606 | 604 | { |
| 607 | 605 | $args = []; |
| 608 | 606 | |
@@ -611,7 +609,7 @@ discard block |
||
| 611 | 609 | |
| 612 | 610 | $t = ''; |
| 613 | 611 | |
| 614 | - for ($i = 0, $len = strlen ($arguments); $i < $len; ++$i) |
|
| 612 | + for ($i = 0, $len = strlen($arguments); $i < $len; ++$i) |
|
| 615 | 613 | { |
| 616 | 614 | $t .= $arguments[$i]; |
| 617 | 615 | |
@@ -628,7 +626,7 @@ discard block |
||
| 628 | 626 | |
| 629 | 627 | elseif (!$split1 && !$split2 && $arguments[$i] == ',') |
| 630 | 628 | { |
| 631 | - $args[] = substr ($t, 0, -1); |
|
| 629 | + $args[] = substr($t, 0, -1); |
|
| 632 | 630 | $t = ''; |
| 633 | 631 | } |
| 634 | 632 | } |
@@ -9,8 +9,8 @@ |
||
| 9 | 9 | |
| 10 | 10 | # Подгружаем PHP расширения |
| 11 | 11 | foreach (glob (CORE_DIR .'/ext/php_*.dll') as $ext) |
| 12 | - if (!extension_loaded (substr (basename ($ext), 4, -4))) |
|
| 13 | - load_extension ($ext); |
|
| 12 | + if (!extension_loaded (substr (basename ($ext), 4, -4))) |
|
| 13 | + load_extension ($ext); |
|
| 14 | 14 | |
| 15 | 15 | # Подгружаем Qero-пакеты |
| 16 | 16 | require __DIR__ .'/../qero-packages/autoload.php'; |
@@ -5,20 +5,20 @@ discard block |
||
| 5 | 5 | # Объявление констант |
| 6 | 6 | const APP_DIR = __DIR__; |
| 7 | 7 | |
| 8 | -define ('VoidEngine\CORE_DIR', dirname (__DIR__) .'/qero-packages/winforms-php/VoidFramework/core'); |
|
| 8 | +define('VoidEngine\CORE_DIR', dirname(__DIR__).'/qero-packages/winforms-php/VoidFramework/core'); |
|
| 9 | 9 | |
| 10 | 10 | # Подгружаем PHP расширения |
| 11 | -foreach (glob (CORE_DIR .'/ext/php_*.dll') as $ext) |
|
| 12 | - if (!extension_loaded (substr (basename ($ext), 4, -4))) |
|
| 13 | - load_extension ($ext); |
|
| 11 | +foreach (glob(CORE_DIR.'/ext/php_*.dll') as $ext) |
|
| 12 | + if (!extension_loaded(substr(basename($ext), 4, -4))) |
|
| 13 | + load_extension($ext); |
|
| 14 | 14 | |
| 15 | 15 | # Подгружаем Qero-пакеты |
| 16 | -require __DIR__ .'/../qero-packages/autoload.php'; |
|
| 16 | +require __DIR__.'/../qero-packages/autoload.php'; |
|
| 17 | 17 | |
| 18 | -chdir (APP_DIR); // Меняем стандартную директорию на директорию приложения |
|
| 18 | +chdir(APP_DIR); // Меняем стандартную директорию на директорию приложения |
|
| 19 | 19 | |
| 20 | 20 | # Парсим app.vlf |
| 21 | -$parser = new VLFParser (__DIR__. '/app.vlf', [ |
|
| 21 | +$parser = new VLFParser(__DIR__.'/app.vlf', [ |
|
| 22 | 22 | 'strong_line_parser' => false, |
| 23 | 23 | 'ignore_postobject_info' => true, |
| 24 | 24 | 'ignore_unexpected_method_args' => true, |
@@ -28,5 +28,5 @@ discard block |
||
| 28 | 28 | ]); |
| 29 | 29 | |
| 30 | 30 | # Запускаем приложение |
| 31 | -$objects = VLFInterpreter::run ($parser); |
|
| 32 | -$APPLICATION->run ($objects['MainForm']); |
|
| 31 | +$objects = VLFInterpreter::run($parser); |
|
| 32 | +$APPLICATION->run($objects['MainForm']); |
|
@@ -8,9 +8,10 @@ |
||
| 8 | 8 | define ('VoidEngine\CORE_DIR', dirname (__DIR__) .'/qero-packages/winforms-php/VoidFramework/core'); |
| 9 | 9 | |
| 10 | 10 | # Подгружаем PHP расширения |
| 11 | -foreach (glob (CORE_DIR .'/ext/php_*.dll') as $ext) |
|
| 11 | +foreach (glob (CORE_DIR .'/ext/php_*.dll') as $ext) { |
|
| 12 | 12 | if (!extension_loaded (substr (basename ($ext), 4, -4))) |
| 13 | 13 | load_extension ($ext); |
| 14 | +} |
|
| 14 | 15 | |
| 15 | 16 | # Подгружаем Qero-пакеты |
| 16 | 17 | require __DIR__ .'/../qero-packages/autoload.php'; |
@@ -24,8 +24,8 @@ |
||
| 24 | 24 | $this->text = $caption; |
| 25 | 25 | } |
| 26 | 26 | |
| 27 | - public function set_font ($font): void |
|
| 28 | - { |
|
| 27 | + public function set_font ($font): void |
|
| 28 | + { |
|
| 29 | 29 | if (is_array ($font)) |
| 30 | 30 | { |
| 31 | 31 | $font = array_values ($font); |
@@ -6,101 +6,100 @@ discard block |
||
| 6 | 6 | { |
| 7 | 7 | public $class = 'System.Windows.Forms.Control'; |
| 8 | 8 | |
| 9 | - public function __construct (Component $parent = null, $className = null, ...$args) |
|
| 9 | + public function __construct(Component $parent = null, $className = null, ...$args) |
|
| 10 | 10 | { |
| 11 | - parent::__construct ($className, ...$args); |
|
| 11 | + parent::__construct($className, ...$args); |
|
| 12 | 12 | |
| 13 | 13 | if ($parent) |
| 14 | 14 | $this->parent = $parent; |
| 15 | 15 | } |
| 16 | 16 | |
| 17 | - public function get_caption (): string |
|
| 17 | + public function get_caption(): string |
|
| 18 | 18 | { |
| 19 | 19 | return $this->text; |
| 20 | 20 | } |
| 21 | 21 | |
| 22 | - public function set_caption (string $caption) |
|
| 22 | + public function set_caption(string $caption) |
|
| 23 | 23 | { |
| 24 | 24 | $this->text = $caption; |
| 25 | 25 | } |
| 26 | 26 | |
| 27 | - public function set_font ($font): void |
|
| 27 | + public function set_font($font): void |
|
| 28 | 28 | { |
| 29 | - if (is_array ($font)) |
|
| 29 | + if (is_array($font)) |
|
| 30 | 30 | { |
| 31 | - $font = array_values ($font); |
|
| 31 | + $font = array_values($font); |
|
| 32 | 32 | |
| 33 | 33 | $obj = isset ($font[2]) ? |
| 34 | - \VoidCore::createObject ('System.Drawing.Font', 'System.Drawing', $font[0], $font[1], [$font[2], 'System.Drawing.FontStyle, System.Drawing']) : |
|
| 35 | - \VoidCore::createObject ('System.Drawing.Font', 'System.Drawing', $font[0], $font[1]); |
|
| 34 | + \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]); |
|
| 36 | 35 | |
| 37 | - $this->setProperty ('Font', $obj); |
|
| 36 | + $this->setProperty('Font', $obj); |
|
| 38 | 37 | } |
| 39 | 38 | |
| 40 | - else $this->setProperty ('Font', EngineAdditions::uncoupleSelector ($font)); |
|
| 39 | + else $this->setProperty('Font', EngineAdditions::uncoupleSelector($font)); |
|
| 41 | 40 | } |
| 42 | 41 | |
| 43 | - public function get_backgroundColor () |
|
| 42 | + public function get_backgroundColor() |
|
| 44 | 43 | { |
| 45 | - return $this->getProperty (['BackColor', 'color']); |
|
| 44 | + return $this->getProperty(['BackColor', 'color']); |
|
| 46 | 45 | } |
| 47 | 46 | |
| 48 | - public function set_backgroundColor ($color) |
|
| 47 | + public function set_backgroundColor($color) |
|
| 49 | 48 | { |
| 50 | - $this->setProperty ('BackColor', $color); |
|
| 49 | + $this->setProperty('BackColor', $color); |
|
| 51 | 50 | } |
| 52 | 51 | |
| 53 | - public function get_foregroundColor () |
|
| 52 | + public function get_foregroundColor() |
|
| 54 | 53 | { |
| 55 | - return $this->getProperty (['ForeColor', 'color']); |
|
| 54 | + return $this->getProperty(['ForeColor', 'color']); |
|
| 56 | 55 | } |
| 57 | 56 | |
| 58 | - public function set_foregroundColor ($color) |
|
| 57 | + public function set_foregroundColor($color) |
|
| 59 | 58 | { |
| 60 | - $this->setProperty ('ForeColor', $color); |
|
| 59 | + $this->setProperty('ForeColor', $color); |
|
| 61 | 60 | } |
| 62 | 61 | |
| 63 | - public function get_w (): int |
|
| 62 | + public function get_w(): int |
|
| 64 | 63 | { |
| 65 | 64 | return $this->width; |
| 66 | 65 | } |
| 67 | 66 | |
| 68 | - public function set_w (int $w) |
|
| 67 | + public function set_w(int $w) |
|
| 69 | 68 | { |
| 70 | 69 | $this->width = $w; |
| 71 | 70 | } |
| 72 | 71 | |
| 73 | - public function get_h (): int |
|
| 72 | + public function get_h(): int |
|
| 74 | 73 | { |
| 75 | 74 | return $this->height; |
| 76 | 75 | } |
| 77 | 76 | |
| 78 | - public function set_h (int $h) |
|
| 77 | + public function set_h(int $h) |
|
| 79 | 78 | { |
| 80 | 79 | $this->height = $h; |
| 81 | 80 | } |
| 82 | 81 | |
| 83 | - public function get_x (): int |
|
| 82 | + public function get_x(): int |
|
| 84 | 83 | { |
| 85 | 84 | return $this->left; |
| 86 | 85 | } |
| 87 | 86 | |
| 88 | - public function set_x (int $x) |
|
| 87 | + public function set_x(int $x) |
|
| 89 | 88 | { |
| 90 | 89 | $this->left = $x; |
| 91 | 90 | } |
| 92 | 91 | |
| 93 | - public function get_y (): int |
|
| 92 | + public function get_y(): int |
|
| 94 | 93 | { |
| 95 | 94 | return $this->top; |
| 96 | 95 | } |
| 97 | 96 | |
| 98 | - public function set_y (int $y) |
|
| 97 | + public function set_y(int $y) |
|
| 99 | 98 | { |
| 100 | 99 | $this->top = $y; |
| 101 | 100 | } |
| 102 | 101 | |
| 103 | - public function get_bounds (): array |
|
| 102 | + public function get_bounds(): array |
|
| 104 | 103 | { |
| 105 | 104 | return [ |
| 106 | 105 | $this->left, |
@@ -110,11 +109,11 @@ discard block |
||
| 110 | 109 | ]; |
| 111 | 110 | } |
| 112 | 111 | |
| 113 | - public function set_bounds ($bounds) |
|
| 112 | + public function set_bounds($bounds) |
|
| 114 | 113 | { |
| 115 | - if (is_array ($bounds)) |
|
| 114 | + if (is_array($bounds)) |
|
| 116 | 115 | { |
| 117 | - $bounds = array_values ($bounds); |
|
| 116 | + $bounds = array_values($bounds); |
|
| 118 | 117 | |
| 119 | 118 | $this->left = (int) $bounds[0]; |
| 120 | 119 | $this->top = (int) $bounds[1]; |
@@ -122,10 +121,10 @@ discard block |
||
| 122 | 121 | $this->height = (int) $bounds[3]; |
| 123 | 122 | } |
| 124 | 123 | |
| 125 | - else $this->setProperty ('Bounds', EngineAdditions::uncoupleSelector ($bounds)); |
|
| 124 | + else $this->setProperty('Bounds', EngineAdditions::uncoupleSelector($bounds)); |
|
| 126 | 125 | } |
| 127 | 126 | |
| 128 | - public function get_location (): array |
|
| 127 | + public function get_location(): array |
|
| 129 | 128 | { |
| 130 | 129 | return [ |
| 131 | 130 | $this->left, |
@@ -133,20 +132,20 @@ discard block |
||
| 133 | 132 | ]; |
| 134 | 133 | } |
| 135 | 134 | |
| 136 | - public function set_location ($location) |
|
| 135 | + public function set_location($location) |
|
| 137 | 136 | { |
| 138 | - if (is_array ($location)) |
|
| 137 | + if (is_array($location)) |
|
| 139 | 138 | { |
| 140 | - $location = array_values ($location); |
|
| 139 | + $location = array_values($location); |
|
| 141 | 140 | |
| 142 | 141 | $this->left = $location[0]; |
| 143 | 142 | $this->top = $location[1]; |
| 144 | 143 | } |
| 145 | 144 | |
| 146 | - else $this->setProperty ('Location', EngineAdditions::uncoupleSelector ($location)); |
|
| 145 | + else $this->setProperty('Location', EngineAdditions::uncoupleSelector($location)); |
|
| 147 | 146 | } |
| 148 | 147 | |
| 149 | - public function get_size (): array |
|
| 148 | + public function get_size(): array |
|
| 150 | 149 | { |
| 151 | 150 | return [ |
| 152 | 151 | $this->width, |
@@ -154,42 +153,42 @@ discard block |
||
| 154 | 153 | ]; |
| 155 | 154 | } |
| 156 | 155 | |
| 157 | - public function set_size ($size) |
|
| 156 | + public function set_size($size) |
|
| 158 | 157 | { |
| 159 | - if (is_array ($size)) |
|
| 158 | + if (is_array($size)) |
|
| 160 | 159 | { |
| 161 | - $size = array_values ($size); |
|
| 160 | + $size = array_values($size); |
|
| 162 | 161 | |
| 163 | 162 | $this->width = (int) $size[0]; |
| 164 | 163 | $this->height = (int) $size[1]; |
| 165 | 164 | } |
| 166 | 165 | |
| 167 | - else $this->setProperty ('Size', EngineAdditions::uncoupleSelector ($size)); |
|
| 166 | + else $this->setProperty('Size', EngineAdditions::uncoupleSelector($size)); |
|
| 168 | 167 | } |
| 169 | 168 | |
| 170 | - public function setBounds (int $x, int $y, int $w, int $h) |
|
| 169 | + public function setBounds(int $x, int $y, int $w, int $h) |
|
| 171 | 170 | { |
| 172 | - $this->set_bounds ([$x, $y, $w, $h]); |
|
| 171 | + $this->set_bounds([$x, $y, $w, $h]); |
|
| 173 | 172 | } |
| 174 | 173 | |
| 175 | - public function setLocation (int $x, int $y) |
|
| 174 | + public function setLocation(int $x, int $y) |
|
| 176 | 175 | { |
| 177 | - $this->set_location ([$x, $y]); |
|
| 176 | + $this->set_location([$x, $y]); |
|
| 178 | 177 | } |
| 179 | 178 | |
| 180 | - public function setSize (int $w, int $h) |
|
| 179 | + public function setSize(int $w, int $h) |
|
| 181 | 180 | { |
| 182 | - $this->set_size ([$w, $h]); |
|
| 181 | + $this->set_size([$w, $h]); |
|
| 183 | 182 | } |
| 184 | 183 | |
| 185 | - public function toBack () |
|
| 184 | + public function toBack() |
|
| 186 | 185 | { |
| 187 | - $this->callMethod ('SendToBack'); |
|
| 186 | + $this->callMethod('SendToBack'); |
|
| 188 | 187 | } |
| 189 | 188 | |
| 190 | - public function toFront () |
|
| 189 | + public function toFront() |
|
| 191 | 190 | { |
| 192 | - $this->callMethod ('BringToFront'); |
|
| 191 | + $this->callMethod('BringToFront'); |
|
| 193 | 192 | } |
| 194 | 193 | } |
| 195 | 194 | |
@@ -10,8 +10,9 @@ discard block |
||
| 10 | 10 | { |
| 11 | 11 | parent::__construct ($className, ...$args); |
| 12 | 12 | |
| 13 | - if ($parent) |
|
| 14 | - $this->parent = $parent; |
|
| 13 | + if ($parent) { |
|
| 14 | + $this->parent = $parent; |
|
| 15 | + } |
|
| 15 | 16 | } |
| 16 | 17 | |
| 17 | 18 | public function get_caption (): string |
@@ -35,9 +36,9 @@ discard block |
||
| 35 | 36 | \VoidCore::createObject ('System.Drawing.Font', 'System.Drawing', $font[0], $font[1]); |
| 36 | 37 | |
| 37 | 38 | $this->setProperty ('Font', $obj); |
| 39 | + } else { |
|
| 40 | + $this->setProperty ('Font', EngineAdditions::uncoupleSelector ($font)); |
|
| 38 | 41 | } |
| 39 | - |
|
| 40 | - else $this->setProperty ('Font', EngineAdditions::uncoupleSelector ($font)); |
|
| 41 | 42 | } |
| 42 | 43 | |
| 43 | 44 | public function get_backgroundColor () |
@@ -120,9 +121,9 @@ discard block |
||
| 120 | 121 | $this->top = (int) $bounds[1]; |
| 121 | 122 | $this->width = (int) $bounds[2]; |
| 122 | 123 | $this->height = (int) $bounds[3]; |
| 124 | + } else { |
|
| 125 | + $this->setProperty ('Bounds', EngineAdditions::uncoupleSelector ($bounds)); |
|
| 123 | 126 | } |
| 124 | - |
|
| 125 | - else $this->setProperty ('Bounds', EngineAdditions::uncoupleSelector ($bounds)); |
|
| 126 | 127 | } |
| 127 | 128 | |
| 128 | 129 | public function get_location (): array |
@@ -141,9 +142,9 @@ discard block |
||
| 141 | 142 | |
| 142 | 143 | $this->left = $location[0]; |
| 143 | 144 | $this->top = $location[1]; |
| 145 | + } else { |
|
| 146 | + $this->setProperty ('Location', EngineAdditions::uncoupleSelector ($location)); |
|
| 144 | 147 | } |
| 145 | - |
|
| 146 | - else $this->setProperty ('Location', EngineAdditions::uncoupleSelector ($location)); |
|
| 147 | 148 | } |
| 148 | 149 | |
| 149 | 150 | public function get_size (): array |
@@ -162,9 +163,9 @@ discard block |
||
| 162 | 163 | |
| 163 | 164 | $this->width = (int) $size[0]; |
| 164 | 165 | $this->height = (int) $size[1]; |
| 166 | + } else { |
|
| 167 | + $this->setProperty ('Size', EngineAdditions::uncoupleSelector ($size)); |
|
| 165 | 168 | } |
| 166 | - |
|
| 167 | - else $this->setProperty ('Size', EngineAdditions::uncoupleSelector ($size)); |
|
| 168 | 169 | } |
| 169 | 170 | |
| 170 | 171 | public function setBounds (int $x, int $y, int $w, int $h) |
@@ -6,18 +6,18 @@ |
||
| 6 | 6 | { |
| 7 | 7 | public $class = 'System.Windows.Forms.ColorDialog'; |
| 8 | 8 | |
| 9 | - public function __construct () |
|
| 9 | + public function __construct() |
|
| 10 | 10 | { |
| 11 | - parent::__construct ($this->class); |
|
| 11 | + parent::__construct($this->class); |
|
| 12 | 12 | } |
| 13 | 13 | |
| 14 | - public function get_color () |
|
| 14 | + public function get_color() |
|
| 15 | 15 | { |
| 16 | - return $this->getProperty (['Color', 'color']); |
|
| 16 | + return $this->getProperty(['Color', 'color']); |
|
| 17 | 17 | } |
| 18 | 18 | |
| 19 | - public function set_color (int $color) |
|
| 19 | + public function set_color(int $color) |
|
| 20 | 20 | { |
| 21 | - $this->setProperty ('Color', $color); |
|
| 21 | + $this->setProperty('Color', $color); |
|
| 22 | 22 | } |
| 23 | 23 | } |