@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | const ENGINE_VERSION = '4.0.0dev1'; |
35 | 35 | const ENGINE_DIR = __DIR__; |
36 | 36 | |
37 | -chdir (ENGINE_DIR); |
|
37 | +chdir(ENGINE_DIR); |
|
38 | 38 | |
39 | 39 | require 'common/Events.php'; |
40 | 40 | require 'common/EngineInterfaces.php'; |
@@ -43,15 +43,15 @@ discard block |
||
43 | 43 | require 'common/Components.php'; |
44 | 44 | require 'common/Others.php'; |
45 | 45 | |
46 | -define ('VoidEngine\CORE_VERSION', $APPLICATION->productVersion); |
|
46 | +define('VoidEngine\CORE_VERSION', $APPLICATION->productVersion); |
|
47 | 47 | |
48 | 48 | require 'components/Component.php'; |
49 | 49 | require 'components/Control.php'; |
50 | 50 | |
51 | -foreach (glob ('components/*/*.php') as $name) |
|
51 | +foreach (glob('components/*/*.php') as $name) |
|
52 | 52 | require $name; |
53 | 53 | |
54 | -if (file_exists ('extensions')) |
|
55 | - foreach (scandir ('extensions') as $ext) |
|
56 | - if (file_exists ($ext = 'extensions/'. $ext .'/main.php')) |
|
54 | +if (file_exists('extensions')) |
|
55 | + foreach (scandir('extensions') as $ext) |
|
56 | + if (file_exists($ext = 'extensions/'.$ext.'/main.php')) |
|
57 | 57 | require $ext; |
@@ -4,176 +4,176 @@ discard block |
||
4 | 4 | |
5 | 5 | use VoidCore; |
6 | 6 | |
7 | -function dn (...$args): NetObject |
|
7 | +function dn(...$args): NetObject |
|
8 | 8 | { |
9 | 9 | try |
10 | 10 | { |
11 | - $object = new NetObject (...$args); |
|
11 | + $object = new NetObject(...$args); |
|
12 | 12 | } |
13 | 13 | |
14 | 14 | catch (\WinformsException $e) |
15 | 15 | { |
16 | - if (VoidCore::callMethod ($e->getNetException (), 'ToString') == 'System.MemberAccessException') |
|
16 | + if (VoidCore::callMethod($e->getNetException(), 'ToString') == 'System.MemberAccessException') |
|
17 | 17 | throw $e; |
18 | 18 | |
19 | - $object = new NetClass (...$args); |
|
19 | + $object = new NetClass(...$args); |
|
20 | 20 | } |
21 | 21 | |
22 | 22 | return $object; |
23 | 23 | } |
24 | 24 | |
25 | -function thread (callable $callable): NetObject |
|
25 | +function thread(callable $callable): NetObject |
|
26 | 26 | { |
27 | - return new NetObject (VoidCore::createThread ($callable)); |
|
27 | + return new NetObject(VoidCore::createThread($callable)); |
|
28 | 28 | } |
29 | 29 | |
30 | -function enum (string $baseType, string $value) |
|
30 | +function enum(string $baseType, string $value) |
|
31 | 31 | { |
32 | 32 | try |
33 | 33 | { |
34 | - return VoidCore::callMethod (VoidCore::getClass ('System.Enum'), ['parse', VC_OBJECT], VoidCore::typeof ($baseType), $value, true); |
|
34 | + return VoidCore::callMethod(VoidCore::getClass('System.Enum'), ['parse', VC_OBJECT], VoidCore::typeof($baseType), $value, true); |
|
35 | 35 | } |
36 | 36 | |
37 | 37 | catch (\WinformsException $e) |
38 | 38 | { |
39 | - return (new NetClass ($baseType))->$value; |
|
39 | + return (new NetClass($baseType))->$value; |
|
40 | 40 | } |
41 | 41 | } |
42 | 42 | |
43 | -function getNetArray (string $type, array $items = []): NetObject |
|
43 | +function getNetArray(string $type, array $items = []): NetObject |
|
44 | 44 | { |
45 | - $array = (new NetClass ('System.Array')) |
|
46 | - ->createInstance (VoidCore::typeof ($type), $size = sizeof ($items)); |
|
45 | + $array = (new NetClass('System.Array')) |
|
46 | + ->createInstance(VoidCore::typeof($type), $size = sizeof($items)); |
|
47 | 47 | |
48 | 48 | for ($i = 0; $i < $size; ++$i) |
49 | - $array[$i] = array_shift ($items); |
|
49 | + $array[$i] = array_shift($items); |
|
50 | 50 | |
51 | 51 | return $array; |
52 | 52 | } |
53 | 53 | |
54 | -function dir_create (string $path, int $mode = 0777): void |
|
54 | +function dir_create(string $path, int $mode = 0777): void |
|
55 | 55 | { |
56 | - if (!is_dir ($path)) |
|
57 | - mkdir ($path, $mode, true); |
|
56 | + if (!is_dir($path)) |
|
57 | + mkdir($path, $mode, true); |
|
58 | 58 | } |
59 | 59 | |
60 | -function dir_delete (string $path): bool |
|
60 | +function dir_delete(string $path): bool |
|
61 | 61 | { |
62 | - if (!is_dir ($path)) |
|
62 | + if (!is_dir($path)) |
|
63 | 63 | return false; |
64 | 64 | |
65 | - foreach (array_slice (scandir ($path), 2) as $file) |
|
66 | - if (is_dir ($file = $path .'/'. $file)) |
|
65 | + foreach (array_slice(scandir($path), 2) as $file) |
|
66 | + if (is_dir($file = $path.'/'.$file)) |
|
67 | 67 | { |
68 | - dir_delete ($file); |
|
68 | + dir_delete($file); |
|
69 | 69 | |
70 | - if (is_dir ($file)) |
|
71 | - rmdir ($file); |
|
70 | + if (is_dir($file)) |
|
71 | + rmdir($file); |
|
72 | 72 | } |
73 | 73 | |
74 | - else unlink ($file); |
|
74 | + else unlink($file); |
|
75 | 75 | |
76 | - rmdir ($path); |
|
76 | + rmdir($path); |
|
77 | 77 | |
78 | 78 | return true; |
79 | 79 | } |
80 | 80 | |
81 | -function dir_clean (string $path): void |
|
81 | +function dir_clean(string $path): void |
|
82 | 82 | { |
83 | - dir_delete ($path); |
|
84 | - dir_create ($path); |
|
83 | + dir_delete($path); |
|
84 | + dir_create($path); |
|
85 | 85 | } |
86 | 86 | |
87 | -function dir_copy (string $from, string $to): bool |
|
87 | +function dir_copy(string $from, string $to): bool |
|
88 | 88 | { |
89 | - if (!is_dir ($from)) |
|
89 | + if (!is_dir($from)) |
|
90 | 90 | return false; |
91 | 91 | |
92 | - if (!is_dir ($to)) |
|
93 | - dir_create ($to); |
|
92 | + if (!is_dir($to)) |
|
93 | + dir_create($to); |
|
94 | 94 | |
95 | - foreach (array_slice (scandir ($from), 2) as $file) |
|
96 | - if (is_dir ($f = $from .'/'. $file)) |
|
97 | - dir_copy ($f, $to .'/'. $file); |
|
95 | + foreach (array_slice(scandir($from), 2) as $file) |
|
96 | + if (is_dir($f = $from.'/'.$file)) |
|
97 | + dir_copy($f, $to.'/'.$file); |
|
98 | 98 | |
99 | - else copy ($f, $to .'/'. $file); |
|
99 | + else copy($f, $to.'/'.$file); |
|
100 | 100 | |
101 | 101 | return true; |
102 | 102 | } |
103 | 103 | |
104 | -function argb (string $color) |
|
104 | +function argb(string $color) |
|
105 | 105 | { |
106 | - return (new NetClass ('System.Drawing.ColorTranslator'))->fromHtml ($color); |
|
106 | + return (new NetClass('System.Drawing.ColorTranslator'))->fromHtml($color); |
|
107 | 107 | } |
108 | 108 | |
109 | -function replaceSl (string $string): string |
|
109 | +function replaceSl(string $string): string |
|
110 | 110 | { |
111 | - return str_replace ('\\', '/', $string); |
|
111 | + return str_replace('\\', '/', $string); |
|
112 | 112 | } |
113 | 113 | |
114 | -function replaceSr (string $string): string |
|
114 | +function replaceSr(string $string): string |
|
115 | 115 | { |
116 | - return str_replace ('/', '\\', $string); |
|
116 | + return str_replace('/', '\\', $string); |
|
117 | 117 | } |
118 | 118 | |
119 | -function basenameNoExt (string $path): string |
|
119 | +function basenameNoExt(string $path): string |
|
120 | 120 | { |
121 | - return pathinfo ($path, PATHINFO_FILENAME); |
|
121 | + return pathinfo($path, PATHINFO_FILENAME); |
|
122 | 122 | } |
123 | 123 | |
124 | -function file_ext (string $path): string |
|
124 | +function file_ext(string $path): string |
|
125 | 125 | { |
126 | - return strtolower (pathinfo ($path, PATHINFO_EXTENSION)); |
|
126 | + return strtolower(pathinfo($path, PATHINFO_EXTENSION)); |
|
127 | 127 | } |
128 | 128 | |
129 | -function filepathNoExt (string $path): string |
|
129 | +function filepathNoExt(string $path): string |
|
130 | 130 | { |
131 | - return dirname ($path) .'/'. basenameNoExt ($path); |
|
131 | + return dirname($path).'/'.basenameNoExt($path); |
|
132 | 132 | } |
133 | 133 | |
134 | -function pre (...$args): void |
|
134 | +function pre(...$args): void |
|
135 | 135 | { |
136 | - message (sizeof ($args) < 2 ? current ($args) : $args); |
|
136 | + message(sizeof($args) < 2 ? current ($args) : $args); |
|
137 | 137 | } |
138 | 138 | |
139 | -function messageBox (string $message, string $caption = '', ...$args): int |
|
139 | +function messageBox(string $message, string $caption = '', ...$args): int |
|
140 | 140 | { |
141 | - return (new MessageBox)->show ($message, $caption, ...$args); |
|
141 | + return (new MessageBox)->show($message, $caption, ...$args); |
|
142 | 142 | } |
143 | 143 | |
144 | -function run (string $path, ...$args) |
|
144 | +function run(string $path, ...$args) |
|
145 | 145 | { |
146 | - return (new Process)->start ($path, ...$args); |
|
146 | + return (new Process)->start($path, ...$args); |
|
147 | 147 | } |
148 | 148 | |
149 | -function setTimer (int $interval, callable $function): Timer |
|
149 | +function setTimer(int $interval, callable $function): Timer |
|
150 | 150 | { |
151 | 151 | $timer = new Timer; |
152 | 152 | $timer->interval = $interval; |
153 | - $timer->tickEvent = fn ($self) => $function ($self); |
|
153 | + $timer->tickEvent = fn($self) => $function($self); |
|
154 | 154 | |
155 | - $timer->start (); |
|
155 | + $timer->start(); |
|
156 | 156 | |
157 | 157 | return $timer; |
158 | 158 | } |
159 | 159 | |
160 | -function setTimeout (int $timeout, callable $function): Timer |
|
160 | +function setTimeout(int $timeout, callable $function): Timer |
|
161 | 161 | { |
162 | 162 | $timer = new Timer; |
163 | 163 | $timer->interval = $timeout; |
164 | - $timer->tickEvent = function ($self) use ($function) |
|
164 | + $timer->tickEvent = function($self) use ($function) |
|
165 | 165 | { |
166 | - $self->stop (); |
|
166 | + $self->stop(); |
|
167 | 167 | |
168 | - $function ($self); |
|
168 | + $function($self); |
|
169 | 169 | }; |
170 | 170 | |
171 | - $timer->start (); |
|
171 | + $timer->start(); |
|
172 | 172 | |
173 | 173 | return $timer; |
174 | 174 | } |
175 | 175 | |
176 | -set_error_handler (function ($no, $str, $file, $line) |
|
176 | +set_error_handler(function($no, $str, $file, $line) |
|
177 | 177 | { |
178 | 178 | // Мог ли я здесь сделать более адекватный код с использованием pow/sqrt? Да, мог |
179 | 179 | // Почему не сделал? Скорость важнее |
@@ -195,7 +195,7 @@ discard block |
||
195 | 195 | 16384 => 'E_USER_DEPRECATED' |
196 | 196 | ]; |
197 | 197 | |
198 | - message ([ |
|
198 | + message([ |
|
199 | 199 | 'type' => $errarr[$no], |
200 | 200 | 'text' => $str, |
201 | 201 | 'file' => $file, |
@@ -9,12 +9,11 @@ discard block |
||
9 | 9 | try |
10 | 10 | { |
11 | 11 | $object = new NetObject (...$args); |
12 | - } |
|
13 | - |
|
14 | - catch (\WinformsException $e) |
|
12 | + } catch (\WinformsException $e) |
|
15 | 13 | { |
16 | - if (VoidCore::callMethod ($e->getNetException (), 'ToString') == 'System.MemberAccessException') |
|
17 | - throw $e; |
|
14 | + if (VoidCore::callMethod ($e->getNetException (), 'ToString') == 'System.MemberAccessException') { |
|
15 | + throw $e; |
|
16 | + } |
|
18 | 17 | |
19 | 18 | $object = new NetClass (...$args); |
20 | 19 | } |
@@ -32,9 +31,7 @@ discard block |
||
32 | 31 | try |
33 | 32 | { |
34 | 33 | return VoidCore::callMethod (VoidCore::getClass ('System.Enum'), ['parse', VC_OBJECT], VoidCore::typeof ($baseType), $value, true); |
35 | - } |
|
36 | - |
|
37 | - catch (\WinformsException $e) |
|
34 | + } catch (\WinformsException $e) |
|
38 | 35 | { |
39 | 36 | return (new NetClass ($baseType))->$value; |
40 | 37 | } |
@@ -45,34 +42,39 @@ discard block |
||
45 | 42 | $array = (new NetClass ('System.Array')) |
46 | 43 | ->createInstance (VoidCore::typeof ($type), $size = sizeof ($items)); |
47 | 44 | |
48 | - for ($i = 0; $i < $size; ++$i) |
|
49 | - $array[$i] = array_shift ($items); |
|
45 | + for ($i = 0; $i < $size; ++$i) { |
|
46 | + $array[$i] = array_shift ($items); |
|
47 | + } |
|
50 | 48 | |
51 | 49 | return $array; |
52 | 50 | } |
53 | 51 | |
54 | 52 | function dir_create (string $path, int $mode = 0777): void |
55 | 53 | { |
56 | - if (!is_dir ($path)) |
|
57 | - mkdir ($path, $mode, true); |
|
58 | -} |
|
54 | + if (!is_dir ($path)) { |
|
55 | + mkdir ($path, $mode, true); |
|
56 | + } |
|
57 | + } |
|
59 | 58 | |
60 | 59 | function dir_delete (string $path): bool |
61 | 60 | { |
62 | - if (!is_dir ($path)) |
|
63 | - return false; |
|
61 | + if (!is_dir ($path)) { |
|
62 | + return false; |
|
63 | + } |
|
64 | 64 | |
65 | - foreach (array_slice (scandir ($path), 2) as $file) |
|
66 | - if (is_dir ($file = $path .'/'. $file)) |
|
65 | + foreach (array_slice (scandir ($path), 2) as $file) { |
|
66 | + if (is_dir ($file = $path .'/'. $file)) |
|
67 | 67 | { |
68 | 68 | dir_delete ($file); |
69 | + } |
|
69 | 70 | |
70 | - if (is_dir ($file)) |
|
71 | - rmdir ($file); |
|
71 | + if (is_dir ($file)) { |
|
72 | + rmdir ($file); |
|
73 | + } |
|
74 | + } else { |
|
75 | + unlink ($file); |
|
72 | 76 | } |
73 | 77 | |
74 | - else unlink ($file); |
|
75 | - |
|
76 | 78 | rmdir ($path); |
77 | 79 | |
78 | 80 | return true; |
@@ -86,17 +88,22 @@ discard block |
||
86 | 88 | |
87 | 89 | function dir_copy (string $from, string $to): bool |
88 | 90 | { |
89 | - if (!is_dir ($from)) |
|
90 | - return false; |
|
91 | + if (!is_dir ($from)) { |
|
92 | + return false; |
|
93 | + } |
|
91 | 94 | |
92 | - if (!is_dir ($to)) |
|
93 | - dir_create ($to); |
|
95 | + if (!is_dir ($to)) { |
|
96 | + dir_create ($to); |
|
97 | + } |
|
94 | 98 | |
95 | - foreach (array_slice (scandir ($from), 2) as $file) |
|
96 | - if (is_dir ($f = $from .'/'. $file)) |
|
99 | + foreach (array_slice (scandir ($from), 2) as $file) { |
|
100 | + if (is_dir ($f = $from .'/'. $file)) |
|
97 | 101 | dir_copy ($f, $to .'/'. $file); |
102 | + } |
|
98 | 103 | |
99 | - else copy ($f, $to .'/'. $file); |
|
104 | + else { |
|
105 | + copy ($f, $to .'/'. $file); |
|
106 | + } |
|
100 | 107 | |
101 | 108 | return true; |
102 | 109 | } |