Inspection of "fixed spaces to tabs in file" - jarednova/timber - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 07faf0...985b38 )

by Jared

created 2015-12-24 03:20 UTC

Status

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

@@ -8,40 +8,40 @@  discard block
 block discarded – undo
 	 * @param string $TermClass
 	 * @return mixed
 	 */
-	public static function get_terms($args = null, $maybe_args = array(), $TermClass = 'TimberTerm'){
-		if (is_string($maybe_args) && !strstr($maybe_args, '=')){
+	public static function get_terms($args = null, $maybe_args = array(), $TermClass = 'TimberTerm') {
+		if ( is_string($maybe_args) && !strstr($maybe_args, '=') ) {
 			//the user is sending the $TermClass in the second argument
 			$TermClass = $maybe_args;
 		}
-		if (is_string($maybe_args) && strstr($maybe_args, '=')){
+		if ( is_string($maybe_args) && strstr($maybe_args, '=') ) {
 			parse_str($maybe_args, $maybe_args);
 		}
-		if (is_string($args) && strstr($args, '=')){
+		if ( is_string($args) && strstr($args, '=') ) {
 			//a string and a query string!
 			$parsed = self::get_term_query_from_query_string($args);
-			if (is_array($maybe_args)){
+			if ( is_array($maybe_args) ) {
 				$parsed->args = array_merge($parsed->args, $maybe_args);
 			}
 			return self::handle_term_query($parsed->taxonomies, $parsed->args, $TermClass);
-		} else if (is_string($args)){
+		} else if ( is_string($args) ) {
 			//its just a string with a single taxonomy
 			$parsed = self::get_term_query_from_string($args);
-			if (is_array($maybe_args)){
+			if ( is_array($maybe_args) ) {
 				$parsed->args = array_merge($parsed->args, $maybe_args);
 			}
 			return self::handle_term_query($parsed->taxonomies, $parsed->args, $TermClass);
-		} else if (is_array($args) && TimberHelper::is_array_assoc($args)){
+		} else if ( is_array($args) && TimberHelper::is_array_assoc($args) ) {
 			//its an associative array, like a good ole query
 			$parsed = self::get_term_query_from_assoc_array($args);
 			return self::handle_term_query($parsed->taxonomies, $parsed->args, $TermClass);
-		} else if (is_array($args)){
+		} else if ( is_array($args) ) {
 			//its just an array of strings or IDs (hopefully)
 			$parsed = self::get_term_query_from_array($args);
-			if (is_array($maybe_args)){
+			if ( is_array($maybe_args) ) {
 				$parsed->args = array_merge($parsed->args, $maybe_args);
 			}
 			return self::handle_term_query($parsed->taxonomies, $parsed->args, $TermClass);
-		} else if (is_null($args)) {
+		} else if ( is_null($args) ) {
 			return self::handle_term_query(get_taxonomies(), array(), $TermClass);
 		}
 		return null;
@@ -53,18 +53,18 @@  discard block
 block discarded – undo
 	 * @param string $TermClass
 	 * @return mixed
 	 */
-	public static function handle_term_query($taxonomies, $args, $TermClass){
-		if (!isset($args['hide_empty'])){
+	public static function handle_term_query($taxonomies, $args, $TermClass) {
+		if ( !isset($args['hide_empty']) ) {
 			$args['hide_empty'] = false;
 		}
-		if (isset($args['term_id']) && is_int($args['term_id'])){
+		if ( isset($args['term_id']) && is_int($args['term_id']) ) {
 			$args['term_id'] = array($args['term_id']);
 		}
-		if (isset($args['term_id'])){
+		if ( isset($args['term_id']) ) {
 			$args['include'] = $args['term_id'];
 		}
 		$terms = get_terms($taxonomies, $args);
-		foreach($terms as &$term){
+		foreach ($terms as &$term) {
 			$term = new $TermClass($term->term_id, $term->taxonomy);
 		}
 		return $terms;
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
 	protected static function get_term_query_from_string($taxs) {
 		$ret = new stdClass();
 		$ret->args = array();
-		if (is_string($taxs)) {
+		if ( is_string($taxs) ) {
 			$taxs = array($taxs);
 		}
 		$ret->taxonomies = self::correct_taxonomy_names($taxs);
@@ -102,17 +102,17 @@  discard block
 block discarded – undo
 	public static function get_term_query_from_assoc_array($args) {
 		$ret = new stdClass();
 		$ret->args = $args;
-		if (isset($ret->args['tax'])) {
+		if ( isset($ret->args['tax']) ) {
 			$ret->taxonomies = $ret->args['tax'];
-		} else if (isset($ret->args['taxonomies'])) {
+		} else if ( isset($ret->args['taxonomies']) ) {
 			$ret->taxonomies = $ret->args['taxonomies'];
-		} else if (isset($ret->args['taxs'])) {
+		} else if ( isset($ret->args['taxs']) ) {
 			$ret->taxonomies = $ret->args['taxs'];
-		} else if (isset($ret->args['taxonomy'])) {
+		} else if ( isset($ret->args['taxonomy']) ) {
 			$ret->taxonomies = $ret->args['taxonomy'];
 		}
-		if (isset($ret->taxonomies)) {
-			if (is_string($ret->taxonomies)) {
+		if ( isset($ret->taxonomies) ) {
+			if ( is_string($ret->taxonomies) ) {
 				$ret->taxonomies = array($ret->taxonomies);
 			}
 			$ret->taxonomies = self::correct_taxonomy_names($ret->taxonomies);
@@ -127,11 +127,11 @@  discard block
 block discarded – undo
 	 * @return stdClass
 	 */
 	public static function get_term_query_from_array($args) {
-		if (is_array($args) && !empty($args)) {
+		if ( is_array($args) && !empty($args) ) {
 			//okay its an array with content
-			if (is_int($args[0])) {
+			if ( is_int($args[0]) ) {
 				return self::get_term_query_from_array_of_ids($args);
-			} else if (is_string($args[0])) {
+			} else if ( is_string($args[0]) ) {
 				return self::get_term_query_from_array_of_strings($args);
 			}
 		}
@@ -165,13 +165,13 @@  discard block
 block discarded – undo
 	 * @return array
 	 */
 	private static function correct_taxonomy_names($taxs) {
-		if (is_string($taxs)) {
+		if ( is_string($taxs) ) {
 			$taxs = array($taxs);
 		}
 		foreach ($taxs as &$tax) {
-			if ($tax == 'tags' || $tax == 'tag') {
+			if ( $tax == 'tags' || $tax == 'tag' ) {
 				$tax = 'post_tag';
-			} else if ($tax == 'categories') {
+			} else if ( $tax == 'categories' ) {
 				$tax = 'category';
 			}
 		}

Please login to merge, or discard this patch.

Braces +15 added lines, -15 removed lines patch added patch discarded remove patch

@@ -8,36 +8,36 @@  discard block
 block discarded – undo
 	 * @param string $TermClass
 	 * @return mixed
 	 */
-	public static function get_terms($args = null, $maybe_args = array(), $TermClass = 'TimberTerm'){
-		if (is_string($maybe_args) && !strstr($maybe_args, '=')){
+	public static function get_terms($args = null, $maybe_args = array(), $TermClass = 'TimberTerm') {
+		if (is_string($maybe_args) && !strstr($maybe_args, '=')) {
 			//the user is sending the $TermClass in the second argument
 			$TermClass = $maybe_args;
 		}
-		if (is_string($maybe_args) && strstr($maybe_args, '=')){
+		if (is_string($maybe_args) && strstr($maybe_args, '=')) {
 			parse_str($maybe_args, $maybe_args);
 		}
-		if (is_string($args) && strstr($args, '=')){
+		if (is_string($args) && strstr($args, '=')) {
 			//a string and a query string!
 			$parsed = self::get_term_query_from_query_string($args);
-			if (is_array($maybe_args)){
+			if (is_array($maybe_args)) {
 				$parsed->args = array_merge($parsed->args, $maybe_args);
 			}
 			return self::handle_term_query($parsed->taxonomies, $parsed->args, $TermClass);
-		} else if (is_string($args)){
+		} else if (is_string($args)) {
 			//its just a string with a single taxonomy
 			$parsed = self::get_term_query_from_string($args);
-			if (is_array($maybe_args)){
+			if (is_array($maybe_args)) {
 				$parsed->args = array_merge($parsed->args, $maybe_args);
 			}
 			return self::handle_term_query($parsed->taxonomies, $parsed->args, $TermClass);
-		} else if (is_array($args) && TimberHelper::is_array_assoc($args)){
+		} else if (is_array($args) && TimberHelper::is_array_assoc($args)) {
 			//its an associative array, like a good ole query
 			$parsed = self::get_term_query_from_assoc_array($args);
 			return self::handle_term_query($parsed->taxonomies, $parsed->args, $TermClass);
-		} else if (is_array($args)){
+		} else if (is_array($args)) {
 			//its just an array of strings or IDs (hopefully)
 			$parsed = self::get_term_query_from_array($args);
-			if (is_array($maybe_args)){
+			if (is_array($maybe_args)) {
 				$parsed->args = array_merge($parsed->args, $maybe_args);
 			}
 			return self::handle_term_query($parsed->taxonomies, $parsed->args, $TermClass);
@@ -53,18 +53,18 @@  discard block
 block discarded – undo
 	 * @param string $TermClass
 	 * @return mixed
 	 */
-	public static function handle_term_query($taxonomies, $args, $TermClass){
-		if (!isset($args['hide_empty'])){
+	public static function handle_term_query($taxonomies, $args, $TermClass) {
+		if (!isset($args['hide_empty'])) {
 			$args['hide_empty'] = false;
 		}
-		if (isset($args['term_id']) && is_int($args['term_id'])){
+		if (isset($args['term_id']) && is_int($args['term_id'])) {
 			$args['term_id'] = array($args['term_id']);
 		}
-		if (isset($args['term_id'])){
+		if (isset($args['term_id'])) {
 			$args['include'] = $args['term_id'];
 		}
 		$terms = get_terms($taxonomies, $args);
-		foreach($terms as &$term){
+		foreach($terms as &$term) {
 			$term = new $TermClass($term->term_id, $term->taxonomy);
 		}
 		return $terms;

Please login to merge, or discard this patch.

		@@ -8,40 +8,40 @@ discard block
		block discarded – undo
8	8	* @param string $TermClass
9	9	* @return mixed
10	10	*/
11		- public static function get_terms($args = null, $maybe_args = array(), $TermClass = 'TimberTerm'){
12		- if (is_string($maybe_args) && !strstr($maybe_args, '=')){
	11	+ public static function get_terms($args = null, $maybe_args = array(), $TermClass = 'TimberTerm') {
	12	+ if ( is_string($maybe_args) && !strstr($maybe_args, '=') ) {
13	13	//the user is sending the $TermClass in the second argument
14	14	$TermClass = $maybe_args;
15	15	}
16		- if (is_string($maybe_args) && strstr($maybe_args, '=')){
	16	+ if ( is_string($maybe_args) && strstr($maybe_args, '=') ) {
17	17	parse_str($maybe_args, $maybe_args);
18	18	}
19		- if (is_string($args) && strstr($args, '=')){
	19	+ if ( is_string($args) && strstr($args, '=') ) {
20	20	//a string and a query string!
21	21	$parsed = self::get_term_query_from_query_string($args);
22		- if (is_array($maybe_args)){
	22	+ if ( is_array($maybe_args) ) {
23	23	$parsed->args = array_merge($parsed->args, $maybe_args);
24	24	}
25	25	return self::handle_term_query($parsed->taxonomies, $parsed->args, $TermClass);
26		- } else if (is_string($args)){
	26	+ } else if ( is_string($args) ) {
27	27	//its just a string with a single taxonomy
28	28	$parsed = self::get_term_query_from_string($args);
29		- if (is_array($maybe_args)){
	29	+ if ( is_array($maybe_args) ) {
30	30	$parsed->args = array_merge($parsed->args, $maybe_args);
31	31	}
32	32	return self::handle_term_query($parsed->taxonomies, $parsed->args, $TermClass);
33		- } else if (is_array($args) && TimberHelper::is_array_assoc($args)){
	33	+ } else if ( is_array($args) && TimberHelper::is_array_assoc($args) ) {
34	34	//its an associative array, like a good ole query
35	35	$parsed = self::get_term_query_from_assoc_array($args);
36	36	return self::handle_term_query($parsed->taxonomies, $parsed->args, $TermClass);
37		- } else if (is_array($args)){
	37	+ } else if ( is_array($args) ) {
38	38	//its just an array of strings or IDs (hopefully)
39	39	$parsed = self::get_term_query_from_array($args);
40		- if (is_array($maybe_args)){
	40	+ if ( is_array($maybe_args) ) {
41	41	$parsed->args = array_merge($parsed->args, $maybe_args);
42	42	}
43	43	return self::handle_term_query($parsed->taxonomies, $parsed->args, $TermClass);
44		- } else if (is_null($args)) {
	44	+ } else if ( is_null($args) ) {
45	45	return self::handle_term_query(get_taxonomies(), array(), $TermClass);
46	46	}
47	47	return null;
		@@ -53,18 +53,18 @@ discard block
		block discarded – undo
53	53	* @param string $TermClass
54	54	* @return mixed
55	55	*/
56		- public static function handle_term_query($taxonomies, $args, $TermClass){
57		- if (!isset($args['hide_empty'])){
	56	+ public static function handle_term_query($taxonomies, $args, $TermClass) {
	57	+ if ( !isset($args['hide_empty']) ) {
58	58	$args['hide_empty'] = false;
59	59	}
60		- if (isset($args['term_id']) && is_int($args['term_id'])){
	60	+ if ( isset($args['term_id']) && is_int($args['term_id']) ) {
61	61	$args['term_id'] = array($args['term_id']);
62	62	}
63		- if (isset($args['term_id'])){
	63	+ if ( isset($args['term_id']) ) {
64	64	$args['include'] = $args['term_id'];
65	65	}
66	66	$terms = get_terms($taxonomies, $args);
67		- foreach($terms as &$term){
	67	+ foreach ($terms as &$term) {
68	68	$term = new $TermClass($term->term_id, $term->taxonomy);
69	69	}
70	70	return $terms;
		@@ -88,7 +88,7 @@ discard block
		block discarded – undo
88	88	protected static function get_term_query_from_string($taxs) {
89	89	$ret = new stdClass();
90	90	$ret->args = array();
91		- if (is_string($taxs)) {
	91	+ if ( is_string($taxs) ) {
92	92	$taxs = array($taxs);
93	93	}
94	94	$ret->taxonomies = self::correct_taxonomy_names($taxs);
		@@ -102,17 +102,17 @@ discard block
		block discarded – undo
102	102	public static function get_term_query_from_assoc_array($args) {
103	103	$ret = new stdClass();
104	104	$ret->args = $args;
105		- if (isset($ret->args['tax'])) {
	105	+ if ( isset($ret->args['tax']) ) {
106	106	$ret->taxonomies = $ret->args['tax'];
107		- } else if (isset($ret->args['taxonomies'])) {
	107	+ } else if ( isset($ret->args['taxonomies']) ) {
108	108	$ret->taxonomies = $ret->args['taxonomies'];
109		- } else if (isset($ret->args['taxs'])) {
	109	+ } else if ( isset($ret->args['taxs']) ) {
110	110	$ret->taxonomies = $ret->args['taxs'];
111		- } else if (isset($ret->args['taxonomy'])) {
	111	+ } else if ( isset($ret->args['taxonomy']) ) {
112	112	$ret->taxonomies = $ret->args['taxonomy'];
113	113	}
114		- if (isset($ret->taxonomies)) {
115		- if (is_string($ret->taxonomies)) {
	114	+ if ( isset($ret->taxonomies) ) {
	115	+ if ( is_string($ret->taxonomies) ) {
116	116	$ret->taxonomies = array($ret->taxonomies);
117	117	}
118	118	$ret->taxonomies = self::correct_taxonomy_names($ret->taxonomies);
		@@ -127,11 +127,11 @@ discard block
		block discarded – undo
127	127	* @return stdClass
128	128	*/
129	129	public static function get_term_query_from_array($args) {
130		- if (is_array($args) && !empty($args)) {
	130	+ if ( is_array($args) && !empty($args) ) {
131	131	//okay its an array with content
132		- if (is_int($args[0])) {
	132	+ if ( is_int($args[0]) ) {
133	133	return self::get_term_query_from_array_of_ids($args);
134		- } else if (is_string($args[0])) {
	134	+ } else if ( is_string($args[0]) ) {
135	135	return self::get_term_query_from_array_of_strings($args);
136	136	}
137	137	}
		@@ -165,13 +165,13 @@ discard block
		block discarded – undo
165	165	* @return array
166	166	*/
167	167	private static function correct_taxonomy_names($taxs) {
168		- if (is_string($taxs)) {
	168	+ if ( is_string($taxs) ) {
169	169	$taxs = array($taxs);
170	170	}
171	171	foreach ($taxs as &$tax) {
172		- if ($tax == 'tags' \|\| $tax == 'tag') {
	172	+ if ( $tax == 'tags' \|\| $tax == 'tag' ) {
173	173	$tax = 'post_tag';
174		- } else if ($tax == 'categories') {
	174	+ } else if ( $tax == 'categories' ) {
175	175	$tax = 'category';
176	176	}
177	177	}

		@@ -8,36 +8,36 @@ discard block
		block discarded – undo
8	8	* @param string $TermClass
9	9	* @return mixed
10	10	*/
11		- public static function get_terms($args = null, $maybe_args = array(), $TermClass = 'TimberTerm'){
12		- if (is_string($maybe_args) && !strstr($maybe_args, '=')){
	11	+ public static function get_terms($args = null, $maybe_args = array(), $TermClass = 'TimberTerm') {
	12	+ if (is_string($maybe_args) && !strstr($maybe_args, '=')) {
13	13	//the user is sending the $TermClass in the second argument
14	14	$TermClass = $maybe_args;
15	15	}
16		- if (is_string($maybe_args) && strstr($maybe_args, '=')){
	16	+ if (is_string($maybe_args) && strstr($maybe_args, '=')) {
17	17	parse_str($maybe_args, $maybe_args);
18	18	}
19		- if (is_string($args) && strstr($args, '=')){
	19	+ if (is_string($args) && strstr($args, '=')) {
20	20	//a string and a query string!
21	21	$parsed = self::get_term_query_from_query_string($args);
22		- if (is_array($maybe_args)){
	22	+ if (is_array($maybe_args)) {
23	23	$parsed->args = array_merge($parsed->args, $maybe_args);
24	24	}
25	25	return self::handle_term_query($parsed->taxonomies, $parsed->args, $TermClass);
26		- } else if (is_string($args)){
	26	+ } else if (is_string($args)) {
27	27	//its just a string with a single taxonomy
28	28	$parsed = self::get_term_query_from_string($args);
29		- if (is_array($maybe_args)){
	29	+ if (is_array($maybe_args)) {
30	30	$parsed->args = array_merge($parsed->args, $maybe_args);
31	31	}
32	32	return self::handle_term_query($parsed->taxonomies, $parsed->args, $TermClass);
33		- } else if (is_array($args) && TimberHelper::is_array_assoc($args)){
	33	+ } else if (is_array($args) && TimberHelper::is_array_assoc($args)) {
34	34	//its an associative array, like a good ole query
35	35	$parsed = self::get_term_query_from_assoc_array($args);
36	36	return self::handle_term_query($parsed->taxonomies, $parsed->args, $TermClass);
37		- } else if (is_array($args)){
	37	+ } else if (is_array($args)) {
38	38	//its just an array of strings or IDs (hopefully)
39	39	$parsed = self::get_term_query_from_array($args);
40		- if (is_array($maybe_args)){
	40	+ if (is_array($maybe_args)) {
41	41	$parsed->args = array_merge($parsed->args, $maybe_args);
42	42	}
43	43	return self::handle_term_query($parsed->taxonomies, $parsed->args, $TermClass);
		@@ -53,18 +53,18 @@ discard block
		block discarded – undo
53	53	* @param string $TermClass
54	54	* @return mixed
55	55	*/
56		- public static function handle_term_query($taxonomies, $args, $TermClass){
57		- if (!isset($args['hide_empty'])){
	56	+ public static function handle_term_query($taxonomies, $args, $TermClass) {
	57	+ if (!isset($args['hide_empty'])) {
58	58	$args['hide_empty'] = false;
59	59	}
60		- if (isset($args['term_id']) && is_int($args['term_id'])){
	60	+ if (isset($args['term_id']) && is_int($args['term_id'])) {
61	61	$args['term_id'] = array($args['term_id']);
62	62	}
63		- if (isset($args['term_id'])){
	63	+ if (isset($args['term_id'])) {
64	64	$args['include'] = $args['term_id'];
65	65	}
66	66	$terms = get_terms($taxonomies, $args);
67		- foreach($terms as &$term){
	67	+ foreach($terms as &$term) {
68	68	$term = new $TermClass($term->term_id, $term->taxonomy);
69	69	}
70	70	return $terms;

jarednova / timber

Push — master ( 07faf0...985b38 )

Status

Category

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

Braces +15 added lines, -15 removed lines patch added patch discarded remove patch