@@ -8,44 +8,44 @@ |
||
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 @@ |
||
37 | 37 | break; |
38 | 38 | } |
39 | 39 | |
40 | - if ( ! isset( $this->_label ) ) { |
|
40 | + if ( !isset($this->_label) ) { |
|
41 | 41 | break; |
42 | 42 | } |
43 | 43 |
@@ -24,14 +24,14 @@ |
||
24 | 24 | */ |
25 | 25 | class Location extends \WPLib_Item_Base { |
26 | 26 | |
27 | - function __construct( $args = array() ) { |
|
27 | + function __construct( $args = array() ) { |
|
28 | 28 | |
29 | - $args = wp_parse_args( $args, array( |
|
30 | - 'location' => new \Clubdeuce\WPGoogleMaps\Location( $args ), |
|
31 | - ) ); |
|
29 | + $args = wp_parse_args( $args, array( |
|
30 | + 'location' => new \Clubdeuce\WPGoogleMaps\Location( $args ), |
|
31 | + ) ); |
|
32 | 32 | |
33 | - parent::__construct( $args ); |
|
33 | + parent::__construct( $args ); |
|
34 | 34 | |
35 | 35 | |
36 | - } |
|
36 | + } |
|
37 | 37 | } |
38 | 38 | \ No newline at end of file |
@@ -14,60 +14,60 @@ |
||
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 | } |
@@ -8,63 +8,63 @@ |
||
8 | 8 | { |
9 | 9 | // define public methods as commands |
10 | 10 | |
11 | - function hello($opts = ['who' => 'unknown']) |
|
12 | - { |
|
13 | - print_r($opts); |
|
14 | - $this->say("Hello, " . $opts['who']); |
|
15 | - } |
|
11 | + function hello($opts = ['who' => 'unknown']) |
|
12 | + { |
|
13 | + print_r($opts); |
|
14 | + $this->say("Hello, " . $opts['who']); |
|
15 | + } |
|
16 | 16 | |
17 | - function scripts() { |
|
17 | + function scripts() { |
|
18 | 18 | |
19 | - $this->taskMinify('assets/maps.js') |
|
20 | - ->to('dist/scripts/maps.min.js') |
|
21 | - ->run(); |
|
19 | + $this->taskMinify('assets/maps.js') |
|
20 | + ->to('dist/scripts/maps.min.js') |
|
21 | + ->run(); |
|
22 | 22 | |
23 | - } |
|
23 | + } |
|
24 | 24 | |
25 | - function tests() |
|
26 | - { |
|
25 | + function tests() |
|
26 | + { |
|
27 | 27 | |
28 | - $this->taskExec('mysql -e "CREATE DATABASE IF NOT EXISTS test_db"')->run(); |
|
29 | - $this->taskExec('mysql -e "GRANT ALL ON test_db.* to \'root\'@\'%\'"')->run(); |
|
30 | - $this->taskSvnStack() |
|
31 | - ->checkout('https://develop.svn.wordpress.org/tags/4.8.3 wp-tests') |
|
32 | - ->run(); |
|
28 | + $this->taskExec('mysql -e "CREATE DATABASE IF NOT EXISTS test_db"')->run(); |
|
29 | + $this->taskExec('mysql -e "GRANT ALL ON test_db.* to \'root\'@\'%\'"')->run(); |
|
30 | + $this->taskSvnStack() |
|
31 | + ->checkout('https://develop.svn.wordpress.org/tags/4.8.3 wp-tests') |
|
32 | + ->run(); |
|
33 | 33 | |
34 | - $this->setTestConfig(); |
|
35 | - $this->phpunit(); |
|
34 | + $this->setTestConfig(); |
|
35 | + $this->phpunit(); |
|
36 | 36 | |
37 | - } |
|
37 | + } |
|
38 | 38 | |
39 | - function phpunit() |
|
40 | - { |
|
41 | - $this->taskPhpUnit('vendor/bin/phpunit') |
|
42 | - ->configFile('tests/phpunit.xml.dist') |
|
43 | - ->envVars(array('WP_TESTS_DIR' => 'wp-tests')) |
|
44 | - ->run(); |
|
45 | - } |
|
39 | + function phpunit() |
|
40 | + { |
|
41 | + $this->taskPhpUnit('vendor/bin/phpunit') |
|
42 | + ->configFile('tests/phpunit.xml.dist') |
|
43 | + ->envVars(array('WP_TESTS_DIR' => 'wp-tests')) |
|
44 | + ->run(); |
|
45 | + } |
|
46 | 46 | |
47 | - private function setTestConfig() |
|
48 | - { |
|
47 | + private function setTestConfig() |
|
48 | + { |
|
49 | 49 | |
50 | - if (file_exists('wp-tests/wp-tests-config-sample.php')) { |
|
51 | - copy('wp-tests/wp-tests-config-sample.php', 'wp-tests/wp-tests-config.php'); |
|
52 | - } |
|
50 | + if (file_exists('wp-tests/wp-tests-config-sample.php')) { |
|
51 | + copy('wp-tests/wp-tests-config-sample.php', 'wp-tests/wp-tests-config.php'); |
|
52 | + } |
|
53 | 53 | |
54 | - $this->taskReplaceInFile( 'wp-tests/wp-tests-config.php') |
|
55 | - ->from('youremptytestdbnamehere') |
|
56 | - ->to('test_db') |
|
57 | - ->run(); |
|
54 | + $this->taskReplaceInFile( 'wp-tests/wp-tests-config.php') |
|
55 | + ->from('youremptytestdbnamehere') |
|
56 | + ->to('test_db') |
|
57 | + ->run(); |
|
58 | 58 | |
59 | - $this->taskReplaceInFile( 'wp-tests/wp-tests-config.php') |
|
60 | - ->from('yourusernamehere') |
|
61 | - ->to('root') |
|
62 | - ->run(); |
|
59 | + $this->taskReplaceInFile( 'wp-tests/wp-tests-config.php') |
|
60 | + ->from('yourusernamehere') |
|
61 | + ->to('root') |
|
62 | + ->run(); |
|
63 | 63 | |
64 | - $this->taskReplaceInFile( 'wp-tests/wp-tests-config.php') |
|
65 | - ->from('yourpasswordhere') |
|
66 | - ->to('') |
|
67 | - ->run(); |
|
68 | - } |
|
64 | + $this->taskReplaceInFile( 'wp-tests/wp-tests-config.php') |
|
65 | + ->from('yourpasswordhere') |
|
66 | + ->to('') |
|
67 | + ->run(); |
|
68 | + } |
|
69 | 69 | |
70 | 70 | } |
71 | 71 | \ No newline at end of file |
@@ -8,16 +8,16 @@ discard block |
||
8 | 8 | { |
9 | 9 | // define public methods as commands |
10 | 10 | |
11 | - function hello($opts = ['who' => 'unknown']) |
|
11 | + function hello( $opts = ['who' => 'unknown'] ) |
|
12 | 12 | { |
13 | - print_r($opts); |
|
14 | - $this->say("Hello, " . $opts['who']); |
|
13 | + print_r( $opts ); |
|
14 | + $this->say( "Hello, ".$opts['who'] ); |
|
15 | 15 | } |
16 | 16 | |
17 | 17 | function scripts() { |
18 | 18 | |
19 | - $this->taskMinify('assets/maps.js') |
|
20 | - ->to('dist/scripts/maps.min.js') |
|
19 | + $this->taskMinify( 'assets/maps.js' ) |
|
20 | + ->to( 'dist/scripts/maps.min.js' ) |
|
21 | 21 | ->run(); |
22 | 22 | |
23 | 23 | } |
@@ -25,10 +25,10 @@ discard block |
||
25 | 25 | function tests() |
26 | 26 | { |
27 | 27 | |
28 | - $this->taskExec('mysql -e "CREATE DATABASE IF NOT EXISTS test_db"')->run(); |
|
29 | - $this->taskExec('mysql -e "GRANT ALL ON test_db.* to \'root\'@\'%\'"')->run(); |
|
28 | + $this->taskExec( 'mysql -e "CREATE DATABASE IF NOT EXISTS test_db"' )->run(); |
|
29 | + $this->taskExec( 'mysql -e "GRANT ALL ON test_db.* to \'root\'@\'%\'"' )->run(); |
|
30 | 30 | $this->taskSvnStack() |
31 | - ->checkout('https://develop.svn.wordpress.org/tags/4.8.3 wp-tests') |
|
31 | + ->checkout( 'https://develop.svn.wordpress.org/tags/4.8.3 wp-tests' ) |
|
32 | 32 | ->run(); |
33 | 33 | |
34 | 34 | $this->setTestConfig(); |
@@ -38,32 +38,32 @@ discard block |
||
38 | 38 | |
39 | 39 | function phpunit() |
40 | 40 | { |
41 | - $this->taskPhpUnit('vendor/bin/phpunit') |
|
42 | - ->configFile('tests/phpunit.xml.dist') |
|
43 | - ->envVars(array('WP_TESTS_DIR' => 'wp-tests')) |
|
41 | + $this->taskPhpUnit( 'vendor/bin/phpunit' ) |
|
42 | + ->configFile( 'tests/phpunit.xml.dist' ) |
|
43 | + ->envVars( array( 'WP_TESTS_DIR' => 'wp-tests' ) ) |
|
44 | 44 | ->run(); |
45 | 45 | } |
46 | 46 | |
47 | 47 | private function setTestConfig() |
48 | 48 | { |
49 | 49 | |
50 | - if (file_exists('wp-tests/wp-tests-config-sample.php')) { |
|
51 | - copy('wp-tests/wp-tests-config-sample.php', 'wp-tests/wp-tests-config.php'); |
|
50 | + if ( file_exists( 'wp-tests/wp-tests-config-sample.php' ) ) { |
|
51 | + copy( 'wp-tests/wp-tests-config-sample.php', 'wp-tests/wp-tests-config.php' ); |
|
52 | 52 | } |
53 | 53 | |
54 | - $this->taskReplaceInFile( 'wp-tests/wp-tests-config.php') |
|
55 | - ->from('youremptytestdbnamehere') |
|
56 | - ->to('test_db') |
|
54 | + $this->taskReplaceInFile( 'wp-tests/wp-tests-config.php' ) |
|
55 | + ->from( 'youremptytestdbnamehere' ) |
|
56 | + ->to( 'test_db' ) |
|
57 | 57 | ->run(); |
58 | 58 | |
59 | - $this->taskReplaceInFile( 'wp-tests/wp-tests-config.php') |
|
60 | - ->from('yourusernamehere') |
|
61 | - ->to('root') |
|
59 | + $this->taskReplaceInFile( 'wp-tests/wp-tests-config.php' ) |
|
60 | + ->from( 'yourusernamehere' ) |
|
61 | + ->to( 'root' ) |
|
62 | 62 | ->run(); |
63 | 63 | |
64 | - $this->taskReplaceInFile( 'wp-tests/wp-tests-config.php') |
|
65 | - ->from('yourpasswordhere') |
|
66 | - ->to('') |
|
64 | + $this->taskReplaceInFile( 'wp-tests/wp-tests-config.php' ) |
|
65 | + ->from( 'yourpasswordhere' ) |
|
66 | + ->to( '' ) |
|
67 | 67 | ->run(); |
68 | 68 | } |
69 | 69 |