Inspection of "Refactor to use wp-google-maps library" - clubdeuce/wplib-olm-google-maps - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — master (#22)

by Daryl

created 2017-11-22 17:03 UTC

Status

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

@@ -11,72 +11,72 @@
 block discarded – undo
  */
 class Marker_Model extends Model_Base {
 
-	/**
-	 * @var \Clubdeuce\WPGoogleMaps\Marker
-	 */
+    /**
+     * @var \Clubdeuce\WPGoogleMaps\Marker
+     */
     protected $_marker;
 
-	/**
-	 * @return bool
-	 */
-	function has_marker() {
+    /**
+     * @return bool
+     */
+    function has_marker() {
 
-		return $this->_has( '_marker' );
+        return $this->_has( '_marker' );
 
-	}
+    }
 
-	/**
-	 * @return Location
-	 */
-	function location() {
+    /**
+     * @return Location
+     */
+    function location() {
 
-		return new Location( array( 'location' => $this->marker()->location() ) );
+        return new Location( array( 'location' => $this->marker()->location() ) );
 
-	}
+    }
 
-	/**
-	 * @return Marker_Label
-	 */
-	function label() {
+    /**
+     * @return Marker_Label
+     */
+    function label() {
 
-		return new Marker_Label( array( 'label' => $this->marker()->label() ) );
+        return new Marker_Label( array( 'label' => $this->marker()->label() ) );
 
-	}
+    }
 
-	/**
-	 * @return Info_Window
-	 */
-	function info_window() {
+    /**
+     * @return Info_Window
+     */
+    function info_window() {
 
-		return new Info_Window( array( 'info_window' => $this->marker()->info_window() ) );
+        return new Info_Window( array( 'info_window' => $this->marker()->info_window() ) );
 
-	}
+    }
 
-	/**
-	 * @param string $method_name
-	 * @param array $args
-	 *
-	 * @return mixed|null
-	 */
-	function __call( $method_name, $args ) {
+    /**
+     * @param string $method_name
+     * @param array $args
+     *
+     * @return mixed|null
+     */
+    function __call( $method_name, $args ) {
 
-		$value = null;
+        $value = null;
 
-		do {
-			$value = parent::__call( $method_name, $args );
+        do {
+            $value = parent::__call( $method_name, $args );
 
-			if ( $value ) {
-				break;
-			}
+            if ( $value ) {
+                break;
+            }
 
-			if ( $this->has_marker() ) {
-				$value = call_user_func_array( array( $this->marker(), $method_name ), $args );
-				break;
-			}
-		} while ( false );
+            if ( $this->has_marker() ) {
+                $value = call_user_func_array( array( $this->marker(), $method_name ), $args );
+                break;
+            }
+        } while ( false );
 
-		return $value;
+        return $value;
 
-	}
+    }
 
 }

Please login to merge, or discard this patch.

includes/class-marker-label-model.php 2 patches

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

@@ -8,44 +8,44 @@
 block discarded – undo
  */
 class Marker_Label_Model extends Model_Base {
 
-	/**
-	 * @var \Clubdeuce\WPGoogleMaps\Marker_Label
-	 */
-	protected $_label;
+    /**
+     * @var \Clubdeuce\WPGoogleMaps\Marker_Label
+     */
+    protected $_label;
 
-	/**
-	 * @return bool
-	 */
-	function has_label() {
+    /**
+     * @return bool
+     */
+    function has_label() {
 
-		return $this->_has( '_label' );
+        return $this->_has( '_label' );
 
-	}
+    }
 
-	/**
-	 * @param  string $method_name
-	 * @return mixed
-	 */
-	function __call( $method_name, $args ) {
-		$value = null;
+    /**
+     * @param  string $method_name
+     * @return mixed
+     */
+    function __call( $method_name, $args ) {
+        $value = null;
 
-		do {
+        do {
 
-			if ( property_exists( $this, "_{$method_name}" ) ) {
-				$property = "_{$method_name}";
-				$value = $this->{$property};
-				break;
-			}
+            if ( property_exists( $this, "_{$method_name}" ) ) {
+                $property = "_{$method_name}";
+                $value = $this->{$property};
+                break;
+            }
 
-			if ( ! isset( $this->_label ) ) {
-				break;
-			}
+            if ( ! isset( $this->_label ) ) {
+                break;
+            }
 
-			$value = call_user_func_array( array( $this->_label, $method_name ), $args );
+            $value = call_user_func_array( array( $this->_label, $method_name ), $args );
 
-		} while ( false );
+        } while ( false );
 
-		return $value;
-	}
+        return $value;
+    }
 
 }

Please login to merge, or discard this patch.

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

@@ -37,7 +37,7 @@
 block discarded – undo
 				break;
 			}
 
-			if ( ! isset( $this->_label ) ) {
+			if ( !isset($this->_label) ) {
 				break;
 			}
 

Please login to merge, or discard this patch.

includes/class-info-window-model.php 1 patch

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

@@ -14,60 +14,60 @@
 block discarded – undo
  */
 class Info_Window_Model extends Model_Base {
 
-	/**
-	 * @var \Clubdeuce\WPGoogleMaps\Info_Window
-	 */
-	protected $_info_window;
+    /**
+     * @var \Clubdeuce\WPGoogleMaps\Info_Window
+     */
+    protected $_info_window;
 
-	/**
-	 * Info_Window constructor.
-	 *
-	 * @param array $args
-	 */
-	function __construct( $args = array() ) {
+    /**
+     * Info_Window constructor.
+     *
+     * @param array $args
+     */
+    function __construct( $args = array() ) {
 
-		$args = wp_parse_args( $args, array(
-			'info_window' => new \Clubdeuce\WPGoogleMaps\Info_Window( $args ),
-		) );
+        $args = wp_parse_args( $args, array(
+            'info_window' => new \Clubdeuce\WPGoogleMaps\Info_Window( $args ),
+        ) );
 
-		parent::__construct( $args );
+        parent::__construct( $args );
 
-	}
+    }
 
-	/**
-	 * @return bool
-	 */
-	function has_info_window() {
+    /**
+     * @return bool
+     */
+    function has_info_window() {
 
-		return $this->_has( '_info_window' );
+        return $this->_has( '_info_window' );
 
-	}
+    }
 
-	/**
-	 * @param string $method_name
-	 * @param array $args
-	 *
-	 * @return mixed|null
-	 */
-	function __call( $method_name, $args ) {
+    /**
+     * @param string $method_name
+     * @param array $args
+     *
+     * @return mixed|null
+     */
+    function __call( $method_name, $args ) {
 
-		$value = null;
+        $value = null;
 
-		do {
-			$value = parent::__call( $method_name, $args );
+        do {
+            $value = parent::__call( $method_name, $args );
 
-			if ( $value ) {
-				break;
-			}
+            if ( $value ) {
+                break;
+            }
 
-			if ( $this->has_info_window() ) {
-				$value = call_user_func_array( array( $this->info_window(), $method_name ), $args );
-				break;
-			}
-		} while ( false );
+            if ( $this->has_info_window() ) {
+                $value = call_user_func_array( array( $this->info_window(), $method_name ), $args );
+                break;
+            }
+        } while ( false );
 
-		return $value;
+        return $value;
 
-	}
+    }
 
 }

Please login to merge, or discard this patch.

component-google-maps.php 1 patch

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

@@ -14,19 +14,19 @@  discard block
 block discarded – undo
 
     const INSTANCE_CLASS = 'Clubdeuce\WPLib\Components\GoogleMaps\Map';
 
-	/**
-	 * @var string
-	 */
-	protected static $_version = '0.1.6';
-
-	/**
-	 *
-	 */
+    /**
+     * @var string
+     */
+    protected static $_version = '0.1.6';
+
+    /**
+     *
+     */
     static function on_load() {
 
-	    require_once 'vendor/autoload.php';
+        require_once 'vendor/autoload.php';
         self::register_helper( '\Clubdeuce\WPGoogleMaps\Google_Maps', __CLASS__ );
-	    \Clubdeuce\WPGoogleMaps\Google_Maps::initialize();
+        \Clubdeuce\WPGoogleMaps\Google_Maps::initialize();
 
     }
 
@@ -41,32 +41,32 @@  discard block
 block discarded – undo
 
     }
 
-	/**
-	 * @param $address
-	 * @param array $args
-	 *
-	 * @return Marker
-	 */
+    /**
+     * @param $address
+     * @param array $args
+     *
+     * @return Marker
+     */
     static function make_marker_by_address( $address, $args = array() ) {
 
-    	$marker = \Clubdeuce\WPGoogleMaps\Google_Maps::make_marker_by_address( $address, $args );
-    	return new Marker( array_merge( array( 'marker' => $marker ), $args ) );
+        $marker = \Clubdeuce\WPGoogleMaps\Google_Maps::make_marker_by_address( $address, $args );
+        return new Marker( array_merge( array( 'marker' => $marker ), $args ) );
 
     }
 
-	/**
-	 * @param float  $lat
-	 * @param float  $lng
-	 * @param array  $args
-	 *
-	 * @return Marker
-	 */
-	static function make_marker_by_position( $lat, $lng, $args = array() ) {
+    /**
+     * @param float  $lat
+     * @param float  $lng
+     * @param array  $args
+     *
+     * @return Marker
+     */
+    static function make_marker_by_position( $lat, $lng, $args = array() ) {
 
-		$marker = \Clubdeuce\WPGoogleMaps\Google_Maps::make_marker_by_position( $lat, $lng, $args );
-		return new Marker( array_merge( array( 'marker' => $marker ), $args ) );
+        $marker = \Clubdeuce\WPGoogleMaps\Google_Maps::make_marker_by_position( $lat, $lng, $args );
+        return new Marker( array_merge( array( 'marker' => $marker ), $args ) );
 
-	}
+    }
 }
 
 Google_Maps::on_load();

Please login to merge, or discard this patch.

		@@ -11,72 +11,72 @@
		block discarded – undo
11	11	*/
12	12	class Marker_Model extends Model_Base {
13	13
14		- /**
15		- * @var \Clubdeuce\WPGoogleMaps\Marker
16		- */
	14	+ /**
	15	+ * @var \Clubdeuce\WPGoogleMaps\Marker
	16	+ */
17	17	protected $_marker;
18	18
19		- /**
20		- * @return bool
21		- */
22		- function has_marker() {
	19	+ /**
	20	+ * @return bool
	21	+ */
	22	+ function has_marker() {
23	23
24		- return $this->_has( '_marker' );
	24	+ return $this->_has( '_marker' );
25	25
26		- }
	26	+ }
27	27
28		- /**
29		- * @return Location
30		- */
31		- function location() {
	28	+ /**
	29	+ * @return Location
	30	+ */
	31	+ function location() {
32	32
33		- return new Location( array( 'location' => $this->marker()->location() ) );
	33	+ return new Location( array( 'location' => $this->marker()->location() ) );
34	34
35		- }
	35	+ }
36	36
37		- /**
38		- * @return Marker_Label
39		- */
40		- function label() {
	37	+ /**
	38	+ * @return Marker_Label
	39	+ */
	40	+ function label() {
41	41
42		- return new Marker_Label( array( 'label' => $this->marker()->label() ) );
	42	+ return new Marker_Label( array( 'label' => $this->marker()->label() ) );
43	43
44		- }
	44	+ }
45	45
46		- /**
47		- * @return Info_Window
48		- */
49		- function info_window() {
	46	+ /**
	47	+ * @return Info_Window
	48	+ */
	49	+ function info_window() {
50	50
51		- return new Info_Window( array( 'info_window' => $this->marker()->info_window() ) );
	51	+ return new Info_Window( array( 'info_window' => $this->marker()->info_window() ) );
52	52
53		- }
	53	+ }
54	54
55		- /**
56		- * @param string $method_name
57		- * @param array $args
58		- *
59		- * @return mixed\|null
60		- */
61		- function __call( $method_name, $args ) {
	55	+ /**
	56	+ * @param string $method_name
	57	+ * @param array $args
	58	+ *
	59	+ * @return mixed\|null
	60	+ */
	61	+ function __call( $method_name, $args ) {
62	62
63		- $value = null;
	63	+ $value = null;
64	64
65		- do {
66		- $value = parent::__call( $method_name, $args );
	65	+ do {
	66	+ $value = parent::__call( $method_name, $args );
67	67
68		- if ( $value ) {
69		- break;
70		- }
	68	+ if ( $value ) {
	69	+ break;
	70	+ }
71	71
72		- if ( $this->has_marker() ) {
73		- $value = call_user_func_array( array( $this->marker(), $method_name ), $args );
74		- break;
75		- }
76		- } while ( false );
	72	+ if ( $this->has_marker() ) {
	73	+ $value = call_user_func_array( array( $this->marker(), $method_name ), $args );
	74	+ break;
	75	+ }
	76	+ } while ( false );
77	77
78		- return $value;
	78	+ return $value;
79	79
80		- }
	80	+ }
81	81
82	82	}

		@@ -8,44 +8,44 @@
		block discarded – undo
8	8	*/
9	9	class Marker_Label_Model extends Model_Base {
10	10
11		- /**
12		- * @var \Clubdeuce\WPGoogleMaps\Marker_Label
13		- */
14		- protected $_label;
	11	+ /**
	12	+ * @var \Clubdeuce\WPGoogleMaps\Marker_Label
	13	+ */
	14	+ protected $_label;
15	15
16		- /**
17		- * @return bool
18		- */
19		- function has_label() {
	16	+ /**
	17	+ * @return bool
	18	+ */
	19	+ function has_label() {
20	20
21		- return $this->_has( '_label' );
	21	+ return $this->_has( '_label' );
22	22
23		- }
	23	+ }
24	24
25		- /**
26		- * @param string $method_name
27		- * @return mixed
28		- */
29		- function __call( $method_name, $args ) {
30		- $value = null;
	25	+ /**
	26	+ * @param string $method_name
	27	+ * @return mixed
	28	+ */
	29	+ function __call( $method_name, $args ) {
	30	+ $value = null;
31	31
32		- do {
	32	+ do {
33	33
34		- if ( property_exists( $this, "_{$method_name}" ) ) {
35		- $property = "_{$method_name}";
36		- $value = $this->{$property};
37		- break;
38		- }
	34	+ if ( property_exists( $this, "_{$method_name}" ) ) {
	35	+ $property = "_{$method_name}";
	36	+ $value = $this->{$property};
	37	+ break;
	38	+ }
39	39
40		- if ( ! isset( $this->_label ) ) {
41		- break;
42		- }
	40	+ if ( ! isset( $this->_label ) ) {
	41	+ break;
	42	+ }
43	43
44		- $value = call_user_func_array( array( $this->_label, $method_name ), $args );
	44	+ $value = call_user_func_array( array( $this->_label, $method_name ), $args );
45	45
46		- } while ( false );
	46	+ } while ( false );
47	47
48		- return $value;
49		- }
	48	+ return $value;
	49	+ }
50	50
51	51	}

		@@ -37,7 +37,7 @@
		block discarded – undo
37	37	break;
38	38	}
39	39
40		- if ( ! isset( $this->_label ) ) {
	40	+ if ( !isset($this->_label) ) {
41	41	break;
42	42	}
43	43

		@@ -14,60 +14,60 @@
		block discarded – undo
14	14	*/
15	15	class Info_Window_Model extends Model_Base {
16	16
17		- /**
18		- * @var \Clubdeuce\WPGoogleMaps\Info_Window
19		- */
20		- protected $_info_window;
	17	+ /**
	18	+ * @var \Clubdeuce\WPGoogleMaps\Info_Window
	19	+ */
	20	+ protected $_info_window;
21	21
22		- /**
23		- * Info_Window constructor.
24		- *
25		- * @param array $args
26		- */
27		- function __construct( $args = array() ) {
	22	+ /**
	23	+ * Info_Window constructor.
	24	+ *
	25	+ * @param array $args
	26	+ */
	27	+ function __construct( $args = array() ) {
28	28
29		- $args = wp_parse_args( $args, array(
30		- 'info_window' => new \Clubdeuce\WPGoogleMaps\Info_Window( $args ),
31		- ) );
	29	+ $args = wp_parse_args( $args, array(
	30	+ 'info_window' => new \Clubdeuce\WPGoogleMaps\Info_Window( $args ),
	31	+ ) );
32	32
33		- parent::__construct( $args );
	33	+ parent::__construct( $args );
34	34
35		- }
	35	+ }
36	36
37		- /**
38		- * @return bool
39		- */
40		- function has_info_window() {
	37	+ /**
	38	+ * @return bool
	39	+ */
	40	+ function has_info_window() {
41	41
42		- return $this->_has( '_info_window' );
	42	+ return $this->_has( '_info_window' );
43	43
44		- }
	44	+ }
45	45
46		- /**
47		- * @param string $method_name
48		- * @param array $args
49		- *
50		- * @return mixed\|null
51		- */
52		- function __call( $method_name, $args ) {
	46	+ /**
	47	+ * @param string $method_name
	48	+ * @param array $args
	49	+ *
	50	+ * @return mixed\|null
	51	+ */
	52	+ function __call( $method_name, $args ) {
53	53
54		- $value = null;
	54	+ $value = null;
55	55
56		- do {
57		- $value = parent::__call( $method_name, $args );
	56	+ do {
	57	+ $value = parent::__call( $method_name, $args );
58	58
59		- if ( $value ) {
60		- break;
61		- }
	59	+ if ( $value ) {
	60	+ break;
	61	+ }
62	62
63		- if ( $this->has_info_window() ) {
64		- $value = call_user_func_array( array( $this->info_window(), $method_name ), $args );
65		- break;
66		- }
67		- } while ( false );
	63	+ if ( $this->has_info_window() ) {
	64	+ $value = call_user_func_array( array( $this->info_window(), $method_name ), $args );
	65	+ break;
	66	+ }
	67	+ } while ( false );
68	68
69		- return $value;
	69	+ return $value;
70	70
71		- }
	71	+ }
72	72
73	73	}

		@@ -14,19 +14,19 @@ discard block
		block discarded – undo
14	14
15	15	const INSTANCE_CLASS = 'Clubdeuce\WPLib\Components\GoogleMaps\Map';
16	16
17		- /**
18		- * @var string
19		- */
20		- protected static $_version = '0.1.6';
21		-
22		- /**
23		- *
24		- */
	17	+ /**
	18	+ * @var string
	19	+ */
	20	+ protected static $_version = '0.1.6';
	21	+
	22	+ /**
	23	+ *
	24	+ */
25	25	static function on_load() {
26	26
27		- require_once 'vendor/autoload.php';
	27	+ require_once 'vendor/autoload.php';
28	28	self::register_helper( '\Clubdeuce\WPGoogleMaps\Google_Maps', __CLASS__ );
29		- \Clubdeuce\WPGoogleMaps\Google_Maps::initialize();
	29	+ \Clubdeuce\WPGoogleMaps\Google_Maps::initialize();
30	30
31	31	}
32	32
		@@ -41,32 +41,32 @@ discard block
		block discarded – undo
41	41
42	42	}
43	43
44		- /**
45		- * @param $address
46		- * @param array $args
47		- *
48		- * @return Marker
49		- */
	44	+ /**
	45	+ * @param $address
	46	+ * @param array $args
	47	+ *
	48	+ * @return Marker
	49	+ */
50	50	static function make_marker_by_address( $address, $args = array() ) {
51	51
52		- $marker = \Clubdeuce\WPGoogleMaps\Google_Maps::make_marker_by_address( $address, $args );
53		- return new Marker( array_merge( array( 'marker' => $marker ), $args ) );
	52	+ $marker = \Clubdeuce\WPGoogleMaps\Google_Maps::make_marker_by_address( $address, $args );
	53	+ return new Marker( array_merge( array( 'marker' => $marker ), $args ) );
54	54
55	55	}
56	56
57		- /**
58		- * @param float $lat
59		- * @param float $lng
60		- * @param array $args
61		- *
62		- * @return Marker
63		- */
64		- static function make_marker_by_position( $lat, $lng, $args = array() ) {
	57	+ /**
	58	+ * @param float $lat
	59	+ * @param float $lng
	60	+ * @param array $args
	61	+ *
	62	+ * @return Marker
	63	+ */
	64	+ static function make_marker_by_position( $lat, $lng, $args = array() ) {
65	65
66		- $marker = \Clubdeuce\WPGoogleMaps\Google_Maps::make_marker_by_position( $lat, $lng, $args );
67		- return new Marker( array_merge( array( 'marker' => $marker ), $args ) );
	66	+ $marker = \Clubdeuce\WPGoogleMaps\Google_Maps::make_marker_by_position( $lat, $lng, $args );
	67	+ return new Marker( array_merge( array( 'marker' => $marker ), $args ) );
68	68
69		- }
	69	+ }
70	70	}
71	71
72	72	Google_Maps::on_load();

clubdeuce / wplib-olm-google-maps

Pull Request — master (#22)

Status

Category

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

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

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

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

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