cadmium-org / cadmium-cms

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);
 		}

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.')') : ''));
 		}
 	}
 }

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

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 
 		protected function getValue(string $value) {
 
-			return ('\'' . addslashes($value) . '\'');
+			return ('\''.addslashes($value).'\'');
 		}
 
 		# Get field sort

Braces +14 added lines, -5 removed lines

@@ -31,7 +31,9 @@ 
 
 		protected function getString($source = null, string $pattern = '', string $separator = '') {
 
-			if (!is_array($source)) return (is_scalar($source) ? strval($source) : '');
+			if (!is_array($source)) {
+				return (is_scalar($source) ? strval($source) : '');
+			}
 
 			$regexs = ['key' => '/\^([a-z]+)/', 'value' => '/\$([a-z]+)/']; $matches = ['key' => [], 'value' => []];
 
@@ -39,18 +41,25 @@ 
 
 			# Parse pattern
 
-			foreach ($regexs as $name => $regex) preg_match($regex, $pattern, $matches[$name]);
+			foreach ($regexs as $name => $regex) {
+				preg_match($regex, $pattern, $matches[$name]);
+			}
 
 			# Process replacements
 
-			foreach ($source as $key => $value) if (is_scalar($value)) {
+			foreach ($source as $key => $value) {
+				if (is_scalar($value)) {
 
-				$output[$count] = $pattern; $item = &$output[$count++];
+				$output[$count] = $pattern;
+			}
+			$item = &$output[$count++];
 
-				foreach ($matches as $name => $match) if (isset($match[1]) && isset($parsers[$match[1]])) {
+				foreach ($matches as $name => $match) {
+					if (isset($match[1]) && isset($parsers[$match[1]])) {
 
 					$item = str_replace($match[0], [$this, $parsers[$match[1]]]($$name), $item);
 				}
+				}
 			};
 
 			# ------------------------

www/engine/Framework/Classes/DB/Result.php

Braces +9 added lines, -3 removed lines

@@ -56,7 +56,9 @@ 
 
 		public function getRow() {
 
-			if (!is_object($this->result)) return null;
+			if (!is_object($this->result)) {
+				return null;
+			}
 
 			return mysqli_fetch_assoc($this->result);
 		}
@@ -67,9 +69,13 @@ 
 
 		public function getRows() {
 
-			if (!is_object($this->result)) return [];
+			if (!is_object($this->result)) {
+				return [];
+			}
 
-			$rows = []; while (null !== ($row = $this->getRow())) $rows[] = $row;
+			$rows = []; while (null !== ($row = $this->getRow())) {
+				$rows[] = $row;
+			}
 
 			# ------------------------
 

www/engine/Framework/Classes/Template/Loop.php

Braces +3 added lines, -1 removed lines

@@ -36,7 +36,9 @@
 
 		public function addItems(array $items) {
 
-			foreach ($items as $item) if (is_array($item)) $this->addItem($item);
+			foreach ($items as $item) {
+				if (is_array($item)) $this->addItem($item);
+			}
 
 			return $this;
 		}