Inspection of "Update .gitignore" - cadmium-org/cadmium-cms - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 1f6010...1bd3c9 )

by Anton

created 2017-06-22 13:32 UTC

Status

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -23,19 +23,19 @@
 block discarded – undo
 
 			# Add params
 
-			$this->params->addTextual       ('code',                true, 40, true, '');
-			$this->params->addTextual       ('ip',                  true, 255, false, '');
-			$this->params->addInteger       ('time',                false, 10, true, 0);
+			$this->params->addTextual('code', true, 40, true, '');
+			$this->params->addTextual('ip', true, 255, false, '');
+			$this->params->addInteger('time', false, 10, true, 0);
 
 			# Add indexes
 
-			$this->indexes->add             ('code',                'UNIQUE');
-			$this->indexes->add             ('ip');
-			$this->indexes->add             ('time');
+			$this->indexes->add('code', 'UNIQUE');
+			$this->indexes->add('ip');
+			$this->indexes->add('time');
 
 			# Add foreign keys
 
-			$this->foreigns->add            ('id',                  TABLE_USERS, 'id', 'CASCADE', 'RESTRICT');
+			$this->foreigns->add('id', TABLE_USERS, 'id', 'CASCADE', 'RESTRICT');
 		}
 	}
 }

Please login to merge, or discard this patch.

www/engine/System/Classes/Modules/Entitizer/Definition/Menuitem.php 1 patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -23,16 +23,16 @@
 block discarded – undo
 
 			# Add params
 
-			$this->params->addBoolean       ('active',              false);
-			$this->params->addInteger       ('position',            true, 2, true, 0);
-			$this->params->addTextual       ('slug',                true, 255, false, '');
-			$this->params->addTextual       ('text',                true, 255, false, '');
-			$this->params->addInteger       ('target',              true, 1, true, TARGET_SELF);
+			$this->params->addBoolean('active', false);
+			$this->params->addInteger('position', true, 2, true, 0);
+			$this->params->addTextual('slug', true, 255, false, '');
+			$this->params->addTextual('text', true, 255, false, '');
+			$this->params->addInteger('target', true, 1, true, TARGET_SELF);
 
 			# Add indexes
 
-			$this->indexes->add             ('active');
-			$this->indexes->add             ('position');
+			$this->indexes->add('active');
+			$this->indexes->add('position');
 		}
 	}
 }

Please login to merge, or discard this patch.

www/engine/System/Classes/Modules/Entitizer/Dataset/User.php 1 patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -21,14 +21,14 @@
 block discarded – undo
 
 		protected function init() {
 
-			$this->addVirtual('gravatar', function (array $data) {
+			$this->addVirtual('gravatar', function(array $data) {
 
 				return md5(strtolower($data['email']));
 			});
 
-			$this->addVirtual('full_name', function (array $data) {
+			$this->addVirtual('full_name', function(array $data) {
 
-				return trim($data['first_name'] . ' ' . $data['last_name']);
+				return trim($data['first_name'].' '.$data['last_name']);
 			});
 		}
 	}

Please login to merge, or discard this patch.

www/engine/System/Classes/Modules/Entitizer/Dataset/Page.php 2 patches

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -21,23 +21,23 @@
 block discarded – undo
 
 		protected function init() {
 
-			$this->addVirtual('active', function (array $data) {
+			$this->addVirtual('active', function(array $data) {
 
 				return (($data['visibility'] === VISIBILITY_PUBLISHED) && !$data['locked']);
 			});
 
-			$this->addVirtual('link', function (array $data) {
+			$this->addVirtual('link', function(array $data) {
 
 				if ('' === $data['slug']) return '';
 
-				return (INSTALL_PATH . '/' . $data['slug']);
+				return (INSTALL_PATH.'/'.$data['slug']);
 			});
 
-			$this->addVirtual('canonical', function (array $data) {
+			$this->addVirtual('canonical', function(array $data) {
 
 				if ('' === $data['slug']) return '';
 
-				return (Settings::get('system_url') . (($data['id'] !== 1) ? ('/' . $data['slug']) : ''));
+				return (Settings::get('system_url').(($data['id'] !== 1) ? ('/'.$data['slug']) : ''));
 			});
 		}
 	}

Please login to merge, or discard this patch.

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

@@ -28,14 +28,18 @@
 block discarded – undo
 
 			$this->addVirtual('link', function (array $data) {
 
-				if ('' === $data['slug']) return '';
+				if ('' === $data['slug']) {
+					return '';
+				}
 
 				return (INSTALL_PATH . '/' . $data['slug']);
 			});
 
 			$this->addVirtual('canonical', function (array $data) {
 
-				if ('' === $data['slug']) return '';
+				if ('' === $data['slug']) {
+					return '';
+				}
 
 				return (Settings::get('system_url') . (($data['id'] !== 1) ? ('/' . $data['slug']) : ''));
 			});

Please login to merge, or discard this patch.

www/engine/System/Classes/Modules/Entitizer/Dataset/Menuitem.php 2 patches

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -21,13 +21,13 @@
 block discarded – undo
 
 		protected function init() {
 
-			$this->addVirtual('link', function (array $data) {
+			$this->addVirtual('link', function(array $data) {
 
 				if ('' === $data['slug']) return '';
 
 				if (false !== Validate::url($data['slug'])) return $data['slug'];
 
-				return (INSTALL_PATH . '/' . $data['slug']);
+				return (INSTALL_PATH.'/'.$data['slug']);
 			});
 		}
 	}

Please login to merge, or discard this patch.

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

@@ -23,9 +23,13 @@
 block discarded – undo
 
 			$this->addVirtual('link', function (array $data) {
 
-				if ('' === $data['slug']) return '';
+				if ('' === $data['slug']) {
+					return '';
+				}
 
-				if (false !== Validate::url($data['slug'])) return $data['slug'];
+				if (false !== Validate::url($data['slug'])) {
+					return $data['slug'];
+				}
 
 				return (INSTALL_PATH . '/' . $data['slug']);
 			});

Please login to merge, or discard this patch.

www/engine/System/Classes/Modules/Entitizer/Entitizer.php 1 patch

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

@@ -37,9 +37,13 @@
 block discarded – undo
 
 		public static function get(string $table, int $id = 0) : Entitizer\Utils\Entity {
 
-			if (!isset(self::$classes[$table])) throw new Exception\General(self::$error_message);
+			if (!isset(self::$classes[$table])) {
+				throw new Exception\General(self::$error_message);
+			}
 
-			if (isset(self::$cache[$table][$id])) return self::$cache[$table][$id];
+			if (isset(self::$cache[$table][$id])) {
+				return self::$cache[$table][$id];
+			}
 
 			$entity = new self::$classes[$table]; $entity->init($id);
 

Please login to merge, or discard this patch.

www/engine/System/Classes/Modules/Entitizer/Entity/Page.php 3 patches

Indentation +17 added lines, -17 removed lines patch added patch discarded remove patch

@@ -16,7 +16,7 @@  discard block
 block discarded – undo
 		use Entitizer\Common\Page;
 
 		/**
- 		 * Initialize the page by a slug
+		 * Initialize the page by a slug
 		 *
 		 * @return bool : true on success or false on failure
 		 */
@@ -39,13 +39,13 @@  discard block
 block discarded – undo
 
 			$query = ("SELECT " . implode(', ', $selection) .", rel.ancestor as parent_id ") .
 
-			         ("FROM " . static::$table . " ent ") .
+					 ("FROM " . static::$table . " ent ") .
 
-			         ("LEFT JOIN " . static::$table_relations . " rel ON rel.descendant = ent.id AND rel.depth = 1 ") .
+					 ("LEFT JOIN " . static::$table_relations . " rel ON rel.descendant = ent.id AND rel.depth = 1 ") .
 
-			         ("WHERE ent.visibility = " . VISIBILITY_PUBLISHED . " AND ent.access <= " . Auth::get('rank') . " AND ") .
+					 ("WHERE ent.visibility = " . VISIBILITY_PUBLISHED . " AND ent.access <= " . Auth::get('rank') . " AND ") .
 
-			         ("ent.locked = 0 AND ent.slug = '" . addslashes($slug) . "' LIMIT 1");
+					 ("ent.locked = 0 AND ent.slug = '" . addslashes($slug) . "' LIMIT 1");
 
 			# Select entity from DB
 
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
 		}
 
 		/**
- 		 * Update slugs of the page descendants
+		 * Update slugs of the page descendants
 		 *
 		 * @return bool : true on success or false on failure
 		 */
@@ -70,17 +70,17 @@  discard block
 block discarded – undo
 
 			$query = ("UPDATE " . static::$table . " ent JOIN (") .
 
-			         ("SELECT rel.descendant as id, GROUP_CONCAT(ens.name ORDER BY rls.depth DESC SEPARATOR '/') slug ") .
+					 ("SELECT rel.descendant as id, GROUP_CONCAT(ens.name ORDER BY rls.depth DESC SEPARATOR '/') slug ") .
 
-			         ("FROM " . static::$table_relations . " rel ") .
+					 ("FROM " . static::$table_relations . " rel ") .
 
-			         ("JOIN " . static::$table_relations . " rls ON rls.descendant = rel.descendant ") .
+					 ("JOIN " . static::$table_relations . " rls ON rls.descendant = rel.descendant ") .
 
-			         ("JOIN " . static::$table . " ens ON ens.id = rls.ancestor ") .
+					 ("JOIN " . static::$table . " ens ON ens.id = rls.ancestor ") .
 
-			         ("WHERE rel.ancestor = " . $this->id . " GROUP BY rel.descendant") .
+					 ("WHERE rel.ancestor = " . $this->id . " GROUP BY rel.descendant") .
 
-			         (") slg ON slg.id = ent.id SET ent.locked = 1, ent.slug = slg.slug");
+					 (") slg ON slg.id = ent.id SET ent.locked = 1, ent.slug = slg.slug");
 
 			if (!(DB::send($query) && DB::getLast()->status)) return false;
 
@@ -88,15 +88,15 @@  discard block
 block discarded – undo
 
 			$query = ("UPDATE " . static::$table . " ent JOIN (") .
 
-			         ("SELECT rel.descendant as id FROM " . static::$table_relations . " rel ") .
+					 ("SELECT rel.descendant as id FROM " . static::$table_relations . " rel ") .
 
-			         ("JOIN " . static::$table . " enc ON enc.id = rel.descendant AND enc.locked = 1 ") .
+					 ("JOIN " . static::$table . " enc ON enc.id = rel.descendant AND enc.locked = 1 ") .
 
-			         ("LEFT JOIN " . static::$table . " end ON end.id != enc.id AND end.slug = enc.slug ") .
+					 ("LEFT JOIN " . static::$table . " end ON end.id != enc.id AND end.slug = enc.slug ") .
 
-			         ("WHERE end.id IS NULL GROUP BY rel.descendant") .
+					 ("WHERE end.id IS NULL GROUP BY rel.descendant") .
 
-			         (") chk ON chk.id = ent.id SET ent.locked = 0");
+					 (") chk ON chk.id = ent.id SET ent.locked = 0");
 
 			if (!(DB::send($query) && DB::getLast()->status)) return false;
 

Please login to merge, or discard this patch.

Spacing +17 added lines, -17 removed lines patch added patch discarded remove patch

@@ -33,19 +33,19 @@  discard block
 block discarded – undo
 
 			$selection = array_keys($this->definition->getParams());
 
-			foreach ($selection as $key => $field) $selection[$key] = ('ent.' . $field);
+			foreach ($selection as $key => $field) $selection[$key] = ('ent.'.$field);
 
 			# Process query
 
-			$query = ("SELECT " . implode(', ', $selection) .", rel.ancestor as parent_id ") .
+			$query = ("SELECT ".implode(', ', $selection).", rel.ancestor as parent_id ").
 
-			         ("FROM " . static::$table . " ent ") .
+			         ("FROM ".static::$table." ent ").
 
-			         ("LEFT JOIN " . static::$table_relations . " rel ON rel.descendant = ent.id AND rel.depth = 1 ") .
+			         ("LEFT JOIN ".static::$table_relations." rel ON rel.descendant = ent.id AND rel.depth = 1 ").
 
-			         ("WHERE ent.visibility = " . VISIBILITY_PUBLISHED . " AND ent.access <= " . Auth::get('rank') . " AND ") .
+			         ("WHERE ent.visibility = ".VISIBILITY_PUBLISHED." AND ent.access <= ".Auth::get('rank')." AND ").
 
-			         ("ent.locked = 0 AND ent.slug = '" . addslashes($slug) . "' LIMIT 1");
+			         ("ent.locked = 0 AND ent.slug = '".addslashes($slug)."' LIMIT 1");
 
 			# Select entity from DB
 
@@ -68,17 +68,17 @@  discard block
 block discarded – undo
 
 			# Send lock/update request
 
-			$query = ("UPDATE " . static::$table . " ent JOIN (") .
+			$query = ("UPDATE ".static::$table." ent JOIN (").
 
-			         ("SELECT rel.descendant as id, GROUP_CONCAT(ens.name ORDER BY rls.depth DESC SEPARATOR '/') slug ") .
+			         ("SELECT rel.descendant as id, GROUP_CONCAT(ens.name ORDER BY rls.depth DESC SEPARATOR '/') slug ").
 
-			         ("FROM " . static::$table_relations . " rel ") .
+			         ("FROM ".static::$table_relations." rel ").
 
-			         ("JOIN " . static::$table_relations . " rls ON rls.descendant = rel.descendant ") .
+			         ("JOIN ".static::$table_relations." rls ON rls.descendant = rel.descendant ").
 
-			         ("JOIN " . static::$table . " ens ON ens.id = rls.ancestor ") .
+			         ("JOIN ".static::$table." ens ON ens.id = rls.ancestor ").
 
-			         ("WHERE rel.ancestor = " . $this->id . " GROUP BY rel.descendant") .
+			         ("WHERE rel.ancestor = ".$this->id." GROUP BY rel.descendant").
 
 			         (") slg ON slg.id = ent.id SET ent.locked = 1, ent.slug = slg.slug");
 
@@ -86,15 +86,15 @@  discard block
 block discarded – undo
 
 			# Send unlock request
 
-			$query = ("UPDATE " . static::$table . " ent JOIN (") .
+			$query = ("UPDATE ".static::$table." ent JOIN (").
 
-			         ("SELECT rel.descendant as id FROM " . static::$table_relations . " rel ") .
+			         ("SELECT rel.descendant as id FROM ".static::$table_relations." rel ").
 
-			         ("JOIN " . static::$table . " enc ON enc.id = rel.descendant AND enc.locked = 1 ") .
+			         ("JOIN ".static::$table." enc ON enc.id = rel.descendant AND enc.locked = 1 ").
 
-			         ("LEFT JOIN " . static::$table . " end ON end.id != enc.id AND end.slug = enc.slug ") .
+			         ("LEFT JOIN ".static::$table." end ON end.id != enc.id AND end.slug = enc.slug ").
 
-			         ("WHERE end.id IS NULL GROUP BY rel.descendant") .
+			         ("WHERE end.id IS NULL GROUP BY rel.descendant").
 
 			         (") chk ON chk.id = ent.id SET ent.locked = 0");
 

Please login to merge, or discard this patch.

Braces +27 added lines, -9 removed lines patch added patch discarded remove patch

@@ -23,7 +23,9 @@  discard block
 block discarded – undo
 
 		public function initBySlug(string $slug) : bool {
 
-			if (0 !== $this->id) return false;
+			if (0 !== $this->id) {
+				return false;
+			}
 
 			# Process value
 
@@ -33,7 +35,9 @@  discard block
 block discarded – undo
 
 			$selection = array_keys($this->definition->getParams());
 
-			foreach ($selection as $key => $field) $selection[$key] = ('ent.' . $field);
+			foreach ($selection as $key => $field) {
+				$selection[$key] = ('ent.' . $field);
+			}
 
 			# Process query
 
@@ -49,7 +53,9 @@  discard block
 block discarded – undo
 
 			# Select entity from DB
 
-			if (!(DB::send($query) && (DB::getLast()->rows === 1))) return false;
+			if (!(DB::send($query) && (DB::getLast()->rows === 1))) {
+				return false;
+			}
 
 			# ------------------------
 
@@ -64,7 +70,9 @@  discard block
 block discarded – undo
 
 		public function updateSlugs() : bool {
 
-			if (0 === $this->id) return false;
+			if (0 === $this->id) {
+				return false;
+			}
 
 			# Send lock/update request
 
@@ -82,7 +90,9 @@  discard block
 block discarded – undo
 
 			         (") slg ON slg.id = ent.id SET ent.locked = 1, ent.slug = slg.slug");
 
-			if (!(DB::send($query) && DB::getLast()->status)) return false;
+			if (!(DB::send($query) && DB::getLast()->status)) {
+				return false;
+			}
 
 			# Send unlock request
 
@@ -98,7 +108,9 @@  discard block
 block discarded – undo
 
 			         (") chk ON chk.id = ent.id SET ent.locked = 0");
 
-			if (!(DB::send($query) && DB::getLast()->status)) return false;
+			if (!(DB::send($query) && DB::getLast()->status)) {
+				return false;
+			}
 
 			# ------------------------
 
@@ -113,7 +125,9 @@  discard block
 block discarded – undo
 
 		public function create(array $data) : bool {
 
-			if (!parent::create($data)) return false;
+			if (!parent::create($data)) {
+				return false;
+			}
 
 			$this->updateSlugs();
 
@@ -130,7 +144,9 @@  discard block
 block discarded – undo
 
 		public function edit(array $data) : bool {
 
-			if (!parent::edit($data)) return false;
+			if (!parent::edit($data)) {
+				return false;
+			}
 
 			$this->updateSlugs();
 
@@ -147,7 +163,9 @@  discard block
 block discarded – undo
 
 		public function move(int $parent_id) : bool {
 
-			if (!parent::move($parent_id)) return false;
+			if (!parent::move($parent_id)) {
+				return false;
+			}
 
 			$this->updateSlugs();
 

Please login to merge, or discard this patch.

engine/System/Classes/Modules/Entitizer/Utils/Definition/Item/Foreign.php 2 patches

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -47,11 +47,11 @@
 block discarded – undo
 
 		public function getStatement() : string {
 
-			return ("FOREIGN KEY (`" . $this->name . "`) REFERENCES `" . $this->table . "` (`" . $this->field . "`)") .
+			return ("FOREIGN KEY (`".$this->name."`) REFERENCES `".$this->table."` (`".$this->field."`)").
 
-				   ((null !== $this->delete) ? (" ON DELETE " . $this->delete) : "") .
+				   ((null !== $this->delete) ? (" ON DELETE ".$this->delete) : "").
 
-				   ((null !== $this->update) ? (" ON UPDATE " . $this->update) : "");
+				   ((null !== $this->update) ? (" ON UPDATE ".$this->update) : "");
 		}
 	}
 }

Please login to merge, or discard this patch.

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

@@ -36,9 +36,13 @@
 block discarded – undo
 
 			$this->name = $name; $this->table = $table; $this->field = $field;
 
-			if (null !== $delete) $this->delete = $this->validateAction($delete);
+			if (null !== $delete) {
+				$this->delete = $this->validateAction($delete);
+			}
 
-			if (null !== $update) $this->update = $this->validateAction($update);
+			if (null !== $update) {
+				$this->update = $this->validateAction($update);
+			}
 		}
 
 		/**

Please login to merge, or discard this patch.

Classes/Modules/Entitizer/Utils/Definition/Item/Param/Type/Integer.php 3 patches

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -32,7 +32,7 @@
 block discarded – undo
 
 			return ("`" . $this->name . "` " . ($this->short ? "tiny" : "") . "int(" . $this->length . ")") .
 
-			       (($this->unsigned ? " UNSIGNED" : "") . " NOT NULL DEFAULT '" . $this->default . "'");
+				   (($this->unsigned ? " UNSIGNED" : "") . " NOT NULL DEFAULT '" . $this->default . "'");
 		}
 
 		/**

Please login to merge, or discard this patch.

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -30,9 +30,9 @@
 block discarded – undo
 
 		public function getStatement() : string {
 
-			return ("`" . $this->name . "` " . ($this->short ? "tiny" : "") . "int(" . $this->length . ")") .
+			return ("`".$this->name."` ".($this->short ? "tiny" : "")."int(".$this->length.")").
 
-			       (($this->unsigned ? " UNSIGNED" : "") . " NOT NULL DEFAULT '" . $this->default . "'");
+			       (($this->unsigned ? " UNSIGNED" : "")." NOT NULL DEFAULT '".$this->default."'");
 		}
 
 		/**

Please login to merge, or discard this patch.

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

@@ -21,7 +21,9 @@
 block discarded – undo
 
 		public function __construct(string $name, bool $short = false, int $length = 0, bool $unsigned = false, int $default = 0) {
 
-			foreach (get_defined_vars() as $name => $value) $this->$name = $value;
+			foreach (get_defined_vars() as $name => $value) {
+				$this->$name = $value;
+			}
 		}
 
 		/**

Please login to merge, or discard this patch.

		@@ -23,19 +23,19 @@
		block discarded – undo
23	23
24	24	# Add params
25	25
26		- $this->params->addTextual ('code', true, 40, true, '');
27		- $this->params->addTextual ('ip', true, 255, false, '');
28		- $this->params->addInteger ('time', false, 10, true, 0);
	26	+ $this->params->addTextual('code', true, 40, true, '');
	27	+ $this->params->addTextual('ip', true, 255, false, '');
	28	+ $this->params->addInteger('time', false, 10, true, 0);
29	29
30	30	# Add indexes
31	31
32		- $this->indexes->add ('code', 'UNIQUE');
33		- $this->indexes->add ('ip');
34		- $this->indexes->add ('time');
	32	+ $this->indexes->add('code', 'UNIQUE');
	33	+ $this->indexes->add('ip');
	34	+ $this->indexes->add('time');
35	35
36	36	# Add foreign keys
37	37
38		- $this->foreigns->add ('id', TABLE_USERS, 'id', 'CASCADE', 'RESTRICT');
	38	+ $this->foreigns->add('id', TABLE_USERS, 'id', 'CASCADE', 'RESTRICT');
39	39	}
40	40	}
41	41	}

		@@ -23,16 +23,16 @@
		block discarded – undo
23	23
24	24	# Add params
25	25
26		- $this->params->addBoolean ('active', false);
27		- $this->params->addInteger ('position', true, 2, true, 0);
28		- $this->params->addTextual ('slug', true, 255, false, '');
29		- $this->params->addTextual ('text', true, 255, false, '');
30		- $this->params->addInteger ('target', true, 1, true, TARGET_SELF);
	26	+ $this->params->addBoolean('active', false);
	27	+ $this->params->addInteger('position', true, 2, true, 0);
	28	+ $this->params->addTextual('slug', true, 255, false, '');
	29	+ $this->params->addTextual('text', true, 255, false, '');
	30	+ $this->params->addInteger('target', true, 1, true, TARGET_SELF);
31	31
32	32	# Add indexes
33	33
34		- $this->indexes->add ('active');
35		- $this->indexes->add ('position');
	34	+ $this->indexes->add('active');
	35	+ $this->indexes->add('position');
36	36	}
37	37	}
38	38	}

		@@ -21,14 +21,14 @@
		block discarded – undo
21	21
22	22	protected function init() {
23	23
24		- $this->addVirtual('gravatar', function (array $data) {
	24	+ $this->addVirtual('gravatar', function(array $data) {
25	25
26	26	return md5(strtolower($data['email']));
27	27	});
28	28
29		- $this->addVirtual('full_name', function (array $data) {
	29	+ $this->addVirtual('full_name', function(array $data) {
30	30
31		- return trim($data['first_name'] . ' ' . $data['last_name']);
	31	+ return trim($data['first_name'].' '.$data['last_name']);
32	32	});
33	33	}
34	34	}

		@@ -21,23 +21,23 @@
		block discarded – undo
21	21
22	22	protected function init() {
23	23
24		- $this->addVirtual('active', function (array $data) {
	24	+ $this->addVirtual('active', function(array $data) {
25	25
26	26	return (($data['visibility'] === VISIBILITY_PUBLISHED) && !$data['locked']);
27	27	});
28	28
29		- $this->addVirtual('link', function (array $data) {
	29	+ $this->addVirtual('link', function(array $data) {
30	30
31	31	if ('' === $data['slug']) return '';
32	32
33		- return (INSTALL_PATH . '/' . $data['slug']);
	33	+ return (INSTALL_PATH.'/'.$data['slug']);
34	34	});
35	35
36		- $this->addVirtual('canonical', function (array $data) {
	36	+ $this->addVirtual('canonical', function(array $data) {
37	37
38	38	if ('' === $data['slug']) return '';
39	39
40		- return (Settings::get('system_url') . (($data['id'] !== 1) ? ('/' . $data['slug']) : ''));
	40	+ return (Settings::get('system_url').(($data['id'] !== 1) ? ('/'.$data['slug']) : ''));
41	41	});
42	42	}
43	43	}

		@@ -28,14 +28,18 @@
		block discarded – undo
28	28
29	29	$this->addVirtual('link', function (array $data) {
30	30
31		- if ('' === $data['slug']) return '';
	31	+ if ('' === $data['slug']) {
	32	+ return '';
	33	+ }
32	34
33	35	return (INSTALL_PATH . '/' . $data['slug']);
34	36	});
35	37
36	38	$this->addVirtual('canonical', function (array $data) {
37	39
38		- if ('' === $data['slug']) return '';
	40	+ if ('' === $data['slug']) {
	41	+ return '';
	42	+ }
39	43
40	44	return (Settings::get('system_url') . (($data['id'] !== 1) ? ('/' . $data['slug']) : ''));
41	45	});

		@@ -21,13 +21,13 @@
		block discarded – undo
21	21
22	22	protected function init() {
23	23
24		- $this->addVirtual('link', function (array $data) {
	24	+ $this->addVirtual('link', function(array $data) {
25	25
26	26	if ('' === $data['slug']) return '';
27	27
28	28	if (false !== Validate::url($data['slug'])) return $data['slug'];
29	29
30		- return (INSTALL_PATH . '/' . $data['slug']);
	30	+ return (INSTALL_PATH.'/'.$data['slug']);
31	31	});
32	32	}
33	33	}

		@@ -23,9 +23,13 @@
		block discarded – undo
23	23
24	24	$this->addVirtual('link', function (array $data) {
25	25
26		- if ('' === $data['slug']) return '';
	26	+ if ('' === $data['slug']) {
	27	+ return '';
	28	+ }
27	29
28		- if (false !== Validate::url($data['slug'])) return $data['slug'];
	30	+ if (false !== Validate::url($data['slug'])) {
	31	+ return $data['slug'];
	32	+ }
29	33
30	34	return (INSTALL_PATH . '/' . $data['slug']);
31	35	});

		@@ -37,9 +37,13 @@
		block discarded – undo
37	37
38	38	public static function get(string $table, int $id = 0) : Entitizer\Utils\Entity {
39	39
40		- if (!isset(self::$classes[$table])) throw new Exception\General(self::$error_message);
	40	+ if (!isset(self::$classes[$table])) {
	41	+ throw new Exception\General(self::$error_message);
	42	+ }
41	43
42		- if (isset(self::$cache[$table][$id])) return self::$cache[$table][$id];
	44	+ if (isset(self::$cache[$table][$id])) {
	45	+ return self::$cache[$table][$id];
	46	+ }
43	47
44	48	$entity = new self::$classes[$table]; $entity->init($id);
45	49

		@@ -16,7 +16,7 @@ discard block
		block discarded – undo
16	16	use Entitizer\Common\Page;
17	17
18	18	/**
19		- * Initialize the page by a slug
	19	+ * Initialize the page by a slug
20	20	*
21	21	* @return bool : true on success or false on failure
22	22	*/
		@@ -39,13 +39,13 @@ discard block
		block discarded – undo
39	39
40	40	$query = ("SELECT " . implode(', ', $selection) .", rel.ancestor as parent_id ") .
41	41
42		- ("FROM " . static::$table . " ent ") .
	42	+ ("FROM " . static::$table . " ent ") .
43	43
44		- ("LEFT JOIN " . static::$table_relations . " rel ON rel.descendant = ent.id AND rel.depth = 1 ") .
	44	+ ("LEFT JOIN " . static::$table_relations . " rel ON rel.descendant = ent.id AND rel.depth = 1 ") .
45	45
46		- ("WHERE ent.visibility = " . VISIBILITY_PUBLISHED . " AND ent.access <= " . Auth::get('rank') . " AND ") .
	46	+ ("WHERE ent.visibility = " . VISIBILITY_PUBLISHED . " AND ent.access <= " . Auth::get('rank') . " AND ") .
47	47
48		- ("ent.locked = 0 AND ent.slug = '" . addslashes($slug) . "' LIMIT 1");
	48	+ ("ent.locked = 0 AND ent.slug = '" . addslashes($slug) . "' LIMIT 1");
49	49
50	50	# Select entity from DB
51	51
		@@ -57,7 +57,7 @@ discard block
		block discarded – undo
57	57	}
58	58
59	59	/**
60		- * Update slugs of the page descendants
	60	+ * Update slugs of the page descendants
61	61	*
62	62	* @return bool : true on success or false on failure
63	63	*/
		@@ -70,17 +70,17 @@ discard block
		block discarded – undo
70	70
71	71	$query = ("UPDATE " . static::$table . " ent JOIN (") .
72	72
73		- ("SELECT rel.descendant as id, GROUP_CONCAT(ens.name ORDER BY rls.depth DESC SEPARATOR '/') slug ") .
	73	+ ("SELECT rel.descendant as id, GROUP_CONCAT(ens.name ORDER BY rls.depth DESC SEPARATOR '/') slug ") .
74	74
75		- ("FROM " . static::$table_relations . " rel ") .
	75	+ ("FROM " . static::$table_relations . " rel ") .
76	76
77		- ("JOIN " . static::$table_relations . " rls ON rls.descendant = rel.descendant ") .
	77	+ ("JOIN " . static::$table_relations . " rls ON rls.descendant = rel.descendant ") .
78	78
79		- ("JOIN " . static::$table . " ens ON ens.id = rls.ancestor ") .
	79	+ ("JOIN " . static::$table . " ens ON ens.id = rls.ancestor ") .
80	80
81		- ("WHERE rel.ancestor = " . $this->id . " GROUP BY rel.descendant") .
	81	+ ("WHERE rel.ancestor = " . $this->id . " GROUP BY rel.descendant") .
82	82
83		- (") slg ON slg.id = ent.id SET ent.locked = 1, ent.slug = slg.slug");
	83	+ (") slg ON slg.id = ent.id SET ent.locked = 1, ent.slug = slg.slug");
84	84
85	85	if (!(DB::send($query) && DB::getLast()->status)) return false;
86	86
		@@ -88,15 +88,15 @@ discard block
		block discarded – undo
88	88
89	89	$query = ("UPDATE " . static::$table . " ent JOIN (") .
90	90
91		- ("SELECT rel.descendant as id FROM " . static::$table_relations . " rel ") .
	91	+ ("SELECT rel.descendant as id FROM " . static::$table_relations . " rel ") .
92	92
93		- ("JOIN " . static::$table . " enc ON enc.id = rel.descendant AND enc.locked = 1 ") .
	93	+ ("JOIN " . static::$table . " enc ON enc.id = rel.descendant AND enc.locked = 1 ") .
94	94
95		- ("LEFT JOIN " . static::$table . " end ON end.id != enc.id AND end.slug = enc.slug ") .
	95	+ ("LEFT JOIN " . static::$table . " end ON end.id != enc.id AND end.slug = enc.slug ") .
96	96
97		- ("WHERE end.id IS NULL GROUP BY rel.descendant") .
	97	+ ("WHERE end.id IS NULL GROUP BY rel.descendant") .
98	98
99		- (") chk ON chk.id = ent.id SET ent.locked = 0");
	99	+ (") chk ON chk.id = ent.id SET ent.locked = 0");
100	100
101	101	if (!(DB::send($query) && DB::getLast()->status)) return false;
102	102

		@@ -33,19 +33,19 @@ discard block
		block discarded – undo
33	33
34	34	$selection = array_keys($this->definition->getParams());
35	35
36		- foreach ($selection as $key => $field) $selection[$key] = ('ent.' . $field);
	36	+ foreach ($selection as $key => $field) $selection[$key] = ('ent.'.$field);
37	37
38	38	# Process query
39	39
40		- $query = ("SELECT " . implode(', ', $selection) .", rel.ancestor as parent_id ") .
	40	+ $query = ("SELECT ".implode(', ', $selection).", rel.ancestor as parent_id ").
41	41
42		- ("FROM " . static::$table . " ent ") .
	42	+ ("FROM ".static::$table." ent ").
43	43
44		- ("LEFT JOIN " . static::$table_relations . " rel ON rel.descendant = ent.id AND rel.depth = 1 ") .
	44	+ ("LEFT JOIN ".static::$table_relations." rel ON rel.descendant = ent.id AND rel.depth = 1 ").
45	45
46		- ("WHERE ent.visibility = " . VISIBILITY_PUBLISHED . " AND ent.access <= " . Auth::get('rank') . " AND ") .
	46	+ ("WHERE ent.visibility = ".VISIBILITY_PUBLISHED." AND ent.access <= ".Auth::get('rank')." AND ").
47	47
48		- ("ent.locked = 0 AND ent.slug = '" . addslashes($slug) . "' LIMIT 1");
	48	+ ("ent.locked = 0 AND ent.slug = '".addslashes($slug)."' LIMIT 1");
49	49
50	50	# Select entity from DB
51	51
		@@ -68,17 +68,17 @@ discard block
		block discarded – undo
68	68
69	69	# Send lock/update request
70	70
71		- $query = ("UPDATE " . static::$table . " ent JOIN (") .
	71	+ $query = ("UPDATE ".static::$table." ent JOIN (").
72	72
73		- ("SELECT rel.descendant as id, GROUP_CONCAT(ens.name ORDER BY rls.depth DESC SEPARATOR '/') slug ") .
	73	+ ("SELECT rel.descendant as id, GROUP_CONCAT(ens.name ORDER BY rls.depth DESC SEPARATOR '/') slug ").
74	74
75		- ("FROM " . static::$table_relations . " rel ") .
	75	+ ("FROM ".static::$table_relations." rel ").
76	76
77		- ("JOIN " . static::$table_relations . " rls ON rls.descendant = rel.descendant ") .
	77	+ ("JOIN ".static::$table_relations." rls ON rls.descendant = rel.descendant ").
78	78
79		- ("JOIN " . static::$table . " ens ON ens.id = rls.ancestor ") .
	79	+ ("JOIN ".static::$table." ens ON ens.id = rls.ancestor ").
80	80
81		- ("WHERE rel.ancestor = " . $this->id . " GROUP BY rel.descendant") .
	81	+ ("WHERE rel.ancestor = ".$this->id." GROUP BY rel.descendant").
82	82
83	83	(") slg ON slg.id = ent.id SET ent.locked = 1, ent.slug = slg.slug");
84	84
		@@ -86,15 +86,15 @@ discard block
		block discarded – undo
86	86
87	87	# Send unlock request
88	88
89		- $query = ("UPDATE " . static::$table . " ent JOIN (") .
	89	+ $query = ("UPDATE ".static::$table." ent JOIN (").
90	90
91		- ("SELECT rel.descendant as id FROM " . static::$table_relations . " rel ") .
	91	+ ("SELECT rel.descendant as id FROM ".static::$table_relations." rel ").
92	92
93		- ("JOIN " . static::$table . " enc ON enc.id = rel.descendant AND enc.locked = 1 ") .
	93	+ ("JOIN ".static::$table." enc ON enc.id = rel.descendant AND enc.locked = 1 ").
94	94
95		- ("LEFT JOIN " . static::$table . " end ON end.id != enc.id AND end.slug = enc.slug ") .
	95	+ ("LEFT JOIN ".static::$table." end ON end.id != enc.id AND end.slug = enc.slug ").
96	96
97		- ("WHERE end.id IS NULL GROUP BY rel.descendant") .
	97	+ ("WHERE end.id IS NULL GROUP BY rel.descendant").
98	98
99	99	(") chk ON chk.id = ent.id SET ent.locked = 0");
100	100

		@@ -23,7 +23,9 @@ discard block
		block discarded – undo
23	23
24	24	public function initBySlug(string $slug) : bool {
25	25
26		- if (0 !== $this->id) return false;
	26	+ if (0 !== $this->id) {
	27	+ return false;
	28	+ }
27	29
28	30	# Process value
29	31
		@@ -33,7 +35,9 @@ discard block
		block discarded – undo
33	35
34	36	$selection = array_keys($this->definition->getParams());
35	37
36		- foreach ($selection as $key => $field) $selection[$key] = ('ent.' . $field);
	38	+ foreach ($selection as $key => $field) {
	39	+ $selection[$key] = ('ent.' . $field);
	40	+ }
37	41
38	42	# Process query
39	43
		@@ -49,7 +53,9 @@ discard block
		block discarded – undo
49	53
50	54	# Select entity from DB
51	55
52		- if (!(DB::send($query) && (DB::getLast()->rows === 1))) return false;
	56	+ if (!(DB::send($query) && (DB::getLast()->rows === 1))) {
	57	+ return false;
	58	+ }
53	59
54	60	# ------------------------
55	61
		@@ -64,7 +70,9 @@ discard block
		block discarded – undo
64	70
65	71	public function updateSlugs() : bool {
66	72
67		- if (0 === $this->id) return false;
	73	+ if (0 === $this->id) {
	74	+ return false;
	75	+ }
68	76
69	77	# Send lock/update request
70	78
		@@ -82,7 +90,9 @@ discard block
		block discarded – undo
82	90
83	91	(") slg ON slg.id = ent.id SET ent.locked = 1, ent.slug = slg.slug");
84	92
85		- if (!(DB::send($query) && DB::getLast()->status)) return false;
	93	+ if (!(DB::send($query) && DB::getLast()->status)) {
	94	+ return false;
	95	+ }
86	96
87	97	# Send unlock request
88	98
		@@ -98,7 +108,9 @@ discard block
		block discarded – undo
98	108
99	109	(") chk ON chk.id = ent.id SET ent.locked = 0");
100	110
101		- if (!(DB::send($query) && DB::getLast()->status)) return false;
	111	+ if (!(DB::send($query) && DB::getLast()->status)) {
	112	+ return false;
	113	+ }
102	114
103	115	# ------------------------
104	116
		@@ -113,7 +125,9 @@ discard block
		block discarded – undo
113	125
114	126	public function create(array $data) : bool {
115	127
116		- if (!parent::create($data)) return false;
	128	+ if (!parent::create($data)) {
	129	+ return false;
	130	+ }
117	131
118	132	$this->updateSlugs();
119	133
		@@ -130,7 +144,9 @@ discard block
		block discarded – undo
130	144
131	145	public function edit(array $data) : bool {
132	146
133		- if (!parent::edit($data)) return false;
	147	+ if (!parent::edit($data)) {
	148	+ return false;
	149	+ }
134	150
135	151	$this->updateSlugs();
136	152
		@@ -147,7 +163,9 @@ discard block
		block discarded – undo
147	163
148	164	public function move(int $parent_id) : bool {
149	165
150		- if (!parent::move($parent_id)) return false;
	166	+ if (!parent::move($parent_id)) {
	167	+ return false;
	168	+ }
151	169
152	170	$this->updateSlugs();
153	171

		@@ -47,11 +47,11 @@
		block discarded – undo
47	47
48	48	public function getStatement() : string {
49	49
50		- return ("FOREIGN KEY (`" . $this->name . "`) REFERENCES `" . $this->table . "` (`" . $this->field . "`)") .
	50	+ return ("FOREIGN KEY (`".$this->name."`) REFERENCES `".$this->table."` (`".$this->field."`)").
51	51
52		- ((null !== $this->delete) ? (" ON DELETE " . $this->delete) : "") .
	52	+ ((null !== $this->delete) ? (" ON DELETE ".$this->delete) : "").
53	53
54		- ((null !== $this->update) ? (" ON UPDATE " . $this->update) : "");
	54	+ ((null !== $this->update) ? (" ON UPDATE ".$this->update) : "");
55	55	}
56	56	}
57	57	}

		@@ -36,9 +36,13 @@
		block discarded – undo
36	36
37	37	$this->name = $name; $this->table = $table; $this->field = $field;
38	38
39		- if (null !== $delete) $this->delete = $this->validateAction($delete);
	39	+ if (null !== $delete) {
	40	+ $this->delete = $this->validateAction($delete);
	41	+ }
40	42
41		- if (null !== $update) $this->update = $this->validateAction($update);
	43	+ if (null !== $update) {
	44	+ $this->update = $this->validateAction($update);
	45	+ }
42	46	}
43	47
44	48	/**

		@@ -32,7 +32,7 @@
		block discarded – undo
32	32
33	33	return ("`" . $this->name . "` " . ($this->short ? "tiny" : "") . "int(" . $this->length . ")") .
34	34
35		- (($this->unsigned ? " UNSIGNED" : "") . " NOT NULL DEFAULT '" . $this->default . "'");
	35	+ (($this->unsigned ? " UNSIGNED" : "") . " NOT NULL DEFAULT '" . $this->default . "'");
36	36	}
37	37
38	38	/**

		@@ -30,9 +30,9 @@
		block discarded – undo
30	30
31	31	public function getStatement() : string {
32	32
33		- return ("`" . $this->name . "` " . ($this->short ? "tiny" : "") . "int(" . $this->length . ")") .
	33	+ return ("`".$this->name."` ".($this->short ? "tiny" : "")."int(".$this->length.")").
34	34
35		- (($this->unsigned ? " UNSIGNED" : "") . " NOT NULL DEFAULT '" . $this->default . "'");
	35	+ (($this->unsigned ? " UNSIGNED" : "")." NOT NULL DEFAULT '".$this->default."'");
36	36	}
37	37
38	38	/**

		@@ -21,7 +21,9 @@
		block discarded – undo
21	21
22	22	public function __construct(string $name, bool $short = false, int $length = 0, bool $unsigned = false, int $default = 0) {
23	23
24		- foreach (get_defined_vars() as $name => $value) $this->$name = $value;
	24	+ foreach (get_defined_vars() as $name => $value) {
	25	+ $this->$name = $value;
	26	+ }
25	27	}
26	28
27	29	/**

cadmium-org / cadmium-cms

Push — master ( 1f6010...1bd3c9 )

Status

Category

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

Indentation +17 added lines, -17 removed lines patch added patch discarded remove patch

Spacing +17 added lines, -17 removed lines patch added patch discarded remove patch

Braces +27 added lines, -9 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch