winforms-php /
VoidStudio
@@ -15,16 +15,15 @@ |
||
| 15 | 15 | |
| 16 | 16 | public function run ($form = null): void |
| 17 | 17 | { |
| 18 | - if ($form instanceof WFObject) |
|
| 19 | - $this->application->run ($form->selector); |
|
| 20 | - |
|
| 21 | - elseif (is_int ($form) && VoidEngine::objectExists ($form)) |
|
| 22 | - $this->application->run ($form); |
|
| 23 | - |
|
| 24 | - elseif ($form === null) |
|
| 25 | - $this->application->run (); |
|
| 26 | - |
|
| 27 | - else throw new \Exception ('$form param must be instance of "VoidEngine\WFObject" ("VoidEngine\Form"), be null or object selector'); |
|
| 18 | + if ($form instanceof WFObject) { |
|
| 19 | + $this->application->run ($form->selector); |
|
| 20 | + } elseif (is_int ($form) && VoidEngine::objectExists ($form)) { |
|
| 21 | + $this->application->run ($form); |
|
| 22 | + } elseif ($form === null) { |
|
| 23 | + $this->application->run (); |
|
| 24 | + } else { |
|
| 25 | + throw new \Exception ('$form param must be instance of "VoidEngine\WFObject" ("VoidEngine\Form"), be null or object selector'); |
|
| 26 | + } |
|
| 28 | 27 | } |
| 29 | 28 | |
| 30 | 29 | public function restart (): void |
@@ -2,50 +2,50 @@ discard block |
||
| 2 | 2 | |
| 3 | 3 | namespace VoidEngine; |
| 4 | 4 | |
| 5 | -register_superglobals ('APPLICATION', 'SCREEN'); |
|
| 5 | +register_superglobals('APPLICATION', 'SCREEN'); |
|
| 6 | 6 | |
| 7 | 7 | $APPLICATION = new class |
| 8 | 8 | { |
| 9 | 9 | public WFClass $application; |
| 10 | 10 | public string $executablePath; |
| 11 | 11 | |
| 12 | - public function __construct () |
|
| 12 | + public function __construct() |
|
| 13 | 13 | { |
| 14 | - $this->application = new WFClass ('System.Windows.Forms.Application'); |
|
| 14 | + $this->application = new WFClass('System.Windows.Forms.Application'); |
|
| 15 | 15 | $this->executablePath = $this->application->executablePath; |
| 16 | 16 | } |
| 17 | 17 | |
| 18 | - public function run ($form = null): void |
|
| 18 | + public function run($form = null): void |
|
| 19 | 19 | { |
| 20 | 20 | if ($form instanceof WFObject) |
| 21 | - $this->application->run ($form->selector); |
|
| 21 | + $this->application->run($form->selector); |
|
| 22 | 22 | |
| 23 | - elseif (is_int ($form) && VoidEngine::objectExists ($form)) |
|
| 24 | - $this->application->run ($form); |
|
| 23 | + elseif (is_int($form) && VoidEngine::objectExists($form)) |
|
| 24 | + $this->application->run($form); |
|
| 25 | 25 | |
| 26 | 26 | elseif ($form === null) |
| 27 | - $this->application->run (); |
|
| 27 | + $this->application->run(); |
|
| 28 | 28 | |
| 29 | - else throw new \Exception ('$form param must be instance of "VoidEngine\WFObject" ("VoidEngine\Form"), be null or object selector'); |
|
| 29 | + else throw new \Exception('$form param must be instance of "VoidEngine\WFObject" ("VoidEngine\Form"), be null or object selector'); |
|
| 30 | 30 | } |
| 31 | 31 | |
| 32 | - public function restart (): void |
|
| 32 | + public function restart(): void |
|
| 33 | 33 | { |
| 34 | - $this->application->restart (); |
|
| 35 | - $this->close (); |
|
| 34 | + $this->application->restart(); |
|
| 35 | + $this->close(); |
|
| 36 | 36 | } |
| 37 | 37 | |
| 38 | - public function close (): void |
|
| 38 | + public function close(): void |
|
| 39 | 39 | { |
| 40 | - $this->application->exit (); |
|
| 40 | + $this->application->exit(); |
|
| 41 | 41 | } |
| 42 | 42 | |
| 43 | - public function __call (string $name, array $args) |
|
| 43 | + public function __call(string $name, array $args) |
|
| 44 | 44 | { |
| 45 | - return $this->application->$name (...$args); |
|
| 45 | + return $this->application->$name(...$args); |
|
| 46 | 46 | } |
| 47 | 47 | |
| 48 | - public function __get (string $name) |
|
| 48 | + public function __get(string $name) |
|
| 49 | 49 | { |
| 50 | 50 | return $this->application->$name; |
| 51 | 51 | } |
@@ -55,14 +55,14 @@ discard block |
||
| 55 | 55 | { |
| 56 | 56 | public WFObject $screen; |
| 57 | 57 | |
| 58 | - public function __construct () |
|
| 58 | + public function __construct() |
|
| 59 | 59 | { |
| 60 | - $this->screen = new WFClass ('System.Windows.Forms.Screen'); |
|
| 60 | + $this->screen = new WFClass('System.Windows.Forms.Screen'); |
|
| 61 | 61 | } |
| 62 | 62 | |
| 63 | - public function __get ($name) |
|
| 63 | + public function __get($name) |
|
| 64 | 64 | { |
| 65 | - switch (strtolower ($name)) |
|
| 65 | + switch (strtolower($name)) |
|
| 66 | 66 | { |
| 67 | 67 | case 'width': |
| 68 | 68 | case 'w': |
@@ -80,7 +80,7 @@ discard block |
||
| 80 | 80 | } |
| 81 | 81 | } |
| 82 | 82 | |
| 83 | - public function __debugInfo (): array |
|
| 83 | + public function __debugInfo(): array |
|
| 84 | 84 | { |
| 85 | 85 | return [ |
| 86 | 86 | $this->w, |
@@ -104,7 +104,8 @@ |
||
| 104 | 104 | require 'components/FastColoredTextBox.php'; |
| 105 | 105 | require 'components/Scintilla.php'; |
| 106 | 106 | |
| 107 | -if (is_dir ('extensions')) |
|
| 107 | +if (is_dir ('extensions')) { |
|
| 108 | 108 | foreach (scandir ('extensions') as $ext) |
| 109 | 109 | if (is_dir ('extensions/'. $ext) && file_exists ($ext = 'extensions/'. $ext .'/main.php')) |
| 110 | 110 | require $ext; |
| 111 | +} |
|
@@ -36,10 +36,10 @@ discard block |
||
| 36 | 36 | const ENGINE_VERSION = '3.5.4 build-2019/09/15'; |
| 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'; |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | require 'components/FastColoredTextBox.php'; |
| 98 | 98 | require 'components/Scintilla.php'; |
| 99 | 99 | |
| 100 | -if (is_dir ('extensions')) |
|
| 101 | - foreach (scandir ('extensions') as $ext) |
|
| 102 | - if (is_dir ('extensions/'. $ext) && file_exists ($ext = 'extensions/'. $ext .'/main.php')) |
|
| 100 | +if (is_dir('extensions')) |
|
| 101 | + foreach (scandir('extensions') as $ext) |
|
| 102 | + if (is_dir('extensions/'.$ext) && file_exists($ext = 'extensions/'.$ext.'/main.php')) |
|
| 103 | 103 | require $ext; |
@@ -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; |
@@ -20,13 +20,13 @@ discard block |
||
| 20 | 20 | * @return array - возвращает список созданных объектов |
| 21 | 21 | */ |
| 22 | 22 | |
| 23 | - public static function run ($syntaxTree, string $resourcesDir = null, array $parent = null): array |
|
| 23 | + public static function run($syntaxTree, string $resourcesDir = null, array $parent = null): array |
|
| 24 | 24 | { |
| 25 | 25 | if ($syntaxTree instanceof VLFParser) |
| 26 | 26 | $syntaxTree = $syntaxTree->tree; |
| 27 | 27 | |
| 28 | - elseif (!is_array ($syntaxTree) && self::$throw_errors) |
|
| 29 | - throw new \Exception ('$syntaxTree argument must be instance of VoidEngine\VLFParser or contains Abstract Syntax Tree - multi-dimensional array'); |
|
| 28 | + elseif (!is_array($syntaxTree) && self::$throw_errors) |
|
| 29 | + throw new \Exception('$syntaxTree argument must be instance of VoidEngine\VLFParser or contains Abstract Syntax Tree - multi-dimensional array'); |
|
| 30 | 30 | |
| 31 | 31 | foreach ($syntaxTree as $id => $syntaxInfo) |
| 32 | 32 | if (isset ($syntaxInfo['type'])) |
@@ -43,16 +43,16 @@ discard block |
||
| 43 | 43 | $args = $syntaxInfo['info']['arguments']; |
| 44 | 44 | |
| 45 | 45 | foreach ($args as $arg_id => $arg) |
| 46 | - if (is_object ($arg) && $arg instanceof VLFLink) |
|
| 46 | + if (is_object($arg) && $arg instanceof VLFLink) |
|
| 47 | 47 | $args[$arg_id] = isset (self::$objects[$arg->name]) ? |
| 48 | - self::formatLine ($arg->name, self::$objects) : null; |
|
| 48 | + self::formatLine($arg->name, self::$objects) : null; |
|
| 49 | 49 | |
| 50 | - else $args[$arg_id] = self::formatLine ($arg, self::$objects); |
|
| 50 | + else $args[$arg_id] = self::formatLine($arg, self::$objects); |
|
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | try |
| 54 | 54 | { |
| 55 | - self::$objects[$name] = eval ("namespace VoidEngine; return new $class (". implode (', ', $args) .");"); |
|
| 55 | + self::$objects[$name] = eval ("namespace VoidEngine; return new $class (".implode(', ', $args).");"); |
|
| 56 | 56 | |
| 57 | 57 | try |
| 58 | 58 | { |
@@ -65,12 +65,12 @@ discard block |
||
| 65 | 65 | catch (\Throwable $e) |
| 66 | 66 | { |
| 67 | 67 | if (self::$throw_errors) |
| 68 | - throw new \Exception ('Interpeter couldn\'t create object "'. $class .'" with name "'. $name .'" at line "'. $syntaxInfo['line'] .'". Exception info:'. "\n\n". (string) $e, 0, $e); |
|
| 68 | + throw new \Exception('Interpeter couldn\'t create object "'.$class.'" with name "'.$name.'" at line "'.$syntaxInfo['line'].'". Exception info:'."\n\n".(string) $e, 0, $e); |
|
| 69 | 69 | } |
| 70 | 70 | break; |
| 71 | 71 | |
| 72 | 72 | case VLF_SUBOBJECT_DEFINITION: |
| 73 | - self::$objects = self::run ((new VLFParser ($syntaxInfo['info']['object_vlf_info']))->tree, null, $syntaxInfo); |
|
| 73 | + self::$objects = self::run((new VLFParser($syntaxInfo['info']['object_vlf_info']))->tree, null, $syntaxInfo); |
|
| 74 | 74 | break; |
| 75 | 75 | |
| 76 | 76 | case VLF_PROPERTY_SET: |
@@ -80,34 +80,34 @@ discard block |
||
| 80 | 80 | $propertyValue = $syntaxInfo['info']['property_value']; |
| 81 | 81 | $preset = ''; |
| 82 | 82 | |
| 83 | - if (is_object ($propertyValue) && $propertyValue instanceof VLFLink) |
|
| 83 | + if (is_object($propertyValue) && $propertyValue instanceof VLFLink) |
|
| 84 | 84 | $propertyValue = isset (self::$objects[$propertyValue->name]) ? |
| 85 | - self::formatLine ($propertyValue->name, self::$objects) : null; |
|
| 85 | + self::formatLine($propertyValue->name, self::$objects) : null; |
|
| 86 | 86 | |
| 87 | - elseif (preg_match ('/function \((.*)\) use \((.*)\)/', $propertyValue)) |
|
| 87 | + elseif (preg_match('/function \((.*)\) use \((.*)\)/', $propertyValue)) |
|
| 88 | 88 | { |
| 89 | - $use = substr ($propertyValue, strpos ($propertyValue, 'use')); |
|
| 90 | - $use = $ouse = substr ($use, ($pos = strpos ($use, '(') + 1), strpos ($use, ')') - $pos); |
|
| 91 | - $use = explode (' ', $use); |
|
| 89 | + $use = substr($propertyValue, strpos($propertyValue, 'use')); |
|
| 90 | + $use = $ouse = substr($use, ($pos = strpos($use, '(') + 1), strpos($use, ')') - $pos); |
|
| 91 | + $use = explode(' ', $use); |
|
| 92 | 92 | |
| 93 | 93 | foreach ($use as $id => $useParam) |
| 94 | 94 | if (isset (self::$objects[$useParam]) && $use[$id + 1][0] == '$') |
| 95 | 95 | { |
| 96 | 96 | $fname = $use[$id + 1]; |
| 97 | 97 | |
| 98 | - if (substr ($fname, strlen ($fname) - 1) == ',') |
|
| 99 | - $fname = substr ($fname, 0, -1); |
|
| 98 | + if (substr($fname, strlen($fname) - 1) == ',') |
|
| 99 | + $fname = substr($fname, 0, -1); |
|
| 100 | 100 | |
| 101 | 101 | $preset .= "$fname = $useParam; "; |
| 102 | 102 | |
| 103 | 103 | unset ($use[$id]); |
| 104 | 104 | } |
| 105 | 105 | |
| 106 | - $preset = self::formatLine ($preset, self::$objects); |
|
| 107 | - $propertyValue = self::formatLine (str_replace ($ouse, join (' ', $use), $propertyValue), self::$objects); |
|
| 106 | + $preset = self::formatLine($preset, self::$objects); |
|
| 107 | + $propertyValue = self::formatLine(str_replace($ouse, join(' ', $use), $propertyValue), self::$objects); |
|
| 108 | 108 | } |
| 109 | 109 | |
| 110 | - else $propertyValue = self::formatLine ($propertyValue, self::$objects); |
|
| 110 | + else $propertyValue = self::formatLine($propertyValue, self::$objects); |
|
| 111 | 111 | |
| 112 | 112 | try |
| 113 | 113 | { |
@@ -120,8 +120,8 @@ discard block |
||
| 120 | 120 | { |
| 121 | 121 | $propertyValue = $syntaxInfo['info']['property_raw_value']; |
| 122 | 122 | |
| 123 | - if (strpos ($propertyName, '->') !== false) |
|
| 124 | - eval ('namespace VoidEngine; '. $preset .' _c('. self::$objects[$name]->selector .')->'. $propertyName .' = '. $propertyValue .';'); |
|
| 123 | + if (strpos($propertyName, '->') !== false) |
|
| 124 | + eval ('namespace VoidEngine; '.$preset.' _c('.self::$objects[$name]->selector.')->'.$propertyName.' = '.$propertyValue.';'); |
|
| 125 | 125 | |
| 126 | 126 | else self::$objects[$name]->$propertyName = eval ("namespace VoidEngine; $preset return $propertyValue;"); |
| 127 | 127 | } |
@@ -129,13 +129,13 @@ discard block |
||
| 129 | 129 | catch (\Throwable $e) |
| 130 | 130 | { |
| 131 | 131 | if (self::$throw_errors) |
| 132 | - throw new \Exception ('Interpeter couldn\'t set property "'. $propertyName .'" with value "'. $propertyValue .'" at line "'. $syntaxInfo['line'] .'". Exception info:'. "\n\n". (string) $e, 0, $e); |
|
| 132 | + throw new \Exception('Interpeter couldn\'t set property "'.$propertyName.'" with value "'.$propertyValue.'" at line "'.$syntaxInfo['line'].'". Exception info:'."\n\n".(string) $e, 0, $e); |
|
| 133 | 133 | } |
| 134 | 134 | } |
| 135 | 135 | } |
| 136 | 136 | |
| 137 | 137 | elseif (self::$throw_errors) |
| 138 | - throw new \Exception ('Setting property to an non-object at line "'. $syntaxInfo['line']); |
|
| 138 | + throw new \Exception('Setting property to an non-object at line "'.$syntaxInfo['line']); |
|
| 139 | 139 | break; |
| 140 | 140 | |
| 141 | 141 | case VLF_METHOD_CALL: |
@@ -145,61 +145,61 @@ discard block |
||
| 145 | 145 | $methodArgs = $syntaxInfo['info']['method_arguments']; |
| 146 | 146 | |
| 147 | 147 | foreach ($methodArgs as $arg_id => $arg) |
| 148 | - if (is_object ($arg) && $arg instanceof VLFLink) |
|
| 148 | + if (is_object($arg) && $arg instanceof VLFLink) |
|
| 149 | 149 | $methodArgs[$arg_id] = isset (self::$objects[$arg->name]) ? |
| 150 | - self::formatLine ($arg->name, self::$objects) : null; |
|
| 150 | + self::formatLine($arg->name, self::$objects) : null; |
|
| 151 | 151 | |
| 152 | - else $methodArgs[$arg_id] = self::formatLine ($arg, self::$objects); |
|
| 152 | + else $methodArgs[$arg_id] = self::formatLine($arg, self::$objects); |
|
| 153 | 153 | |
| 154 | 154 | try |
| 155 | 155 | { |
| 156 | - if (strpos ($methodName, '->') !== false && self::$allow_multimethods_calls) |
|
| 157 | - eval ('namespace VoidEngine; _c('. self::$objects[$name]->selector .')->'. $methodName .' ('. implode (', ', $methodArgs) .');'); |
|
| 156 | + if (strpos($methodName, '->') !== false && self::$allow_multimethods_calls) |
|
| 157 | + eval ('namespace VoidEngine; _c('.self::$objects[$name]->selector.')->'.$methodName.' ('.implode(', ', $methodArgs).');'); |
|
| 158 | 158 | |
| 159 | - elseif (sizeof ($methodArgs) > 0) |
|
| 160 | - self::$objects[$name]->$methodName (...eval ('namespace VoidEngine; return ['. implode (', ', $methodArgs) .'];')); |
|
| 159 | + elseif (sizeof($methodArgs) > 0) |
|
| 160 | + self::$objects[$name]->$methodName(...eval ('namespace VoidEngine; return ['.implode(', ', $methodArgs).'];')); |
|
| 161 | 161 | |
| 162 | - else self::$objects[$name]->$methodName (); |
|
| 162 | + else self::$objects[$name]->$methodName(); |
|
| 163 | 163 | } |
| 164 | 164 | |
| 165 | 165 | catch (\Throwable $e) |
| 166 | 166 | { |
| 167 | 167 | if (self::$throw_errors) |
| 168 | - throw new \Exception ('Interpeter couldn\'t call method "'. $methodName .'" with arguments '. json_encode ($methodArgs) .' at line "'. $syntaxInfo['line'] .'". Exception info:'. "\n\n". (string) $e, 0, $e); |
|
| 168 | + throw new \Exception('Interpeter couldn\'t call method "'.$methodName.'" with arguments '.json_encode($methodArgs).' at line "'.$syntaxInfo['line'].'". Exception info:'."\n\n".(string) $e, 0, $e); |
|
| 169 | 169 | } |
| 170 | 170 | } |
| 171 | 171 | |
| 172 | 172 | elseif (self::$throw_errors) |
| 173 | - throw new \Exception ('Calling method to an non-object at line "'. $syntaxInfo['line'] .'"'); |
|
| 173 | + throw new \Exception('Calling method to an non-object at line "'.$syntaxInfo['line'].'"'); |
|
| 174 | 174 | break; |
| 175 | 175 | |
| 176 | 176 | case VLF_RUNTIME_EXECUTABLE: |
| 177 | - eval (self::formatLine ($syntaxInfo['info']['code'], self::$objects)); |
|
| 177 | + eval (self::formatLine($syntaxInfo['info']['code'], self::$objects)); |
|
| 178 | 178 | break; |
| 179 | 179 | } |
| 180 | 180 | |
| 181 | - if (isset ($syntaxInfo['syntax_nodes']) && sizeof ($syntaxInfo['syntax_nodes']) > 0) |
|
| 182 | - self::$objects = self::run ($syntaxInfo['syntax_nodes'], null, $syntaxInfo); |
|
| 181 | + if (isset ($syntaxInfo['syntax_nodes']) && sizeof($syntaxInfo['syntax_nodes']) > 0) |
|
| 182 | + self::$objects = self::run($syntaxInfo['syntax_nodes'], null, $syntaxInfo); |
|
| 183 | 183 | } |
| 184 | 184 | |
| 185 | - else throw new \Exception ('Catched unknown syntax node: "'. json_encode ($syntaxInfo) .'"'); |
|
| 185 | + else throw new \Exception('Catched unknown syntax node: "'.json_encode($syntaxInfo).'"'); |
|
| 186 | 186 | |
| 187 | - if (is_dir ($resourcesDir)) |
|
| 188 | - foreach (glob ($resourcesDir .'/*.vrsf') as $id => $dir) |
|
| 187 | + if (is_dir($resourcesDir)) |
|
| 188 | + foreach (glob($resourcesDir.'/*.vrsf') as $id => $dir) |
|
| 189 | 189 | { |
| 190 | - $baseName = basenameNoExt ($dir); |
|
| 191 | - $info = explode ('.', $baseName); |
|
| 190 | + $baseName = basenameNoExt($dir); |
|
| 191 | + $info = explode('.', $baseName); |
|
| 192 | 192 | |
| 193 | 193 | if (isset (self::$objects[$info[0]])) |
| 194 | 194 | { |
| 195 | 195 | if (isset ($info[2])) |
| 196 | 196 | { |
| 197 | - $collection = VoidEngine::getProperty (self::$objects[$info[0]]->selector, $info[1]); |
|
| 197 | + $collection = VoidEngine::getProperty(self::$objects[$info[0]]->selector, $info[1]); |
|
| 198 | 198 | |
| 199 | - VoidEngine::callMethod ($collection, 'Add', [VoidEngine::importObject (base64_encode (file_get_contents ($dir))), 'object']); |
|
| 199 | + VoidEngine::callMethod($collection, 'Add', [VoidEngine::importObject(base64_encode(file_get_contents($dir))), 'object']); |
|
| 200 | 200 | } |
| 201 | 201 | |
| 202 | - else VoidEngine::setProperty (self::$objects[$info[0]]->selector, $info[1], VoidEngine::importObject (base64_encode (file_get_contents ($dir)))); |
|
| 202 | + else VoidEngine::setProperty(self::$objects[$info[0]]->selector, $info[1], VoidEngine::importObject(base64_encode(file_get_contents($dir)))); |
|
| 203 | 203 | } |
| 204 | 204 | } |
| 205 | 205 | |
@@ -216,26 +216,25 @@ discard block |
||
| 216 | 216 | * @return string - возвращает форматированную строку |
| 217 | 217 | */ |
| 218 | 218 | |
| 219 | - public static function formatLine (string $line, array $objects = []): string |
|
| 219 | + public static function formatLine(string $line, array $objects = []): string |
|
| 220 | 220 | { |
| 221 | - if (sizeof ($objects) > 0) |
|
| 221 | + if (sizeof($objects) > 0) |
|
| 222 | 222 | { |
| 223 | - $len = strlen ($line); |
|
| 223 | + $len = strlen($line); |
|
| 224 | 224 | $newLine = ''; |
| 225 | 225 | |
| 226 | - $replacement = array_map (function ($object) |
|
| 226 | + $replacement = array_map(function($object) |
|
| 227 | 227 | { |
| 228 | - return Components::componentExists ($object->selector) !== false ? |
|
| 229 | - '\VoidEngine\_c('. $object->selector .')' : |
|
| 230 | - 'unserialize (\''. serialize ($object) .'\')'; |
|
| 228 | + return Components::componentExists($object->selector) !== false ? |
|
| 229 | + '\VoidEngine\_c('.$object->selector.')' : 'unserialize (\''.serialize($object).'\')'; |
|
| 231 | 230 | }, $objects); |
| 232 | 231 | |
| 233 | - $replacement = array_map (function ($name) |
|
| 232 | + $replacement = array_map(function($name) |
|
| 234 | 233 | { |
| 235 | - return strlen ($name = trim ($name)) + substr_count ($name, '_'); |
|
| 236 | - }, $omap = array_flip ($replacement)); |
|
| 234 | + return strlen($name = trim($name)) + substr_count($name, '_'); |
|
| 235 | + }, $omap = array_flip($replacement)); |
|
| 237 | 236 | |
| 238 | - arsort ($replacement); |
|
| 237 | + arsort($replacement); |
|
| 239 | 238 | |
| 240 | 239 | $nReplacement = []; |
| 241 | 240 | |
@@ -243,14 +242,14 @@ discard block |
||
| 243 | 242 | $nReplacement[$omap[$replaceTo]] = $replaceTo; |
| 244 | 243 | |
| 245 | 244 | $replacement = $nReplacement; |
| 246 | - $blacklist = array_flip (['\'', '"', '$']); |
|
| 245 | + $blacklist = array_flip(['\'', '"', '$']); |
|
| 247 | 246 | |
| 248 | 247 | for ($i = 0; $i < $len; ++$i) |
| 249 | 248 | { |
| 250 | 249 | $replaced = false; |
| 251 | 250 | |
| 252 | 251 | foreach ($replacement as $name => $replaceAt) |
| 253 | - if (substr ($line, $i, ($l = strlen ($name))) == $name && !isset ($blacklist[$line[$i - 1]])) |
|
| 252 | + if (substr($line, $i, ($l = strlen($name))) == $name && !isset ($blacklist[$line[$i - 1]])) |
|
| 254 | 253 | { |
| 255 | 254 | $newLine .= $replaceAt; |
| 256 | 255 | |
@@ -22,19 +22,20 @@ discard block |
||
| 22 | 22 | |
| 23 | 23 | public static function run ($syntaxTree, string $resourcesDir = null, array $parent = null): array |
| 24 | 24 | { |
| 25 | - if ($syntaxTree instanceof VLFParser) |
|
| 26 | - $syntaxTree = $syntaxTree->tree; |
|
| 27 | - |
|
| 28 | - elseif (!is_array ($syntaxTree) && self::$throw_errors) |
|
| 29 | - throw new \Exception ('$syntaxTree argument must be instance of VoidEngine\VLFParser or contains Abstract Syntax Tree - multi-dimensional array'); |
|
| 25 | + if ($syntaxTree instanceof VLFParser) { |
|
| 26 | + $syntaxTree = $syntaxTree->tree; |
|
| 27 | + } elseif (!is_array ($syntaxTree) && self::$throw_errors) { |
|
| 28 | + throw new \Exception ('$syntaxTree argument must be instance of VoidEngine\VLFParser or contains Abstract Syntax Tree - multi-dimensional array'); |
|
| 29 | + } |
|
| 30 | 30 | |
| 31 | - foreach ($syntaxTree as $id => $syntaxInfo) |
|
| 32 | - if (isset ($syntaxInfo['type'])) |
|
| 31 | + foreach ($syntaxTree as $id => $syntaxInfo) { |
|
| 32 | + if (isset ($syntaxInfo['type'])) |
|
| 33 | 33 | { |
| 34 | 34 | switch ($syntaxInfo['type']) |
| 35 | 35 | { |
| 36 | 36 | case VLF_OBJECT_DEFINITION: |
| 37 | 37 | $class = $syntaxInfo['info']['object_class']; |
| 38 | + } |
|
| 38 | 39 | $name = $syntaxInfo['info']['object_name']; |
| 39 | 40 | $args = []; |
| 40 | 41 | |
@@ -42,12 +43,15 @@ discard block |
||
| 42 | 43 | { |
| 43 | 44 | $args = $syntaxInfo['info']['arguments']; |
| 44 | 45 | |
| 45 | - foreach ($args as $arg_id => $arg) |
|
| 46 | - if (is_object ($arg) && $arg instanceof VLFLink) |
|
| 46 | + foreach ($args as $arg_id => $arg) { |
|
| 47 | + if (is_object ($arg) && $arg instanceof VLFLink) |
|
| 47 | 48 | $args[$arg_id] = isset (self::$objects[$arg->name]) ? |
| 48 | 49 | self::formatLine ($arg->name, self::$objects) : null; |
| 50 | + } |
|
| 49 | 51 | |
| 50 | - else $args[$arg_id] = self::formatLine ($arg, self::$objects); |
|
| 52 | + else { |
|
| 53 | + $args[$arg_id] = self::formatLine ($arg, self::$objects); |
|
| 54 | + } |
|
| 51 | 55 | } |
| 52 | 56 | |
| 53 | 57 | try |
@@ -57,15 +61,12 @@ discard block |
||
| 57 | 61 | try |
| 58 | 62 | { |
| 59 | 63 | self::$objects[$name]->name = $name; |
| 60 | - } |
|
| 61 | - |
|
| 62 | - catch (\Throwable $e) {} |
|
| 63 | - } |
|
| 64 | - |
|
| 65 | - catch (\Throwable $e) |
|
| 64 | + } catch (\Throwable $e) {} |
|
| 65 | + } catch (\Throwable $e) |
|
| 66 | 66 | { |
| 67 | - if (self::$throw_errors) |
|
| 68 | - throw new \Exception ('Interpeter couldn\'t create object "'. $class .'" with name "'. $name .'" at line "'. $syntaxInfo['line'] .'". Exception info:'. "\n\n". (string) $e, 0, $e); |
|
| 67 | + if (self::$throw_errors) { |
|
| 68 | + throw new \Exception ('Interpeter couldn\'t create object "'. $class .'" with name "'. $name .'" at line "'. $syntaxInfo['line'] .'". Exception info:'. "\n\n". (string) $e, 0, $e); |
|
| 69 | + } |
|
| 69 | 70 | } |
| 70 | 71 | break; |
| 71 | 72 | |
@@ -80,23 +81,24 @@ discard block |
||
| 80 | 81 | $propertyValue = $syntaxInfo['info']['property_value']; |
| 81 | 82 | $preset = ''; |
| 82 | 83 | |
| 83 | - if (is_object ($propertyValue) && $propertyValue instanceof VLFLink) |
|
| 84 | - $propertyValue = isset (self::$objects[$propertyValue->name]) ? |
|
| 84 | + if (is_object ($propertyValue) && $propertyValue instanceof VLFLink) { |
|
| 85 | + $propertyValue = isset (self::$objects[$propertyValue->name]) ? |
|
| 85 | 86 | self::formatLine ($propertyValue->name, self::$objects) : null; |
| 86 | - |
|
| 87 | - elseif (preg_match ('/function \((.*)\) use \((.*)\)/', $propertyValue)) |
|
| 87 | + } elseif (preg_match ('/function \((.*)\) use \((.*)\)/', $propertyValue)) |
|
| 88 | 88 | { |
| 89 | 89 | $use = substr ($propertyValue, strpos ($propertyValue, 'use')); |
| 90 | 90 | $use = $ouse = substr ($use, ($pos = strpos ($use, '(') + 1), strpos ($use, ')') - $pos); |
| 91 | 91 | $use = explode (' ', $use); |
| 92 | 92 | |
| 93 | - foreach ($use as $id => $useParam) |
|
| 94 | - if (isset (self::$objects[$useParam]) && $use[$id + 1][0] == '$') |
|
| 93 | + foreach ($use as $id => $useParam) { |
|
| 94 | + if (isset (self::$objects[$useParam]) && $use[$id + 1][0] == '$') |
|
| 95 | 95 | { |
| 96 | 96 | $fname = $use[$id + 1]; |
| 97 | + } |
|
| 97 | 98 | |
| 98 | - if (substr ($fname, strlen ($fname) - 1) == ',') |
|
| 99 | - $fname = substr ($fname, 0, -1); |
|
| 99 | + if (substr ($fname, strlen ($fname) - 1) == ',') { |
|
| 100 | + $fname = substr ($fname, 0, -1); |
|
| 101 | + } |
|
| 100 | 102 | |
| 101 | 103 | $preset .= "$fname = $useParam; "; |
| 102 | 104 | |
@@ -105,37 +107,34 @@ discard block |
||
| 105 | 107 | |
| 106 | 108 | $preset = self::formatLine ($preset, self::$objects); |
| 107 | 109 | $propertyValue = self::formatLine (str_replace ($ouse, join (' ', $use), $propertyValue), self::$objects); |
| 110 | + } else { |
|
| 111 | + $propertyValue = self::formatLine ($propertyValue, self::$objects); |
|
| 108 | 112 | } |
| 109 | 113 | |
| 110 | - else $propertyValue = self::formatLine ($propertyValue, self::$objects); |
|
| 111 | - |
|
| 112 | 114 | try |
| 113 | 115 | { |
| 114 | 116 | self::$objects[$name]->$propertyName = eval ("namespace VoidEngine; $preset return $propertyValue;"); |
| 115 | - } |
|
| 116 | - |
|
| 117 | - catch (\Throwable $e) |
|
| 117 | + } catch (\Throwable $e) |
|
| 118 | 118 | { |
| 119 | 119 | try |
| 120 | 120 | { |
| 121 | 121 | $propertyValue = $syntaxInfo['info']['property_raw_value']; |
| 122 | 122 | |
| 123 | - if (strpos ($propertyName, '->') !== false) |
|
| 124 | - eval ('namespace VoidEngine; '. $preset .' _c('. self::$objects[$name]->selector .')->'. $propertyName .' = '. $propertyValue .';'); |
|
| 125 | - |
|
| 126 | - else self::$objects[$name]->$propertyName = eval ("namespace VoidEngine; $preset return $propertyValue;"); |
|
| 127 | - } |
|
| 128 | - |
|
| 129 | - catch (\Throwable $e) |
|
| 123 | + if (strpos ($propertyName, '->') !== false) { |
|
| 124 | + eval ('namespace VoidEngine; '. $preset .' _c('. self::$objects[$name]->selector .')->'. $propertyName .' = '. $propertyValue .';'); |
|
| 125 | + } else { |
|
| 126 | + self::$objects[$name]->$propertyName = eval ("namespace VoidEngine; $preset return $propertyValue;"); |
|
| 127 | + } |
|
| 128 | + } catch (\Throwable $e) |
|
| 130 | 129 | { |
| 131 | - if (self::$throw_errors) |
|
| 132 | - throw new \Exception ('Interpeter couldn\'t set property "'. $propertyName .'" with value "'. $propertyValue .'" at line "'. $syntaxInfo['line'] .'". Exception info:'. "\n\n". (string) $e, 0, $e); |
|
| 130 | + if (self::$throw_errors) { |
|
| 131 | + throw new \Exception ('Interpeter couldn\'t set property "'. $propertyName .'" with value "'. $propertyValue .'" at line "'. $syntaxInfo['line'] .'". Exception info:'. "\n\n". (string) $e, 0, $e); |
|
| 132 | + } |
|
| 133 | 133 | } |
| 134 | 134 | } |
| 135 | + } elseif (self::$throw_errors) { |
|
| 136 | + throw new \Exception ('Setting property to an non-object at line "'. $syntaxInfo['line']); |
|
| 135 | 137 | } |
| 136 | - |
|
| 137 | - elseif (self::$throw_errors) |
|
| 138 | - throw new \Exception ('Setting property to an non-object at line "'. $syntaxInfo['line']); |
|
| 139 | 138 | break; |
| 140 | 139 | |
| 141 | 140 | case VLF_METHOD_CALL: |
@@ -144,33 +143,34 @@ discard block |
||
| 144 | 143 | $methodName = $syntaxInfo['info']['method_name']; |
| 145 | 144 | $methodArgs = $syntaxInfo['info']['method_arguments']; |
| 146 | 145 | |
| 147 | - foreach ($methodArgs as $arg_id => $arg) |
|
| 148 | - if (is_object ($arg) && $arg instanceof VLFLink) |
|
| 146 | + foreach ($methodArgs as $arg_id => $arg) { |
|
| 147 | + if (is_object ($arg) && $arg instanceof VLFLink) |
|
| 149 | 148 | $methodArgs[$arg_id] = isset (self::$objects[$arg->name]) ? |
| 150 | 149 | self::formatLine ($arg->name, self::$objects) : null; |
| 150 | + } |
|
| 151 | 151 | |
| 152 | - else $methodArgs[$arg_id] = self::formatLine ($arg, self::$objects); |
|
| 152 | + else { |
|
| 153 | + $methodArgs[$arg_id] = self::formatLine ($arg, self::$objects); |
|
| 154 | + } |
|
| 153 | 155 | |
| 154 | 156 | try |
| 155 | 157 | { |
| 156 | - if (strpos ($methodName, '->') !== false && self::$allow_multimethods_calls) |
|
| 157 | - eval ('namespace VoidEngine; _c('. self::$objects[$name]->selector .')->'. $methodName .' ('. implode (', ', $methodArgs) .');'); |
|
| 158 | - |
|
| 159 | - elseif (sizeof ($methodArgs) > 0) |
|
| 160 | - self::$objects[$name]->$methodName (...eval ('namespace VoidEngine; return ['. implode (', ', $methodArgs) .'];')); |
|
| 161 | - |
|
| 162 | - else self::$objects[$name]->$methodName (); |
|
| 163 | - } |
|
| 164 | - |
|
| 165 | - catch (\Throwable $e) |
|
| 158 | + if (strpos ($methodName, '->') !== false && self::$allow_multimethods_calls) { |
|
| 159 | + eval ('namespace VoidEngine; _c('. self::$objects[$name]->selector .')->'. $methodName .' ('. implode (', ', $methodArgs) .');'); |
|
| 160 | + } elseif (sizeof ($methodArgs) > 0) { |
|
| 161 | + self::$objects[$name]->$methodName (...eval ('namespace VoidEngine; return ['. implode (', ', $methodArgs) .'];')); |
|
| 162 | + } else { |
|
| 163 | + self::$objects[$name]->$methodName (); |
|
| 164 | + } |
|
| 165 | + } catch (\Throwable $e) |
|
| 166 | 166 | { |
| 167 | - if (self::$throw_errors) |
|
| 168 | - throw new \Exception ('Interpeter couldn\'t call method "'. $methodName .'" with arguments '. json_encode ($methodArgs) .' at line "'. $syntaxInfo['line'] .'". Exception info:'. "\n\n". (string) $e, 0, $e); |
|
| 167 | + if (self::$throw_errors) { |
|
| 168 | + throw new \Exception ('Interpeter couldn\'t call method "'. $methodName .'" with arguments '. json_encode ($methodArgs) .' at line "'. $syntaxInfo['line'] .'". Exception info:'. "\n\n". (string) $e, 0, $e); |
|
| 169 | + } |
|
| 169 | 170 | } |
| 171 | + } elseif (self::$throw_errors) { |
|
| 172 | + throw new \Exception ('Calling method to an non-object at line "'. $syntaxInfo['line'] .'"'); |
|
| 170 | 173 | } |
| 171 | - |
|
| 172 | - elseif (self::$throw_errors) |
|
| 173 | - throw new \Exception ('Calling method to an non-object at line "'. $syntaxInfo['line'] .'"'); |
|
| 174 | 174 | break; |
| 175 | 175 | |
| 176 | 176 | case VLF_RUNTIME_EXECUTABLE: |
@@ -178,16 +178,18 @@ discard block |
||
| 178 | 178 | break; |
| 179 | 179 | } |
| 180 | 180 | |
| 181 | - if (isset ($syntaxInfo['syntax_nodes']) && sizeof ($syntaxInfo['syntax_nodes']) > 0) |
|
| 182 | - self::$objects = self::run ($syntaxInfo['syntax_nodes'], null, $syntaxInfo); |
|
| 181 | + if (isset ($syntaxInfo['syntax_nodes']) && sizeof ($syntaxInfo['syntax_nodes']) > 0) { |
|
| 182 | + self::$objects = self::run ($syntaxInfo['syntax_nodes'], null, $syntaxInfo); |
|
| 183 | + } |
|
| 184 | + } else { |
|
| 185 | + throw new \Exception ('Catched unknown syntax node: "'. json_encode ($syntaxInfo) .'"'); |
|
| 183 | 186 | } |
| 184 | 187 | |
| 185 | - else throw new \Exception ('Catched unknown syntax node: "'. json_encode ($syntaxInfo) .'"'); |
|
| 186 | - |
|
| 187 | - if (is_dir ($resourcesDir)) |
|
| 188 | - foreach (glob ($resourcesDir .'/*.vrsf') as $id => $dir) |
|
| 188 | + if (is_dir ($resourcesDir)) { |
|
| 189 | + foreach (glob ($resourcesDir .'/*.vrsf') as $id => $dir) |
|
| 189 | 190 | { |
| 190 | 191 | $baseName = basenameNoExt ($dir); |
| 192 | + } |
|
| 191 | 193 | $info = explode ('.', $baseName); |
| 192 | 194 | |
| 193 | 195 | if (isset (self::$objects[$info[0]])) |
@@ -197,9 +199,9 @@ discard block |
||
| 197 | 199 | $collection = VoidEngine::getProperty (self::$objects[$info[0]]->selector, $info[1]); |
| 198 | 200 | |
| 199 | 201 | VoidEngine::callMethod ($collection, 'Add', [VoidEngine::importObject (base64_encode (file_get_contents ($dir))), 'object']); |
| 202 | + } else { |
|
| 203 | + VoidEngine::setProperty (self::$objects[$info[0]]->selector, $info[1], VoidEngine::importObject (base64_encode (file_get_contents ($dir)))); |
|
| 200 | 204 | } |
| 201 | - |
|
| 202 | - else VoidEngine::setProperty (self::$objects[$info[0]]->selector, $info[1], VoidEngine::importObject (base64_encode (file_get_contents ($dir)))); |
|
| 203 | 205 | } |
| 204 | 206 | } |
| 205 | 207 | |
@@ -239,8 +241,9 @@ discard block |
||
| 239 | 241 | |
| 240 | 242 | $nReplacement = []; |
| 241 | 243 | |
| 242 | - foreach ($replacement as $replaceTo => $nLn) |
|
| 243 | - $nReplacement[$omap[$replaceTo]] = $replaceTo; |
|
| 244 | + foreach ($replacement as $replaceTo => $nLn) { |
|
| 245 | + $nReplacement[$omap[$replaceTo]] = $replaceTo; |
|
| 246 | + } |
|
| 244 | 247 | |
| 245 | 248 | $replacement = $nReplacement; |
| 246 | 249 | $blacklist = array_flip (['\'', '"', '$']); |
@@ -249,10 +252,11 @@ discard block |
||
| 249 | 252 | { |
| 250 | 253 | $replaced = false; |
| 251 | 254 | |
| 252 | - foreach ($replacement as $name => $replaceAt) |
|
| 253 | - if (substr ($line, $i, ($l = strlen ($name))) == $name && !isset ($blacklist[$line[$i - 1]])) |
|
| 255 | + foreach ($replacement as $name => $replaceAt) { |
|
| 256 | + if (substr ($line, $i, ($l = strlen ($name))) == $name && !isset ($blacklist[$line[$i - 1]])) |
|
| 254 | 257 | { |
| 255 | 258 | $newLine .= $replaceAt; |
| 259 | + } |
|
| 256 | 260 | |
| 257 | 261 | $i += $l - 1; |
| 258 | 262 | $replaced = true; |
@@ -260,8 +264,9 @@ discard block |
||
| 260 | 264 | break; |
| 261 | 265 | } |
| 262 | 266 | |
| 263 | - if (!$replaced) |
|
| 264 | - $newLine .= $line[$i]; |
|
| 267 | + if (!$replaced) { |
|
| 268 | + $newLine .= $line[$i]; |
|
| 269 | + } |
|
| 265 | 270 | } |
| 266 | 271 | |
| 267 | 272 | $line = $newLine; |
@@ -4,7 +4,7 @@ discard block |
||
| 4 | 4 | |
| 5 | 5 | class VLFImporter |
| 6 | 6 | { |
| 7 | - static function import (string $vlf, PropertyGrid $propertyGrid, ListBox $eventsList, ComboBox $currentSelectedItem, TabControl $formsList, array $settings = array ( |
|
| 7 | + static function import(string $vlf, PropertyGrid $propertyGrid, ListBox $eventsList, ComboBox $currentSelectedItem, TabControl $formsList, array $settings = array( |
|
| 8 | 8 | 'strong_line_parser' => false, |
| 9 | 9 | 'ignore_postobject_info' => true, |
| 10 | 10 | 'ignore_unexpected_method_args' => true, |
@@ -13,20 +13,20 @@ discard block |
||
| 13 | 13 | 'debug_mode' => false |
| 14 | 14 | )): array |
| 15 | 15 | { |
| 16 | - $objects = VLFInterpreter::run (new VLFParser ($vlf, $settings)); |
|
| 16 | + $objects = VLFInterpreter::run(new VLFParser($vlf, $settings)); |
|
| 17 | 17 | $designers = []; |
| 18 | 18 | |
| 19 | 19 | foreach ($objects as $name => $object) |
| 20 | 20 | if ($object instanceof Form) |
| 21 | 21 | { |
| 22 | - $page = new TabPage ($name); |
|
| 23 | - $designers[$object->selector] = new VoidDesigner ($page, $name, $propertyGrid, $eventsList, $currentSelectedItem, $formsList, $object); |
|
| 22 | + $page = new TabPage($name); |
|
| 23 | + $designers[$object->selector] = new VoidDesigner($page, $name, $propertyGrid, $eventsList, $currentSelectedItem, $formsList, $object); |
|
| 24 | 24 | |
| 25 | 25 | $designers[$object->selector]->form->text = $object->text; |
| 26 | 26 | |
| 27 | - VoidStudioAPI::addObjects ('main', ['Designer__'. $name .'Designer' => $designers[$object->selector]]); |
|
| 27 | + VoidStudioAPI::addObjects('main', ['Designer__'.$name.'Designer' => $designers[$object->selector]]); |
|
| 28 | 28 | |
| 29 | - $formsList->items->add ($page); |
|
| 29 | + $formsList->items->add($page); |
|
| 30 | 30 | $formsList->selectedTab = $page->selector; |
| 31 | 31 | } |
| 32 | 32 | |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | $parent = $parent->parent; |
| 39 | 39 | |
| 40 | 40 | if (isset ($designers[$parent->selector])) |
| 41 | - $designers[$parent->selector]->addComponent ($object->selector, $name); |
|
| 41 | + $designers[$parent->selector]->addComponent($object->selector, $name); |
|
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | catch (\Throwable $e) {} |
@@ -16,10 +16,11 @@ discard block |
||
| 16 | 16 | $objects = VLFInterpreter::run (new VLFParser ($vlf, $settings)); |
| 17 | 17 | $designers = []; |
| 18 | 18 | |
| 19 | - foreach ($objects as $name => $object) |
|
| 20 | - if ($object instanceof Form) |
|
| 19 | + foreach ($objects as $name => $object) { |
|
| 20 | + if ($object instanceof Form) |
|
| 21 | 21 | { |
| 22 | 22 | $page = new TabPage ($name); |
| 23 | + } |
|
| 23 | 24 | $designers[$object->selector] = new VoidDesigner ($page, $name, $propertyGrid, $eventsList, $currentSelectedItem, $formsList, $object); |
| 24 | 25 | |
| 25 | 26 | $designers[$object->selector]->form->text = $object->text; |
@@ -28,20 +29,19 @@ discard block |
||
| 28 | 29 | |
| 29 | 30 | $formsList->items->add ($page); |
| 30 | 31 | $formsList->selectedTab = $page->selector; |
| 31 | - } |
|
| 32 | - |
|
| 33 | - elseif ($object instanceof Control) |
|
| 34 | - try |
|
| 32 | + } elseif ($object instanceof Control) { |
|
| 33 | + try |
|
| 35 | 34 | { |
| 36 | 35 | $parent = $object->parent; |
| 37 | - while (!isset ($designers[$parent->selector]) && $parent->parent) |
|
| 38 | - $parent = $parent->parent; |
|
| 39 | - |
|
| 40 | - if (isset ($designers[$parent->selector])) |
|
| 41 | - $designers[$parent->selector]->addComponent ($object->selector, $name); |
|
| 42 | - } |
|
| 43 | - |
|
| 44 | - catch (\Throwable $e) {} |
|
| 36 | + } |
|
| 37 | + while (!isset ($designers[$parent->selector]) && $parent->parent) { |
|
| 38 | + $parent = $parent->parent; |
|
| 39 | + } |
|
| 40 | + |
|
| 41 | + if (isset ($designers[$parent->selector])) { |
|
| 42 | + $designers[$parent->selector]->addComponent ($object->selector, $name); |
|
| 43 | + } |
|
| 44 | + } catch (\Throwable $e) {} |
|
| 45 | 45 | |
| 46 | 46 | return $designers; |
| 47 | 47 | } |
@@ -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 | |
@@ -610,7 +608,7 @@ discard block |
||
| 610 | 608 | $split2 = false; |
| 611 | 609 | $canSplit = -1; |
| 612 | 610 | |
| 613 | - $len = strlen ($arguments); |
|
| 611 | + $len = strlen($arguments); |
|
| 614 | 612 | $t = ''; |
| 615 | 613 | |
| 616 | 614 | for ($i = 0; $i < $len; ++$i) |
@@ -630,7 +628,7 @@ discard block |
||
| 630 | 628 | |
| 631 | 629 | elseif (!$split1 && !$split2 && $arguments[$i] == ',') |
| 632 | 630 | { |
| 633 | - $args[] = substr ($t, 0, -1); |
|
| 631 | + $args[] = substr($t, 0, -1); |
|
| 634 | 632 | $t = ''; |
| 635 | 633 | } |
| 636 | 634 | } |
@@ -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 = ''; |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | { |
| 30 | 30 | protected $WinAPI; |
| 31 | 31 | |
| 32 | - public function __construct () |
|
| 32 | + public function __construct() |
|
| 33 | 33 | { |
| 34 | 34 | /** |
| 35 | 35 | * Большинство функций было взято из класса "WinAPI" проекта "DevelStudio XL" |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | * |
| 41 | 41 | */ |
| 42 | 42 | |
| 43 | - $this->WinAPI = \FFI::cdef (' |
|
| 43 | + $this->WinAPI = \FFI::cdef(' |
|
| 44 | 44 | struct LPCTSTR |
| 45 | 45 | { |
| 46 | 46 | char string; |
@@ -76,25 +76,25 @@ discard block |
||
| 76 | 76 | ', 'User32.dll'); |
| 77 | 77 | } |
| 78 | 78 | |
| 79 | - public function __call ($method, $args) |
|
| 79 | + public function __call($method, $args) |
|
| 80 | 80 | { |
| 81 | - if (method_exists ($this, $method)) |
|
| 82 | - return $this->$method (...$args); |
|
| 81 | + if (method_exists($this, $method)) |
|
| 82 | + return $this->$method(...$args); |
|
| 83 | 83 | |
| 84 | 84 | else try |
| 85 | 85 | { |
| 86 | - return $this->WinAPI->$method (...$args); |
|
| 86 | + return $this->WinAPI->$method(...$args); |
|
| 87 | 87 | } |
| 88 | 88 | |
| 89 | 89 | catch (\Throwable $e) |
| 90 | 90 | { |
| 91 | - throw new \Exception ('Method "'. $method .'" not found or return an exception. Exception info: '. "\n\n". (string) $e); |
|
| 91 | + throw new \Exception('Method "'.$method.'" not found or return an exception. Exception info: '."\n\n".(string) $e); |
|
| 92 | 92 | } |
| 93 | 93 | } |
| 94 | 94 | |
| 95 | - public function findWindow (string $caption, string $class = null): ?int |
|
| 95 | + public function findWindow(string $caption, string $class = null): ?int |
|
| 96 | 96 | { |
| 97 | - return $this->FindWindowA ($class, $caption); |
|
| 97 | + return $this->FindWindowA($class, $caption); |
|
| 98 | 98 | } |
| 99 | 99 | |
| 100 | 100 | /*public function getWindowCaption (int $handle) |
@@ -78,15 +78,14 @@ |
||
| 78 | 78 | |
| 79 | 79 | public function __call ($method, $args) |
| 80 | 80 | { |
| 81 | - if (method_exists ($this, $method)) |
|
| 82 | - return $this->$method (...$args); |
|
| 83 | - |
|
| 84 | - else try |
|
| 81 | + if (method_exists ($this, $method)) { |
|
| 82 | + return $this->$method (...$args); |
|
| 83 | + } else { |
|
| 84 | + try |
|
| 85 | 85 | { |
| 86 | 86 | return $this->WinAPI->$method (...$args); |
| 87 | 87 | } |
| 88 | - |
|
| 89 | - catch (\Throwable $e) |
|
| 88 | + } catch (\Throwable $e) |
|
| 90 | 89 | { |
| 91 | 90 | throw new \Exception ('Method "'. $method .'" not found or return an exception. Exception info: '. "\n\n". (string) $e); |
| 92 | 91 | } |
@@ -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 | +} |
|
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | /** |
| 46 | 46 | * Парсер значений |
| 47 | 47 | */ |
| 48 | - public function parse (array &$args); |
|
| 48 | + public function parse(array &$args); |
|
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | /** |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | * |
| 63 | 63 | * @param string $name - имя флага |
| 64 | 64 | */ |
| 65 | - public function __construct (string $name) |
|
| 65 | + public function __construct(string $name) |
|
| 66 | 66 | {
|
| 67 | 67 | $this->names = [$name]; |
| 68 | 68 | } |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | * |
| 75 | 75 | * @return Flag - возвращает сам себя |
| 76 | 76 | */ |
| 77 | - public function setLocale (Locale $locale): Param |
|
| 77 | + public function setLocale(Locale $locale): Param |
|
| 78 | 78 | {
|
| 79 | 79 | $this->locale = $locale; |
| 80 | 80 | |
@@ -88,10 +88,10 @@ discard block |
||
| 88 | 88 | * |
| 89 | 89 | * @return Flag - возвращает сам себя |
| 90 | 90 | */ |
| 91 | - public function addAliase (string $name) |
|
| 91 | + public function addAliase(string $name) |
|
| 92 | 92 | {
|
| 93 | - if (array_search ($name, $this->names) !== false) |
|
| 94 | - throw new \Exception ($this->locale->aliase_exists_exception); |
|
| 93 | + if (array_search($name, $this->names) !== false) |
|
| 94 | + throw new \Exception($this->locale->aliase_exists_exception); |
|
| 95 | 95 | |
| 96 | 96 | $this->names[] = $name; |
| 97 | 97 | |
@@ -105,17 +105,17 @@ discard block |
||
| 105 | 105 | * |
| 106 | 106 | * Возвращает состояние флага |
| 107 | 107 | */ |
| 108 | - public function parse (array &$args) |
|
| 108 | + public function parse(array &$args) |
|
| 109 | 109 | {
|
| 110 | - $args = array_values ($args); |
|
| 110 | + $args = array_values($args); |
|
| 111 | 111 | |
| 112 | 112 | foreach ($this->names as $name) |
| 113 | - if (($key = array_search ($name, $args)) !== false) |
|
| 113 | + if (($key = array_search($name, $args)) !== false) |
|
| 114 | 114 | {
|
| 115 | 115 | unset ($args[$key]); |
| 116 | - $args = array_values ($args); |
|
| 116 | + $args = array_values($args); |
|
| 117 | 117 | |
| 118 | - while ($this->parse ($args) !== false); |
|
| 118 | + while ($this->parse($args) !== false); |
|
| 119 | 119 | |
| 120 | 120 | return true; |
| 121 | 121 | } |
@@ -142,7 +142,7 @@ discard block |
||
| 142 | 142 | * [@param string $defaultValue = null] - значение параметра по умолчанию |
| 143 | 143 | * [@param bool $required = false] - обязательно ли указание параметра |
| 144 | 144 | */ |
| 145 | - public function __construct (string $name, string $defaultValue = null, bool $required = false) |
|
| 145 | + public function __construct(string $name, string $defaultValue = null, bool $required = false) |
|
| 146 | 146 | {
|
| 147 | 147 | $this->names = [$name]; |
| 148 | 148 | $this->defaultValue = $defaultValue; |
@@ -158,7 +158,7 @@ discard block |
||
| 158 | 158 | * |
| 159 | 159 | * @return Param - возвращает сам себя |
| 160 | 160 | */ |
| 161 | - public function setLocale (Locale $locale): Param |
|
| 161 | + public function setLocale(Locale $locale): Param |
|
| 162 | 162 | {
|
| 163 | 163 | $this->locale = $locale; |
| 164 | 164 | |
@@ -172,10 +172,10 @@ discard block |
||
| 172 | 172 | * |
| 173 | 173 | * @return Param - возвращает сам себя |
| 174 | 174 | */ |
| 175 | - public function addAliase (string $name) |
|
| 175 | + public function addAliase(string $name) |
|
| 176 | 176 | {
|
| 177 | - if (array_search ($name, $this->names) !== false) |
|
| 178 | - throw new \Exception ($this->locale->aliase_exists_exception); |
|
| 177 | + if (array_search($name, $this->names) !== false) |
|
| 178 | + throw new \Exception($this->locale->aliase_exists_exception); |
|
| 179 | 179 | |
| 180 | 180 | $this->names[] = $name; |
| 181 | 181 | |
@@ -189,27 +189,27 @@ discard block |
||
| 189 | 189 | * |
| 190 | 190 | * Возвращает найденый параметр или массив найдёных параметров, если их было указано несколько |
| 191 | 191 | */ |
| 192 | - public function parse (array &$args) |
|
| 192 | + public function parse(array &$args) |
|
| 193 | 193 | {
|
| 194 | - $args = array_values ($args); |
|
| 194 | + $args = array_values($args); |
|
| 195 | 195 | |
| 196 | 196 | foreach ($this->names as $name) |
| 197 | - if (($key = array_search ($name, $args)) !== false) |
|
| 197 | + if (($key = array_search($name, $args)) !== false) |
|
| 198 | 198 | {
|
| 199 | 199 | if (!isset ($args[$key + 1])) |
| 200 | - throw new \Exception ($this->locale->unselected_value_exception); |
|
| 200 | + throw new \Exception($this->locale->unselected_value_exception); |
|
| 201 | 201 | |
| 202 | 202 | $param = [$args[$key + 1]]; |
| 203 | 203 | |
| 204 | 204 | unset ($args[$key], $args[$key + 1]); |
| 205 | - $args = array_values ($args); |
|
| 205 | + $args = array_values($args); |
|
| 206 | 206 | |
| 207 | 207 | try |
| 208 | 208 | {
|
| 209 | - while (($altParam = $this->parse ($args)) !== $this->defaultValue) |
|
| 209 | + while (($altParam = $this->parse($args)) !== $this->defaultValue) |
|
| 210 | 210 | {
|
| 211 | - if (is_array ($altParam)) |
|
| 212 | - $param = array_merge ($param, $altParam); |
|
| 211 | + if (is_array($altParam)) |
|
| 212 | + $param = array_merge($param, $altParam); |
|
| 213 | 213 | |
| 214 | 214 | else $param[] = $altParam; |
| 215 | 215 | } |
@@ -217,12 +217,12 @@ discard block |
||
| 217 | 217 | |
| 218 | 218 | catch (\Throwable $e) {}
|
| 219 | 219 | |
| 220 | - return sizeof ($param) == 1 ? |
|
| 220 | + return sizeof($param) == 1 ? |
|
| 221 | 221 | $param[0] : $param; |
| 222 | 222 | } |
| 223 | 223 | |
| 224 | 224 | if ($this->required) |
| 225 | - throw new \Exception ($this->locale->undefined_param_exception); |
|
| 225 | + throw new \Exception($this->locale->undefined_param_exception); |
|
| 226 | 226 | |
| 227 | 227 | return $this->defaultValue; |
| 228 | 228 | } |
@@ -248,7 +248,7 @@ discard block |
||
| 248 | 248 | * [@param string $defaultValue = null] - значение сеттера по умолчанию |
| 249 | 249 | * [@param bool $required = false] - обязательно ли указание сеттера |
| 250 | 250 | */ |
| 251 | - public function __construct (string $name, string $separator = '=', string $defaultValue = null, bool $required = false) |
|
| 251 | + public function __construct(string $name, string $separator = '=', string $defaultValue = null, bool $required = false) |
|
| 252 | 252 | {
|
| 253 | 253 | $this->names = [$name]; |
| 254 | 254 | $this->separator = $separator; |
@@ -265,7 +265,7 @@ discard block |
||
| 265 | 265 | * |
| 266 | 266 | * @return Param - возвращает сам себя |
| 267 | 267 | */ |
| 268 | - public function setLocale (Locale $locale): Param |
|
| 268 | + public function setLocale(Locale $locale): Param |
|
| 269 | 269 | {
|
| 270 | 270 | $this->locale = $locale; |
| 271 | 271 | |
@@ -279,10 +279,10 @@ discard block |
||
| 279 | 279 | * |
| 280 | 280 | * @return Param - возвращает сам себя |
| 281 | 281 | */ |
| 282 | - public function addAliase (string $name) |
|
| 282 | + public function addAliase(string $name) |
|
| 283 | 283 | {
|
| 284 | - if (array_search ($name, $this->names) !== false) |
|
| 285 | - throw new \Exception ($this->locale->aliase_exists_exception); |
|
| 284 | + if (array_search($name, $this->names) !== false) |
|
| 285 | + throw new \Exception($this->locale->aliase_exists_exception); |
|
| 286 | 286 | |
| 287 | 287 | $this->names[] = $name; |
| 288 | 288 | |
@@ -296,26 +296,26 @@ discard block |
||
| 296 | 296 | * |
| 297 | 297 | * Возвращает найденый параметр или массив найдёных параметров, если их было указано несколько |
| 298 | 298 | */ |
| 299 | - public function parse (array &$args) |
|
| 299 | + public function parse(array &$args) |
|
| 300 | 300 | {
|
| 301 | - $args = array_values ($args); |
|
| 302 | - $l = strlen ($this->separator); |
|
| 301 | + $args = array_values($args); |
|
| 302 | + $l = strlen($this->separator); |
|
| 303 | 303 | |
| 304 | 304 | foreach ($this->names as $name) |
| 305 | 305 | foreach ($args as $id => $arg) |
| 306 | - if (substr ($arg, 0, ($pos = strlen ($name) + $l)) == $name . $this->separator) |
|
| 306 | + if (substr($arg, 0, ($pos = strlen($name) + $l)) == $name.$this->separator) |
|
| 307 | 307 | {
|
| 308 | - $param = [substr ($arg, $pos)]; |
|
| 308 | + $param = [substr($arg, $pos)]; |
|
| 309 | 309 | |
| 310 | 310 | unset ($args[$id]); |
| 311 | - $args = array_values ($args); |
|
| 311 | + $args = array_values($args); |
|
| 312 | 312 | |
| 313 | 313 | try |
| 314 | 314 | {
|
| 315 | - while (($altParam = $this->parse ($args)) !== $this->defaultValue) |
|
| 315 | + while (($altParam = $this->parse($args)) !== $this->defaultValue) |
|
| 316 | 316 | {
|
| 317 | - if (is_array ($altParam)) |
|
| 318 | - $param = array_merge ($param, $altParam); |
|
| 317 | + if (is_array($altParam)) |
|
| 318 | + $param = array_merge($param, $altParam); |
|
| 319 | 319 | |
| 320 | 320 | else $param[] = $altParam; |
| 321 | 321 | } |
@@ -323,12 +323,12 @@ discard block |
||
| 323 | 323 | |
| 324 | 324 | catch (\Throwable $e) {}
|
| 325 | 325 | |
| 326 | - return sizeof ($param) == 1 ? |
|
| 326 | + return sizeof($param) == 1 ? |
|
| 327 | 327 | $param[0] : $param; |
| 328 | 328 | } |
| 329 | 329 | |
| 330 | 330 | if ($this->required) |
| 331 | - throw new \Exception ($this->locale->undefined_param_exception); |
|
| 331 | + throw new \Exception($this->locale->undefined_param_exception); |
|
| 332 | 332 | |
| 333 | 333 | return $this->defaultValue; |
| 334 | 334 | } |
@@ -352,7 +352,7 @@ discard block |
||
| 352 | 352 | * @param string $name - имя команды |
| 353 | 353 | * [@param \Closure $callable = null] - анонимная функция для выполнения |
| 354 | 354 | */ |
| 355 | - public function __construct (string $name, \Closure $callable = null) |
|
| 355 | + public function __construct(string $name, \Closure $callable = null) |
|
| 356 | 356 | {
|
| 357 | 357 | $this->name = $name; |
| 358 | 358 | $this->locale = new Locale; |
@@ -368,7 +368,7 @@ discard block |
||
| 368 | 368 | * |
| 369 | 369 | * @return Command - возвращает сам себя |
| 370 | 370 | */ |
| 371 | - public function setLocale (Locale $locale): Command |
|
| 371 | + public function setLocale(Locale $locale): Command |
|
| 372 | 372 | {
|
| 373 | 373 | $this->locale = $locale; |
| 374 | 374 | |
@@ -382,13 +382,13 @@ discard block |
||
| 382 | 382 | * |
| 383 | 383 | * @return Command - возвращает сам себя |
| 384 | 384 | */ |
| 385 | - public function addParams (array $params): Command |
|
| 385 | + public function addParams(array $params): Command |
|
| 386 | 386 | {
|
| 387 | 387 | foreach ($params as $param) |
| 388 | 388 | if ($param instanceof Parameter) |
| 389 | - $this->params[current ($param->names)] = $param; |
|
| 389 | + $this->params[current($param->names)] = $param; |
|
| 390 | 390 | |
| 391 | - else throw new \Exception ($this->locale->param_type_exception); |
|
| 391 | + else throw new \Exception($this->locale->param_type_exception); |
|
| 392 | 392 | |
| 393 | 393 | return $this; |
| 394 | 394 | } |
@@ -400,12 +400,12 @@ discard block |
||
| 400 | 400 | * |
| 401 | 401 | * @return array - возвращает ассоциативный массив [параметр] => [значение] |
| 402 | 402 | */ |
| 403 | - public function getParams (array &$args): array |
|
| 403 | + public function getParams(array &$args): array |
|
| 404 | 404 | {
|
| 405 | - $params = array_combine (array_keys ($this->params), array_fill (0, sizeof ($this->params), null)); |
|
| 405 | + $params = array_combine(array_keys($this->params), array_fill(0, sizeof($this->params), null)); |
|
| 406 | 406 | |
| 407 | 407 | foreach ($this->params as $name => $param) |
| 408 | - $params[$name] = $param->parse ($args); |
|
| 408 | + $params[$name] = $param->parse($args); |
|
| 409 | 409 | |
| 410 | 410 | return $params; |
| 411 | 411 | } |
@@ -415,16 +415,16 @@ discard block |
||
| 415 | 415 | * |
| 416 | 416 | * @param array &$args - аргументы команды |
| 417 | 417 | */ |
| 418 | - public function execute (array &$args) |
|
| 418 | + public function execute(array &$args) |
|
| 419 | 419 | {
|
| 420 | 420 | if ($this->callable instanceof \Closure) |
| 421 | 421 | {
|
| 422 | - $params = $this->getParams ($args); |
|
| 422 | + $params = $this->getParams($args); |
|
| 423 | 423 | |
| 424 | - return $this->callable->call ($this, array_values ($args), $params); |
|
| 424 | + return $this->callable->call($this, array_values($args), $params); |
|
| 425 | 425 | } |
| 426 | 426 | |
| 427 | - throw new \Exception ($this->locale->execution_error); |
|
| 427 | + throw new \Exception($this->locale->execution_error); |
|
| 428 | 428 | } |
| 429 | 429 | } |
| 430 | 430 | |
@@ -439,7 +439,7 @@ discard block |
||
| 439 | 439 | * |
| 440 | 440 | * [@param \Closure $callable = null] - анонимная функция для выполнения |
| 441 | 441 | */ |
| 442 | - public function __construct (\Closure $callable = null) |
|
| 442 | + public function __construct(\Closure $callable = null) |
|
| 443 | 443 | {
|
| 444 | 444 | if ($callable !== null) |
| 445 | 445 | $this->callable = $callable; |
@@ -462,7 +462,7 @@ discard block |
||
| 462 | 462 | * @param array $commands - список команд |
| 463 | 463 | * [@param DefaultCommand $defaultCommand = null] - объект дефолтной команды |
| 464 | 464 | */ |
| 465 | - public function __construct (array $commands, DefaultCommand $defaultCommand = null) |
|
| 465 | + public function __construct(array $commands, DefaultCommand $defaultCommand = null) |
|
| 466 | 466 | {
|
| 467 | 467 | $this->locale = new Locale; |
| 468 | 468 | $this->defaultCommand = $defaultCommand; |
@@ -471,7 +471,7 @@ discard block |
||
| 471 | 471 | if ($command instanceof Command) |
| 472 | 472 | $this->commands[$command->name] = $command; |
| 473 | 473 | |
| 474 | - else throw new \Exception ($this->locale->command_type_exception); |
|
| 474 | + else throw new \Exception($this->locale->command_type_exception); |
|
| 475 | 475 | } |
| 476 | 476 | |
| 477 | 477 | /** |
@@ -481,7 +481,7 @@ discard block |
||
| 481 | 481 | * |
| 482 | 482 | * @return Manager - возвращает сам себя |
| 483 | 483 | */ |
| 484 | - public function setLocale (Locale $locale): Manager |
|
| 484 | + public function setLocale(Locale $locale): Manager |
|
| 485 | 485 | {
|
| 486 | 486 | $this->locale = $locale; |
| 487 | 487 | |
@@ -495,7 +495,7 @@ discard block |
||
| 495 | 495 | * |
| 496 | 496 | * @return Manager - возвращает сам себя |
| 497 | 497 | */ |
| 498 | - public function setDefault (DefaultCommand $defaultCommand): Manager |
|
| 498 | + public function setDefault(DefaultCommand $defaultCommand): Manager |
|
| 499 | 499 | {
|
| 500 | 500 | $this->defaultCommand = $defaultCommand; |
| 501 | 501 | |
@@ -507,25 +507,25 @@ discard block |
||
| 507 | 507 | * |
| 508 | 508 | * @param array $args - список аргументов консоли |
| 509 | 509 | */ |
| 510 | - public function execute (array $args) |
|
| 510 | + public function execute(array $args) |
|
| 511 | 511 | {
|
| 512 | - $args = array_values ($args); |
|
| 512 | + $args = array_values($args); |
|
| 513 | 513 | |
| 514 | 514 | if (!isset ($args[0])) |
| 515 | 515 | {
|
| 516 | 516 | if ($this->defaultCommand !== null) |
| 517 | - return $this->defaultCommand->execute ($args); |
|
| 517 | + return $this->defaultCommand->execute($args); |
|
| 518 | 518 | |
| 519 | - else throw new \Exception ($this->locale->command_undefined_error); |
|
| 519 | + else throw new \Exception($this->locale->command_undefined_error); |
|
| 520 | 520 | } |
| 521 | 521 | |
| 522 | 522 | $name = $args[0]; |
| 523 | - $args = array_slice ($args, 1); |
|
| 523 | + $args = array_slice($args, 1); |
|
| 524 | 524 | |
| 525 | 525 | if (!isset ($this->commands[$name])) |
| 526 | 526 | return $this->defaultCommand !== null ? |
| 527 | - $this->defaultCommand->execute ($args) : false; |
|
| 527 | + $this->defaultCommand->execute($args) : false; |
|
| 528 | 528 | |
| 529 | - return $this->commands[$name]->execute ($args); |
|
| 529 | + return $this->commands[$name]->execute($args); |
|
| 530 | 530 | } |
| 531 | 531 | } |
@@ -90,8 +90,9 @@ discard block |
||
| 90 | 90 | */ |
| 91 | 91 | public function addAliase (string $name) |
| 92 | 92 | {
|
| 93 | - if (array_search ($name, $this->names) !== false) |
|
| 94 | - throw new \Exception ($this->locale->aliase_exists_exception); |
|
| 93 | + if (array_search ($name, $this->names) !== false) { |
|
| 94 | + throw new \Exception ($this->locale->aliase_exists_exception); |
|
| 95 | + } |
|
| 95 | 96 | |
| 96 | 97 | $this->names[] = $name; |
| 97 | 98 | |
@@ -109,10 +110,11 @@ discard block |
||
| 109 | 110 | {
|
| 110 | 111 | $args = array_values ($args); |
| 111 | 112 | |
| 112 | - foreach ($this->names as $name) |
|
| 113 | - if (($key = array_search ($name, $args)) !== false) |
|
| 113 | + foreach ($this->names as $name) { |
|
| 114 | + if (($key = array_search ($name, $args)) !== false) |
|
| 114 | 115 | {
|
| 115 | - unset ($args[$key]); |
|
| 116 | + unset ($args[$key]); |
|
| 117 | + } |
|
| 116 | 118 | $args = array_values ($args); |
| 117 | 119 | |
| 118 | 120 | while ($this->parse ($args) !== false); |
@@ -174,8 +176,9 @@ discard block |
||
| 174 | 176 | */ |
| 175 | 177 | public function addAliase (string $name) |
| 176 | 178 | {
|
| 177 | - if (array_search ($name, $this->names) !== false) |
|
| 178 | - throw new \Exception ($this->locale->aliase_exists_exception); |
|
| 179 | + if (array_search ($name, $this->names) !== false) { |
|
| 180 | + throw new \Exception ($this->locale->aliase_exists_exception); |
|
| 181 | + } |
|
| 179 | 182 | |
| 180 | 183 | $this->names[] = $name; |
| 181 | 184 | |
@@ -193,11 +196,12 @@ discard block |
||
| 193 | 196 | {
|
| 194 | 197 | $args = array_values ($args); |
| 195 | 198 | |
| 196 | - foreach ($this->names as $name) |
|
| 197 | - if (($key = array_search ($name, $args)) !== false) |
|
| 199 | + foreach ($this->names as $name) { |
|
| 200 | + if (($key = array_search ($name, $args)) !== false) |
|
| 198 | 201 | {
|
| 199 | 202 | if (!isset ($args[$key + 1])) |
| 200 | - throw new \Exception ($this->locale->unselected_value_exception); |
|
| 203 | + throw new \Exception ($this->locale->unselected_value_exception); |
|
| 204 | + } |
|
| 201 | 205 | |
| 202 | 206 | $param = [$args[$key + 1]]; |
| 203 | 207 | |
@@ -208,21 +212,21 @@ discard block |
||
| 208 | 212 | {
|
| 209 | 213 | while (($altParam = $this->parse ($args)) !== $this->defaultValue) |
| 210 | 214 | {
|
| 211 | - if (is_array ($altParam)) |
|
| 212 | - $param = array_merge ($param, $altParam); |
|
| 213 | - |
|
| 214 | - else $param[] = $altParam; |
|
| 215 | + if (is_array ($altParam)) { |
|
| 216 | + $param = array_merge ($param, $altParam); |
|
| 217 | + } else { |
|
| 218 | + $param[] = $altParam; |
|
| 219 | + } |
|
| 215 | 220 | } |
| 216 | - } |
|
| 217 | - |
|
| 218 | - catch (\Throwable $e) {}
|
|
| 221 | + } catch (\Throwable $e) {}
|
|
| 219 | 222 | |
| 220 | 223 | return sizeof ($param) == 1 ? |
| 221 | 224 | $param[0] : $param; |
| 222 | 225 | } |
| 223 | 226 | |
| 224 | - if ($this->required) |
|
| 225 | - throw new \Exception ($this->locale->undefined_param_exception); |
|
| 227 | + if ($this->required) { |
|
| 228 | + throw new \Exception ($this->locale->undefined_param_exception); |
|
| 229 | + } |
|
| 226 | 230 | |
| 227 | 231 | return $this->defaultValue; |
| 228 | 232 | } |
@@ -281,8 +285,9 @@ discard block |
||
| 281 | 285 | */ |
| 282 | 286 | public function addAliase (string $name) |
| 283 | 287 | {
|
| 284 | - if (array_search ($name, $this->names) !== false) |
|
| 285 | - throw new \Exception ($this->locale->aliase_exists_exception); |
|
| 288 | + if (array_search ($name, $this->names) !== false) { |
|
| 289 | + throw new \Exception ($this->locale->aliase_exists_exception); |
|
| 290 | + } |
|
| 286 | 291 | |
| 287 | 292 | $this->names[] = $name; |
| 288 | 293 | |
@@ -301,11 +306,12 @@ discard block |
||
| 301 | 306 | $args = array_values ($args); |
| 302 | 307 | $l = strlen ($this->separator); |
| 303 | 308 | |
| 304 | - foreach ($this->names as $name) |
|
| 305 | - foreach ($args as $id => $arg) |
|
| 309 | + foreach ($this->names as $name) { |
|
| 310 | + foreach ($args as $id => $arg) |
|
| 306 | 311 | if (substr ($arg, 0, ($pos = strlen ($name) + $l)) == $name . $this->separator) |
| 307 | 312 | {
|
| 308 | - $param = [substr ($arg, $pos)]; |
|
| 313 | + $param = [substr ($arg, $pos)]; |
|
| 314 | + } |
|
| 309 | 315 | |
| 310 | 316 | unset ($args[$id]); |
| 311 | 317 | $args = array_values ($args); |
@@ -314,21 +320,21 @@ discard block |
||
| 314 | 320 | {
|
| 315 | 321 | while (($altParam = $this->parse ($args)) !== $this->defaultValue) |
| 316 | 322 | {
|
| 317 | - if (is_array ($altParam)) |
|
| 318 | - $param = array_merge ($param, $altParam); |
|
| 319 | - |
|
| 320 | - else $param[] = $altParam; |
|
| 323 | + if (is_array ($altParam)) { |
|
| 324 | + $param = array_merge ($param, $altParam); |
|
| 325 | + } else { |
|
| 326 | + $param[] = $altParam; |
|
| 327 | + } |
|
| 321 | 328 | } |
| 322 | - } |
|
| 323 | - |
|
| 324 | - catch (\Throwable $e) {}
|
|
| 329 | + } catch (\Throwable $e) {}
|
|
| 325 | 330 | |
| 326 | 331 | return sizeof ($param) == 1 ? |
| 327 | 332 | $param[0] : $param; |
| 328 | 333 | } |
| 329 | 334 | |
| 330 | - if ($this->required) |
|
| 331 | - throw new \Exception ($this->locale->undefined_param_exception); |
|
| 335 | + if ($this->required) { |
|
| 336 | + throw new \Exception ($this->locale->undefined_param_exception); |
|
| 337 | + } |
|
| 332 | 338 | |
| 333 | 339 | return $this->defaultValue; |
| 334 | 340 | } |
@@ -357,8 +363,9 @@ discard block |
||
| 357 | 363 | $this->name = $name; |
| 358 | 364 | $this->locale = new Locale; |
| 359 | 365 | |
| 360 | - if ($callable !== null) |
|
| 361 | - $this->callable = $callable; |
|
| 366 | + if ($callable !== null) { |
|
| 367 | + $this->callable = $callable; |
|
| 368 | + } |
|
| 362 | 369 | } |
| 363 | 370 | |
| 364 | 371 | /** |
@@ -384,11 +391,14 @@ discard block |
||
| 384 | 391 | */ |
| 385 | 392 | public function addParams (array $params): Command |
| 386 | 393 | {
|
| 387 | - foreach ($params as $param) |
|
| 388 | - if ($param instanceof Parameter) |
|
| 389 | - $this->params[current ($param->names)] = $param; |
|
| 394 | + foreach ($params as $param) { |
|
| 395 | + if ($param instanceof Parameter) |
|
| 396 | + $this->params[current ($param->names)] = $param; |
|
| 397 | + } |
|
| 390 | 398 | |
| 391 | - else throw new \Exception ($this->locale->param_type_exception); |
|
| 399 | + else { |
|
| 400 | + throw new \Exception ($this->locale->param_type_exception); |
|
| 401 | + } |
|
| 392 | 402 | |
| 393 | 403 | return $this; |
| 394 | 404 | } |
@@ -404,8 +414,9 @@ discard block |
||
| 404 | 414 | {
|
| 405 | 415 | $params = array_combine (array_keys ($this->params), array_fill (0, sizeof ($this->params), null)); |
| 406 | 416 | |
| 407 | - foreach ($this->params as $name => $param) |
|
| 408 | - $params[$name] = $param->parse ($args); |
|
| 417 | + foreach ($this->params as $name => $param) { |
|
| 418 | + $params[$name] = $param->parse ($args); |
|
| 419 | + } |
|
| 409 | 420 | |
| 410 | 421 | return $params; |
| 411 | 422 | } |
@@ -441,8 +452,9 @@ discard block |
||
| 441 | 452 | */ |
| 442 | 453 | public function __construct (\Closure $callable = null) |
| 443 | 454 | {
|
| 444 | - if ($callable !== null) |
|
| 445 | - $this->callable = $callable; |
|
| 455 | + if ($callable !== null) { |
|
| 456 | + $this->callable = $callable; |
|
| 457 | + } |
|
| 446 | 458 | } |
| 447 | 459 | } |
| 448 | 460 | |
@@ -467,11 +479,14 @@ discard block |
||
| 467 | 479 | $this->locale = new Locale; |
| 468 | 480 | $this->defaultCommand = $defaultCommand; |
| 469 | 481 | |
| 470 | - foreach ($commands as $command) |
|
| 471 | - if ($command instanceof Command) |
|
| 472 | - $this->commands[$command->name] = $command; |
|
| 482 | + foreach ($commands as $command) { |
|
| 483 | + if ($command instanceof Command) |
|
| 484 | + $this->commands[$command->name] = $command; |
|
| 485 | + } |
|
| 473 | 486 | |
| 474 | - else throw new \Exception ($this->locale->command_type_exception); |
|
| 487 | + else { |
|
| 488 | + throw new \Exception ($this->locale->command_type_exception); |
|
| 489 | + } |
|
| 475 | 490 | } |
| 476 | 491 | |
| 477 | 492 | /** |
@@ -513,18 +528,20 @@ discard block |
||
| 513 | 528 | |
| 514 | 529 | if (!isset ($args[0])) |
| 515 | 530 | {
|
| 516 | - if ($this->defaultCommand !== null) |
|
| 517 | - return $this->defaultCommand->execute ($args); |
|
| 518 | - |
|
| 519 | - else throw new \Exception ($this->locale->command_undefined_error); |
|
| 531 | + if ($this->defaultCommand !== null) { |
|
| 532 | + return $this->defaultCommand->execute ($args); |
|
| 533 | + } else { |
|
| 534 | + throw new \Exception ($this->locale->command_undefined_error); |
|
| 535 | + } |
|
| 520 | 536 | } |
| 521 | 537 | |
| 522 | 538 | $name = $args[0]; |
| 523 | 539 | $args = array_slice ($args, 1); |
| 524 | 540 | |
| 525 | - if (!isset ($this->commands[$name])) |
|
| 526 | - return $this->defaultCommand !== null ? |
|
| 527 | - $this->defaultCommand->execute ($args) : false; |
|
| 541 | + if (!isset ($this->commands[$name])) { |
|
| 542 | + return $this->defaultCommand !== null ? |
|
| 543 | + $this->defaultCommand->execute ($args) : false; |
|
| 544 | + } |
|
| 528 | 545 | |
| 529 | 546 | return $this->commands[$name]->execute ($args); |
| 530 | 547 | } |
