Completed
Push — master ( 854e15...fefbc6 )
by Andrew
04:57 queued 02:25
created
app/classy/classy.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -302,7 +302,7 @@
 block discarded – undo
302 302
 
303 303
 	/**
304 304
 	 * @param array   $prefs
305
-	 * @return array mixed
305
+	 * @return stdClass mixed
306 306
 	 */
307 307
 	public static function get_pagination( $prefs = array() ) {
308 308
 
Please login to merge, or discard this patch.
Spacing   +69 added lines, -69 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 	 */
30 30
 	public static function get_instance() {
31 31
 
32
-		if ( null === self::$single_instance ) {
32
+		if (null === self::$single_instance) {
33 33
 
34 34
 			self::$single_instance = new self();
35 35
 
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
 
57 57
 		$this->init_config();
58 58
 
59
-		add_filter( 'theme_page_templates', array( $this, 'filter_templates' ) );
59
+		add_filter('theme_page_templates', array($this, 'filter_templates'));
60 60
 
61 61
 	}
62 62
 
@@ -70,13 +70,13 @@  discard block
 block discarded – undo
70 70
 
71 71
 		$theme = wp_get_theme();
72 72
 
73
-		define( 'CLASSY_THEME', $theme->template );
74
-		define( 'CLASSY_THEME_NAME', $theme->get( 'Name' ) );
75
-		define( 'CLASSY_THEME_PATH', get_template_directory() . '/' );
76
-		define( 'CLASSY_THEME_DIR', get_template_directory_uri() . '/' );
77
-		define( 'CLASSY_THEME_VERSION', $theme->get( 'Version' ) );
78
-		define( 'CLASSY_THEME_FRAMEWORK_PATH', CLASSY_THEME_PATH . 'app/' );
79
-		define( 'CLASSY_THEME_FRAMEWORK_DIR', CLASSY_THEME_DIR . 'app/' );
73
+		define('CLASSY_THEME', $theme->template);
74
+		define('CLASSY_THEME_NAME', $theme->get('Name'));
75
+		define('CLASSY_THEME_PATH', get_template_directory().'/');
76
+		define('CLASSY_THEME_DIR', get_template_directory_uri().'/');
77
+		define('CLASSY_THEME_VERSION', $theme->get('Version'));
78
+		define('CLASSY_THEME_FRAMEWORK_PATH', CLASSY_THEME_PATH.'app/');
79
+		define('CLASSY_THEME_FRAMEWORK_DIR', CLASSY_THEME_DIR.'app/');
80 80
 
81 81
 	}
82 82
 
@@ -85,40 +85,40 @@  discard block
 block discarded – undo
85 85
 	 */
86 86
 	private function include_core_files() {
87 87
 
88
-		require_once CLASSY_THEME_PATH . 'vendor/autoload.php';
88
+		require_once CLASSY_THEME_PATH.'vendor/autoload.php';
89 89
 
90 90
 		// Basis Class
91
-		require_once CLASSY_THEME_FRAMEWORK_PATH . 'classy/classy-basis.php';
91
+		require_once CLASSY_THEME_FRAMEWORK_PATH.'classy/classy-basis.php';
92 92
 
93 93
 		// Hierarchy
94
-		require_once CLASSY_THEME_FRAMEWORK_PATH . 'classy/classy-hierarchy.php';
94
+		require_once CLASSY_THEME_FRAMEWORK_PATH.'classy/classy-hierarchy.php';
95 95
 
96 96
 		// Theme Config
97
-		require_once CLASSY_THEME_FRAMEWORK_PATH . 'classy/classy-config.php';
97
+		require_once CLASSY_THEME_FRAMEWORK_PATH.'classy/classy-config.php';
98 98
 
99 99
 		// Scope
100
-		require_once CLASSY_THEME_FRAMEWORK_PATH . 'classy/classy-scope.php';
100
+		require_once CLASSY_THEME_FRAMEWORK_PATH.'classy/classy-scope.php';
101 101
 
102 102
 		// View Loader
103
-		require_once CLASSY_THEME_FRAMEWORK_PATH . 'classy/classy-view.php';
103
+		require_once CLASSY_THEME_FRAMEWORK_PATH.'classy/classy-view.php';
104 104
 
105 105
 		// Helper functions
106
-		require_once CLASSY_THEME_FRAMEWORK_PATH . 'classy/classy-helper.php';
106
+		require_once CLASSY_THEME_FRAMEWORK_PATH.'classy/classy-helper.php';
107 107
 
108 108
 		// Query Helper
109
-		require_once CLASSY_THEME_FRAMEWORK_PATH . 'classy/classy-query-helper.php';
109
+		require_once CLASSY_THEME_FRAMEWORK_PATH.'classy/classy-query-helper.php';
110 110
 
111 111
 		// Menu
112
-		require_once CLASSY_THEME_FRAMEWORK_PATH . 'classy/classy-menu.php';
112
+		require_once CLASSY_THEME_FRAMEWORK_PATH.'classy/classy-menu.php';
113 113
 
114 114
 		// Menu Item
115
-		require_once CLASSY_THEME_FRAMEWORK_PATH . 'classy/classy-menu-item.php';
115
+		require_once CLASSY_THEME_FRAMEWORK_PATH.'classy/classy-menu-item.php';
116 116
 
117 117
 		// Comment
118
-		require_once CLASSY_THEME_FRAMEWORK_PATH . 'classy/classy-comment.php';
118
+		require_once CLASSY_THEME_FRAMEWORK_PATH.'classy/classy-comment.php';
119 119
 
120 120
 		// Appearance
121
-		require_once CLASSY_THEME_FRAMEWORK_PATH . 'appearance.php';
121
+		require_once CLASSY_THEME_FRAMEWORK_PATH.'appearance.php';
122 122
 
123 123
 	}
124 124
 
@@ -127,11 +127,11 @@  discard block
 block discarded – undo
127 127
 	 */
128 128
 	private function include_models() {
129 129
 
130
-		$files = (array) glob( CLASSY_THEME_FRAMEWORK_PATH . '/models/*.php' );
130
+		$files = (array) glob(CLASSY_THEME_FRAMEWORK_PATH.'/models/*.php');
131 131
 
132
-		foreach ( $files as $filename ) {
132
+		foreach ($files as $filename) {
133 133
 
134
-			if ( ! empty( $filename ) ) {
134
+			if (!empty($filename)) {
135 135
 
136 136
 				require_once $filename;
137 137
 
@@ -156,11 +156,11 @@  discard block
 block discarded – undo
156 156
 	 *
157 157
 	 * @return array
158 158
 	 */
159
-	public function filter_templates( $page_templates = array() ) {
159
+	public function filter_templates($page_templates = array()) {
160 160
 
161 161
 		$custom_templates = ClassyView::get_page_templates_list();
162 162
 
163
-		return array_merge( $page_templates, $custom_templates );
163
+		return array_merge($page_templates, $custom_templates);
164 164
 
165 165
 	}
166 166
 
@@ -171,11 +171,11 @@  discard block
 block discarded – undo
171 171
 	 *
172 172
 	 * @return mixed|bool Return false if variable not found.
173 173
 	 */
174
-	public static function get_config_var( $name ) {
174
+	public static function get_config_var($name) {
175 175
 
176 176
 		$vars = ClassyConfig::get_vars();
177 177
 
178
-		return ( isset( $vars[ $name ] ) ) ? $vars[ $name ] : false;
178
+		return (isset($vars[$name])) ? $vars[$name] : false;
179 179
 
180 180
 	}
181 181
 
@@ -186,7 +186,7 @@  discard block
 block discarded – undo
186 186
 	 */
187 187
 	public static function textdomain() {
188 188
 
189
-		$textdomain = Classy::get_config_var( 'textdomain' );
189
+		$textdomain = Classy::get_config_var('textdomain');
190 190
 
191 191
 		return $textdomain ? $textdomain : CLASSY_THEME;
192 192
 
@@ -201,17 +201,17 @@  discard block
 block discarded – undo
201 201
 	 * @param  array|null  $data     Additional params
202 202
 	 * @return void
203 203
 	 */
204
-	public static function render( $view = null, $data = null ) {
204
+	public static function render($view = null, $data = null) {
205 205
 
206
-		$views = CLASSY_THEME_PATH . ClassyView::$folder;
207
-		$cache = WP_CONTENT_DIR . '/viewcache';
206
+		$views = CLASSY_THEME_PATH.ClassyView::$folder;
207
+		$cache = WP_CONTENT_DIR.'/viewcache';
208 208
 		$common_scope = ClassyScope::get_common_scope();
209 209
 
210
-		if ( null !== $view && is_string( $view ) ) {
210
+		if (null !== $view && is_string($view)) {
211 211
 
212
-			if ( $data && is_array( $data ) ) {
212
+			if ($data && is_array($data)) {
213 213
 
214
-				$scope = array_merge( $common_scope, $data );
214
+				$scope = array_merge($common_scope, $data);
215 215
 
216 216
 			} else {
217 217
 
@@ -226,9 +226,9 @@  discard block
 block discarded – undo
226 226
 
227 227
 		}
228 228
 
229
-		$renderer = new BladeRenderer( $views, array( 'cache_path' => $cache ) );
229
+		$renderer = new BladeRenderer($views, array('cache_path' => $cache));
230 230
 
231
-		echo $renderer->render( $view, $scope ); // XSS: xss ok.
231
+		echo $renderer->render($view, $scope); // XSS: xss ok.
232 232
 
233 233
 	}
234 234
 
@@ -253,27 +253,27 @@  discard block
 block discarded – undo
253 253
 	 * @param  string  $return object/id/ClassyPost
254 254
 	 * @return mixed
255 255
 	 */
256
-	public static function get_posts( $args = false, $return = 'ClassyPost' ) {
256
+	public static function get_posts($args = false, $return = 'ClassyPost') {
257 257
 
258 258
 		$_return = array();
259 259
 
260
-		$query = ClassyQueryHelper::find_query( $args );
260
+		$query = ClassyQueryHelper::find_query($args);
261 261
 
262
-		if ( isset( $query->posts ) ) {
262
+		if (isset($query->posts)) {
263 263
 
264
-			foreach ( $query->posts as $post ) {
264
+			foreach ($query->posts as $post) {
265 265
 
266
-				if ( 'id' === $return ) {
266
+				if ('id' === $return) {
267 267
 
268 268
 					$_return[] = $post->id;
269 269
 
270
-				} elseif ( 'object' === $return ) {
270
+				} elseif ('object' === $return) {
271 271
 
272 272
 					$_return[] = $post;
273 273
 
274
-				} elseif ( class_exists( $return ) ) {
274
+				} elseif (class_exists($return)) {
275 275
 
276
-					$_return[] = new $return( $post );
276
+					$_return[] = new $return($post);
277 277
 
278 278
 				}
279 279
 			}
@@ -290,11 +290,11 @@  discard block
 block discarded – undo
290 290
 	 * @param  string  $return_type ClassyPost/object/id
291 291
 	 * @return mixed
292 292
 	 */
293
-	public static function get_post( $args = false, $return_type = 'ClassyPost' ) {
293
+	public static function get_post($args = false, $return_type = 'ClassyPost') {
294 294
 
295
-		$posts = self::get_posts( $args, $return_type );
295
+		$posts = self::get_posts($args, $return_type);
296 296
 
297
-		if ( $post = reset( $posts ) ) {
297
+		if ($post = reset($posts)) {
298 298
 			return $post;
299 299
 		}
300 300
 
@@ -304,62 +304,62 @@  discard block
 block discarded – undo
304 304
 	 * @param array   $prefs
305 305
 	 * @return array mixed
306 306
 	 */
307
-	public static function get_pagination( $prefs = array() ) {
307
+	public static function get_pagination($prefs = array()) {
308 308
 
309 309
 		global $wp_query;
310 310
 		global $paged;
311 311
 		global $wp_rewrite;
312 312
 
313 313
 		$args = array();
314
-		$args['total'] = ceil( $wp_query->found_posts / $wp_query->query_vars['posts_per_page'] );
314
+		$args['total'] = ceil($wp_query->found_posts / $wp_query->query_vars['posts_per_page']);
315 315
 
316
-		if ( $wp_rewrite->using_permalinks() ) {
316
+		if ($wp_rewrite->using_permalinks()) {
317 317
 
318
-			$url = explode( '?', get_pagenum_link( 0 ) );
318
+			$url = explode('?', get_pagenum_link(0));
319 319
 
320
-			if ( isset( $url[1] ) ) {
321
-				parse_str( $url[1], $query );
320
+			if (isset($url[1])) {
321
+				parse_str($url[1], $query);
322 322
 				$args['add_args'] = $query;
323 323
 			}
324 324
 
325 325
 			$args['format'] = 'page/%#%';
326
-			$args['base'] = trailingslashit( $url[0] ).'%_%';
326
+			$args['base'] = trailingslashit($url[0]).'%_%';
327 327
 
328 328
 		} else {
329 329
 			$big = 999999999;
330
-			$args['base'] = str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) );
330
+			$args['base'] = str_replace($big, '%#%', esc_url(get_pagenum_link($big)));
331 331
 		}
332 332
 
333 333
 		$args['type'] = 'array';
334
-		$args['current'] = max( 1, get_query_var( 'paged' ) );
335
-		$args['mid_size'] = max( 9 - $args['current'], 3 );
334
+		$args['current'] = max(1, get_query_var('paged'));
335
+		$args['mid_size'] = max(9 - $args['current'], 3);
336 336
 		$args['prev_next'] = false;
337 337
 
338
-		if ( is_int( $prefs ) ) {
338
+		if (is_int($prefs)) {
339 339
 			$args['mid_size'] = $prefs - 2;
340 340
 		} else {
341
-			$args = array_merge( $args, $prefs );
341
+			$args = array_merge($args, $prefs);
342 342
 		}
343 343
 
344 344
 		$data = array();
345
-		$data['pages'] = ClassyHelper::paginate_links( $args );
346
-		$next = get_next_posts_page_link( $args['total'] );
345
+		$data['pages'] = ClassyHelper::paginate_links($args);
346
+		$next = get_next_posts_page_link($args['total']);
347 347
 
348
-		if ( $next ) {
349
-			$data['next'] = array( 'link' => untrailingslashit( $next ), 'class' => 'page-numbers next' );
348
+		if ($next) {
349
+			$data['next'] = array('link' => untrailingslashit($next), 'class' => 'page-numbers next');
350 350
 		}
351 351
 
352
-		$prev = previous_posts( false );
352
+		$prev = previous_posts(false);
353 353
 
354
-		if ( $prev ) {
355
-			$data['prev'] = array( 'link' => untrailingslashit( $prev ), 'class' => 'page-numbers prev' );
354
+		if ($prev) {
355
+			$data['prev'] = array('link' => untrailingslashit($prev), 'class' => 'page-numbers prev');
356 356
 		}
357 357
 
358
-		if ( $paged < 2 ) {
358
+		if ($paged < 2) {
359 359
 			$data['prev'] = null;
360 360
 		}
361 361
 
362
-		return ClassyHelper::array_to_object( $data );
362
+		return ClassyHelper::array_to_object($data);
363 363
 
364 364
 	}
365 365
 }
Please login to merge, or discard this patch.
app/classy/classy-config.php 1 patch
Spacing   +59 added lines, -59 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@  discard block
 block discarded – undo
16 16
 	 */
17 17
 	private static function get_allowed_variables() {
18 18
 
19
-		return array( 'environment', 'textdomain', 'post_types', 'taxonomies', 'post_formats', 'sidebars' );
19
+		return array('environment', 'textdomain', 'post_types', 'taxonomies', 'post_formats', 'sidebars');
20 20
 
21 21
 	}
22 22
 
@@ -27,33 +27,33 @@  discard block
 block discarded – undo
27 27
 	 */
28 28
 	public static function get_vars() {
29 29
 
30
-		if ( null === self::$vars ) {
30
+		if (null === self::$vars) {
31 31
 
32 32
 			// Check for a theme config
33
-			$config_file = CLASSY_THEME_FRAMEWORK_PATH . 'config.php';
33
+			$config_file = CLASSY_THEME_FRAMEWORK_PATH.'config.php';
34 34
 
35
-			if ( file_exists( $config_file ) ) {
35
+			if (file_exists($config_file)) {
36 36
 
37
-				require_once CLASSY_THEME_FRAMEWORK_PATH . 'config.php';
37
+				require_once CLASSY_THEME_FRAMEWORK_PATH.'config.php';
38 38
 
39 39
 				$vars = self::get_allowed_variables();
40 40
 
41
-				foreach ( $vars as $var ) {
41
+				foreach ($vars as $var) {
42 42
 
43
-					if ( isset( $$var ) ) {
43
+					if (isset($$var)) {
44 44
 
45
-						self::$vars[ $var ] = $$var;
45
+						self::$vars[$var] = $$var;
46 46
 
47
-						unset( $$var ); // We don't require it anymore
47
+						unset($$var); // We don't require it anymore
48 48
 
49 49
 					}
50 50
 				}
51 51
 			} else {
52 52
 
53
-				wp_die( sprintf(
53
+				wp_die(sprintf(
54 54
 					'There is no config file in %s custom/config.php',
55
-					esc_html( CLASSY_THEME )
56
-				) );
55
+					esc_html(CLASSY_THEME)
56
+				));
57 57
 
58 58
 			}
59 59
 		}
@@ -72,16 +72,16 @@  discard block
 block discarded – undo
72 72
 		$vars = self::get_vars();
73 73
 
74 74
 		// Init Post Types
75
-		if ( isset( $vars['post_types'] ) ) { self::init_post_types( $vars['post_types'] ); }
75
+		if (isset($vars['post_types'])) { self::init_post_types($vars['post_types']); }
76 76
 
77 77
 		// Init Taxonomies
78
-		if ( isset( $vars['taxonomies'] ) ) { self::init_taxonomies( $vars['taxonomies'] ); }
78
+		if (isset($vars['taxonomies'])) { self::init_taxonomies($vars['taxonomies']); }
79 79
 
80 80
 		// Init Post Formats
81
-		if ( isset( $vars['post_formats'] ) ) { self::init_post_formats( $vars['post_formats'] ); }
81
+		if (isset($vars['post_formats'])) { self::init_post_formats($vars['post_formats']); }
82 82
 
83 83
 		// Init Sidebars
84
-		if ( isset( $vars['sidebars'] ) ) { self::init_sidebars( $vars['sidebars'] ); }
84
+		if (isset($vars['sidebars'])) { self::init_sidebars($vars['sidebars']); }
85 85
 
86 86
 	}
87 87
 
@@ -92,13 +92,13 @@  discard block
 block discarded – undo
92 92
 	 *
93 93
 	 * @param  array $post_types
94 94
 	 */
95
-	private static function init_post_types( $post_types ) {
95
+	private static function init_post_types($post_types) {
96 96
 
97
-		if ( is_array( $post_types ) ) {
97
+		if (is_array($post_types)) {
98 98
 
99
-			foreach ( $post_types as $type => $options ) {
99
+			foreach ($post_types as $type => $options) {
100 100
 
101
-				self::add_post_type( $type, $options['config'], $options['singular'], $options['multiple'] );
101
+				self::add_post_type($type, $options['config'], $options['singular'], $options['multiple']);
102 102
 
103 103
 			}
104 104
 		}
@@ -114,28 +114,28 @@  discard block
 block discarded – undo
114 114
 	 * @param string $singular
115 115
 	 * @param string $multiple
116 116
 	 */
117
-	private static function add_post_type( $name, $config, $singular = 'Entry', $multiple = 'Entries' ) {
117
+	private static function add_post_type($name, $config, $singular = 'Entry', $multiple = 'Entries') {
118 118
 
119 119
 		$domain = Classy::textdomain();
120 120
 
121
-		if ( ! isset( $config['labels'] ) ) {
121
+		if (!isset($config['labels'])) {
122 122
 
123 123
 			$config['labels'] = array(
124
-				'name' => __( $multiple, $domain ),
125
-				'singular_name' => __( $singular, $domain ),
126
-				'not_found' => __( 'No ' . $multiple . ' Found', $domain ),
127
-				'not_found_in_trash' => __( 'No ' . $multiple . ' found in Trash', $domain ),
128
-				'edit_item' => __( 'Edit ', $singular, $domain ),
129
-				'search_items' => __( 'Search ' . $multiple, $domain ),
130
-				'view_item' => __( 'View ', $singular, $domain ),
131
-				'new_item' => __( 'New ' . $singular, $domain ),
132
-				'add_new' => __( 'Add New', $domain ),
133
-				'add_new_item' => __( 'Add New ' . $singular, $domain ),
124
+				'name' => __($multiple, $domain),
125
+				'singular_name' => __($singular, $domain),
126
+				'not_found' => __('No '.$multiple.' Found', $domain),
127
+				'not_found_in_trash' => __('No '.$multiple.' found in Trash', $domain),
128
+				'edit_item' => __('Edit ', $singular, $domain),
129
+				'search_items' => __('Search '.$multiple, $domain),
130
+				'view_item' => __('View ', $singular, $domain),
131
+				'new_item' => __('New '.$singular, $domain),
132
+				'add_new' => __('Add New', $domain),
133
+				'add_new_item' => __('Add New '.$singular, $domain),
134 134
 			);
135 135
 
136 136
 		}
137 137
 
138
-		register_post_type( $name, $config );
138
+		register_post_type($name, $config);
139 139
 
140 140
 	}
141 141
 
@@ -144,13 +144,13 @@  discard block
 block discarded – undo
144 144
 	 *
145 145
 	 * @param  array $taxonomies
146 146
 	 */
147
-	private static function init_taxonomies( $taxonomies ) {
147
+	private static function init_taxonomies($taxonomies) {
148 148
 
149
-		if ( is_array( $taxonomies ) ) {
149
+		if (is_array($taxonomies)) {
150 150
 
151
-			foreach ( $taxonomies as $type => $options ) {
151
+			foreach ($taxonomies as $type => $options) {
152 152
 
153
-				self::add_taxonomy( $type, $options['for'], $options['config'], $options['singular'], $options['multiple'] );
153
+				self::add_taxonomy($type, $options['for'], $options['config'], $options['singular'], $options['multiple']);
154 154
 
155 155
 			}
156 156
 		}
@@ -166,29 +166,29 @@  discard block
 block discarded – undo
166 166
 	 * @param string $singular
167 167
 	 * @param string $multiple
168 168
 	 */
169
-	private static function add_taxonomy( $name, $object_type, $config, $singular = 'Entry', $multiple = 'Entries' ) {
169
+	private static function add_taxonomy($name, $object_type, $config, $singular = 'Entry', $multiple = 'Entries') {
170 170
 
171 171
 		$domain = Classy::textdomain();
172 172
 
173
-		if ( ! isset( $config['labels'] ) ) {
173
+		if (!isset($config['labels'])) {
174 174
 
175 175
 			$config['labels'] = array(
176
-				'name' => __( $multiple, $domain ),
177
-				'singular_name' => __( $singular, $domain ),
178
-				'search_items' => __( 'Search ' . $multiple, $domain ),
179
-				'all_items' => __( 'All ' . $multiple, $domain ),
180
-				'parent_item' => __( 'Parent ' . $singular, $domain ),
181
-				'parent_item_colon' => __( 'Parent ' . $singular . ':', $domain ),
182
-				'edit_item' => __( 'Edit ' . $singular, $domain ),
183
-				'update_item' => __( 'Update ' . $singular, $domain ),
184
-				'add_new_item' => __( 'Add New ' . $singular, $domain ),
185
-				'new_item_name' => __( 'New ' . $singular . ' Name', $domain ),
186
-				'menu_name' => __( $singular, $domain ),
176
+				'name' => __($multiple, $domain),
177
+				'singular_name' => __($singular, $domain),
178
+				'search_items' => __('Search '.$multiple, $domain),
179
+				'all_items' => __('All '.$multiple, $domain),
180
+				'parent_item' => __('Parent '.$singular, $domain),
181
+				'parent_item_colon' => __('Parent '.$singular.':', $domain),
182
+				'edit_item' => __('Edit '.$singular, $domain),
183
+				'update_item' => __('Update '.$singular, $domain),
184
+				'add_new_item' => __('Add New '.$singular, $domain),
185
+				'new_item_name' => __('New '.$singular.' Name', $domain),
186
+				'menu_name' => __($singular, $domain),
187 187
 			);
188 188
 
189 189
 		}
190 190
 
191
-		register_taxonomy( $name, $object_type, $config );
191
+		register_taxonomy($name, $object_type, $config);
192 192
 
193 193
 	}
194 194
 
@@ -197,11 +197,11 @@  discard block
 block discarded – undo
197 197
 	 *
198 198
 	 * @param  array $post_formats
199 199
 	 */
200
-	private static function init_post_formats( $post_formats ) {
200
+	private static function init_post_formats($post_formats) {
201 201
 
202
-		if ( is_array( $post_formats ) ) {
202
+		if (is_array($post_formats)) {
203 203
 
204
-			add_theme_support( 'post-formats', $post_formats );
204
+			add_theme_support('post-formats', $post_formats);
205 205
 
206 206
 		}
207 207
 
@@ -212,19 +212,19 @@  discard block
 block discarded – undo
212 212
 	 *
213 213
 	 * @param  array $sidebars
214 214
 	 */
215
-	private static function init_sidebars( $sidebars ) {
215
+	private static function init_sidebars($sidebars) {
216 216
 
217 217
 		$domain = Classy::textdomain();
218 218
 
219
-		if ( is_array( $sidebars ) ) {
219
+		if (is_array($sidebars)) {
220 220
 
221
-			foreach ( $sidebars as $id => $title ) {
221
+			foreach ($sidebars as $id => $title) {
222 222
 
223 223
 				register_sidebar(
224 224
 					array(
225 225
 						'id' => $id,
226
-						'name' => __( $title, $domain ),
227
-						'description' => __( $title, $domain ),
226
+						'name' => __($title, $domain),
227
+						'description' => __($title, $domain),
228 228
 						'before_widget' => '<div id="%1$s" class="widget %2$s"><div class="widget-inner">',
229 229
 						'after_widget' => '</div></div>',
230 230
 						'before_title' => '<h3>',
Please login to merge, or discard this patch.
app/classy/classy-hierarchy.php 1 patch
Spacing   +67 added lines, -67 removed lines patch added patch discarded remove patch
@@ -20,39 +20,39 @@  discard block
 block discarded – undo
20 20
 	 */
21 21
 	protected static function check_request() {
22 22
 
23
-		if ( is_404() ) : return '404';
23
+		if (is_404()) : return '404';
24 24
 
25
-		elseif ( is_search() ) : return 'search';
25
+		elseif (is_search()) : return 'search';
26 26
 
27
-		elseif ( is_front_page() ) : return 'front-page';
27
+		elseif (is_front_page()) : return 'front-page';
28 28
 
29
-		elseif ( is_home() ) : return 'home';
29
+		elseif (is_home()) : return 'home';
30 30
 
31
-		elseif ( is_post_type_archive() ) : return 'post_type_archive';
31
+		elseif (is_post_type_archive()) : return 'post_type_archive';
32 32
 
33
-		elseif ( is_tax() ) : return 'taxonomy';
33
+		elseif (is_tax()) : return 'taxonomy';
34 34
 
35
-		elseif ( is_attachment() ) : return 'attachment';
35
+		elseif (is_attachment()) : return 'attachment';
36 36
 
37
-		elseif ( is_single() ) : return 'single';
37
+		elseif (is_single()) : return 'single';
38 38
 
39
-		elseif ( self::is_classy_template() ) : return 'classy-template';
39
+		elseif (self::is_classy_template()) : return 'classy-template';
40 40
 
41
-		elseif ( is_page() ) : return 'page';
41
+		elseif (is_page()) : return 'page';
42 42
 
43
-		elseif ( is_singular() ) : return 'singular';
43
+		elseif (is_singular()) : return 'singular';
44 44
 
45
-		elseif ( is_category() ) : return 'category';
45
+		elseif (is_category()) : return 'category';
46 46
 
47
-		elseif ( is_tag() ) : return 'tag';
47
+		elseif (is_tag()) : return 'tag';
48 48
 
49
-		elseif ( is_author() ) : return 'author';
49
+		elseif (is_author()) : return 'author';
50 50
 
51
-		elseif ( is_date() ) : return 'date';
51
+		elseif (is_date()) : return 'date';
52 52
 
53
-		elseif ( is_archive() ) : return 'archive';
53
+		elseif (is_archive()) : return 'archive';
54 54
 
55
-		elseif ( is_paged() ) : return 'paged';
55
+		elseif (is_paged()) : return 'paged';
56 56
 
57 57
 		else :
58 58
 
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
 	 */
70 70
 	public static function get_current_request() {
71 71
 
72
-		if ( null === self::$current_request ) {
72
+		if (null === self::$current_request) {
73 73
 
74 74
 			self::$current_request = self::check_request();
75 75
 
@@ -87,21 +87,21 @@  discard block
 block discarded – undo
87 87
 	 * @param  string $view path to view ex: "post/archive"
88 88
 	 * @return string           full fule path
89 89
 	 */
90
-	public static function get_file_path( $type = 'view', $view ) {
90
+	public static function get_file_path($type = 'view', $view) {
91 91
 
92
-		$view = str_replace( '.', '/', $view );
92
+		$view = str_replace('.', '/', $view);
93 93
 
94
-		if ( 'view' === $type ) {
94
+		if ('view' === $type) {
95 95
 
96 96
 			$folder = ClassyView::$folder;
97 97
 
98
-			return CLASSY_THEME_PATH . $folder . '/' . $view . '.blade.php';
98
+			return CLASSY_THEME_PATH.$folder.'/'.$view.'.blade.php';
99 99
 
100
-		} elseif ( 'scope' === $type ) {
100
+		} elseif ('scope' === $type) {
101 101
 
102 102
 			$folder = ClassyScope::$folder;
103 103
 
104
-			return CLASSY_THEME_PATH . $folder . '/' . $view . '.php';
104
+			return CLASSY_THEME_PATH.$folder.'/'.$view.'.php';
105 105
 
106 106
 		}
107 107
 
@@ -115,13 +115,13 @@  discard block
 block discarded – undo
115 115
 	 * @param  string $file in blade path format, ex: layout|header
116 116
 	 * @return boolean true|false
117 117
 	 */
118
-	public static function file_exists( $type = 'view', $file ) {
118
+	public static function file_exists($type = 'view', $file) {
119 119
 
120
-		$file = str_replace( '.', '/', $file );
120
+		$file = str_replace('.', '/', $file);
121 121
 
122
-		$file_path = self::get_file_path( $type, $file );
122
+		$file_path = self::get_file_path($type, $file);
123 123
 
124
-		return file_exists( $file_path );
124
+		return file_exists($file_path);
125 125
 
126 126
 	}
127 127
 
@@ -133,13 +133,13 @@  discard block
 block discarded – undo
133 133
 	 * @param  string $type
134 134
 	 * @return array
135 135
 	 */
136
-	public static function get_available_file( $type = 'view', $page ) {
136
+	public static function get_available_file($type = 'view', $page) {
137 137
 
138
-		$views = self::get_request_hierarchy_list( $page );
138
+		$views = self::get_request_hierarchy_list($page);
139 139
 
140
-		foreach ( $views as $view ) {
140
+		foreach ($views as $view) {
141 141
 
142
-			if ( self::file_exists( $type, $view ) ) :
142
+			if (self::file_exists($type, $view)) :
143 143
 
144 144
 				return $view;
145 145
 
@@ -158,43 +158,43 @@  discard block
 block discarded – undo
158 158
 	 * @param  string $type
159 159
 	 * @return array
160 160
 	 */
161
-	private static function get_request_hierarchy_list( $type ) {
161
+	private static function get_request_hierarchy_list($type) {
162 162
 
163 163
 		$views = array();
164 164
 
165 165
 		// Home
166 166
 
167
-		if ( 'home' === $type ) :
167
+		if ('home' === $type) :
168 168
 
169 169
 			$views[] = 'home';
170 170
 
171 171
 			// Single
172 172
 
173
-		elseif ( 'single' === $type ) :
173
+		elseif ('single' === $type) :
174 174
 
175 175
 			$post_type = get_post_type();
176 176
 
177
-			$views[] = $post_type . '.single';
177
+			$views[] = $post_type.'.single';
178 178
 
179 179
 			$views[] = 'single';
180 180
 
181 181
 			// Post type
182 182
 
183
-		elseif ( 'post_type_archive' === $type ) :
183
+		elseif ('post_type_archive' === $type) :
184 184
 
185 185
 			$post_type = get_post_type();
186 186
 
187
-			$views[] = $post_type . '.archive';
187
+			$views[] = $post_type.'.archive';
188 188
 
189 189
 			$views[] = 'archive';
190 190
 
191 191
 			// Taxonomy
192 192
 
193
-		elseif ( 'taxonomy' === $type ) :
193
+		elseif ('taxonomy' === $type) :
194 194
 
195 195
 			$term = get_queried_object();
196 196
 
197
-			if ( ! empty( $term->slug ) ) {
197
+			if (!empty($term->slug)) {
198 198
 
199 199
 				$taxonomy = $term->taxonomy;
200 200
 
@@ -209,11 +209,11 @@  discard block
 block discarded – undo
209 209
 
210 210
 			// Category
211 211
 
212
-		elseif ( 'category' === $type ) :
212
+		elseif ('category' === $type) :
213 213
 
214 214
 			$category = get_queried_object();
215 215
 
216
-			if ( ! empty( $category->slug ) ) {
216
+			if (!empty($category->slug)) {
217 217
 				$views[] = "category.{$category->slug}";
218 218
 				$views[] = "category.{$category->term_id}";
219 219
 			}
@@ -224,23 +224,23 @@  discard block
 block discarded – undo
224 224
 
225 225
 			// Attachment
226 226
 
227
-		elseif ( 'attachment' === $type ) :
227
+		elseif ('attachment' === $type) :
228 228
 
229 229
 			$attachment = get_queried_object();
230 230
 
231
-			if ( $attachment ) {
231
+			if ($attachment) {
232 232
 
233
-				if ( false !== strpos( $attachment->post_mime_type, '/' ) ) {
233
+				if (false !== strpos($attachment->post_mime_type, '/')) {
234 234
 
235
-					list( $type, $subtype ) = explode( '/', $attachment->post_mime_type );
235
+					list($type, $subtype) = explode('/', $attachment->post_mime_type);
236 236
 
237 237
 				} else {
238 238
 
239
-					list( $type, $subtype ) = array( $attachment->post_mime_type, '' );
239
+					list($type, $subtype) = array($attachment->post_mime_type, '');
240 240
 
241 241
 				}
242 242
 
243
-				if ( ! empty( $subtype ) ) {
243
+				if (!empty($subtype)) {
244 244
 					$views[] = "attachment.{$type}.{$subtype}";
245 245
 					$views[] = "attachment.{$subtype}";
246 246
 
@@ -259,11 +259,11 @@  discard block
 block discarded – undo
259 259
 
260 260
 			// Tag
261 261
 
262
-		elseif ( 'tag' === $type ) :
262
+		elseif ('tag' === $type) :
263 263
 
264 264
 			$tag = get_queried_object();
265 265
 
266
-			if ( ! empty( $tag->slug ) ) {
266
+			if (!empty($tag->slug)) {
267 267
 				$views[] = "post.tag.{$tag->slug}";
268 268
 				$views[] = "post.tag.{$tag->term_id}";
269 269
 
@@ -276,11 +276,11 @@  discard block
 block discarded – undo
276 276
 
277 277
 			// Author
278 278
 
279
-		elseif ( 'author' === $type ) :
279
+		elseif ('author' === $type) :
280 280
 
281 281
 			$author = get_queried_object();
282 282
 
283
-			if ( $author instanceof WP_User ) {
283
+			if ($author instanceof WP_User) {
284 284
 				$views[] = "post.author.{$author->user_nicename}";
285 285
 				$views[] = "post.author.{$author->ID}";
286 286
 
@@ -294,7 +294,7 @@  discard block
 block discarded – undo
294 294
 
295 295
 			// Front Page
296 296
 
297
-		elseif ( 'front-page' === $type ) :
297
+		elseif ('front-page' === $type) :
298 298
 
299 299
 			$views[] = 'front-page.front-page';
300 300
 			$views[] = 'front-page';
@@ -302,45 +302,45 @@  discard block
 block discarded – undo
302 302
 			$views[] = 'home.home';
303 303
 			$views[] = 'home';
304 304
 
305
-			$views = array_merge( $views, self::get_request_hierarchy_list( 'post_type_archive' ) );
305
+			$views = array_merge($views, self::get_request_hierarchy_list('post_type_archive'));
306 306
 
307 307
 			// Page
308 308
 
309
-		elseif ( 'classy-template' === $type ) :
309
+		elseif ('classy-template' === $type) :
310 310
 
311 311
 			$template = self::get_classy_template();
312 312
 
313 313
 			$views[] = $template;
314 314
 
315
-			$views[] = 'page.' . $template;
315
+			$views[] = 'page.'.$template;
316 316
 
317
-			$views[] = 'template.' . $template;
317
+			$views[] = 'template.'.$template;
318 318
 
319 319
 			$views[] = 'page.page';
320 320
 
321 321
 			$views[] = 'page';
322 322
 
323
-		elseif ( 'page' === $type ) :
323
+		elseif ('page' === $type) :
324 324
 
325 325
 			$id = get_queried_object_id();
326 326
 
327
-			$pagename = get_query_var( 'pagename' );
327
+			$pagename = get_query_var('pagename');
328 328
 
329
-			if ( ! $pagename && $id ) {
329
+			if (!$pagename && $id) {
330 330
 				// If a static page is set as the front page, $pagename will not be set. Retrieve it from the queried object
331 331
 				$post = get_queried_object();
332 332
 
333
-				if ( $post ) {
333
+				if ($post) {
334 334
 					$pagename = $post->post_name;
335 335
 				}
336 336
 			}
337 337
 
338
-			if ( $pagename ) {
339
-				$views[] = 'page.' . $pagename;
338
+			if ($pagename) {
339
+				$views[] = 'page.'.$pagename;
340 340
 			}
341 341
 
342
-			if ( $id ) {
343
-				$views[] = 'page.' . $id;
342
+			if ($id) {
343
+				$views[] = 'page.'.$id;
344 344
 			}
345 345
 
346 346
 			$views[] = 'page.page';
@@ -382,9 +382,9 @@  discard block
 block discarded – undo
382 382
 
383 383
 		$template_slug = get_page_template_slug();
384 384
 
385
-		preg_match( '/classy\-(.*)/', $template_slug, $matches );
385
+		preg_match('/classy\-(.*)/', $template_slug, $matches);
386 386
 
387
-		if ( ! empty( $matches ) && isset( $matches[1] ) ) { return $matches[1]; }
387
+		if (!empty($matches) && isset($matches[1])) { return $matches[1]; }
388 388
 
389 389
 		return false;
390 390
 
Please login to merge, or discard this patch.
app/classy/classy-view.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -23,9 +23,9 @@  discard block
 block discarded – undo
23 23
 
24 24
 		$request = ClassyHierarchy::get_current_request();
25 25
 
26
-		$file = ClassyHierarchy::get_available_file( 'view', $request );
26
+		$file = ClassyHierarchy::get_available_file('view', $request);
27 27
 
28
-		$view = self::get_blade_view( $file );
28
+		$view = self::get_blade_view($file);
29 29
 
30 30
 		return $view;
31 31
 
@@ -38,9 +38,9 @@  discard block
 block discarded – undo
38 38
 	 * @param  string $view
39 39
 	 * @return string
40 40
 	 */
41
-	public static function get_blade_view( $view ) {
41
+	public static function get_blade_view($view) {
42 42
 
43
-		return str_replace( '/', '.', $view );
43
+		return str_replace('/', '.', $view);
44 44
 
45 45
 	}
46 46
 
@@ -54,21 +54,21 @@  discard block
 block discarded – undo
54 54
 
55 55
 		$templates = array();
56 56
 
57
-		$files = (array) glob( CLASSY_THEME_PATH . '/' . self::$folder . '/*/*.blade.php' );
57
+		$files = (array) glob(CLASSY_THEME_PATH.'/'.self::$folder.'/*/*.blade.php');
58 58
 
59
-		foreach ( $files as $filename ) {
59
+		foreach ($files as $filename) {
60 60
 
61
-			if ( ! empty( $filename ) ) {
61
+			if (!empty($filename)) {
62 62
 
63
-				if ( ! preg_match( '/\{\{\-\-\s*Template Name:(.*)\s*\-\-\}\}/mi', file_get_contents( $filename ), $header ) ) { continue; }
63
+				if (!preg_match('/\{\{\-\-\s*Template Name:(.*)\s*\-\-\}\}/mi', file_get_contents($filename), $header)) { continue; }
64 64
 
65
-				$template_name = trim( $header[1] );
65
+				$template_name = trim($header[1]);
66 66
 
67
-				preg_match( '/\/([^\/]*)\.blade.php$/is', $filename, $filename_match );
67
+				preg_match('/\/([^\/]*)\.blade.php$/is', $filename, $filename_match);
68 68
 
69
-				$template_file = 'classy-' . $filename_match[1];
69
+				$template_file = 'classy-'.$filename_match[1];
70 70
 
71
-				$templates[ $template_file ] = $template_name;
71
+				$templates[$template_file] = $template_name;
72 72
 
73 73
 			}
74 74
 		}
Please login to merge, or discard this patch.
app/appearance.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -12,13 +12,13 @@  discard block
 block discarded – undo
12 12
 	 */
13 13
 	public function __construct() {
14 14
 
15
-		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_styles' ) );
15
+		add_action('wp_enqueue_scripts', array($this, 'enqueue_styles'));
16 16
 
17
-		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
17
+		add_action('wp_enqueue_scripts', array($this, 'enqueue_scripts'));
18 18
 
19
-		add_action( 'wp_print_scripts', array( $this, 'init_js_vars' ) );
19
+		add_action('wp_print_scripts', array($this, 'init_js_vars'));
20 20
 
21
-		add_action( 'after_setup_theme', array( $this, 'setup_theme' ) );
21
+		add_action('after_setup_theme', array($this, 'setup_theme'));
22 22
 
23 23
 	}
24 24
 
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
 	 */
28 28
 	public function enqueue_styles() {
29 29
 
30
-		wp_register_style( 'general_css', CLASSY_THEME_DIR . 'assets/css/general.css', array(), CLASSY_THEME_VERSION, 'all' );
30
+		wp_register_style('general_css', CLASSY_THEME_DIR.'assets/css/general.css', array(), CLASSY_THEME_VERSION, 'all');
31 31
 
32 32
 	}
33 33
 
@@ -36,13 +36,13 @@  discard block
 block discarded – undo
36 36
 	 */
37 37
 	public function enqueue_scripts() {
38 38
 
39
-		if ( 'production' === Classy::get_config_var( 'environment' ) ) {
39
+		if ('production' === Classy::get_config_var('environment')) {
40 40
 
41
-			wp_register_script( 'theme_scripts', CLASSY_THEME_DIR . 'assets/js/min/production.js', array( 'jquery' ), CLASSY_THEME_VERSION, true );
41
+			wp_register_script('theme_scripts', CLASSY_THEME_DIR.'assets/js/min/production.js', array('jquery'), CLASSY_THEME_VERSION, true);
42 42
 
43 43
 		} else {
44 44
 
45
-			wp_register_script( 'theme_scripts', CLASSY_THEME_DIR . 'assets/js/scripts.js', array( 'jquery' ), CLASSY_THEME_VERSION, true );
45
+			wp_register_script('theme_scripts', CLASSY_THEME_DIR.'assets/js/scripts.js', array('jquery'), CLASSY_THEME_VERSION, true);
46 46
 
47 47
 		}
48 48
 
@@ -54,10 +54,10 @@  discard block
 block discarded – undo
54 54
 	public function init_js_vars() {
55 55
 
56 56
 		$options = array(
57
-			'base_url'          => home_url( '' ),
58
-			'blog_url'          => home_url( 'archives/' ),
57
+			'base_url'          => home_url(''),
58
+			'blog_url'          => home_url('archives/'),
59 59
 			'template_dir'      => CLASSY_THEME_DIR,
60
-			'ajax_load_url'     => admin_url( 'admin-ajax.php' ),
60
+			'ajax_load_url'     => admin_url('admin-ajax.php'),
61 61
 			'is_mobile'         => (int) wp_is_mobile(),
62 62
 		);
63 63
 
@@ -85,12 +85,12 @@  discard block
 block discarded – undo
85 85
 		 * @link http://codex.wordpress.org/Function_Reference/add_theme_support#Post_Thumbnails
86 86
 		 */
87 87
 
88
-		add_theme_support( 'post-thumbnails' );
88
+		add_theme_support('post-thumbnails');
89 89
 
90 90
 		// This theme uses wp_nav_menu() in one location.
91 91
 		register_nav_menus(array(
92
-			'header-menu' => __( 'Header Menu', Classy::textdomain() ),
93
-			'footer-menu' => __( 'Footer Menu', Classy::textdomain() ),
92
+			'header-menu' => __('Header Menu', Classy::textdomain()),
93
+			'footer-menu' => __('Footer Menu', Classy::textdomain()),
94 94
 		));
95 95
 
96 96
 		/*
Please login to merge, or discard this patch.
app/models/classy-image.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -12,10 +12,10 @@  discard block
 block discarded – undo
12 12
 	 * Main constructor function. Requires image id
13 13
 	 * @param int $pid
14 14
 	 */
15
-	public function __construct( $pid = null ) {
15
+	public function __construct($pid = null) {
16 16
 
17 17
 		// Checks if image with this id exists
18
-		if ( null !== $pid && wp_get_attachment_image_src( $pid ) ) {
18
+		if (null !== $pid && wp_get_attachment_image_src($pid)) {
19 19
 
20 20
 			$this->ID = $pid;
21 21
 
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
 	public static function get_default_image() {
34 34
 
35 35
 		// You can put here any url
36
-		return CLASSY_THEME_DIR . '/assets/noimage.png';
36
+		return CLASSY_THEME_DIR.'/assets/noimage.png';
37 37
 
38 38
 	}
39 39
 
@@ -42,11 +42,11 @@  discard block
 block discarded – undo
42 42
 	 * @param  string $size
43 43
 	 * @return string
44 44
 	 */
45
-	public function src( $size = 'medium' ) {
45
+	public function src($size = 'medium') {
46 46
 
47
-		if ( $this->ID ) {
47
+		if ($this->ID) {
48 48
 
49
-			$thumb = wp_get_attachment_image_src( $this->ID, $size );
49
+			$thumb = wp_get_attachment_image_src($this->ID, $size);
50 50
 
51 51
 			return $thumb[0];
52 52
 
Please login to merge, or discard this patch.