cadmium-org / cadmium-cms

www/engine/System/Classes/Utils/View.php

Unused Use Statements +4 added lines, -1 removed lines

@@ -2,7 +2,10 @@
 
 namespace Utils {
 
-	use Exception, Modules\Extend, Explorer, Template;
+	use Exception;
+	use Modules\Extend;
+	use Explorer;
+	use Template;
 
 	abstract class View {
 

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 
 			if (false === ($path = Extend\Templates::path())) throw new Exception\View;
 
-			if (!isset(self::$cache[$file_name = ($path . $name . '.tpl')])) {
+			if (!isset(self::$cache[$file_name = ($path.$name.'.tpl')])) {
 
 				if (false === ($contents = Explorer::getContents($file_name))) throw new Exception\ViewFile($file_name);
 

Braces +6 added lines, -2 removed lines

@@ -19,11 +19,15 @@
 
 		public static function get(string $name) {
 
-			if (false === ($path = Extend\Templates::path())) throw new Exception\View;
+			if (false === ($path = Extend\Templates::path())) {
+				throw new Exception\View;
+			}
 
 			if (!isset(self::$cache[$file_name = ($path . $name . '.tpl')])) {
 
-				if (false === ($contents = Explorer::getContents($file_name))) throw new Exception\ViewFile($file_name);
+				if (false === ($contents = Explorer::getContents($file_name))) {
+					throw new Exception\ViewFile($file_name);
+				}
 
 				self::$cache[$file_name] = Template::createBlock($contents);
 			}

www/engine/Framework/Includes/Constants.php

Spacing +14 added lines, -14 removed lines

@@ -2,23 +2,23 @@
 
 # Date formats
 
-define('DATE_FORMAT_STANDART',                      'd.m.Y');
-define('DATE_FORMAT_MYSQL',                         'Y-m-d');
-define('DATE_FORMAT_DATETIME',                      'd.m.Y, H:i');
-define('DATE_FORMAT_W3C',                           'Y-m-d\TH:i:sP');
+define('DATE_FORMAT_STANDART', 'd.m.Y');
+define('DATE_FORMAT_MYSQL', 'Y-m-d');
+define('DATE_FORMAT_DATETIME', 'd.m.Y, H:i');
+define('DATE_FORMAT_W3C', 'Y-m-d\TH:i:sP');
 
 # Form fields
 
-define('FORM_FIELD_HIDDEN',                         'hidden');
-define('FORM_FIELD_PASSWORD',                       'password');
-define('FORM_FIELD_CAPTCHA',                        'captcha');
-define('FORM_FIELD_TEXT',                           'text');
-define('FORM_FIELD_TEXTAREA',                       'textarea');
+define('FORM_FIELD_HIDDEN', 'hidden');
+define('FORM_FIELD_PASSWORD', 'password');
+define('FORM_FIELD_CAPTCHA', 'captcha');
+define('FORM_FIELD_TEXT', 'text');
+define('FORM_FIELD_TEXTAREA', 'textarea');
 
 # String pools
 
-define('STR_POOL_DEFAULT',                          'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789');
-define('STR_POOL_LATIN',                            'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ');
-define('STR_POOL_LATIN_LOWER',                      'abcdefghijklmnopqrstuvwxyz');
-define('STR_POOL_LATIN_UPPER',                      'ABCDEFGHIJKLMNOPQRSTUVWXYZ');
-define('STR_POOL_NUMERIC',                          '0123456789');
+define('STR_POOL_DEFAULT', 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789');
+define('STR_POOL_LATIN', 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ');
+define('STR_POOL_LATIN_LOWER', 'abcdefghijklmnopqrstuvwxyz');
+define('STR_POOL_LATIN_UPPER', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ');
+define('STR_POOL_NUMERIC', '0123456789');

www/engine/Framework/Includes/Headers/Status.php

Spacing +53 added lines, -53 removed lines

@@ -2,60 +2,60 @@
 
 # Status codes
 
-define('STATUS_CODE_100',       100);
-define('STATUS_CODE_101',       101);
-define('STATUS_CODE_102',       102);
+define('STATUS_CODE_100', 100);
+define('STATUS_CODE_101', 101);
+define('STATUS_CODE_102', 102);
 
-define('STATUS_CODE_200',       200);
-define('STATUS_CODE_201',       201);
-define('STATUS_CODE_202',       202);
-define('STATUS_CODE_203',       203);
-define('STATUS_CODE_204',       204);
-define('STATUS_CODE_205',       205);
-define('STATUS_CODE_206',       206);
-define('STATUS_CODE_207',       207);
-define('STATUS_CODE_226',       226);
+define('STATUS_CODE_200', 200);
+define('STATUS_CODE_201', 201);
+define('STATUS_CODE_202', 202);
+define('STATUS_CODE_203', 203);
+define('STATUS_CODE_204', 204);
+define('STATUS_CODE_205', 205);
+define('STATUS_CODE_206', 206);
+define('STATUS_CODE_207', 207);
+define('STATUS_CODE_226', 226);
 
-define('STATUS_CODE_300',       300);
-define('STATUS_CODE_301',       301);
-define('STATUS_CODE_302',       302);
-define('STATUS_CODE_303',       303);
-define('STATUS_CODE_304',       304);
-define('STATUS_CODE_305',       305);
-define('STATUS_CODE_307',       307);
+define('STATUS_CODE_300', 300);
+define('STATUS_CODE_301', 301);
+define('STATUS_CODE_302', 302);
+define('STATUS_CODE_303', 303);
+define('STATUS_CODE_304', 304);
+define('STATUS_CODE_305', 305);
+define('STATUS_CODE_307', 307);
 
-define('STATUS_CODE_400',       400);
-define('STATUS_CODE_401',       401);
-define('STATUS_CODE_402',       402);
-define('STATUS_CODE_403',       403);
-define('STATUS_CODE_404',       404);
-define('STATUS_CODE_405',       405);
-define('STATUS_CODE_406',       406);
-define('STATUS_CODE_407',       407);
-define('STATUS_CODE_408',       408);
-define('STATUS_CODE_409',       409);
-define('STATUS_CODE_410',       410);
-define('STATUS_CODE_411',       411);
-define('STATUS_CODE_412',       412);
-define('STATUS_CODE_413',       413);
-define('STATUS_CODE_414',       414);
-define('STATUS_CODE_415',       415);
-define('STATUS_CODE_416',       416);
-define('STATUS_CODE_417',       417);
-define('STATUS_CODE_422',       422);
-define('STATUS_CODE_423',       423);
-define('STATUS_CODE_424',       424);
-define('STATUS_CODE_425',       425);
-define('STATUS_CODE_426',       426);
-define('STATUS_CODE_449',       449);
+define('STATUS_CODE_400', 400);
+define('STATUS_CODE_401', 401);
+define('STATUS_CODE_402', 402);
+define('STATUS_CODE_403', 403);
+define('STATUS_CODE_404', 404);
+define('STATUS_CODE_405', 405);
+define('STATUS_CODE_406', 406);
+define('STATUS_CODE_407', 407);
+define('STATUS_CODE_408', 408);
+define('STATUS_CODE_409', 409);
+define('STATUS_CODE_410', 410);
+define('STATUS_CODE_411', 411);
+define('STATUS_CODE_412', 412);
+define('STATUS_CODE_413', 413);
+define('STATUS_CODE_414', 414);
+define('STATUS_CODE_415', 415);
+define('STATUS_CODE_416', 416);
+define('STATUS_CODE_417', 417);
+define('STATUS_CODE_422', 422);
+define('STATUS_CODE_423', 423);
+define('STATUS_CODE_424', 424);
+define('STATUS_CODE_425', 425);
+define('STATUS_CODE_426', 426);
+define('STATUS_CODE_449', 449);
 
-define('STATUS_CODE_500',       500);
-define('STATUS_CODE_501',       501);
-define('STATUS_CODE_502',       502);
-define('STATUS_CODE_503',       503);
-define('STATUS_CODE_504',       504);
-define('STATUS_CODE_505',       505);
-define('STATUS_CODE_506',       506);
-define('STATUS_CODE_507',       507);
-define('STATUS_CODE_509',       509);
-define('STATUS_CODE_510',       510);
+define('STATUS_CODE_500', 500);
+define('STATUS_CODE_501', 501);
+define('STATUS_CODE_502', 502);
+define('STATUS_CODE_503', 503);
+define('STATUS_CODE_504', 504);
+define('STATUS_CODE_505', 505);
+define('STATUS_CODE_506', 506);
+define('STATUS_CODE_507', 507);
+define('STATUS_CODE_509', 509);
+define('STATUS_CODE_510', 510);

www/engine/Framework/Includes/Regex.php

Indentation +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 define('REGEX_TEMPLATE_COMPONENT_NAME',             '/^(?![0-9_])(?!.*_$)(?!.*_{2,})[a-zA-Z0-9_]+$/');
 
 define('REGEX_TEMPLATE_STRUCTURE',                  '/(?s){[ ]*(!)?[ ]*(block|for|widget)[ ]*:[ ]*([a-zA-Z0-9_]+)[ ]*' .
-                                                    '(?:\/[ ]*}|}(.*?){[ ]*\/[ ]*\2[ ]*:[ ]*\3[ ]*})/');
+													'(?:\/[ ]*}|}(.*?){[ ]*\/[ ]*\2[ ]*:[ ]*\3[ ]*})/');
 
 define('REGEX_TEMPLATE_VARIABLE',                   '/\$([a-zA-Z0-9_]+)\$/');
 define('REGEX_TEMPLATE_PHRASE',                     '/\%([a-zA-Z0-9_]+)\%/');

Spacing +7 added lines, -7 removed lines

@@ -2,19 +2,19 @@
 
 # Form expressions
 
-define('REGEX_FORM_NAME',                           '/^[a-zA-Z][a-zA-Z0-9]*$/');
-define('REGEX_FORM_FIELD_KEY',                      '/^(?![0-9_])(?!.*_$)(?!.*_{2,})[a-zA-Z0-9_]+$/');
+define('REGEX_FORM_NAME', '/^[a-zA-Z][a-zA-Z0-9]*$/');
+define('REGEX_FORM_FIELD_KEY', '/^(?![0-9_])(?!.*_$)(?!.*_{2,})[a-zA-Z0-9_]+$/');
 
 # Language expressions
 
-define('REGEX_LANGUAGE_PHRASE_NAME',                '/^(?![0-9_])(?!.*_$)(?!.*_{2,})[a-zA-Z0-9_]+$/');
+define('REGEX_LANGUAGE_PHRASE_NAME', '/^(?![0-9_])(?!.*_$)(?!.*_{2,})[a-zA-Z0-9_]+$/');
 
 # Template expressions
 
-define('REGEX_TEMPLATE_COMPONENT_NAME',             '/^(?![0-9_])(?!.*_$)(?!.*_{2,})[a-zA-Z0-9_]+$/');
+define('REGEX_TEMPLATE_COMPONENT_NAME', '/^(?![0-9_])(?!.*_$)(?!.*_{2,})[a-zA-Z0-9_]+$/');
 
-define('REGEX_TEMPLATE_STRUCTURE',                  '/(?s){[ ]*(!)?[ ]*(block|for|widget)[ ]*:[ ]*([a-zA-Z0-9_]+)[ ]*' .
+define('REGEX_TEMPLATE_STRUCTURE', '/(?s){[ ]*(!)?[ ]*(block|for|widget)[ ]*:[ ]*([a-zA-Z0-9_]+)[ ]*'.
                                                     '(?:\/[ ]*}|}(.*?){[ ]*\/[ ]*\2[ ]*:[ ]*\3[ ]*})/');
 
-define('REGEX_TEMPLATE_VARIABLE',                   '/\$([a-zA-Z0-9_]+)\$/');
-define('REGEX_TEMPLATE_PHRASE',                     '/\%([a-zA-Z0-9_]+)\%/');
+define('REGEX_TEMPLATE_VARIABLE', '/\$([a-zA-Z0-9_]+)\$/');
+define('REGEX_TEMPLATE_PHRASE', '/\%([a-zA-Z0-9_]+)\%/');

www/engine/Framework/Classes/Range/Range.php

Braces +3 added lines, -1 removed lines

@@ -19,7 +19,9 @@
 
 		protected static function init(string $file_name) {
 
-			if (is_array($range = Explorer::include($file_name))) static::$range = $range;
+			if (is_array($range = Explorer::include($file_name))) {
+				static::$range = $range;
+			}
 		}
 
 		/**

www/engine/Framework/Classes/XML/XML.php

Braces +9 added lines, -3 removed lines

@@ -30,7 +30,9 @@ 
 
 		public static function stringify(SimpleXMLElement $xml) {
 
-			if (false === ($xml = dom_import_simplexml($xml))) return false;
+			if (false === ($xml = dom_import_simplexml($xml))) {
+				return false;
+			}
 
 			$dom = $xml->ownerDocument; $dom->formatOutput = true;
 
@@ -47,7 +49,9 @@ 
 
 		public static function load(string $file_name) {
 
-			if (false === ($contents = Explorer::getContents($file_name))) return false;
+			if (false === ($contents = Explorer::getContents($file_name))) {
+				return false;
+			}
 
 			return self::parse($contents);
 		}
@@ -60,7 +64,9 @@ 
 
 		public static function save(string $file_name, SimpleXMLElement $xml) {
 
-			if (false === ($xml = self::stringify($xml))) return false;
+			if (false === ($xml = self::stringify($xml))) {
+				return false;
+			}
 
 			return Explorer::putContents($file_name, $xml);
 		}

Doc Comments +2 added lines, -2 removed lines

@@ -14,7 +14,7 @@ 
 		/**
 		 * Parse a string as XML
 		 *
-		 * @return the XML object or false on failure
+		 * @return SimpleXMLElement XML object or false on failure
 		 */
 
 		public static function parse(string $string) {
@@ -25,7 +25,7 @@ 
 		/**
 		 * Convert an XML object to a string
 		 *
-		 * @return the string or false on failure
+		 * @return string string or false on failure
 		 */
 
 		public static function stringify(SimpleXMLElement $xml) {

www/engine/Framework/Classes/Language/Language.php

Braces +9 added lines, -3 removed lines

@@ -19,7 +19,9 @@ 
 
 		private static function addPhrase(string $name, string $value) {
 
-			if (preg_match(REGEX_LANGUAGE_PHRASE_NAME, $name)) self::$phrases[$name] = $value;
+			if (preg_match(REGEX_LANGUAGE_PHRASE_NAME, $name)) {
+				self::$phrases[$name] = $value;
+			}
 		}
 
 		/**
@@ -30,9 +32,13 @@ 
 
 		public static function load(string $file_name) {
 
-			if (!is_array($phrases = Explorer::include($file_name))) return false;
+			if (!is_array($phrases = Explorer::include($file_name))) {
+				return false;
+			}
 
-			foreach ($phrases as $name => $value) if (is_scalar($value)) self::addPhrase($name, $value);
+			foreach ($phrases as $name => $value) {
+				if (is_scalar($value)) self::addPhrase($name, $value);
+			}
 
 			# ------------------------
 

www/engine/Framework/Classes/Dataset/Validator.php

Spacing +6 added lines, -6 removed lines

@@ -19,17 +19,17 @@
 
 			# Check basic types
 
-			if (is_string   ($default)) return function(string      $value) { return $value; };
+			if (is_string($default)) return function(string      $value) { return $value; };
 
-			if (is_bool     ($default)) return function(bool        $value) { return $value; };
+			if (is_bool($default)) return function(bool        $value) { return $value; };
 
-			if (is_int      ($default)) return function(int         $value) { return $value; };
+			if (is_int($default)) return function(int         $value) { return $value; };
 
-			if (is_float    ($default)) return function(float       $value) { return $value; };
+			if (is_float($default)) return function(float       $value) { return $value; };
 
-			if (is_array    ($default)) return function(array       $value) { return $value; };
+			if (is_array($default)) return function(array       $value) { return $value; };
 
-			if (is_callable ($default)) return function(callable    $value) { return $value; };
+			if (is_callable($default)) return function(callable    $value) { return $value; };
 
 			# Check object type
 

Braces +31 added lines, -8 removed lines

@@ -19,28 +19,51 @@
 
 			# Check basic types
 
-			if (is_string   ($default)) return function(string      $value) { return $value; };
+			if (is_string   ($default)) {
+				return function(string      $value) { return $value;
+			}
+			};
 
-			if (is_bool     ($default)) return function(bool        $value) { return $value; };
+			if (is_bool     ($default)) {
+				return function(bool        $value) { return $value;
+			}
+			};
 
-			if (is_int      ($default)) return function(int         $value) { return $value; };
+			if (is_int      ($default)) {
+				return function(int         $value) { return $value;
+			}
+			};
 
-			if (is_float    ($default)) return function(float       $value) { return $value; };
+			if (is_float    ($default)) {
+				return function(float       $value) { return $value;
+			}
+			};
 
-			if (is_array    ($default)) return function(array       $value) { return $value; };
+			if (is_array    ($default)) {
+				return function(array       $value) { return $value;
+			}
+			};
 
-			if (is_callable ($default)) return function(callable    $value) { return $value; };
+			if (is_callable ($default)) {
+				return function(callable    $value) { return $value;
+			}
+			};
 
 			# Check object type
 
-			if (is_object($default)) return function($value) use($default) {
+			if (is_object($default)) {
+				return function($value) use($default) {
 
 				return (is_a($value, get_class($default)) ? $value : null);
+			}
 			};
 
 			# Check resource type
 
-			if (is_resource($default)) return function($value) { return (is_resource($value) ? $value : null); };
+			if (is_resource($default)) {
+				return function($value) { return (is_resource($value) ? $value : null);
+			}
+			};
 
 			# ------------------------
 

www/engine/Framework/Classes/DB/Query/Update.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 
 			# Build query
 
-			$this->query = ('UPDATE ' . $table . ' SET ' . $set . ($condition ? (' WHERE (' .  $condition . ')') : ''));
+			$this->query = ('UPDATE '.$table.' SET '.$set.($condition ? (' WHERE ('.$condition.')') : ''));
 		}
 	}
 }