winforms-php / VoidFramework

after_install.php

Braces +12 added lines, -7 removed lines

@@ -4,17 +4,22 @@
 
 function dir_copy (string $from, string $to): bool
 {
-    if (!is_dir ($from))
-        return false;
+    if (!is_dir ($from)) {
+            return false;
+    }
 
-    if (!is_dir ($to))
-        dir_create ($to);
+    if (!is_dir ($to)) {
+            dir_create ($to);
+    }
 
-    foreach (array_slice (scandir ($from), 2) as $file)
-        if (is_dir ($f = $from .'/'. $file))
+    foreach (array_slice (scandir ($from), 2) as $file) {
+            if (is_dir ($f = $from .'/'. $file))
             dir_copy ($f, $to .'/'. $file);
+    }
 
-        else copy ($f, $to .'/'. $file);
+        else {
+            copy ($f, $to .'/'. $file);
+        }
 
     return true;
 }

Indentation +1 added lines, -1 removed lines

@@ -40,4 +40,4 @@
 unlink (__FILE__);
 
 echo '    Configuration completed'. PHP_EOL .
-     '    Thank for installing winforms-php/VoidFramework!'. PHP_EOL . PHP_EOL;
+        '    Thank for installing winforms-php/VoidFramework!'. PHP_EOL . PHP_EOL;

Spacing +21 added lines, -21 removed lines

@@ -1,44 +1,44 @@
 <?php
 
-echo '    Configuring VoidFramework...'. PHP_EOL;
+echo '    Configuring VoidFramework...'.PHP_EOL;
 
-function dir_copy (string $from, string $to): bool
+function dir_copy(string $from, string $to): bool
 {
-    if (!is_dir ($from))
+    if (!is_dir($from))
         return false;
 
-    if (!is_dir ($to))
-        dir_create ($to);
+    if (!is_dir($to))
+        dir_create($to);
 
-    foreach (array_slice (scandir ($from), 2) as $file)
-        if (is_dir ($f = $from .'/'. $file))
-            dir_copy ($f, $to .'/'. $file);
+    foreach (array_slice(scandir($from), 2) as $file)
+        if (is_dir($f = $from.'/'.$file))
+            dir_copy($f, $to.'/'.$file);
 
-        else copy ($f, $to .'/'. $file);
+        else copy($f, $to.'/'.$file);
 
     return true;
 }
 
-$info = file_exists (QERO_DIR .'/qero-info.json') ?
-    json_decode (file_get_contents (QERO_DIR .'/qero-info.json'), true) : array ();
+$info = file_exists(QERO_DIR.'/qero-info.json') ?
+    json_decode (file_get_contents(QERO_DIR.'/qero-info.json'), true) : array();
 
 $info['scripts']['start'] = '"qero-packages/winforms-php/VoidFramework/core/VoidCore.exe" "app/start.php"';
 
-file_put_contents (QERO_DIR .'/qero-info.json', json_encode ($info, defined ('JSON_PRETTY_PRINT') ?
+file_put_contents(QERO_DIR.'/qero-info.json', json_encode($info, defined('JSON_PRETTY_PRINT') ?
     constant ('JSON_PRETTY_PRINT') : 0));
-file_put_contents (QERO_DIR .'/start.bat', '@echo off
+file_put_contents(QERO_DIR.'/start.bat', '@echo off
 '. $info['scripts']['start']);
 
-if (!is_dir (QERO_DIR .'/app'))
+if (!is_dir(QERO_DIR.'/app'))
 {
-    echo '    Configuring application...'. PHP_EOL;
+    echo '    Configuring application...'.PHP_EOL;
 
-    mkdir (QERO_DIR .'/app');
-    dir_copy (__DIR__ .'/app_bundle', QERO_DIR .'/app');
+    mkdir(QERO_DIR.'/app');
+    dir_copy(__DIR__.'/app_bundle', QERO_DIR.'/app');
 }
 
-Qero\dir_delete (__DIR__ .'/app_bundle');
-unlink (__FILE__);
+Qero\dir_delete(__DIR__.'/app_bundle');
+unlink(__FILE__);
 
-echo '    Configuration completed'. PHP_EOL .
-     '    Thank for installing winforms-php/VoidFramework!'. PHP_EOL . PHP_EOL;
+echo '    Configuration completed'.PHP_EOL.
+     '    Thank for installing winforms-php/VoidFramework!'.PHP_EOL.PHP_EOL;

engine/common/Constants.php

Braces +2 added lines, -1 removed lines

@@ -338,8 +338,9 @@
 	'clLight'  	  => $converter->fromHtml ('#EEEEEE')
 ];
 
-foreach ($constants as $name => $value)
+foreach ($constants as $name => $value) {
 	define ($name, $value);
+}
 
 $argv = START_PARAMS;
 $argc = sizeof ($argv);

Indentation +299 added lines, -299 removed lines

@@ -8,338 +8,338 @@
 $converter = new NetClass ('System.Drawing.ColorTranslator');
 
 $constants = [
-	# Информация об окружении
+    # Информация об окружении
 	
-	'EXE_NAME'     => $APPLICATION->executablePath,
-	'DOC_ROOT'     => dirname ($APPLICATION->executablePath),
-	'IS_ADMIN'     => is_writable (getenv ('SystemRoot')),
-	'START_PARAMS' => $params,
-	'USERNAME'	   => $env->username,
+    'EXE_NAME'     => $APPLICATION->executablePath,
+    'DOC_ROOT'     => dirname ($APPLICATION->executablePath),
+    'IS_ADMIN'     => is_writable (getenv ('SystemRoot')),
+    'START_PARAMS' => $params,
+    'USERNAME'	   => $env->username,
 
-	# Константы MessageBox'а
+    # Константы MessageBox'а
 	
-	'MB_YESNO' 			  => 4,
-	'MB_YESNOCANCEL' 	  => 3,
-	'MB_OK' 			  => 0,
-	'MB_OKCANCEL' 		  => 1,
-	'MB_RETRYCANCEL' 	  => 5,
-	'MB_ABORTRETRYIGNORE' => 2,
-	'MBI_ASTERISK' 		  => 64,
-	'MBI_ERROR' 		  => 16,
-	'MBI_EXCLAMATION' 	  => 48,
-	'MBI_HAND' 			  => 16,
-	'MBI_INFORMATION' 	  => 64,
-	'MBI_NONE' 			  => 0,
-	'MBI_QUESTION' 		  => 32,
-	'MBI_STOP' 			  => 16,
-	'MBI_WARNING' 		  => 48,
-	'MBDB_1' 			  => 0,
-	'MBDB_2' 			  => 256,
-	'MBDB_3' 			  => 512,
+    'MB_YESNO' 			  => 4,
+    'MB_YESNOCANCEL' 	  => 3,
+    'MB_OK' 			  => 0,
+    'MB_OKCANCEL' 		  => 1,
+    'MB_RETRYCANCEL' 	  => 5,
+    'MB_ABORTRETRYIGNORE' => 2,
+    'MBI_ASTERISK' 		  => 64,
+    'MBI_ERROR' 		  => 16,
+    'MBI_EXCLAMATION' 	  => 48,
+    'MBI_HAND' 			  => 16,
+    'MBI_INFORMATION' 	  => 64,
+    'MBI_NONE' 			  => 0,
+    'MBI_QUESTION' 		  => 32,
+    'MBI_STOP' 			  => 16,
+    'MBI_WARNING' 		  => 48,
+    'MBDB_1' 			  => 0,
+    'MBDB_2' 			  => 256,
+    'MBDB_3' 			  => 512,
 	
-	# Константы DialogResult
+    # Константы DialogResult
 	
-	'drOk'	   => 1,
-	'drYes'    => 6,
-	'drNo' 	   => 7,
-	'drCancel' => 2,
-	'drRetry'  => 4,
-	'drAbort'  => 3,
-	'drIgnore' => 5,
-	'drNone'   => 0,
+    'drOk'	   => 1,
+    'drYes'    => 6,
+    'drNo' 	   => 7,
+    'drCancel' => 2,
+    'drRetry'  => 4,
+    'drAbort'  => 3,
+    'drIgnore' => 5,
+    'drNone'   => 0,
 	
-	# Константы форм
+    # Константы форм
 	
-	'fbsNone'			   => 0,
-	'fbsSingle'			   => 1,
-	'fbs3D'				   => 2,
-	'fbsDialog'			   => 3,
-	'fbsSizable'		   => 4,
-	'fbsToolWindow'		   => 5,
-	'fbsSizableToolWindow' => 6,
-
-	'fwsNormal'	   => 0,
-	'fwsMinimized' => 1,
-	'fwsMaximized' => 2,
-
-	'fspManual' 				=> 0,
-	'fspCenterScreen' 			=> 1,
-	'fspWindowsDefaultLocation' => 2,
-	'fspWindowsDefaultBounds'   => 3,
-	'fspCenterParent' 			=> 4,
-
-	# Константы стиля оконтовки
-
-	'bsNone' 		=> 0,
-	'bsFixedSingle' => 1,
-	'bsFixed3D' 	=> 2,
-
-	# Константы выравнивания
-
-	'alTopLeft' 	 => 1,
-	'alTopCenter' 	 => 2,
-	'alTopRight' 	 => 4,
-	'alMiddleLeft' 	 => 16,
-	'alMiddleCenter' => 32,
-	'alMiddleRight'  => 64,
-	'alBottomLeft' 	 => 256,
-	'alBottomCenter' => 512,
-	'alBottomRight'  => 1024,
-
-	# Константы притягивания (Anchor)
-
-	'acNone'   => 0,
-	'acTop'	   => 1,
-	'acBottom' => 2,
-	'acLeft'   => 4,
-	'acRight'  => 8,
-
-	# Константы SizeMode-параметра PictureBox'а
-
-	'smNormal' 		 => 0,
-	'smStretchImage' => 1,
-	'smAutoSize' 	 => 2,
-	'smCenterImage'  => 3,
-	'smZoom' 		 => 4,
-
-	# Константы View-параметра ListView'а
+    'fbsNone'			   => 0,
+    'fbsSingle'			   => 1,
+    'fbs3D'				   => 2,
+    'fbsDialog'			   => 3,
+    'fbsSizable'		   => 4,
+    'fbsToolWindow'		   => 5,
+    'fbsSizableToolWindow' => 6,
+
+    'fwsNormal'	   => 0,
+    'fwsMinimized' => 1,
+    'fwsMaximized' => 2,
+
+    'fspManual' 				=> 0,
+    'fspCenterScreen' 			=> 1,
+    'fspWindowsDefaultLocation' => 2,
+    'fspWindowsDefaultBounds'   => 3,
+    'fspCenterParent' 			=> 4,
+
+    # Константы стиля оконтовки
+
+    'bsNone' 		=> 0,
+    'bsFixedSingle' => 1,
+    'bsFixed3D' 	=> 2,
+
+    # Константы выравнивания
+
+    'alTopLeft' 	 => 1,
+    'alTopCenter' 	 => 2,
+    'alTopRight' 	 => 4,
+    'alMiddleLeft' 	 => 16,
+    'alMiddleCenter' => 32,
+    'alMiddleRight'  => 64,
+    'alBottomLeft' 	 => 256,
+    'alBottomCenter' => 512,
+    'alBottomRight'  => 1024,
+
+    # Константы притягивания (Anchor)
+
+    'acNone'   => 0,
+    'acTop'	   => 1,
+    'acBottom' => 2,
+    'acLeft'   => 4,
+    'acRight'  => 8,
+
+    # Константы SizeMode-параметра PictureBox'а
+
+    'smNormal' 		 => 0,
+    'smStretchImage' => 1,
+    'smAutoSize' 	 => 2,
+    'smCenterImage'  => 3,
+    'smZoom' 		 => 4,
+
+    # Константы View-параметра ListView'а
 	
-	'vwLargeIcon' => 0,
-	'vwDetails'	  => 1,
-	'vwSmallIcon' => 2,
-	'vwList' 	  => 3,
-	'vwTile' 	  => 4,
+    'vwLargeIcon' => 0,
+    'vwDetails'	  => 1,
+    'vwSmallIcon' => 2,
+    'vwList' 	  => 3,
+    'vwTile' 	  => 4,
 
-	# Константы dropDownStyle компонента ComboBox
+    # Константы dropDownStyle компонента ComboBox
 
-	'ddSimple'		 => 0,
-	'ddDropDown' 	 => 1,
-	'ddDropDownList' => 2,
+    'ddSimple'		 => 0,
+    'ddDropDown' 	 => 1,
+    'ddDropDownList' => 2,
 
-	# Константы причины закрытия формы
+    # Константы причины закрытия формы
 	
-	'fcrNone'                => 0,
-	'fcrWindowsShutDown'     => 1,
-	'fcrMdiFormClosing'      => 2,
-	'fcrUserClosing'         => 3,
-	'fcrTaskManagerClosing'  => 4,
-	'fcrFormOwnerClosing'    => 5,
-	'fcrApplicationExitCall' => 6,
+    'fcrNone'                => 0,
+    'fcrWindowsShutDown'     => 1,
+    'fcrMdiFormClosing'      => 2,
+    'fcrUserClosing'         => 3,
+    'fcrTaskManagerClosing'  => 4,
+    'fcrFormOwnerClosing'    => 5,
+    'fcrApplicationExitCall' => 6,
 	
-	# Константы дока
+    # Константы дока
 	
-	'dsBottom' => 2,
-	'dsFill'   => 5,
-	'dsLeft'   => 3,
-	'dsNone'   => 0,
-	'dsRight'  => 4,
-	'dsTop'    => 1,
+    'dsBottom' => 2,
+    'dsFill'   => 5,
+    'dsLeft'   => 3,
+    'dsNone'   => 0,
+    'dsRight'  => 4,
+    'dsTop'    => 1,
 	
-	# Константы FCTB.Language
+    # Константы FCTB.Language
 	
-	'langCSharp' => 1,
-	'langCustom' => 2,
-	'langHTML' 	 => 3,
-	'langJS' 	 => 4,
-	'langLua'	 => 5,
-	'langPHP' 	 => 6,
-	'langSQL' 	 => 7,
-	'langVB' 	 => 8,
-	'langXML' 	 => 9,
+    'langCSharp' => 1,
+    'langCustom' => 2,
+    'langHTML' 	 => 3,
+    'langJS' 	 => 4,
+    'langLua'	 => 5,
+    'langPHP' 	 => 6,
+    'langSQL' 	 => 7,
+    'langVB' 	 => 8,
+    'langXML' 	 => 9,
 	
-	# Константы видимости окна процесса
+    # Константы видимости окна процесса
 	
-	'pwsHidden'    => 0,
-	'pwsMaximized' => 3,
-	'pwsMinimized' => 2,
-	'pwsNormal'    => 1,
+    'pwsHidden'    => 0,
+    'pwsMaximized' => 3,
+    'pwsMinimized' => 2,
+    'pwsNormal'    => 1,
 	
-	# Константы запуска
+    # Константы запуска
 	
-	'runNo'     => 0,
-	'runYes'    => 1,
-	'runThread' => 2,
+    'runNo'     => 0,
+    'runYes'    => 1,
+    'runThread' => 2,
 
-	# Константы стиля ProgressBar'а
+    # Константы стиля ProgressBar'а
 
-	'pbBlocks'	   => 0,
-	'pbContinuous' => 1,
-	'pbMarquee'    => 2,
+    'pbBlocks'	   => 0,
+    'pbContinuous' => 1,
+    'pbMarquee'    => 2,
 
-	# Константы свойства FlatStyle
+    # Константы свойства FlatStyle
 	
-	'flFlat'	 => 0,
-	'flPopup'	 => 1,
-	'flStandard' => 2,
-	'flSystem'   => 3,
+    'flFlat'	 => 0,
+    'flPopup'	 => 1,
+    'flStandard' => 2,
+    'flSystem'   => 3,
 
-	# Константы свойства DrawMode
+    # Константы свойства DrawMode
 
-	'dwNormal'			  => 0,
-	'dwOwnerDrawFixed'	  => 1,
-	'dwOwnerDrawVariable' => 2,
+    'dwNormal'			  => 0,
+    'dwOwnerDrawFixed'	  => 1,
+    'dwOwnerDrawVariable' => 2,
 
-	# Константы свойства SizeMode PictureBox'а
+    # Константы свойства SizeMode PictureBox'а
 
-	'smNormal' 		 => 0,
-	'smStretchImage' => 1,
-	'smAutoSize'	 => 2,
-	'smCenterImage'  => 3,
-	'smZoom'		 => 4,
+    'smNormal' 		 => 0,
+    'smStretchImage' => 1,
+    'smAutoSize'	 => 2,
+    'smCenterImage'  => 3,
+    'smZoom'		 => 4,
 
-	# Цветовые константы
+    # Цветовые константы
 	
-	'clAliceBlue'			 => 0xFFF0F8FF,
-	'clAntiqueWhite'		 => 0xFFFAEBD7,
-	'clAqua'				 => 0xFF00FFFF,
-	'clAquamarine'			 => 0xFF7FFFD4,
-	'clAzure'				 => 0xFFF0FFFF,
-	'clBeige'				 => 0xFFF5F5DC,
-	'clBisque'				 => 0xFFFFE4C4,
-	'clBlack'				 => 0xFF000000,
-	'clBlanchedAlmond'		 => 0xFFFFEBCD,
-	'clBlue'				 => 0xFF0000FF,
-	'clBlueViolet'			 => 0xFF8A2BE2,
-	'clBrown'				 => 0xFFA52A2A,
-	'clBurlyWood'			 => 0xFFDEB887,
-	'clCadetBlue' 			 => 0xFF5F9EA0,
-	'clChartreuse'			 => 0xFF7FFF00,
-	'clChocolate'			 => 0xFFD2691E,
-	'clCoral'				 => 0xFFFF7F50,
-	'clCornflowerBlue'		 => 0xFF6495ED,
-	'clCornsilk'			 => 0xFFFFF8DC,
-	'clCrimson'				 => 0xFFDC143C,
-	'clCyan'				 => 0xFF00FFFF,
-	'clDarkBlue'			 => 0xFF00008B,
-	'clDarkCyan'			 => 0xFF008B8B,
-	'clDarkGoldenrod'		 => 0xFFB8860B,
-	'clDarkGray'			 => 0xFFA9A9A9,
-	'clDarkGreen'			 => 0xFF006400,
-	'clDarkKhaki'			 => 0xFFBDB76B,
-	'clDarkMagenta'			 => 0xFF8B008B,
-	'clDarkOliveGreen'		 => 0xFF556B2F,
-	'clDarkOrange'			 => 0xFFFF8C00,
-	'clDarkOrchid'			 => 0xFF9932CC,
-	'clDarkRed'				 => 0xFF8B0000,
-	'clDarkSalmon'			 => 0xFFE9967A,
-	'clDarkSeaGreen'		 => 0xFF8FBC8F,
-	'clDarkSlateBlue'		 => 0xFF483D8B,
-	'clDarkSlateGray'		 => 0xFF2F4F4F,
-	'clDarkTurquoise'		 => 0xFF00CED1,
-	'clDarkViolet'			 => 0xFF9400D3,
-	'clDeepPink'			 => 0xFFFF1493,
-	'clDeepSkyBlue'			 => 0xFF00BFFF,
-	'clDimGray'				 => 0xFF696969,
-	'clDodgerBlue'			 => 0xFF1E90FF,
-	'clFirebrick'			 => 0xFFB22222,
-	'clFloralWhite'			 => 0xFFFFFAF0,
-	'clForestGreen'			 => 0xFF228B22,
-	'clFuchsia'				 => 0xFFFF00FF,
-	'clGainsboro'			 => 0xFFDCDCDC,
-	'clGhostWhite'			 => 0xFFF8F8FF,
-	'clGold'				 => 0xFFFFD700,
-	'clGoldenrod'			 => 0xFFDAA520,
-	'clGray'				 => 0xFF808080,
-	'clGreen'				 => 0xFF008000,
-	'clGreenYellow'			 => 0xFFADFF2F,
-	'clHoneydew'			 => 0xFFF0FFF0,
-	'clHotPink'				 => 0xFFFF69B4,
-	'clIndianRed'			 => 0xFFCD5C5C,
-	'clIndigo'				 => 0xFF4B0082,
-	'clIvory'				 => 0xFFFFFFF0,
-	'clKhaki'				 => 0xFFF0E68C,
-	'clLavender'			 => 0xFFE6E6FA,
-	'clLavenderBlush'		 => 0xFFFFF0F5,
-	'clLawnGreen'			 => 0xFF7CFC00,
-	'clLemonChiffon'		 => 0xFFFFFACD,
-	'clLightBlue'			 => 0xFFADD8E6,
-	'clLightCoral'			 => 0xFFF08080,
-	'clLightCyan'			 => 0xFFE0FFFF,
-	'clLightGoldenrodYellow' => 0xFFFAFAD2,
-	'clLightGray' 			 => 0xFFD3D3D3,
-	'clLightGreen'			 => 0xFF90EE90,
-	'clLightPink' 			 => 0xFFFFB6C1,
-	'clLightSalmon'			 => 0xFFFFA07A,
-	'clLightSeaGreen'		 => 0xFF20B2AA,
-	'clLightSkyBlue'		 => 0xFF87CEFA,
-	'clLightSlateGray'		 => 0xFF778899,
-	'clLightSteelBlue'		 => 0xFFB0C4DE,
-	'clLightYellow'			 => 0xFFFFFFE0,
-	'clLime'				 => 0xFF00FF00,
-	'clLimeGreen'			 => 0xFF32CD32,
-	'clLinen'				 => 0xFFFAF0E6,
-	'clMagenta'				 => 0xFFFF00FF,
-	'clMaroon'				 => 0xFF800000,
-	'clMediumAquamarine'	 => 0xFF66CDAA,
-	'clMediumBlue' 			 => 0xFF0000CD,
-	'clMediumOrchid'		 => 0xFFBA55D3,
-	'clMediumPurple'		 => 0xFF9370DB,
-	'clMediumSeaGreen'		 => 0xFF3CB371,
-	'clMediumSlateBlue'		 => 0xFF7B68EE,
-	'clMediumSpringGreen'	 => 0xFF00FA9A,
-	'clMediumTurquoise'		 => 0xFF48D1CC,
-	'clMediumVioletRed'		 => 0xFFC71585,
-	'clMidnightBlue'		 => 0xFF191970,
-	'clMintCream'			 => 0xFFF5FFFA,
-	'clMistyRose'			 => 0xFFFFE4E1,
-	'clMoccasin'			 => 0xFFFFE4B5,
-	'clNavajoWhite'			 => 0xFFFFDEAD,
-	'clNavy'				 => 0xFF000080,
-	'clOldLace'				 => 0xFFFDF5E6,
-	'clOlive'				 => 0xFF808000,
-	'clOliveDrab'			 => 0xFF6B8E23,
-	'clOrange'				 => 0xFFFFA500,
-	'clOrangeRed'			 => 0xFFFF4500,
-	'clOrchid'				 => 0xFFDA70D6,
-	'clPaleGoldenrod'		 => 0xFFEEE8AA,
-	'clPaleGreen'			 => 0xFF98FB98,
-	'clPaleTurquoise'		 => 0xFFAFEEEE,
-	'clPaleVioletRed'		 => 0xFFDB7093,
-	'clPapayaWhip'			 => 0xFFFFEFD5,
-	'clPeachPuff'			 => 0xFFFFDAB9,
-	'clPeru'				 => 0xFFCD853F,
-	'clPink'				 => 0xFFFFC0CB,
-	'clPlum'				 => 0xFFDDA0DD,
-	'clPowderBlue'			 => 0xFFB0E0E6,
-	'clPurple'				 => 0xFF800080,
-	'clRed'					 => 0xFFFF0000,
-	'clRosyBrown'			 => 0xFFBC8F8F,
-	'clRoyalBlue'			 => 0xFF4169E1,
-	'clSaddleBrown'			 => 0xFF8B4513,
-	'clSalmon'				 => 0xFFFA8072,
-	'clSandyBrown'			 => 0xFFF4A460,
-	'clSeaGreen'			 => 0xFF2E8B57,
-	'clSeaShell'			 => 0xFFFFF5EE,
-	'clSienna'				 => 0xFFA0522D,
-	'clSilver'				 => 0xFFC0C0C0,
-	'clSkyBlue'				 => 0xFF87CEEB,
-	'clSlateBlue'			 => 0xFF6A5ACD,
-	'clSlateGray'			 => 0xFF708090,
-	'clSnow'				 => 0xFFFFFAFA,
-	'clSpringGreen'			 => 0xFF00FF7F,
-	'clSteelBlue'			 => 0xFF4682B4,
-	'clTan'					 => 0xFFD2B48C,
-	'clTeal'				 => 0xFF008080,
-	'clThistle'				 => 0xFFD8BFD8,
-	'clTomato'				 => 0xFFFF6347,
-	'clTurquoise'			 => 0xFF40E0D0,
-	'clViolet'				 => 0xFFEE82EE,
-	'clWheat'				 => 0xFFF5DEB3,
-	'clWhite'				 => 0xFFFFFFFF,
-	'clWhiteSmoke'			 => 0xFFF5F5F5,
-	'clYellow'				 => 0xFFFFFF00,
-	'clYellowGreen'			 => 0xFF9ACD32,
-
-	# Моя подборка цветов
-
-	'clDark'	  => $converter->fromHtml ('#0D0F12'),
-	'clDark2'	  => $converter->fromHtml ('#121416'),
-	'clTurquoise' => $converter->fromHtml ('#00ADB5'),
-	'clLight'  	  => $converter->fromHtml ('#EEEEEE')
+    'clAliceBlue'			 => 0xFFF0F8FF,
+    'clAntiqueWhite'		 => 0xFFFAEBD7,
+    'clAqua'				 => 0xFF00FFFF,
+    'clAquamarine'			 => 0xFF7FFFD4,
+    'clAzure'				 => 0xFFF0FFFF,
+    'clBeige'				 => 0xFFF5F5DC,
+    'clBisque'				 => 0xFFFFE4C4,
+    'clBlack'				 => 0xFF000000,
+    'clBlanchedAlmond'		 => 0xFFFFEBCD,
+    'clBlue'				 => 0xFF0000FF,
+    'clBlueViolet'			 => 0xFF8A2BE2,
+    'clBrown'				 => 0xFFA52A2A,
+    'clBurlyWood'			 => 0xFFDEB887,
+    'clCadetBlue' 			 => 0xFF5F9EA0,
+    'clChartreuse'			 => 0xFF7FFF00,
+    'clChocolate'			 => 0xFFD2691E,
+    'clCoral'				 => 0xFFFF7F50,
+    'clCornflowerBlue'		 => 0xFF6495ED,
+    'clCornsilk'			 => 0xFFFFF8DC,
+    'clCrimson'				 => 0xFFDC143C,
+    'clCyan'				 => 0xFF00FFFF,
+    'clDarkBlue'			 => 0xFF00008B,
+    'clDarkCyan'			 => 0xFF008B8B,
+    'clDarkGoldenrod'		 => 0xFFB8860B,
+    'clDarkGray'			 => 0xFFA9A9A9,
+    'clDarkGreen'			 => 0xFF006400,
+    'clDarkKhaki'			 => 0xFFBDB76B,
+    'clDarkMagenta'			 => 0xFF8B008B,
+    'clDarkOliveGreen'		 => 0xFF556B2F,
+    'clDarkOrange'			 => 0xFFFF8C00,
+    'clDarkOrchid'			 => 0xFF9932CC,
+    'clDarkRed'				 => 0xFF8B0000,
+    'clDarkSalmon'			 => 0xFFE9967A,
+    'clDarkSeaGreen'		 => 0xFF8FBC8F,
+    'clDarkSlateBlue'		 => 0xFF483D8B,
+    'clDarkSlateGray'		 => 0xFF2F4F4F,
+    'clDarkTurquoise'		 => 0xFF00CED1,
+    'clDarkViolet'			 => 0xFF9400D3,
+    'clDeepPink'			 => 0xFFFF1493,
+    'clDeepSkyBlue'			 => 0xFF00BFFF,
+    'clDimGray'				 => 0xFF696969,
+    'clDodgerBlue'			 => 0xFF1E90FF,
+    'clFirebrick'			 => 0xFFB22222,
+    'clFloralWhite'			 => 0xFFFFFAF0,
+    'clForestGreen'			 => 0xFF228B22,
+    'clFuchsia'				 => 0xFFFF00FF,
+    'clGainsboro'			 => 0xFFDCDCDC,
+    'clGhostWhite'			 => 0xFFF8F8FF,
+    'clGold'				 => 0xFFFFD700,
+    'clGoldenrod'			 => 0xFFDAA520,
+    'clGray'				 => 0xFF808080,
+    'clGreen'				 => 0xFF008000,
+    'clGreenYellow'			 => 0xFFADFF2F,
+    'clHoneydew'			 => 0xFFF0FFF0,
+    'clHotPink'				 => 0xFFFF69B4,
+    'clIndianRed'			 => 0xFFCD5C5C,
+    'clIndigo'				 => 0xFF4B0082,
+    'clIvory'				 => 0xFFFFFFF0,
+    'clKhaki'				 => 0xFFF0E68C,
+    'clLavender'			 => 0xFFE6E6FA,
+    'clLavenderBlush'		 => 0xFFFFF0F5,
+    'clLawnGreen'			 => 0xFF7CFC00,
+    'clLemonChiffon'		 => 0xFFFFFACD,
+    'clLightBlue'			 => 0xFFADD8E6,
+    'clLightCoral'			 => 0xFFF08080,
+    'clLightCyan'			 => 0xFFE0FFFF,
+    'clLightGoldenrodYellow' => 0xFFFAFAD2,
+    'clLightGray' 			 => 0xFFD3D3D3,
+    'clLightGreen'			 => 0xFF90EE90,
+    'clLightPink' 			 => 0xFFFFB6C1,
+    'clLightSalmon'			 => 0xFFFFA07A,
+    'clLightSeaGreen'		 => 0xFF20B2AA,
+    'clLightSkyBlue'		 => 0xFF87CEFA,
+    'clLightSlateGray'		 => 0xFF778899,
+    'clLightSteelBlue'		 => 0xFFB0C4DE,
+    'clLightYellow'			 => 0xFFFFFFE0,
+    'clLime'				 => 0xFF00FF00,
+    'clLimeGreen'			 => 0xFF32CD32,
+    'clLinen'				 => 0xFFFAF0E6,
+    'clMagenta'				 => 0xFFFF00FF,
+    'clMaroon'				 => 0xFF800000,
+    'clMediumAquamarine'	 => 0xFF66CDAA,
+    'clMediumBlue' 			 => 0xFF0000CD,
+    'clMediumOrchid'		 => 0xFFBA55D3,
+    'clMediumPurple'		 => 0xFF9370DB,
+    'clMediumSeaGreen'		 => 0xFF3CB371,
+    'clMediumSlateBlue'		 => 0xFF7B68EE,
+    'clMediumSpringGreen'	 => 0xFF00FA9A,
+    'clMediumTurquoise'		 => 0xFF48D1CC,
+    'clMediumVioletRed'		 => 0xFFC71585,
+    'clMidnightBlue'		 => 0xFF191970,
+    'clMintCream'			 => 0xFFF5FFFA,
+    'clMistyRose'			 => 0xFFFFE4E1,
+    'clMoccasin'			 => 0xFFFFE4B5,
+    'clNavajoWhite'			 => 0xFFFFDEAD,
+    'clNavy'				 => 0xFF000080,
+    'clOldLace'				 => 0xFFFDF5E6,
+    'clOlive'				 => 0xFF808000,
+    'clOliveDrab'			 => 0xFF6B8E23,
+    'clOrange'				 => 0xFFFFA500,
+    'clOrangeRed'			 => 0xFFFF4500,
+    'clOrchid'				 => 0xFFDA70D6,
+    'clPaleGoldenrod'		 => 0xFFEEE8AA,
+    'clPaleGreen'			 => 0xFF98FB98,
+    'clPaleTurquoise'		 => 0xFFAFEEEE,
+    'clPaleVioletRed'		 => 0xFFDB7093,
+    'clPapayaWhip'			 => 0xFFFFEFD5,
+    'clPeachPuff'			 => 0xFFFFDAB9,
+    'clPeru'				 => 0xFFCD853F,
+    'clPink'				 => 0xFFFFC0CB,
+    'clPlum'				 => 0xFFDDA0DD,
+    'clPowderBlue'			 => 0xFFB0E0E6,
+    'clPurple'				 => 0xFF800080,
+    'clRed'					 => 0xFFFF0000,
+    'clRosyBrown'			 => 0xFFBC8F8F,
+    'clRoyalBlue'			 => 0xFF4169E1,
+    'clSaddleBrown'			 => 0xFF8B4513,
+    'clSalmon'				 => 0xFFFA8072,
+    'clSandyBrown'			 => 0xFFF4A460,
+    'clSeaGreen'			 => 0xFF2E8B57,
+    'clSeaShell'			 => 0xFFFFF5EE,
+    'clSienna'				 => 0xFFA0522D,
+    'clSilver'				 => 0xFFC0C0C0,
+    'clSkyBlue'				 => 0xFF87CEEB,
+    'clSlateBlue'			 => 0xFF6A5ACD,
+    'clSlateGray'			 => 0xFF708090,
+    'clSnow'				 => 0xFFFFFAFA,
+    'clSpringGreen'			 => 0xFF00FF7F,
+    'clSteelBlue'			 => 0xFF4682B4,
+    'clTan'					 => 0xFFD2B48C,
+    'clTeal'				 => 0xFF008080,
+    'clThistle'				 => 0xFFD8BFD8,
+    'clTomato'				 => 0xFFFF6347,
+    'clTurquoise'			 => 0xFF40E0D0,
+    'clViolet'				 => 0xFFEE82EE,
+    'clWheat'				 => 0xFFF5DEB3,
+    'clWhite'				 => 0xFFFFFFFF,
+    'clWhiteSmoke'			 => 0xFFF5F5F5,
+    'clYellow'				 => 0xFFFFFF00,
+    'clYellowGreen'			 => 0xFF9ACD32,
+
+    # Моя подборка цветов
+
+    'clDark'	  => $converter->fromHtml ('#0D0F12'),
+    'clDark2'	  => $converter->fromHtml ('#121416'),
+    'clTurquoise' => $converter->fromHtml ('#00ADB5'),
+    'clLight'  	  => $converter->fromHtml ('#EEEEEE')
 ];
 
 foreach ($constants as $name => $value)
-	define ($name, $value);
+    define ($name, $value);
 
 $argv = START_PARAMS;
 $argc = sizeof ($argv);

Spacing +12 added lines, -12 removed lines

@@ -2,17 +2,17 @@ 
 
 namespace VoidEngine;
 
-$env 	= new NetClass ('System.Environment', 'mscorlib');
-$params = $env->getCommandLineArgs ()->list;
+$env = new NetClass('System.Environment', 'mscorlib');
+$params = $env->getCommandLineArgs()->list;
 
-$converter = new NetClass ('System.Drawing.ColorTranslator');
+$converter = new NetClass('System.Drawing.ColorTranslator');
 
 $constants = [
 	# Информация об окружении
 	
 	'EXE_NAME'     => $APPLICATION->executablePath,
-	'DOC_ROOT'     => dirname ($APPLICATION->executablePath),
-	'IS_ADMIN'     => is_writable (getenv ('SystemRoot')),
+	'DOC_ROOT'     => dirname($APPLICATION->executablePath),
+	'IS_ADMIN'     => is_writable(getenv('SystemRoot')),
 	'START_PARAMS' => $params,
 	'USERNAME'	   => $env->username,
 
@@ -332,17 +332,17 @@ 
 
 	# Моя подборка цветов
 
-	'clDark'	  => $converter->fromHtml ('#0D0F12'),
-	'clDark2'	  => $converter->fromHtml ('#121416'),
-	'clTurquoise' => $converter->fromHtml ('#00ADB5'),
-	'clLight'  	  => $converter->fromHtml ('#EEEEEE')
+	'clDark'	  => $converter->fromHtml('#0D0F12'),
+	'clDark2'	  => $converter->fromHtml('#121416'),
+	'clTurquoise' => $converter->fromHtml('#00ADB5'),
+	'clLight'  	  => $converter->fromHtml('#EEEEEE')
 ];
 
 foreach ($constants as $name => $value)
-	define ($name, $value);
+	define($name, $value);
 
 $argv = START_PARAMS;
-$argc = sizeof ($argv);
+$argc = sizeof($argv);
 
-\VoidCore::removeObjects ($converter->selector);
+\VoidCore::removeObjects($converter->selector);
 unset ($constants, $env, $params, $converter);

app_bundle/start.php

Indentation +2 added lines, -2 removed lines

@@ -9,8 +9,8 @@
 
 # Подгружаем PHP расширения
 foreach (glob (CORE_DIR .'/ext/php_*.dll') as $ext)
-	if (!extension_loaded (substr (basename ($ext), 4, -4)))
-		load_extension ($ext);
+    if (!extension_loaded (substr (basename ($ext), 4, -4)))
+        load_extension ($ext);
 
 # Подгружаем Qero-пакеты
 require __DIR__ .'/../qero-packages/autoload.php';

Braces +2 added lines, -1 removed lines

@@ -8,9 +8,10 @@
 define ('VoidEngine\CORE_DIR', dirname (__DIR__) .'/qero-packages/winforms-php/VoidFramework/core');
 
 # Подгружаем PHP расширения
-foreach (glob (CORE_DIR .'/ext/php_*.dll') as $ext)
+foreach (glob (CORE_DIR .'/ext/php_*.dll') as $ext) {
 	if (!extension_loaded (substr (basename ($ext), 4, -4)))
 		load_extension ($ext);
+}
 
 # Подгружаем Qero-пакеты
 require __DIR__ .'/../qero-packages/autoload.php';

Spacing +9 added lines, -9 removed lines

@@ -15,22 +15,22 @@
 # Объявление констант
 const APP_DIR = __DIR__;
 
-define ('VoidEngine\CORE_DIR', dirname (__DIR__) .'/qero-packages/winforms-php/VoidFramework/core');
+define('VoidEngine\CORE_DIR', dirname(__DIR__).'/qero-packages/winforms-php/VoidFramework/core');
 
 # Подгружаем PHP расширения
-foreach (glob (CORE_DIR .'/ext/php_*.dll') as $ext)
-	if (!extension_loaded (substr (basename ($ext), 4, -4)))
-		load_extension ($ext);
+foreach (glob(CORE_DIR.'/ext/php_*.dll') as $ext)
+	if (!extension_loaded(substr(basename($ext), 4, -4)))
+		load_extension($ext);
 
 # Подгружаем Qero-пакеты
-require __DIR__ .'/../qero-packages/autoload.php';
+require __DIR__.'/../qero-packages/autoload.php';
 
-chdir (APP_DIR); // Меняем стандартную директорию на директорию приложения
+chdir(APP_DIR); // Меняем стандартную директорию на директорию приложения
 
 # Парсим стили main.vst
-VSTInterpreter::run (VSTParser::parse ('main.vst'));
+VSTInterpreter::run(VSTParser::parse('main.vst'));
 
 # Парсим разметку app.vlf и запускаем приложение
-$objects = VLFInterpreter::run (VLFParser::parse ('app.vlf'));
+$objects = VLFInterpreter::run(VLFParser::parse('app.vlf'));
 
-$APPLICATION->run ($objects['MainForm']);
+$APPLICATION->run($objects['MainForm']);

engine/components/Control.php

Indentation +2 added lines, -2 removed lines

@@ -24,8 +24,8 @@
         $this->text = $caption;
     }
 	
-	public function set_font ($font): void
-	{
+    public function set_font ($font): void
+    {
         if (is_array ($font))
         {
             $font = array_values ($font);

Spacing +51 added lines, -52 removed lines

@@ -6,101 +6,100 @@ 
 
 abstract class Control extends Component
 {
-    public function __construct (NetObject $parent = null, ...$args)
+    public function __construct(NetObject $parent = null, ...$args)
     {
-        parent::__construct (...$args);
+        parent::__construct(...$args);
 
         if ($parent !== null)
             $this->parent = $parent;
     }
 
-    public function get_caption (): string
+    public function get_caption(): string
     {
         return $this->text;
     }
 	
-    public function set_caption (string $caption): void
+    public function set_caption(string $caption): void
     {
         $this->text = $caption;
     }
 	
-	public function set_font ($font): void
+	public function set_font($font): void
 	{
-        if (is_array ($font))
+        if (is_array($font))
         {
-            $font = array_values ($font);
+            $font = array_values($font);
 
             $obj = isset ($font[2]) ?
-                VoidCore::createObject ('System.Drawing.Font', 'System.Drawing', $font[0], $font[1], [$font[2], 'System.Drawing.FontStyle, System.Drawing']) :
-                VoidCore::createObject ('System.Drawing.Font', 'System.Drawing', $font[0], $font[1]);
+                VoidCore::createObject('System.Drawing.Font', 'System.Drawing', $font[0], $font[1], [$font[2], 'System.Drawing.FontStyle, System.Drawing']) : VoidCore::createObject('System.Drawing.Font', 'System.Drawing', $font[0], $font[1]);
             
-            $this->setProperty ('Font', $obj);
+            $this->setProperty('Font', $obj);
         }
 
-        else $this->setProperty ('Font', EngineAdditions::uncoupleSelector ($font));
+        else $this->setProperty('Font', EngineAdditions::uncoupleSelector($font));
     }
 	
-    public function get_backgroundColor ()
+    public function get_backgroundColor()
     {
-        return $this->getProperty (['BackColor', VC_COLOR]);
+        return $this->getProperty(['BackColor', VC_COLOR]);
     }
 	
-    public function set_backgroundColor ($color): void
+    public function set_backgroundColor($color): void
     {
-        $this->setProperty ('BackColor', $color);
+        $this->setProperty('BackColor', $color);
     }
 	
-    public function get_foregroundColor ()
+    public function get_foregroundColor()
     {
-        return $this->getProperty (['ForeColor', VC_COLOR]);
+        return $this->getProperty(['ForeColor', VC_COLOR]);
     }
 	
-    public function set_foregroundColor ($color): void
+    public function set_foregroundColor($color): void
     {
-        $this->setProperty ('ForeColor', $color);
+        $this->setProperty('ForeColor', $color);
     }
 	
-    public function get_w (): int
+    public function get_w(): int
     {
         return $this->width;
     }
 	
-    public function set_w (int $w): void
+    public function set_w(int $w): void
     {
         $this->width = $w;
     }
 	
-    public function get_h (): int
+    public function get_h(): int
     {
         return $this->height;
     }
 	
-    public function set_h (int $h): void
+    public function set_h(int $h): void
     {
         $this->height = $h;
     }
 	
-    public function get_x (): int
+    public function get_x(): int
     {
         return $this->left;
     }
 	
-    public function set_x (int $x): void
+    public function set_x(int $x): void
     {
         $this->left = $x;
     }
 	
-    public function get_y (): int
+    public function get_y(): int
     {
         return $this->top;
     }
 	
-    public function set_y (int $y): void
+    public function set_y(int $y): void
     {
         $this->top = $y;
     }
 
-    public function get_bounds (): array
+    public function get_bounds(): array
     {
         return [
             $this->left,
@@ -110,11 +109,11 @@ 
         ];
     }
 	
-    public function set_bounds ($bounds): void
+    public function set_bounds($bounds): void
     {
-        if (is_array ($bounds))
+        if (is_array($bounds))
         {
-            $bounds = array_values ($bounds);
+            $bounds = array_values($bounds);
             
             $this->left   = (int) $bounds[0];
             $this->top    = (int) $bounds[1];
@@ -122,10 +121,10 @@ 
             $this->height = (int) $bounds[3];
         }
 
-        else $this->setProperty ('Bounds', EngineAdditions::uncoupleSelector ($bounds));
+        else $this->setProperty('Bounds', EngineAdditions::uncoupleSelector($bounds));
     }
 	
-    public function get_location (): array
+    public function get_location(): array
     {
         return [
             $this->left,
@@ -133,20 +132,20 @@ 
         ];
     }
 	
-    public function set_location ($location)
+    public function set_location($location)
     {
-        if (is_array ($location))
+        if (is_array($location))
         {
-            $location = array_values ($location);
+            $location = array_values($location);
             
             $this->left = $location[0];
             $this->top  = $location[1];
         }
 
-        else $this->setProperty ('Location', EngineAdditions::uncoupleSelector ($location));
+        else $this->setProperty('Location', EngineAdditions::uncoupleSelector($location));
     }
 	
-    public function get_size (): array
+    public function get_size(): array
     {
         return [
             $this->width,
@@ -154,41 +153,41 @@ 
         ];
     }
 	
-    public function set_size ($size): void
+    public function set_size($size): void
     {
-        if (is_array ($size))
+        if (is_array($size))
         {
-            $size = array_values ($size);
+            $size = array_values($size);
             
             $this->width  = (int) $size[0];
             $this->height = (int) $size[1];
         }
 
-        else $this->setProperty ('Size', EngineAdditions::uncoupleSelector ($size));
+        else $this->setProperty('Size', EngineAdditions::uncoupleSelector($size));
     }
 	
-    public function setBounds (int $x, int $y, int $w, int $h): void
+    public function setBounds(int $x, int $y, int $w, int $h): void
     {
-        $this->set_bounds ([$x, $y, $w, $h]);
+        $this->set_bounds([$x, $y, $w, $h]);
     }
 	
-    public function setLocation (int $x, int $y): void
+    public function setLocation(int $x, int $y): void
     {
-        $this->set_location ([$x, $y]);
+        $this->set_location([$x, $y]);
     }
 	
-    public function setSize (int $w, int $h): void
+    public function setSize(int $w, int $h): void
     {
-        $this->set_size ([$w, $h]);
+        $this->set_size([$w, $h]);
     }
 	
-    public function toBack (): void
+    public function toBack(): void
     {
-        $this->callMethod ('SendToBack');
+        $this->callMethod('SendToBack');
     }
 	
-    public function toFront (): void
+    public function toFront(): void
     {
-        $this->callMethod ('BringToFront');
+        $this->callMethod('BringToFront');
     }
 }

Braces +11 added lines, -10 removed lines

@@ -10,8 +10,9 @@ 
     {
         parent::__construct (...$args);
 
-        if ($parent !== null)
-            $this->parent = $parent;
+        if ($parent !== null) {
+                    $this->parent = $parent;
+        }
     }
 
     public function get_caption (): string
@@ -35,9 +36,9 @@ 
                 VoidCore::createObject ('System.Drawing.Font', 'System.Drawing', $font[0], $font[1]);
             
             $this->setProperty ('Font', $obj);
+        } else {
+            $this->setProperty ('Font', EngineAdditions::uncoupleSelector ($font));
         }
-
-        else $this->setProperty ('Font', EngineAdditions::uncoupleSelector ($font));
     }
 	
     public function get_backgroundColor ()
@@ -120,9 +121,9 @@ 
             $this->top    = (int) $bounds[1];
             $this->width  = (int) $bounds[2];
             $this->height = (int) $bounds[3];
+        } else {
+            $this->setProperty ('Bounds', EngineAdditions::uncoupleSelector ($bounds));
         }
-
-        else $this->setProperty ('Bounds', EngineAdditions::uncoupleSelector ($bounds));
     }
 	
     public function get_location (): array
@@ -141,9 +142,9 @@ 
             
             $this->left = $location[0];
             $this->top  = $location[1];
+        } else {
+            $this->setProperty ('Location', EngineAdditions::uncoupleSelector ($location));
         }
-
-        else $this->setProperty ('Location', EngineAdditions::uncoupleSelector ($location));
     }
 	
     public function get_size (): array
@@ -162,9 +163,9 @@ 
             
             $this->width  = (int) $size[0];
             $this->height = (int) $size[1];
+        } else {
+            $this->setProperty ('Size', EngineAdditions::uncoupleSelector ($size));
         }
-
-        else $this->setProperty ('Size', EngineAdditions::uncoupleSelector ($size));
     }
 	
     public function setBounds (int $x, int $y, int $w, int $h): void

core/script.php

Indentation +4 added lines, -4 removed lines

@@ -6,17 +6,17 @@
 chdir (CORE_DIR);
 
 foreach (glob ('ext/php_*.dll') as $ext)
-	if (!extension_loaded (substr (basename ($ext), 4, -4)))
-		load_extension ($ext);
+    if (!extension_loaded (substr (basename ($ext), 4, -4)))
+        load_extension ($ext);
 
 if (file_exists ('../engine/VoidEngine.php'))
-	require '../engine/VoidEngine.php';
+    require '../engine/VoidEngine.php';
 
 else message ('VoidEngine not founded');
 
 $app = '../../app/start.php';
 
 if (file_exists ($app))
-	require $app;
+    require $app;
 
 else \VoidCore::callMethod (\VoidCore::createObject ('WinForms_PHP.DebugForm'), 'ShowDialog');

Spacing +8 added lines, -8 removed lines

@@ -3,20 +3,20 @@
 namespace VoidEngine;
 
 const CORE_DIR = __DIR__;
-chdir (CORE_DIR);
+chdir(CORE_DIR);
 
-foreach (glob ('ext/php_*.dll') as $ext)
-	if (!extension_loaded (substr (basename ($ext), 4, -4)))
-		load_extension ($ext);
+foreach (glob('ext/php_*.dll') as $ext)
+	if (!extension_loaded(substr(basename($ext), 4, -4)))
+		load_extension($ext);
 
-if (file_exists ('../engine/VoidEngine.php'))
+if (file_exists('../engine/VoidEngine.php'))
 	require '../engine/VoidEngine.php';
 
-else message ('VoidEngine not founded');
+else message('VoidEngine not founded');
 
 $app = '../../app/start.php';
 
-if (file_exists ($app))
+if (file_exists($app))
 	require $app;
 
-else \VoidCore::callMethod (\VoidCore::createObject ('WinForms_PHP.DebugForm'), 'ShowDialog');
+else \VoidCore::callMethod(\VoidCore::createObject('WinForms_PHP.DebugForm'), 'ShowDialog');

Braces +10 added lines, -7 removed lines

@@ -5,18 +5,21 @@
 const CORE_DIR = __DIR__;
 chdir (CORE_DIR);
 
-foreach (glob ('ext/php_*.dll') as $ext)
+foreach (glob ('ext/php_*.dll') as $ext) {
 	if (!extension_loaded (substr (basename ($ext), 4, -4)))
 		load_extension ($ext);
+}
 
-if (file_exists ('../engine/VoidEngine.php'))
+if (file_exists ('../engine/VoidEngine.php')) {
 	require '../engine/VoidEngine.php';
-
-else message ('VoidEngine not founded');
+} else {
+    message ('VoidEngine not founded');
+}
 
 $app = '../../app/start.php';
 
-if (file_exists ($app))
+if (file_exists ($app)) {
 	require $app;
-
-else \VoidCore::callMethod (\VoidCore::createObject ('WinForms_PHP.DebugForm'), 'ShowDialog');
+} else {
+    \VoidCore::callMethod (\VoidCore::createObject ('WinForms_PHP.DebugForm'), 'ShowDialog');
+}

engine/extensions/VLF/bin/parser.php

Spacing +76 added lines, -76 removed lines

@@ -17,33 +17,33 @@ 
      * 
      * @return AST - возвращает AST дерево разметки
      */
-    public static function parse (string $vlf): AST
+    public static function parse(string $vlf): AST
     {
         $tree    = new AST;
         $objects = new Stack;
 
-        if (file_exists ($vlf))
-            $vlf = file_get_contents ($vlf);
+        if (file_exists($vlf))
+            $vlf = file_get_contents($vlf);
 
-        $lines   = explode (self::$divider, $vlf);
+        $lines   = explode(self::$divider, $vlf);
         $skip_at = -1;
 
         foreach ($lines as $line_num => $line)
         {
             // \VoidEngine\pre ($line_num .', '. ($skip_at > $line_num ? 'skip' : 'not skip') .': '. $line);
 
-            if ($skip_at > $line_num || !self::filter ($line))
+            if ($skip_at > $line_num || !self::filter($line))
                 continue;
 
-            $height = self::getHeight ($line);
-            $words  = array_filter (explode (' ', $line), 'VLF\Parser::filter');
+            $height = self::getHeight($line);
+            $words  = array_filter(explode(' ', $line), 'VLF\Parser::filter');
             $poped  = false;
 
             # Очищаем стек объектов
-            while ($objects->size () > 0)
-                if ($objects->current ()->height >= $height)
+            while ($objects->size() > 0)
+                if ($objects->current()->height >= $height)
                 {
-                    $objects->pop ();
+                    $objects->pop();
                     
                     $poped = true;
                 }
@@ -51,12 +51,12 @@ 
                 else break;
 
             # Создаём новую ссылку на объект
-            if ($poped && $objects->size () > 0)
+            if ($poped && $objects->size() > 0)
             {
-                $object = $objects->pop ();
+                $object = $objects->pop();
 
-                $objects->push (new Node (array_merge ($object->export (), ['nodes' => []])));
-                $tree->push ($objects->current ());
+                $objects->push(new Node(array_merge($object->export(), ['nodes' => []])));
+                $tree->push($objects->current());
             }
 
             /**
@@ -64,16 +64,16 @@ 
              */
             if ($words[0] == 'import')
             {
-                $imports = substr ($line, strlen ($words[0]));
-                $parsed  = self::parseSubtext ($lines, $line_num, $height);
+                $imports = substr($line, strlen($words[0]));
+                $parsed  = self::parseSubtext($lines, $line_num, $height);
 
                 $imports .= $parsed[0];
                 $skip_at  = $parsed[1];
 
-                $imports = self::filter ($imports) ?
-                    array_map ('trim', self::parseArguments ($imports)) : [];
+                $imports = self::filter($imports) ?
+                    array_map ('trim', self::parseArguments($imports)) : [];
 
-                $tree->push (new Node ([
+                $tree->push(new Node([
                     'type'   => STYLES_IMPORTING,
                     'line'   => $line,
                     'words'  => $words,
@@ -96,9 +96,9 @@ 
                 if (isset ($words[0][1]))
                 {
                     if ($words[0][1] == '^')
-                        $skip_at = self::parseSubtext ($lines, $line_num, $height)[1];
+                        $skip_at = self::parseSubtext($lines, $line_num, $height)[1];
 
-                    else throw new \Exception ('Unknown char founded after comment definition at line '. ($line_num + 1));
+                    else throw new \Exception('Unknown char founded after comment definition at line '.($line_num + 1));
                 }
 
                 continue;
@@ -109,7 +109,7 @@ 
              */
             elseif ($words[0][0] == '%')
             {
-                $code = substr ($line, strlen ($words[0]));
+                $code = substr($line, strlen($words[0]));
 
                 /**
                  * Обработка многострочного кода
@@ -118,16 +118,16 @@ 
                 {
                     if ($words[0][1] == '^')
                     {
-                        $parsed = self::parseSubtext ($lines, $line_num, $height);
+                        $parsed = self::parseSubtext($lines, $line_num, $height);
 
                         $code   .= $parsed[0];
                         $skip_at = $parsed[1];
                     }
 
-                    else throw new \Exception ('Unknown char founded after runtime execution definition at line '. ($line_num + 1));
+                    else throw new \Exception('Unknown char founded after runtime execution definition at line '.($line_num + 1));
                 }
 
-                $tree->push (new Node ([
+                $tree->push(new Node([
                     'type'   => RUNTIME_EXECUTION,
                     'line'   => $line,
                     'words'  => $words,
@@ -142,29 +142,29 @@ 
             /**
              * Установка свойства
              */
-            elseif (($pos = strpos ($line, ':')) !== false)
+            elseif (($pos = strpos($line, ':')) !== false)
             {
-                if ($objects->size () == 0)
-                    throw new \Exception ('Trying to set property to unknown object at line '. ($line_num + 1));
+                if ($objects->size() == 0)
+                    throw new \Exception('Trying to set property to unknown object at line '.($line_num + 1));
 
                 if (!isset ($words[1]))
-                    throw new \Exception ('Trying to set void property value at line '. ($line_num + 1));
+                    throw new \Exception('Trying to set void property value at line '.($line_num + 1));
 
-                $propertyName  = substr ($line, 0, $pos);
-                $propertyValue = substr ($line, $pos + 1);
+                $propertyName  = substr($line, 0, $pos);
+                $propertyValue = substr($line, $pos + 1);
 
                 /**
                  * Обработка многострочных свойств
                  */
                 if ($line[$pos + 1] == '^')
                 {
-                    $parsed = self::parseSubtext ($lines, $line_num, $height);
+                    $parsed = self::parseSubtext($lines, $line_num, $height);
 
-                    $propertyValue = substr ($propertyValue, 1) . $parsed[0];
+                    $propertyValue = substr($propertyValue, 1).$parsed[0];
                     $skip_at       = $parsed[1];
                 }
 
-                $objects->current ()->push (new Node ([
+                $objects->current()->push(new Node([
                     'type'   => PROPERTY_SET,
                     'line'   => $line,
                     'words'  => $words,
@@ -182,26 +182,26 @@ 
              */
             elseif (isset ($words[0][1]) && $words[0][0] == '-' && $words[0][1] == '>')
             {
-                if ($objects->size () == 0)
-                    throw new \Exception ('Trying to call method from unknown object at line '. ($line_num + 1));
+                if ($objects->size() == 0)
+                    throw new \Exception('Trying to call method from unknown object at line '.($line_num + 1));
 
                 $methodArgs = [];
 
-                if (($pos = strpos ($line, '(')) !== false)
+                if (($pos = strpos($line, '(')) !== false)
                 {
-                    if (($end = strrpos ($line, ')', $pos)) === false)
-                        throw new \Exception ('Incorrect method arguments syntax at line '. ($line_num + 1));
+                    if (($end = strrpos($line, ')', $pos)) === false)
+                        throw new \Exception('Incorrect method arguments syntax at line '.($line_num + 1));
 
-                    $methodArgs = substr ($line, $pos + 1, $end - $pos - 1);
+                    $methodArgs = substr($line, $pos + 1, $end - $pos - 1);
 
-                    $methodName = trim (substr ($line, 2, $pos - 2));
-                    $methodArgs = self::filter ($methodArgs) ?
-                        self::parseArguments ($methodArgs) : [];
+                    $methodName = trim(substr($line, 2, $pos - 2));
+                    $methodArgs = self::filter($methodArgs) ?
+                        self::parseArguments($methodArgs) : [];
                 }
 
-                else $methodName = trim (substr ($line, 2));
+                else $methodName = trim(substr($line, 2));
 
-                $objects->current ()->push (new Node ([
+                $objects->current()->push(new Node([
                     'type'   => METHOD_CALL,
                     'line'   => $line,
                     'words'  => $words,
@@ -217,39 +217,39 @@ 
             /**
              * Объявление объекта
              */
-            elseif (sizeof ($words) > 1)
+            elseif (sizeof($words) > 1)
             {
                 $class  = $words[0];
                 $name   = $words[1];
                 $args   = [];
                 $styles = [];
 
-                if ($objects->size () > 0 && $objects->current ()->height < $height)
-                    $args[] = $objects->current ()->args['name'];
+                if ($objects->size() > 0 && $objects->current()->height < $height)
+                    $args[] = $objects->current()->args['name'];
 
-                if (($pos = strpos ($line, '(')) !== false)
+                if (($pos = strpos($line, '(')) !== false)
                 {
-                    if (($end = strrpos ($line, ')', $pos)) === false)
-                        throw new \Exception ('Incorrect class constructor arguments syntax at line '. ($line_num + 1));
+                    if (($end = strrpos($line, ')', $pos)) === false)
+                        throw new \Exception('Incorrect class constructor arguments syntax at line '.($line_num + 1));
 
-                    $args = substr ($line, $pos + 1, $end - $pos - 1);
+                    $args = substr($line, $pos + 1, $end - $pos - 1);
 
-                    $name = substr ($line, $len = strlen ($class), $pos - $len);
-                    $args = self::filter ($args) ?
-                        self::parseArguments ($args) : [];
+                    $name = substr($line, $len = strlen($class), $pos - $len);
+                    $args = self::filter($args) ?
+                        self::parseArguments($args) : [];
                 }
 
-                if (($end = strpos ($line, '>')) !== false)
+                if (($end = strpos($line, '>')) !== false)
                 {
-                    $styles = trim (substr ($line, $end + 1));
+                    $styles = trim(substr($line, $end + 1));
 
-                    if (strlen ($styles) == 0)
-                        throw new \Exception ('Trying to set empty style to object');
+                    if (strlen($styles) == 0)
+                        throw new \Exception('Trying to set empty style to object');
 
-                    $styles = array_map ('trim', explode (',', $styles));
+                    $styles = array_map('trim', explode(',', $styles));
                 }
 
-                $objects->push (new Node ([
+                $objects->push(new Node([
                     'type'   => OBJECT_DEFINITION,
                     'line'   => $line,
                     'words'  => $words,
@@ -257,19 +257,19 @@ 
 
                     'args' => [
                         'class'  => $class,
-                        'name'   => trim ($name),
+                        'name'   => trim($name),
                         'args'   => $args,
                         'styles' => $styles
                     ]
                 ]));
 
-                $tree->push ($objects->current ());
+                $tree->push($objects->current());
             }
 
             /**
              * Неопознанная структура
              */
-            else throw new \Exception ('Unsupported structure founded at line '. ($line_num + 1));
+            else throw new \Exception('Unsupported structure founded at line '.($line_num + 1));
         }
 
         return $tree;
@@ -282,12 +282,12 @@ 
      * 
      * @return int - возвращает её высоту
      */
-    protected static function getHeight (string &$line): int
+    protected static function getHeight(string &$line): int
     {
         $i = 0;
         $height = 0;
 
-        while (isset ($line[$i]) && ctype_space ($line[$i]))
+        while (isset ($line[$i]) && ctype_space($line[$i]))
         {
             ++$height;
 
@@ -297,7 +297,7 @@ 
             ++$i;
         }
 
-        $line = substr ($line, $i);
+        $line = substr($line, $i);
 
         return $height;
     }
@@ -309,9 +309,9 @@ 
      * 
      * @return bool - возвращает true если строка не пустая
      */
-    protected static function filter (string $line): bool
+    protected static function filter(string $line): bool
     {
-        return strlen (trim ($line)) > 0;
+        return strlen(trim($line)) > 0;
     }
 
     /**
@@ -323,7 +323,7 @@ 
      * 
      * @return array - возвращает массив [текст, конечный индекс]
      */
-    protected static function parseSubtext (array $lines, $begin_id, int $down_height): array
+    protected static function parseSubtext(array $lines, $begin_id, int $down_height): array
     {
         $parsed = "\n";
 
@@ -332,17 +332,17 @@ 
             if ($line_id <= $begin_id)
                 continue;
 
-            if (!self::filter ($line))
+            if (!self::filter($line))
             {
                 $parsed .= "\n";
             
                 continue;
             }
 
-            $height = self::getHeight ($line);
+            $height = self::getHeight($line);
 
             if ($height > $down_height)
-                $parsed .= str_repeat (' ', $height - $down_height) ."$line\n";
+                $parsed .= str_repeat(' ', $height - $down_height)."$line\n";
 
             else return [$parsed, $line_id];
         }
@@ -357,7 +357,7 @@ 
      * 
      * @return array - возвращает массив аргументов
      */
-    protected static function parseArguments (string $arguments): array
+    protected static function parseArguments(string $arguments): array
     {
         $args = [];
 
@@ -366,7 +366,7 @@ 
 
         $t = '';
 
-        for ($i = 0, $len = strlen ($arguments); $i < $len; ++$i)
+        for ($i = 0, $len = strlen($arguments); $i < $len; ++$i)
         {
             $t .= $arguments[$i];
             
@@ -383,7 +383,7 @@ 
 
                 elseif (!$split1 && !$split2 && $arguments[$i] == ',')
                 {
-                    $args[] = substr ($t, 0, -1);
+                    $args[] = substr($t, 0, -1);
                     $t = '';
                 }
             }

Braces +63 added lines, -50 removed lines

@@ -22,8 +22,9 @@ 
         $tree    = new AST;
         $objects = new Stack;
 
-        if (file_exists ($vlf))
-            $vlf = file_get_contents ($vlf);
+        if (file_exists ($vlf)) {
+                    $vlf = file_get_contents ($vlf);
+        }
 
         $lines   = explode (self::$divider, $vlf);
         $skip_at = -1;
@@ -32,24 +33,26 @@ 
         {
             // \VoidEngine\pre ($line_num .', '. ($skip_at > $line_num ? 'skip' : 'not skip') .': '. $line);
 
-            if ($skip_at > $line_num || !self::filter ($line))
-                continue;
+            if ($skip_at > $line_num || !self::filter ($line)) {
+                            continue;
+            }
 
             $height = self::getHeight ($line);
             $words  = array_filter (explode (' ', $line), 'VLF\Parser::filter');
             $poped  = false;
 
             # Очищаем стек объектов
-            while ($objects->size () > 0)
-                if ($objects->current ()->height >= $height)
+            while ($objects->size () > 0) {
+                            if ($objects->current ()->height >= $height)
                 {
                     $objects->pop ();
+            }
                     
                     $poped = true;
+                } else {
+                    break;
                 }
 
-                else break;
-
             # Создаём новую ссылку на объект
             if ($poped && $objects->size () > 0)
             {
@@ -95,10 +98,11 @@ 
                  */
                 if (isset ($words[0][1]))
                 {
-                    if ($words[0][1] == '^')
-                        $skip_at = self::parseSubtext ($lines, $line_num, $height)[1];
-
-                    else throw new \Exception ('Unknown char founded after comment definition at line '. ($line_num + 1));
+                    if ($words[0][1] == '^') {
+                                            $skip_at = self::parseSubtext ($lines, $line_num, $height)[1];
+                    } else {
+                        throw new \Exception ('Unknown char founded after comment definition at line '. ($line_num + 1));
+                    }
                 }
 
                 continue;
@@ -122,9 +126,9 @@ 
 
                         $code   .= $parsed[0];
                         $skip_at = $parsed[1];
+                    } else {
+                        throw new \Exception ('Unknown char founded after runtime execution definition at line '. ($line_num + 1));
                     }
-
-                    else throw new \Exception ('Unknown char founded after runtime execution definition at line '. ($line_num + 1));
                 }
 
                 $tree->push (new Node ([
@@ -144,11 +148,13 @@ 
              */
             elseif (($pos = strpos ($line, ':')) !== false)
             {
-                if ($objects->size () == 0)
-                    throw new \Exception ('Trying to set property to unknown object at line '. ($line_num + 1));
+                if ($objects->size () == 0) {
+                                    throw new \Exception ('Trying to set property to unknown object at line '. ($line_num + 1));
+                }
 
-                if (!isset ($words[1]))
-                    throw new \Exception ('Trying to set void property value at line '. ($line_num + 1));
+                if (!isset ($words[1])) {
+                                    throw new \Exception ('Trying to set void property value at line '. ($line_num + 1));
+                }
 
                 $propertyName  = substr ($line, 0, $pos);
                 $propertyValue = substr ($line, $pos + 1);
@@ -182,25 +188,27 @@ 
              */
             elseif (isset ($words[0][1]) && $words[0][0] == '-' && $words[0][1] == '>')
             {
-                if ($objects->size () == 0)
-                    throw new \Exception ('Trying to call method from unknown object at line '. ($line_num + 1));
+                if ($objects->size () == 0) {
+                                    throw new \Exception ('Trying to call method from unknown object at line '. ($line_num + 1));
+                }
 
                 $methodArgs = [];
 
                 if (($pos = strpos ($line, '(')) !== false)
                 {
-                    if (($end = strrpos ($line, ')', $pos)) === false)
-                        throw new \Exception ('Incorrect method arguments syntax at line '. ($line_num + 1));
+                    if (($end = strrpos ($line, ')', $pos)) === false) {
+                                            throw new \Exception ('Incorrect method arguments syntax at line '. ($line_num + 1));
+                    }
 
                     $methodArgs = substr ($line, $pos + 1, $end - $pos - 1);
 
                     $methodName = trim (substr ($line, 2, $pos - 2));
                     $methodArgs = self::filter ($methodArgs) ?
                         self::parseArguments ($methodArgs) : [];
+                } else {
+                    $methodName = trim (substr ($line, 2));
                 }
 
-                else $methodName = trim (substr ($line, 2));
-
                 $objects->current ()->push (new Node ([
                     'type'   => METHOD_CALL,
                     'line'   => $line,
@@ -224,13 +232,15 @@ 
                 $args   = [];
                 $styles = [];
 
-                if ($objects->size () > 0 && $objects->current ()->height < $height)
-                    $args[] = $objects->current ()->args['name'];
+                if ($objects->size () > 0 && $objects->current ()->height < $height) {
+                                    $args[] = $objects->current ()->args['name'];
+                }
 
                 if (($pos = strpos ($line, '(')) !== false)
                 {
-                    if (($end = strrpos ($line, ')', $pos)) === false)
-                        throw new \Exception ('Incorrect class constructor arguments syntax at line '. ($line_num + 1));
+                    if (($end = strrpos ($line, ')', $pos)) === false) {
+                                            throw new \Exception ('Incorrect class constructor arguments syntax at line '. ($line_num + 1));
+                    }
 
                     $args = substr ($line, $pos + 1, $end - $pos - 1);
 
@@ -243,8 +253,9 @@ 
                 {
                     $styles = trim (substr ($line, $end + 1));
 
-                    if (strlen ($styles) == 0)
-                        throw new \Exception ('Trying to set empty style to object');
+                    if (strlen ($styles) == 0) {
+                                            throw new \Exception ('Trying to set empty style to object');
+                    }
 
                     $styles = array_map ('trim', explode (',', $styles));
                 }
@@ -269,7 +280,9 @@ 
             /**
              * Неопознанная структура
              */
-            else throw new \Exception ('Unsupported structure founded at line '. ($line_num + 1));
+            else {
+                throw new \Exception ('Unsupported structure founded at line '. ($line_num + 1));
+            }
         }
 
         return $tree;
@@ -291,8 +304,9 @@ 
         {
             ++$height;
 
-            if ($line[$i] == "\t")
-                $height += 3;
+            if ($line[$i] == "\t") {
+                            $height += 3;
+            }
 
             ++$i;
         }
@@ -329,8 +343,9 @@ 
 
         foreach ($lines as $line_id => $line)
         {
-            if ($line_id <= $begin_id)
-                continue;
+            if ($line_id <= $begin_id) {
+                            continue;
+            }
 
             if (!self::filter ($line))
             {
@@ -341,10 +356,11 @@ 
 
             $height = self::getHeight ($line);
 
-            if ($height > $down_height)
-                $parsed .= str_repeat (' ', $height - $down_height) ."$line\n";
-
-            else return [$parsed, $line_id];
+            if ($height > $down_height) {
+                            $parsed .= str_repeat (' ', $height - $down_height) ."$line\n";
+            } else {
+                return [$parsed, $line_id];
+            }
         }
 
         return [$parsed, $line_id + 1];
@@ -370,18 +386,15 @@ 
         {
             $t .= $arguments[$i];
             
-            if ($arguments[$i] == '\\')
-                $canSplit = $i + 1;
-
-            elseif ($canSplit < $i)
+            if ($arguments[$i] == '\\') {
+                            $canSplit = $i + 1;
+            } elseif ($canSplit < $i)
             {
-                if ($arguments[$i] == '\'' && !$split2)
-                    $split1 = !$split1;
-
-                elseif ($arguments[$i] == '"' && !$split1)
-                    $split2 = !$split2;
-
-                elseif (!$split1 && !$split2 && $arguments[$i] == ',')
+                if ($arguments[$i] == '\'' && !$split2) {
+                                    $split1 = !$split1;
+                } elseif ($arguments[$i] == '"' && !$split1) {
+                                    $split2 = !$split2;
+                } elseif (!$split1 && !$split2 && $arguments[$i] == ',')
                 {
                     $args[] = substr ($t, 0, -1);
                     $t = '';

engine/extensions/VLF/bin/interpreter.php

Spacing +46 added lines, -47 removed lines

@@ -20,9 +20,9 @@ 
      * 
      * @return array - возвращает список созданных объектов
      */
-    public static function run (AST $tree, Node $parent = null): array
+    public static function run(AST $tree, Node $parent = null): array
     {
-        foreach ($tree->getNodes () as $id => $node)
+        foreach ($tree->getNodes() as $id => $node)
         {
             switch ($node->type)
             {
@@ -39,12 +39,12 @@ 
                         $args = $node->args['args'];
 
                         foreach ($args as $arg_id => $arg)
-                            $args[$arg_id] = self::formatLine ($arg, self::$objects);
+                            $args[$arg_id] = self::formatLine($arg, self::$objects);
                     }
 
                     try
                     {
-                        self::$objects[$name] = eval ("namespace VoidEngine; return new $class (". implode (', ', $args) .");");
+                        self::$objects[$name] = eval ("namespace VoidEngine; return new $class (".implode(', ', $args).");");
 
                         try
                         {
@@ -57,7 +57,7 @@ 
                     catch (\Throwable $e)
                     {
                         if (self::$throw_errors)
-                            throw new \Exception ('Interpeter couldn\'t create object "'. $class .'" with name "'. $name .'" at line "'. $node->line .'". Exception info:'. "\n\n". (string) $e, 0, $e);
+                            throw new \Exception('Interpeter couldn\'t create object "'.$class.'" with name "'.$name.'" at line "'.$node->line.'". Exception info:'."\n\n".(string) $e, 0, $e);
                     }
                 break;
 
@@ -70,30 +70,30 @@ 
                         $propertyValue = $node->args['value'];
                         $preset        = '';
 
-                        if (preg_match ('/function \((.*)\) use \((.*)\)/', $propertyValue))
+                        if (preg_match('/function \((.*)\) use \((.*)\)/', $propertyValue))
                         {
-                            $use = substr ($propertyValue, strpos ($propertyValue, 'use'));
-                            $use = $ouse = substr ($use, ($pos = strpos ($use, '(') + 1), strpos ($use, ')') - $pos);
-                            $use = explode (' ', $use);
+                            $use = substr($propertyValue, strpos($propertyValue, 'use'));
+                            $use = $ouse = substr($use, ($pos = strpos($use, '(') + 1), strpos($use, ')') - $pos);
+                            $use = explode(' ', $use);
 
                             foreach ($use as $id => $useParam)  
                                 if (isset (self::$objects[$useParam]) && $use[$id + 1][0] == '$')
                                 {
                                     $fname = $use[$id + 1];
 
-                                    if (substr ($fname, strlen ($fname) - 1) == ',')
-                                        $fname = substr ($fname, 0, -1);
+                                    if (substr($fname, strlen($fname) - 1) == ',')
+                                        $fname = substr($fname, 0, -1);
 
                                     $preset .= "$fname = $useParam; ";
 
                                     unset ($use[$id]);
                                 }
 
-                            $preset        = self::formatLine ($preset, self::$objects);
-                            $propertyValue = self::formatLine (str_replace ($ouse, implode (' ', $use), $propertyValue), self::$objects);
+                            $preset        = self::formatLine($preset, self::$objects);
+                            $propertyValue = self::formatLine(str_replace($ouse, implode(' ', $use), $propertyValue), self::$objects);
                         }
 
-                        else $propertyValue = self::formatLine ($propertyValue, self::$objects);
+                        else $propertyValue = self::formatLine($propertyValue, self::$objects);
 
                         try
                         {
@@ -103,12 +103,12 @@ 
                         catch (\Throwable $e)
                         {
                             if (self::$throw_errors)
-                                throw new \Exception ('Interpeter couldn\'t set property "'. $propertyName .'" with value "'. $propertyValue .'" at line "'. $node->line .'". Exception info:'. "\n\n". (string) $e, 0, $e);
+                                throw new \Exception('Interpeter couldn\'t set property "'.$propertyName.'" with value "'.$propertyValue.'" at line "'.$node->line.'". Exception info:'."\n\n".(string) $e, 0, $e);
                         }
                     }
 
                     elseif (self::$throw_errors)
-                        throw new \Exception ('Setting property to an non-object at line "'. $node->line);
+                        throw new \Exception('Setting property to an non-object at line "'.$node->line);
                 break;
 
                 case METHOD_CALL:
@@ -120,58 +120,58 @@ 
                         $methodArgs = $node->args['args'];
 
                         foreach ($methodArgs as $arg_id => $arg)
-                            $methodArgs[$arg_id] = self::formatLine ($arg, self::$objects);
+                            $methodArgs[$arg_id] = self::formatLine($arg, self::$objects);
 
                         try
                         {
-                            if (strpos ($methodName, '->') !== false && self::$allow_multimethods_calls)
-                                eval ('namespace VoidEngine; _c('. self::$objects[$name]->selector .')->'. $methodName .' ('. implode (', ', $methodArgs) .');');
+                            if (strpos($methodName, '->') !== false && self::$allow_multimethods_calls)
+                                eval ('namespace VoidEngine; _c('.self::$objects[$name]->selector.')->'.$methodName.' ('.implode(', ', $methodArgs).');');
 
-                            elseif (sizeof ($methodArgs) > 0)
-                                self::$objects[$name]->$methodName (...eval ('namespace VoidEngine; return ['. implode (', ', $methodArgs) .'];'));
+                            elseif (sizeof($methodArgs) > 0)
+                                self::$objects[$name]->$methodName(...eval ('namespace VoidEngine; return ['.implode(', ', $methodArgs).'];'));
 
-                            else self::$objects[$name]->$methodName ();
+                            else self::$objects[$name]->$methodName();
                         }
 
                         catch (\Throwable $e)
                         {
                             if (self::$throw_errors)
-                                throw new \Exception ('Interpeter couldn\'t call method "'. $methodName .'" with arguments '. json_encode ($methodArgs) .' at line "'. $node->line .'". Exception info:'. "\n\n". (string) $e, 0, $e);
+                                throw new \Exception('Interpeter couldn\'t call method "'.$methodName.'" with arguments '.json_encode($methodArgs).' at line "'.$node->line.'". Exception info:'."\n\n".(string) $e, 0, $e);
                         }
                     }
 
                     elseif (self::$throw_errors)
-                        throw new \Exception ('Calling method to an non-object at line "'. $node->line .'"');
+                        throw new \Exception('Calling method to an non-object at line "'.$node->line.'"');
                 break;
 
                 case STYLES_IMPORTING:
                     foreach ($node->args['imports'] as $style)
                     {
-                        $path = eval ('namespace VoidEngine; return '. self::formatLine ($style, self::$objects) .';');
+                        $path = eval ('namespace VoidEngine; return '.self::formatLine($style, self::$objects).';');
 
-                        if (!file_exists ($path))
-                            throw new \Exception ('Trying to import nonexistent style at line "'. $node->line .'"');
+                        if (!file_exists($path))
+                            throw new \Exception('Trying to import nonexistent style at line "'.$node->line.'"');
                         
-                        \VLF\VST\Interpreter::run (\VLF\VST\Parser::parse (file_get_contents ($path)));
+                        \VLF\VST\Interpreter::run(\VLF\VST\Parser::parse(file_get_contents($path)));
                     }
                 break;
 
                 case RUNTIME_EXECUTION:
-                    eval (self::formatLine ($node->args['code'], self::$objects));
+                    eval (self::formatLine($node->args['code'], self::$objects));
                 break;
             }
 
-            $nodes = $node->getNodes ();
+            $nodes = $node->getNodes();
 
             if (isset ($node->args['styles']))
                 foreach ($node->args['styles'] as $style)
                     if (isset (\VLF\VST\Interpreter::$styles[$style]))
-                        $nodes = array_merge ($nodes, \VLF\VST\Interpreter::$styles[$style]);
+                        $nodes = array_merge($nodes, \VLF\VST\Interpreter::$styles[$style]);
 
-                    else throw new \Exception ('Trying to set undefined style to object at line "'. $node->line .'"');
+                    else throw new \Exception('Trying to set undefined style to object at line "'.$node->line.'"');
 
-            self::$objects = self::run (new AST (array_map (
-                fn ($node) => $node->export (), $nodes)), $node);
+            self::$objects = self::run(new AST(array_map(
+                fn($node) => $node->export(), $nodes)), $node);
         }
 
         return self::$objects;
@@ -185,26 +185,25 @@ 
      * 
      * @return string - возвращает форматированную строку
      */
-    public static function formatLine (string $line, array $objects = []): string
+    public static function formatLine(string $line, array $objects = []): string
     {
-        if (sizeof ($objects) > 0)
+        if (sizeof($objects) > 0)
         {
-            $len     = strlen ($line);
+            $len     = strlen($line);
             $newLine = '';
 
-            $replacement = array_map (function ($object)
+            $replacement = array_map(function($object)
             {
-                return \VoidEngine\Components::exists ($object->selector) !== false ? 
-                    '\VoidEngine\_c('. $object->selector .')' :
-                    'unserialize (\''. serialize ($object) .'\')';
+                return \VoidEngine\Components::exists($object->selector) !== false ? 
+                    '\VoidEngine\_c('.$object->selector.')' : 'unserialize (\''.serialize($object).'\')';
             }, $objects);
 
-            $replacement = array_map (function ($name)
+            $replacement = array_map(function($name)
             {
-                return strlen ($name = trim ($name)) + substr_count ($name, '_');
-            }, $omap = array_flip ($replacement));
+                return strlen($name = trim($name)) + substr_count($name, '_');
+            }, $omap = array_flip($replacement));
 
-            arsort ($replacement);
+            arsort($replacement);
 
             $nReplacement = [];
 
@@ -212,14 +211,14 @@ 
                 $nReplacement[$omap[$replaceTo]] = $replaceTo;
 
             $replacement = $nReplacement;
-            $blacklist   = array_flip (['\'', '"', '$']);
+            $blacklist   = array_flip(['\'', '"', '$']);
 
             for ($i = 0; $i < $len; ++$i)
             {
                 $replaced = false;
 
                 foreach ($replacement as $name => $replaceAt)
-                    if (substr ($line, $i, ($l = strlen ($name))) == $name && !isset ($blacklist[$line[$i - 1]]))
+                    if (substr($line, $i, ($l = strlen($name))) == $name && !isset ($blacklist[$line[$i - 1]]))
                     {
                         $newLine .= $replaceAt;
 

Braces +58 added lines, -55 removed lines

@@ -31,15 +31,17 @@ 
                     $name  = $node->args['name'];
                     $args  = [];
 
-                    if (isset (self::$objects[$name]))
-                        break;
+                    if (isset (self::$objects[$name])) {
+                                            break;
+                    }
 
                     if (isset ($node->args['args']))
                     {
                         $args = $node->args['args'];
 
-                        foreach ($args as $arg_id => $arg)
-                            $args[$arg_id] = self::formatLine ($arg, self::$objects);
+                        foreach ($args as $arg_id => $arg) {
+                                                    $args[$arg_id] = self::formatLine ($arg, self::$objects);
+                        }
                     }
 
                     try
@@ -49,15 +51,12 @@ 
                         try
                         {
                             self::$objects[$name]->name = $name;
-                        }
-
-                        catch (\Throwable $e) {}
-                    }
-
-                    catch (\Throwable $e)
+                        } catch (\Throwable $e) {}
+                    } catch (\Throwable $e)
                     {
-                        if (self::$throw_errors)
-                            throw new \Exception ('Interpeter couldn\'t create object "'. $class .'" with name "'. $name .'" at line "'. $node->line .'". Exception info:'. "\n\n". (string) $e, 0, $e);
+                        if (self::$throw_errors) {
+                                                    throw new \Exception ('Interpeter couldn\'t create object "'. $class .'" with name "'. $name .'" at line "'. $node->line .'". Exception info:'. "\n\n". (string) $e, 0, $e);
+                        }
                     }
                 break;
 
@@ -76,13 +75,15 @@ 
                             $use = $ouse = substr ($use, ($pos = strpos ($use, '(') + 1), strpos ($use, ')') - $pos);
                             $use = explode (' ', $use);
 
-                            foreach ($use as $id => $useParam)  
-                                if (isset (self::$objects[$useParam]) && $use[$id + 1][0] == '$')
+                            foreach ($use as $id => $useParam) {
+                                                            if (isset (self::$objects[$useParam]) && $use[$id + 1][0] == '$')
                                 {
                                     $fname = $use[$id + 1];
+                            }
 
-                                    if (substr ($fname, strlen ($fname) - 1) == ',')
-                                        $fname = substr ($fname, 0, -1);
+                                    if (substr ($fname, strlen ($fname) - 1) == ',') {
+                                                                            $fname = substr ($fname, 0, -1);
+                                    }
 
                                     $preset .= "$fname = $useParam; ";
 
@@ -91,24 +92,22 @@ 
 
                             $preset        = self::formatLine ($preset, self::$objects);
                             $propertyValue = self::formatLine (str_replace ($ouse, implode (' ', $use), $propertyValue), self::$objects);
+                        } else {
+                            $propertyValue = self::formatLine ($propertyValue, self::$objects);
                         }
 
-                        else $propertyValue = self::formatLine ($propertyValue, self::$objects);
-
                         try
                         {
                             self::$objects[$name]->$propertyName = eval ("namespace VoidEngine; $preset return $propertyValue;");
-                        }
-
-                        catch (\Throwable $e)
+                        } catch (\Throwable $e)
                         {
-                            if (self::$throw_errors)
-                                throw new \Exception ('Interpeter couldn\'t set property "'. $propertyName .'" with value "'. $propertyValue .'" at line "'. $node->line .'". Exception info:'. "\n\n". (string) $e, 0, $e);
+                            if (self::$throw_errors) {
+                                                            throw new \Exception ('Interpeter couldn\'t set property "'. $propertyName .'" with value "'. $propertyValue .'" at line "'. $node->line .'". Exception info:'. "\n\n". (string) $e, 0, $e);
+                            }
                         }
+                    } elseif (self::$throw_errors) {
+                                            throw new \Exception ('Setting property to an non-object at line "'. $node->line);
                     }
-
-                    elseif (self::$throw_errors)
-                        throw new \Exception ('Setting property to an non-object at line "'. $node->line);
                 break;
 
                 case METHOD_CALL:
@@ -119,29 +118,28 @@ 
                         $methodName = $node->args['name'];
                         $methodArgs = $node->args['args'];
 
-                        foreach ($methodArgs as $arg_id => $arg)
-                            $methodArgs[$arg_id] = self::formatLine ($arg, self::$objects);
+                        foreach ($methodArgs as $arg_id => $arg) {
+                                                    $methodArgs[$arg_id] = self::formatLine ($arg, self::$objects);
+                        }
 
                         try
                         {
-                            if (strpos ($methodName, '->') !== false && self::$allow_multimethods_calls)
-                                eval ('namespace VoidEngine; _c('. self::$objects[$name]->selector .')->'. $methodName .' ('. implode (', ', $methodArgs) .');');
-
-                            elseif (sizeof ($methodArgs) > 0)
-                                self::$objects[$name]->$methodName (...eval ('namespace VoidEngine; return ['. implode (', ', $methodArgs) .'];'));
-
-                            else self::$objects[$name]->$methodName ();
-                        }
-
-                        catch (\Throwable $e)
+                            if (strpos ($methodName, '->') !== false && self::$allow_multimethods_calls) {
+                                                            eval ('namespace VoidEngine; _c('. self::$objects[$name]->selector .')->'. $methodName .' ('. implode (', ', $methodArgs) .');');
+                            } elseif (sizeof ($methodArgs) > 0) {
+                                                            self::$objects[$name]->$methodName (...eval ('namespace VoidEngine; return ['. implode (', ', $methodArgs) .'];'));
+                            } else {
+                                self::$objects[$name]->$methodName ();
+                            }
+                        } catch (\Throwable $e)
                         {
-                            if (self::$throw_errors)
-                                throw new \Exception ('Interpeter couldn\'t call method "'. $methodName .'" with arguments '. json_encode ($methodArgs) .' at line "'. $node->line .'". Exception info:'. "\n\n". (string) $e, 0, $e);
+                            if (self::$throw_errors) {
+                                                            throw new \Exception ('Interpeter couldn\'t call method "'. $methodName .'" with arguments '. json_encode ($methodArgs) .' at line "'. $node->line .'". Exception info:'. "\n\n". (string) $e, 0, $e);
+                            }
                         }
+                    } elseif (self::$throw_errors) {
+                                            throw new \Exception ('Calling method to an non-object at line "'. $node->line .'"');
                     }
-
-                    elseif (self::$throw_errors)
-                        throw new \Exception ('Calling method to an non-object at line "'. $node->line .'"');
                 break;
 
                 case STYLES_IMPORTING:
@@ -149,8 +147,9 @@ 
                     {
                         $path = eval ('namespace VoidEngine; return '. self::formatLine ($style, self::$objects) .';');
 
-                        if (!file_exists ($path))
-                            throw new \Exception ('Trying to import nonexistent style at line "'. $node->line .'"');
+                        if (!file_exists ($path)) {
+                                                    throw new \Exception ('Trying to import nonexistent style at line "'. $node->line .'"');
+                        }
                         
                         \VLF\VST\Interpreter::run (\VLF\VST\Parser::parse (file_get_contents ($path)));
                     }
@@ -163,12 +162,13 @@ 
 
             $nodes = $node->getNodes ();
 
-            if (isset ($node->args['styles']))
-                foreach ($node->args['styles'] as $style)
+            if (isset ($node->args['styles'])) {
+                            foreach ($node->args['styles'] as $style)
                     if (isset (\VLF\VST\Interpreter::$styles[$style]))
                         $nodes = array_merge ($nodes, \VLF\VST\Interpreter::$styles[$style]);
-
-                    else throw new \Exception ('Trying to set undefined style to object at line "'. $node->line .'"');
+            } else {
+                        throw new \Exception ('Trying to set undefined style to object at line "'. $node->line .'"');
+                    }
 
             self::$objects = self::run (new AST (array_map (
                 fn ($node) => $node->export (), $nodes)), $node);
@@ -208,8 +208,9 @@ 
 
             $nReplacement = [];
 
-            foreach ($replacement as $replaceTo => $nLn)
-                $nReplacement[$omap[$replaceTo]] = $replaceTo;
+            foreach ($replacement as $replaceTo => $nLn) {
+                            $nReplacement[$omap[$replaceTo]] = $replaceTo;
+            }
 
             $replacement = $nReplacement;
             $blacklist   = array_flip (['\'', '"', '$']);
@@ -218,10 +219,11 @@ 
             {
                 $replaced = false;
 
-                foreach ($replacement as $name => $replaceAt)
-                    if (substr ($line, $i, ($l = strlen ($name))) == $name && !isset ($blacklist[$line[$i - 1]]))
+                foreach ($replacement as $name => $replaceAt) {
+                                    if (substr ($line, $i, ($l = strlen ($name))) == $name && !isset ($blacklist[$line[$i - 1]]))
                     {
                         $newLine .= $replaceAt;
+                }
 
                         $i += $l - 1;
                         $replaced = true;
@@ -229,8 +231,9 @@ 
                         break;
                     }
 
-                if (!$replaced)
-                    $newLine .= $line[$i];
+                if (!$replaced) {
+                                    $newLine .= $line[$i];
+                }
             }
 
             $line = $newLine;

engine/extensions/VLF/bin/Translator.php

Spacing +31 added lines, -31 removed lines

@@ -4,25 +4,25 @@ 
 
 class Translator
 {
-    public static function translate (AST $tree): string
+    public static function translate(AST $tree): string
     {
         $code = "<?php\n\nnamespace VoidEngine;\n\n";
         $definedObjects = [];
 
-        foreach ($tree->getNodes () as $node)
-            $code .= self::translateNode ($node, null, $definedObjects) ."\n";
+        foreach ($tree->getNodes() as $node)
+            $code .= self::translateNode($node, null, $definedObjects)."\n";
 
         return $code;
     }
 
-    protected static function translateNode (Node $node, Node $owner = null, array &$definedObjects = []): string
+    protected static function translateNode(Node $node, Node $owner = null, array &$definedObjects = []): string
     {
         $code = '';
 
         switch ($node->type)
         {
             case RUNTIME_EXECUTION:
-                $code .= self::formatLine ($node->args['code'], $definedObjects) ."\n\n";
+                $code .= self::formatLine($node->args['code'], $definedObjects)."\n\n";
 
                 break;
 
@@ -30,7 +30,7 @@ 
                 if (isset ($definedObjects[$node->args['name']]))
                     break;
                 
-                $code .= '$'. $node->args['name'] .' = new '. $node->args['class'] .' ('. implode (', ', self::processArgs ($node->args['args'], $definedObjects)) .');' ."\n". '$'. $node->args['name'] .'->name = \''. $node->args['name'] .'\';' ."\n";
+                $code .= '$'.$node->args['name'].' = new '.$node->args['class'].' ('.implode(', ', self::processArgs($node->args['args'], $definedObjects)).');'."\n".'$'.$node->args['name'].'->name = \''.$node->args['name'].'\';'."\n";
 
                 $definedObjects[$node->args['name']] = $node->args['name'];
 
@@ -39,74 +39,74 @@ 
             case PROPERTY_SET:
                 $preset = '';
 
-                if (preg_match ('/function \((.*)\) use \((.*)\)/', $node->args['property_value']))
+                if (preg_match('/function \((.*)\) use \((.*)\)/', $node->args['property_value']))
                 {
-                    $use = substr ($node->args['property_value'], strpos ($node->args['property_value'], 'use'));
-                    $use = $ouse = substr ($use, ($pos = strpos ($use, '(') + 1), strpos ($use, ')') - $pos);
-                    $use = explode (' ', $use);
+                    $use = substr($node->args['property_value'], strpos($node->args['property_value'], 'use'));
+                    $use = $ouse = substr($use, ($pos = strpos($use, '(') + 1), strpos($use, ')') - $pos);
+                    $use = explode(' ', $use);
 
                     foreach ($use as $id => $useParam)  
                         if (isset ($definedObjects[$useParam]) && $use[$id + 1][0] == '$')
                         {
                             $fname = $use[$id + 1];
 
-                            if (substr ($fname, strlen ($fname) - 1) == ',')
-                                $fname = substr ($fname, 0, -1);
+                            if (substr($fname, strlen($fname) - 1) == ',')
+                                $fname = substr($fname, 0, -1);
 
                             $preset .= "$fname = $useParam; ";
 
                             unset ($use[$id]);
                         }
 
-                    $preset = self::formatLine ($preset, $definedObjects) ."\n";
+                    $preset = self::formatLine($preset, $definedObjects)."\n";
 
-                    $node->args['property_value'] = self::formatLine (str_replace ($ouse, join (' ', $use), $node->args['property_value']), $definedObjects);
+                    $node->args['property_value'] = self::formatLine(str_replace($ouse, join(' ', $use), $node->args['property_value']), $definedObjects);
                 }
                 
-                $code .= $preset .'$'. $owner->args['name'] .'->'. $node->args['property_name'] .' = '. self::formatLine ($node->args['property_value'], $definedObjects) .';' ."\n";
+                $code .= $preset.'$'.$owner->args['name'].'->'.$node->args['property_name'].' = '.self::formatLine($node->args['property_value'], $definedObjects).';'."\n";
 
                 break;
 
             case METHOD_CALL:
-                $code .= '$'. $owner->args['name'] .'->'. $node->args['method_name'] .' ('. implode (', ', self::processArgs ($node->args['method_args'], $definedObjects)) .');' ."\n";
+                $code .= '$'.$owner->args['name'].'->'.$node->args['method_name'].' ('.implode(', ', self::processArgs($node->args['method_args'], $definedObjects)).');'."\n";
 
                 break;
         }
 
-        foreach ($node->getNodes () as $subnode)
-            $code .= self::translateNode ($subnode, $node, $definedObjects);
+        foreach ($node->getNodes() as $subnode)
+            $code .= self::translateNode($subnode, $node, $definedObjects);
 
         return $code;
     }
 
-    protected static function processArgs (array $args, array $definedObjects = []): array
+    protected static function processArgs(array $args, array $definedObjects = []): array
     {
         $newArgs = [];
 
         foreach ($args as $arg)
-            $newArgs[] = self::formatLine ($arg, $definedObjects);
+            $newArgs[] = self::formatLine($arg, $definedObjects);
 
         return $newArgs;
     }
 
-    protected static function formatLine (string $line, array $objects = []): string
+    protected static function formatLine(string $line, array $objects = []): string
     {
-        if (sizeof ($objects) > 0)
+        if (sizeof($objects) > 0)
         {
-            $len     = strlen ($line);
+            $len     = strlen($line);
             $newLine = '';
 
-            $replacement = array_map (function ($object)
+            $replacement = array_map(function($object)
             {
-                return '$'. $object;
+                return '$'.$object;
             }, $objects);
 
-            $replacement = array_map (function ($name)
+            $replacement = array_map(function($name)
             {
-                return strlen ($name = trim ($name)) + substr_count ($name, '_');
-            }, $omap = array_flip ($replacement));
+                return strlen($name = trim($name)) + substr_count($name, '_');
+            }, $omap = array_flip($replacement));
 
-            arsort ($replacement);
+            arsort($replacement);
 
             $nReplacement = [];
 
@@ -114,14 +114,14 @@ 
                 $nReplacement[$omap[$replaceTo]] = $replaceTo;
 
             $replacement = $nReplacement;
-            $blacklist   = array_flip (['\'', '"', '$']);
+            $blacklist   = array_flip(['\'', '"', '$']);
 
             for ($i = 0; $i < $len; ++$i)
             {
                 $replaced = false;
 
                 foreach ($replacement as $name => $replaceAt)
-                    if (substr ($line, $i, ($l = strlen ($name))) == $name && !isset ($blacklist[$line[$i - 1]]))
+                    if (substr($line, $i, ($l = strlen($name))) == $name && !isset ($blacklist[$line[$i - 1]]))
                     {
                         $newLine .= $replaceAt;
 

Braces +27 added lines, -18 removed lines

@@ -9,8 +9,9 @@ 
         $code = "<?php\n\nnamespace VoidEngine;\n\n";
         $definedObjects = [];
 
-        foreach ($tree->getNodes () as $node)
-            $code .= self::translateNode ($node, null, $definedObjects) ."\n";
+        foreach ($tree->getNodes () as $node) {
+                    $code .= self::translateNode ($node, null, $definedObjects) ."\n";
+        }
 
         return $code;
     }
@@ -27,8 +28,9 @@ 
                 break;
 
             case OBJECT_DEFINITION:
-                if (isset ($definedObjects[$node->args['name']]))
-                    break;
+                if (isset ($definedObjects[$node->args['name']])) {
+                                    break;
+                }
                 
                 $code .= '$'. $node->args['name'] .' = new '. $node->args['class'] .' ('. implode (', ', self::processArgs ($node->args['args'], $definedObjects)) .');' ."\n". '$'. $node->args['name'] .'->name = \''. $node->args['name'] .'\';' ."\n";
 
@@ -45,13 +47,15 @@ 
                     $use = $ouse = substr ($use, ($pos = strpos ($use, '(') + 1), strpos ($use, ')') - $pos);
                     $use = explode (' ', $use);
 
-                    foreach ($use as $id => $useParam)  
-                        if (isset ($definedObjects[$useParam]) && $use[$id + 1][0] == '$')
+                    foreach ($use as $id => $useParam) {
+                                            if (isset ($definedObjects[$useParam]) && $use[$id + 1][0] == '$')
                         {
                             $fname = $use[$id + 1];
+                    }
 
-                            if (substr ($fname, strlen ($fname) - 1) == ',')
-                                $fname = substr ($fname, 0, -1);
+                            if (substr ($fname, strlen ($fname) - 1) == ',') {
+                                                            $fname = substr ($fname, 0, -1);
+                            }
 
                             $preset .= "$fname = $useParam; ";
 
@@ -73,8 +77,9 @@ 
                 break;
         }
 
-        foreach ($node->getNodes () as $subnode)
-            $code .= self::translateNode ($subnode, $node, $definedObjects);
+        foreach ($node->getNodes () as $subnode) {
+                    $code .= self::translateNode ($subnode, $node, $definedObjects);
+        }
 
         return $code;
     }
@@ -83,8 +88,9 @@ 
     {
         $newArgs = [];
 
-        foreach ($args as $arg)
-            $newArgs[] = self::formatLine ($arg, $definedObjects);
+        foreach ($args as $arg) {
+                    $newArgs[] = self::formatLine ($arg, $definedObjects);
+        }
 
         return $newArgs;
     }
@@ -110,8 +116,9 @@ 
 
             $nReplacement = [];
 
-            foreach ($replacement as $replaceTo => $nLn)
-                $nReplacement[$omap[$replaceTo]] = $replaceTo;
+            foreach ($replacement as $replaceTo => $nLn) {
+                            $nReplacement[$omap[$replaceTo]] = $replaceTo;
+            }
 
             $replacement = $nReplacement;
             $blacklist   = array_flip (['\'', '"', '$']);
@@ -120,10 +127,11 @@ 
             {
                 $replaced = false;
 
-                foreach ($replacement as $name => $replaceAt)
-                    if (substr ($line, $i, ($l = strlen ($name))) == $name && !isset ($blacklist[$line[$i - 1]]))
+                foreach ($replacement as $name => $replaceAt) {
+                                    if (substr ($line, $i, ($l = strlen ($name))) == $name && !isset ($blacklist[$line[$i - 1]]))
                     {
                         $newLine .= $replaceAt;
+                }
 
                         $i += $l - 1;
                         $replaced = true;
@@ -131,8 +139,9 @@ 
                         break;
                     }
 
-                if (!$replaced)
-                    $newLine .= $line[$i];
+                if (!$replaced) {
+                                    $newLine .= $line[$i];
+                }
             }
 
             $line = $newLine;

engine/extensions/VLF/bin/AST/Node.php

Spacing +12 added lines, -12 removed lines

@@ -8,10 +8,10 @@ 
 class Node
 {
     public ?string $line = null; // Строка
-    public array $words  = [];   // Список слов
-    public int $height   = 0;    // Высота строки
-    public int $type     = 0;    // Тип ноды
-    public array $args   = [];   // Аргументы ноды
+    public array $words  = []; // Список слов
+    public int $height   = 0; // Высота строки
+    public int $type     = 0; // Тип ноды
+    public array $args   = []; // Аргументы ноды
 
     protected array $nodes = []; // Ветви ноды
 
@@ -20,10 +20,10 @@ 
      * 
      * [@param array $node = null] - массив для импорта ноды
      */
-    public function __construct (array $node = null)
+    public function __construct(array $node = null)
     {
         if ($node !== null)
-            $this->import ($node);
+            $this->import($node);
     }
 
     /**
@@ -33,7 +33,7 @@ 
      * 
      * @return Node - возвращает саму себя
      */
-    public function import (array $node): Node
+    public function import(array $node): Node
     {
         $this->line   = $node['line'] ?? null;
         $this->words  = $node['words'] ?? [];
@@ -41,7 +41,7 @@ 
         $this->type   = $node['type'] ?? 0;
         $this->args   = $node['args'] ?? [];
 
-        $this->nodes = array_map (fn (array $t) => new Node ($t), $node['nodes'] ?? []);
+        $this->nodes = array_map(fn(array $t) => new Node($t), $node['nodes'] ?? []);
 
         return $this;
     }
@@ -51,7 +51,7 @@ 
      * 
      * @return array - возвращает массив экспортированной ноды
      */
-    public function export (): array
+    public function export(): array
     {
         return [
             'line'   => $this->line,
@@ -60,7 +60,7 @@ 
             'type'   => $this->type,
             'args'   => $this->args,
 
-            'nodes'  => array_map (fn (Node $node) => $node->export (), $this->nodes)
+            'nodes'  => array_map(fn(Node $node) => $node->export(), $this->nodes)
         ];
     }
 
@@ -71,7 +71,7 @@ 
      * 
      * @return Node - возвращает саму себя
      */
-    public function push (Node $node): Node
+    public function push(Node $node): Node
     {
         $this->nodes[] = $node;
 
@@ -83,7 +83,7 @@ 
      * 
      * @return array - возвращает список ветвей
      */
-    public function getNodes (): array
+    public function getNodes(): array
     {
         return $this->nodes;
     }

Braces +3 added lines, -2 removed lines

@@ -22,8 +22,9 @@
      */
     public function __construct (array $node = null)
     {
-        if ($node !== null)
-            $this->import ($node);
+        if ($node !== null) {
+                    $this->import ($node);
+        }
     }
 
     /**