Inspection of "Rename attributes" - cadmium-org/cadmium-cms - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — 0.2.1 ( dab97b...c28689 )

by Anton

created 2016-01-07 02:00 UTC

Status

Braces +21 added lines, -7 removed lines patch added patch discarded remove patch

@@ -10,7 +10,9 @@  discard block
 block discarded – undo
 
 		public function __invoke(array $post) {
 
-			if (Auth::check()) return true;
+			if (Auth::check()) {
+				return true;
+			}
 
 			# Declare variables
 
@@ -22,9 +24,13 @@  discard block
 block discarded – undo
 
 			# Validate values
 
-			if (false === ($name = Validate::userName($name))) return 'USER_ERROR_NAME_INVALID';
+			if (false === ($name = Validate::userName($name))) {
+				return 'USER_ERROR_NAME_INVALID';
+			}
 
-			if (false === Security::checkCaptcha($captcha)) return 'USER_ERROR_CAPTCHA_INCORRECT';
+			if (false === Security::checkCaptcha($captcha)) {
+				return 'USER_ERROR_CAPTCHA_INCORRECT';
+			}
 
 			# Create user object
 
@@ -32,13 +38,19 @@  discard block
 block discarded – undo
 
 			# Init user
 
-			if (!$user->init($name, 'name')) return 'USER_ERROR_NAME_INCORRECT';
+			if (!$user->init($name, 'name')) {
+				return 'USER_ERROR_NAME_INCORRECT';
+			}
 
-			if (Auth::admin() && ($user->rank < RANK_ADMINISTRATOR)) return 'USER_ERROR_NAME_INCORRECT';
+			if (Auth::admin() && ($user->rank < RANK_ADMINISTRATOR)) {
+				return 'USER_ERROR_NAME_INCORRECT';
+			}
 
 			# Check access
 
-			if (!Auth::admin() && ($user->rank === RANK_GUEST)) return 'USER_ERROR_ACCESS';
+			if (!Auth::admin() && ($user->rank === RANK_GUEST)) {
+				return 'USER_ERROR_ACCESS';
+			}
 
 			# Create session
 
@@ -48,7 +60,9 @@  discard block
 block discarded – undo
 
 			$data = ['id' => $user->id, 'code' => $code, 'ip' => $ip, 'time' => $time];
 
-			if (!$secret->create($data)) return 'USER_ERROR_AUTH_RESET';
+			if (!$secret->create($data)) {
+				return 'USER_ERROR_AUTH_RESET';
+			}
 
 			# Send mail
 

Please login to merge, or discard this patch.

www/engine/System/Classes/Modules/Auth/Controller/Login.php 1 patch

Braces +24 added lines, -8 removed lines patch added patch discarded remove patch

@@ -10,7 +10,9 @@  discard block
 block discarded – undo
 
 		public function __invoke(array $post) {
 
-			if (Auth::check()) return true;
+			if (Auth::check()) {
+				return true;
+			}
 
 			# Declare variables
 
@@ -22,9 +24,13 @@  discard block
 block discarded – undo
 
 			# Validate values
 
-			if (false === ($name = Validate::userName($name))) return 'USER_ERROR_NAME_INVALID';
+			if (false === ($name = Validate::userName($name))) {
+				return 'USER_ERROR_NAME_INVALID';
+			}
 
-			if (false === ($password = Validate::userPassword($password))) return 'USER_ERROR_PASSWORD_INVALID';
+			if (false === ($password = Validate::userPassword($password))) {
+				return 'USER_ERROR_PASSWORD_INVALID';
+			}
 
 			# Create user object
 
@@ -32,19 +38,27 @@  discard block
 block discarded – undo
 
 			# Init user
 
-			if (!$user->init($name, 'name')) return 'USER_ERROR_NAME_INCORRECT';
+			if (!$user->init($name, 'name')) {
+				return 'USER_ERROR_NAME_INCORRECT';
+			}
 
-			if (Auth::admin() && ($user->rank < RANK_ADMINISTRATOR)) return 'USER_ERROR_NAME_INCORRECT';
+			if (Auth::admin() && ($user->rank < RANK_ADMINISTRATOR)) {
+				return 'USER_ERROR_NAME_INCORRECT';
+			}
 
 			# Check password
 
 			$password = Str::encode($user->auth_key, $password);
 
-			if (0 !== strcmp($user->password, $password)) return 'USER_ERROR_PASSWORD_INCORRECT';
+			if (0 !== strcmp($user->password, $password)) {
+				return 'USER_ERROR_PASSWORD_INCORRECT';
+			}
 
 			# Check access
 
-			if (!Auth::admin() && ($user->rank === RANK_GUEST)) return 'USER_ERROR_ACCESS';
+			if (!Auth::admin() && ($user->rank === RANK_GUEST)) {
+				return 'USER_ERROR_ACCESS';
+			}
 
 			# Create session
 
@@ -54,7 +68,9 @@  discard block
 block discarded – undo
 
 			$data = ['id' => $user->id, 'code' => $code, 'ip' => $ip, 'time' => $time];
 
-			if (!$session->create($data)) return 'USER_ERROR_AUTH_LOGIN';
+			if (!$session->create($data)) {
+				return 'USER_ERROR_AUTH_LOGIN';
+			}
 
 			# Set session variable
 

Please login to merge, or discard this patch.

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

Braces +36 added lines, -12 removed lines patch added patch discarded remove patch

@@ -12,9 +12,13 @@  discard block
 block discarded – undo
 
 		private static function getAuth(string $code, string $type, int $lifetime) {
 
-			if (!($auth = Entitizer::get($type))->init($code, 'code')) return false;
+			if (!($auth = Entitizer::get($type))->init($code, 'code')) {
+				return false;
+			}
 
-			if (($auth->ip !== REQUEST_CLIENT_IP) || ($auth->time < (REQUEST_TIME - $lifetime))) return false;
+			if (($auth->ip !== REQUEST_CLIENT_IP) || ($auth->time < (REQUEST_TIME - $lifetime))) {
+				return false;
+			}
 
 			# ------------------------
 
@@ -25,9 +29,13 @@  discard block
 block discarded – undo
 
 		private static function getUser(int $id) {
 
-			if (0 === ($user = Entitizer::get(ENTITY_TYPE_USER, $id))->id) return false;
+			if (0 === ($user = Entitizer::get(ENTITY_TYPE_USER, $id))->id) {
+				return false;
+			}
 
-			if ($user->rank < (self::$admin ? RANK_ADMINISTRATOR : RANK_USER)) return false;
+			if ($user->rank < (self::$admin ? RANK_ADMINISTRATOR : RANK_USER)) {
+				return false;
+			}
 
 			# ------------------------
 
@@ -42,17 +50,23 @@  discard block
 block discarded – undo
 
 			# Check session code
 
-			if (false === ($code = Validate::authCode(Session::get('code')))) return false;
+			if (false === ($code = Validate::authCode(Session::get('code')))) {
+				return false;
+			}
 
 			# Get auth
 
 			$type = ENTITY_TYPE_USER_SESSION; $lifetime = CONFIG_USER_SESSION_LIFETIME;
 
-			if (false === ($session = self::getAuth($code, $type, $lifetime))) return false;
+			if (false === ($session = self::getAuth($code, $type, $lifetime))) {
+				return false;
+			}
 
 			# Get user
 
-			if (false === ($user = self::getUser($session->id))) return false;
+			if (false === ($user = self::getUser($session->id))) {
+				return false;
+			}
 
 			# Update session
 
@@ -71,21 +85,29 @@  discard block
 block discarded – undo
 
 		public static function secret() {
 
-			if ((null === self::$user) || (0 !== self::$user->id)) return false;
+			if ((null === self::$user) || (0 !== self::$user->id)) {
+				return false;
+			}
 
 			# Check secret code
 
-			if (false === ($code = Validate::authCode(Request::get('code')))) return false;
+			if (false === ($code = Validate::authCode(Request::get('code')))) {
+				return false;
+			}
 
 			# Get auth
 
 			$type = ENTITY_TYPE_USER_SECRET; $lifetime = CONFIG_USER_SECRET_LIFETIME;
 
-			if (false === ($secret = self::getAuth($code, $type, $lifetime))) return false;
+			if (false === ($secret = self::getAuth($code, $type, $lifetime))) {
+				return false;
+			}
 
 			# Get user
 
-			if (false === ($user = self::getUser($secret->id))) return false;
+			if (false === ($user = self::getUser($secret->id))) {
+				return false;
+			}
 
 			# ------------------------
 
@@ -96,7 +118,9 @@  discard block
 block discarded – undo
 
 		public static function logout() {
 
-			if ((null === self::$user) || (0 === self::$user->id)) return false;
+			if ((null === self::$user) || (0 === self::$user->id)) {
+				return false;
+			}
 
 			# Remove session
 

Please login to merge, or discard this patch.

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

Braces +39 added lines, -13 removed lines patch added patch discarded remove patch

@@ -37,7 +37,9 @@  discard block
 block discarded – undo
 
 		public static function __autoload() {
 
-			if (self::$loaded || empty($host = getenv('HTTP_HOST'))) return;
+			if (self::$loaded || empty($host = getenv('HTTP_HOST'))) {
+				return;
+			}
 
 			self::$settings['system_url'] = ((Request::isSecure() ? 'https://' : 'http://') . $host);
 
@@ -52,7 +54,9 @@  discard block
 block discarded – undo
 
 			self::$loaded = (false !== ($settings = Explorer::json($settings_file)));
 
-			if (self::$loaded) foreach ($settings as $name => $value) self::set($name, $value);
+			if (self::$loaded) {
+				foreach ($settings as $name => $value) self::set($name, $value);
+			}
 
 			# ------------------------
 
@@ -65,9 +69,13 @@  discard block
 block discarded – undo
 
 			$settings_file = (DIR_SYSTEM_DATA . 'Settings.json');
 
-			if (false === ($settings = json_encode(self::$settings, JSON_PRETTY_PRINT))) return false;
+			if (false === ($settings = json_encode(self::$settings, JSON_PRETTY_PRINT))) {
+				return false;
+			}
 
-			if (false === Explorer::save($settings_file, $settings, true)) return false;
+			if (false === Explorer::save($settings_file, $settings, true)) {
+				return false;
+			}
 
 			# ------------------------
 
@@ -85,34 +93,44 @@  discard block
 block discarded – undo
 
 		public static function set(string $name, $value) {
 
-			if (!isset(self::$settings[$name])) return false;
+			if (!isset(self::$settings[$name])) {
+				return false;
+			}
 
 			# Validate language
 
 			if (($name === 'admin_language') || ($name === 'site_language')) {
 
-				if (false === ($value = Extend\Languages::validate($value))) return false;
+				if (false === ($value = Extend\Languages::validate($value))) {
+					return false;
+				}
 			}
 
 			# Validate template
 
 			else if (($name === 'admin_template') || ($name === 'site_template')) {
 
-				if (false === ($value = Extend\Templates::validate($value))) return false;
+				if (false === ($value = Extend\Templates::validate($value))) {
+					return false;
+				}
 			}
 
 			# Validate site title
 
 			else if ($name === 'site_title') {
 
-				if ('' === ($value = (function(string $value) { return $value; })($value))) return false;
+				if ('' === ($value = (function(string $value) { return $value; })($value))) {
+					return false;
+				}
 			}
 
 			# Validate site status
 
 			else if ($name === 'site_status') {
 
-				if (false === ($value = Lister\Status::validate($value))) return false;
+				if (false === ($value = Lister\Status::validate($value))) {
+					return false;
+				}
 			}
 
 			# Validate site slogan/description/keywords
@@ -126,21 +144,27 @@  discard block
 block discarded – undo
 
 			else if ($name === 'system_url') {
 
-				if (false === ($value = Validate::url($value))) return false;
+				if (false === ($value = Validate::url($value))) {
+					return false;
+				}
 			}
 
 			# Validate system email
 
 			else if ($name === 'system_email') {
 
-				if (false === ($value = Validate::email($value))) return false;
+				if (false === ($value = Validate::email($value))) {
+					return false;
+				}
 			}
 
 			# Validate system timezone
 
 			else if ($name === 'system_timezone') {
 
-				if (false === ($value = Timezone::validate($value))) return false;
+				if (false === ($value = Timezone::validate($value))) {
+					return false;
+				}
 			}
 
 			# Validate users registration
@@ -163,7 +187,9 @@  discard block
 block discarded – undo
 
 		public static function get(string $name = null) {
 
-			if (null === $name) return self::$settings;
+			if (null === $name) {
+				return self::$settings;
+			}
 
 			return (isset(self::$settings[$name]) ? self::$settings[$name] : null);
 		}

Please login to merge, or discard this patch.

		@@ -37,7 +37,9 @@ discard block
		block discarded – undo
37	37
38	38	public static function __autoload() {
39	39
40		- if (self::$loaded \|\| empty($host = getenv('HTTP_HOST'))) return;
	40	+ if (self::$loaded \|\| empty($host = getenv('HTTP_HOST'))) {
	41	+ return;
	42	+ }
41	43
42	44	self::$settings['system_url'] = ((Request::isSecure() ? 'https://' : 'http://') . $host);
43	45
		@@ -52,7 +54,9 @@ discard block
		block discarded – undo
52	54
53	55	self::$loaded = (false !== ($settings = Explorer::json($settings_file)));
54	56
55		- if (self::$loaded) foreach ($settings as $name => $value) self::set($name, $value);
	57	+ if (self::$loaded) {
	58	+ foreach ($settings as $name => $value) self::set($name, $value);
	59	+ }
56	60
57	61	# ------------------------
58	62
		@@ -65,9 +69,13 @@ discard block
		block discarded – undo
65	69
66	70	$settings_file = (DIR_SYSTEM_DATA . 'Settings.json');
67	71
68		- if (false === ($settings = json_encode(self::$settings, JSON_PRETTY_PRINT))) return false;
	72	+ if (false === ($settings = json_encode(self::$settings, JSON_PRETTY_PRINT))) {
	73	+ return false;
	74	+ }
69	75
70		- if (false === Explorer::save($settings_file, $settings, true)) return false;
	76	+ if (false === Explorer::save($settings_file, $settings, true)) {
	77	+ return false;
	78	+ }
71	79
72	80	# ------------------------
73	81
		@@ -85,34 +93,44 @@ discard block
		block discarded – undo
85	93
86	94	public static function set(string $name, $value) {
87	95
88		- if (!isset(self::$settings[$name])) return false;
	96	+ if (!isset(self::$settings[$name])) {
	97	+ return false;
	98	+ }
89	99
90	100	# Validate language
91	101
92	102	if (($name === 'admin_language') \|\| ($name === 'site_language')) {
93	103
94		- if (false === ($value = Extend\Languages::validate($value))) return false;
	104	+ if (false === ($value = Extend\Languages::validate($value))) {
	105	+ return false;
	106	+ }
95	107	}
96	108
97	109	# Validate template
98	110
99	111	else if (($name === 'admin_template') \|\| ($name === 'site_template')) {
100	112
101		- if (false === ($value = Extend\Templates::validate($value))) return false;
	113	+ if (false === ($value = Extend\Templates::validate($value))) {
	114	+ return false;
	115	+ }
102	116	}
103	117
104	118	# Validate site title
105	119
106	120	else if ($name === 'site_title') {
107	121
108		- if ('' === ($value = (function(string $value) { return $value; })($value))) return false;
	122	+ if ('' === ($value = (function(string $value) { return $value; })($value))) {
	123	+ return false;
	124	+ }
109	125	}
110	126
111	127	# Validate site status
112	128
113	129	else if ($name === 'site_status') {
114	130
115		- if (false === ($value = Lister\Status::validate($value))) return false;
	131	+ if (false === ($value = Lister\Status::validate($value))) {
	132	+ return false;
	133	+ }
116	134	}
117	135
118	136	# Validate site slogan/description/keywords
		@@ -126,21 +144,27 @@ discard block
		block discarded – undo
126	144
127	145	else if ($name === 'system_url') {
128	146
129		- if (false === ($value = Validate::url($value))) return false;
	147	+ if (false === ($value = Validate::url($value))) {
	148	+ return false;
	149	+ }
130	150	}
131	151
132	152	# Validate system email
133	153
134	154	else if ($name === 'system_email') {
135	155
136		- if (false === ($value = Validate::email($value))) return false;
	156	+ if (false === ($value = Validate::email($value))) {
	157	+ return false;
	158	+ }
137	159	}
138	160
139	161	# Validate system timezone
140	162
141	163	else if ($name === 'system_timezone') {
142	164
143		- if (false === ($value = Timezone::validate($value))) return false;
	165	+ if (false === ($value = Timezone::validate($value))) {
	166	+ return false;
	167	+ }
144	168	}
145	169
146	170	# Validate users registration
		@@ -163,7 +187,9 @@ discard block
		block discarded – undo
163	187
164	188	public static function get(string $name = null) {
165	189
166		- if (null === $name) return self::$settings;
	190	+ if (null === $name) {
	191	+ return self::$settings;
	192	+ }
167	193
168	194	return (isset(self::$settings[$name]) ? self::$settings[$name] : null);
169	195	}

		@@ -10,7 +10,9 @@ discard block
		block discarded – undo
10	10
11	11	public function __invoke(array $post) {
12	12
13		- if (Auth::check()) return true;
	13	+ if (Auth::check()) {
	14	+ return true;
	15	+ }
14	16
15	17	# Declare variables
16	18
		@@ -22,9 +24,13 @@ discard block
		block discarded – undo
22	24
23	25	# Validate values
24	26
25		- if (false === ($name = Validate::userName($name))) return 'USER_ERROR_NAME_INVALID';
	27	+ if (false === ($name = Validate::userName($name))) {
	28	+ return 'USER_ERROR_NAME_INVALID';
	29	+ }
26	30
27		- if (false === Security::checkCaptcha($captcha)) return 'USER_ERROR_CAPTCHA_INCORRECT';
	31	+ if (false === Security::checkCaptcha($captcha)) {
	32	+ return 'USER_ERROR_CAPTCHA_INCORRECT';
	33	+ }
28	34
29	35	# Create user object
30	36
		@@ -32,13 +38,19 @@ discard block
		block discarded – undo
32	38
33	39	# Init user
34	40
35		- if (!$user->init($name, 'name')) return 'USER_ERROR_NAME_INCORRECT';
	41	+ if (!$user->init($name, 'name')) {
	42	+ return 'USER_ERROR_NAME_INCORRECT';
	43	+ }
36	44
37		- if (Auth::admin() && ($user->rank < RANK_ADMINISTRATOR)) return 'USER_ERROR_NAME_INCORRECT';
	45	+ if (Auth::admin() && ($user->rank < RANK_ADMINISTRATOR)) {
	46	+ return 'USER_ERROR_NAME_INCORRECT';
	47	+ }
38	48
39	49	# Check access
40	50
41		- if (!Auth::admin() && ($user->rank === RANK_GUEST)) return 'USER_ERROR_ACCESS';
	51	+ if (!Auth::admin() && ($user->rank === RANK_GUEST)) {
	52	+ return 'USER_ERROR_ACCESS';
	53	+ }
42	54
43	55	# Create session
44	56
		@@ -48,7 +60,9 @@ discard block
		block discarded – undo
48	60
49	61	$data = ['id' => $user->id, 'code' => $code, 'ip' => $ip, 'time' => $time];
50	62
51		- if (!$secret->create($data)) return 'USER_ERROR_AUTH_RESET';
	63	+ if (!$secret->create($data)) {
	64	+ return 'USER_ERROR_AUTH_RESET';
	65	+ }
52	66
53	67	# Send mail
54	68

		@@ -12,9 +12,13 @@ discard block
		block discarded – undo
12	12
13	13	private static function getAuth(string $code, string $type, int $lifetime) {
14	14
15		- if (!($auth = Entitizer::get($type))->init($code, 'code')) return false;
	15	+ if (!($auth = Entitizer::get($type))->init($code, 'code')) {
	16	+ return false;
	17	+ }
16	18
17		- if (($auth->ip !== REQUEST_CLIENT_IP) \|\| ($auth->time < (REQUEST_TIME - $lifetime))) return false;
	19	+ if (($auth->ip !== REQUEST_CLIENT_IP) \|\| ($auth->time < (REQUEST_TIME - $lifetime))) {
	20	+ return false;
	21	+ }
18	22
19	23	# ------------------------
20	24
		@@ -25,9 +29,13 @@ discard block
		block discarded – undo
25	29
26	30	private static function getUser(int $id) {
27	31
28		- if (0 === ($user = Entitizer::get(ENTITY_TYPE_USER, $id))->id) return false;
	32	+ if (0 === ($user = Entitizer::get(ENTITY_TYPE_USER, $id))->id) {
	33	+ return false;
	34	+ }
29	35
30		- if ($user->rank < (self::$admin ? RANK_ADMINISTRATOR : RANK_USER)) return false;
	36	+ if ($user->rank < (self::$admin ? RANK_ADMINISTRATOR : RANK_USER)) {
	37	+ return false;
	38	+ }
31	39
32	40	# ------------------------
33	41
		@@ -42,17 +50,23 @@ discard block
		block discarded – undo
42	50
43	51	# Check session code
44	52
45		- if (false === ($code = Validate::authCode(Session::get('code')))) return false;
	53	+ if (false === ($code = Validate::authCode(Session::get('code')))) {
	54	+ return false;
	55	+ }
46	56
47	57	# Get auth
48	58
49	59	$type = ENTITY_TYPE_USER_SESSION; $lifetime = CONFIG_USER_SESSION_LIFETIME;
50	60
51		- if (false === ($session = self::getAuth($code, $type, $lifetime))) return false;
	61	+ if (false === ($session = self::getAuth($code, $type, $lifetime))) {
	62	+ return false;
	63	+ }
52	64
53	65	# Get user
54	66
55		- if (false === ($user = self::getUser($session->id))) return false;
	67	+ if (false === ($user = self::getUser($session->id))) {
	68	+ return false;
	69	+ }
56	70
57	71	# Update session
58	72
		@@ -71,21 +85,29 @@ discard block
		block discarded – undo
71	85
72	86	public static function secret() {
73	87
74		- if ((null === self::$user) \|\| (0 !== self::$user->id)) return false;
	88	+ if ((null === self::$user) \|\| (0 !== self::$user->id)) {
	89	+ return false;
	90	+ }
75	91
76	92	# Check secret code
77	93
78		- if (false === ($code = Validate::authCode(Request::get('code')))) return false;
	94	+ if (false === ($code = Validate::authCode(Request::get('code')))) {
	95	+ return false;
	96	+ }
79	97
80	98	# Get auth
81	99
82	100	$type = ENTITY_TYPE_USER_SECRET; $lifetime = CONFIG_USER_SECRET_LIFETIME;
83	101
84		- if (false === ($secret = self::getAuth($code, $type, $lifetime))) return false;
	102	+ if (false === ($secret = self::getAuth($code, $type, $lifetime))) {
	103	+ return false;
	104	+ }
85	105
86	106	# Get user
87	107
88		- if (false === ($user = self::getUser($secret->id))) return false;
	108	+ if (false === ($user = self::getUser($secret->id))) {
	109	+ return false;
	110	+ }
89	111
90	112	# ------------------------
91	113
		@@ -96,7 +118,9 @@ discard block
		block discarded – undo
96	118
97	119	public static function logout() {
98	120
99		- if ((null === self::$user) \|\| (0 === self::$user->id)) return false;
	121	+ if ((null === self::$user) \|\| (0 === self::$user->id)) {
	122	+ return false;
	123	+ }
100	124
101	125	# Remove session
102	126

cadmium-org / cadmium-cms

Push — 0.2.1 ( dab97b...c28689 )

Status

Category

Braces +21 added lines, -7 removed lines patch added patch discarded remove patch

Braces +24 added lines, -8 removed lines patch added patch discarded remove patch

Braces +36 added lines, -12 removed lines patch added patch discarded remove patch

Braces +39 added lines, -13 removed lines patch added patch discarded remove patch