anrw / classy

app/classy/classy-config.php

Doc Comments +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 	/**
 	 * Returns list of allowed variables that can be used in theme config
 	 * 
-	 * @return array
+	 * @return string[]
 	 */
 	private static function get_allowed_variables() {
 		

Spacing +35 added lines, -35 removed lines

@@ -16,7 +16,7 @@ 
 	 */
 	private static function get_allowed_variables() {
 		
-		return array('environment', 'textdomain', 'post_types', 'taxonomies', 'post_formats', 'sidebars');;
+		return array('environment', 'textdomain', 'post_types', 'taxonomies', 'post_formats', 'sidebars'); ;
 
 	}
 
@@ -27,14 +27,14 @@ 
 	 */
 	public static function get_vars() {
 
-		if ( null === self::$vars ) {
+		if (null === self::$vars) {
 
 			// Check for a theme config
-			$config_file = THEME_FRAMEWORK_PATH . 'config.php';
+			$config_file = THEME_FRAMEWORK_PATH.'config.php';
 
 			if (file_exists($config_file)) {
 
-				require_once THEME_FRAMEWORK_PATH . 'config.php';
+				require_once THEME_FRAMEWORK_PATH.'config.php';
 
 				$vars = self::get_allowed_variables();
 
@@ -52,7 +52,7 @@ 
 
 			} else {
 
-				die('There is no config file in ' . THEME . ' custom/config.php');
+				die('There is no config file in '.THEME.' custom/config.php');
 
 			}
 
@@ -73,16 +73,16 @@ 
 		$vars = self::get_vars();
 
 		// Init Post Types
-		if (isset($vars['post_types'])) self::init_post_types( $vars['post_types'] );
+		if (isset($vars['post_types'])) self::init_post_types($vars['post_types']);
 
 		// Init Taxonomies
-		if (isset($vars['taxonomies'])) self::init_taxonomies( $vars['taxonomies'] );
+		if (isset($vars['taxonomies'])) self::init_taxonomies($vars['taxonomies']);
 
 		// Init Post Formats
-		if (isset($vars['post_formats'])) self::init_post_formats( $vars['post_formats'] );
+		if (isset($vars['post_formats'])) self::init_post_formats($vars['post_formats']);
 
 		// Init Sidebars
-		if (isset($vars['sidebars'])) self::init_sidebars( $vars['sidebars'] );
+		if (isset($vars['sidebars'])) self::init_sidebars($vars['sidebars']);
 		
 	}
 
@@ -93,13 +93,13 @@ 
 	 * 
 	 * @param  array $post_types
 	 */
-	private static function init_post_types( $post_types ) {
+	private static function init_post_types($post_types) {
 
 		if (is_array($post_types)) {
 
-			foreach ( $post_types as $type => $options ) {
+			foreach ($post_types as $type => $options) {
 			
-				self::add_post_type( $type, $options['config'], $options['singular'], $options['multiple'] );
+				self::add_post_type($type, $options['config'], $options['singular'], $options['multiple']);
 			
 			}
 			
@@ -116,23 +116,23 @@ 
 	 * @param string $singular
 	 * @param string $multiple
 	 */
-	private static function add_post_type( $name, $config, $singular = 'Entry', $multiple = 'Entries' ) {
+	private static function add_post_type($name, $config, $singular = 'Entry', $multiple = 'Entries') {
 
 		$domain = Classy::textdomain();
 		
-		if ( !isset($config['labels']) ) {
+		if (!isset($config['labels'])) {
 
 			$config['labels'] = array(
 				'name' => __($multiple, $domain),
 				'singular_name' => __($singular, $domain),
-				'not_found'=> __('No ' . $multiple . ' Found', $domain),
-				'not_found_in_trash'=> __('No ' . $multiple . ' found in Trash', $domain),
+				'not_found'=> __('No '.$multiple.' Found', $domain),
+				'not_found_in_trash'=> __('No '.$multiple.' found in Trash', $domain),
 				'edit_item' => __('Edit ', $singular, $domain),
-				'search_items' => __('Search ' . $multiple, $domain),
+				'search_items' => __('Search '.$multiple, $domain),
 				'view_item' => __('View ', $singular, $domain),
-				'new_item' => __('New ' . $singular, $domain),
+				'new_item' => __('New '.$singular, $domain),
 				'add_new' => __('Add New', $domain),
-				'add_new_item' => __('Add New ' . $singular, $domain),
+				'add_new_item' => __('Add New '.$singular, $domain),
 			);
 
 		}
@@ -146,13 +146,13 @@ 
 	 * 
 	 * @param  array $taxonomies
 	 */
-	private static function init_taxonomies( $taxonomies ) {
+	private static function init_taxonomies($taxonomies) {
 
 		if (is_array($taxonomies)) {
 
-			foreach ( $taxonomies as $type => $options ) {
+			foreach ($taxonomies as $type => $options) {
 			
-				self::add_taxonomy( $type, $options['for'], $options['config'], $options['singular'], $options['multiple'] );
+				self::add_taxonomy($type, $options['for'], $options['config'], $options['singular'], $options['multiple']);
 			
 			}
 			
@@ -170,23 +170,23 @@ 
 	 * @param string $singular
 	 * @param string $multiple
 	 */
-	private static function add_taxonomy( $name, $object_type, $config, $singular = 'Entry', $multiple = 'Entries' ) {
+	private static function add_taxonomy($name, $object_type, $config, $singular = 'Entry', $multiple = 'Entries') {
 
 		$domain = Classy::textdomain();
 		
-		if ( !isset($config['labels']) ) {
+		if (!isset($config['labels'])) {
 
 			$config['labels'] = array(
 				'name' => __($multiple, $domain),
 				'singular_name' => __($singular, $domain),
-				'search_items' =>  __('Search ' . $multiple, $domain),
-				'all_items' => __('All ' . $multiple, $domain),
-				'parent_item' => __('Parent ' . $singular, $domain),
-				'parent_item_colon' => __('Parent ' . $singular . ':', $domain),
-				'edit_item' => __('Edit ' . $singular, $domain), 
-				'update_item' => __('Update ' . $singular, $domain),
-				'add_new_item' => __('Add New ' . $singular, $domain),
-				'new_item_name' => __('New ' . $singular . ' Name', $domain),
+				'search_items' =>  __('Search '.$multiple, $domain),
+				'all_items' => __('All '.$multiple, $domain),
+				'parent_item' => __('Parent '.$singular, $domain),
+				'parent_item_colon' => __('Parent '.$singular.':', $domain),
+				'edit_item' => __('Edit '.$singular, $domain), 
+				'update_item' => __('Update '.$singular, $domain),
+				'add_new_item' => __('Add New '.$singular, $domain),
+				'new_item_name' => __('New '.$singular.' Name', $domain),
 				'menu_name' => __($singular, $domain),
 			);
 
@@ -202,7 +202,7 @@ 
 	 * 
 	 * @param  array $post_formats
 	 */
-	private static function init_post_formats( $post_formats ) {
+	private static function init_post_formats($post_formats) {
 
 		if (is_array($post_formats)) {
 
@@ -218,13 +218,13 @@ 
 	 * 
 	 * @param  array $sidebars
 	 */
-	private static function init_sidebars( $sidebars ) {
+	private static function init_sidebars($sidebars) {
 
 		$domain = Classy::textdomain();
 
 		if (is_array($sidebars)) {
 	
-			foreach ( $sidebars as $id => $title ) {
+			foreach ($sidebars as $id => $title) {
 				
 				register_sidebar(
 					array(

Braces +14 added lines, -5 removed lines

@@ -50,7 +50,8 @@ 
 
 				}
 
-			} else {
+			}
+			else {
 
 				die('There is no config file in ' . THEME . ' custom/config.php');
 
@@ -73,16 +74,24 @@ 
 		$vars = self::get_vars();
 
 		// Init Post Types
-		if (isset($vars['post_types'])) self::init_post_types( $vars['post_types'] );
+		if (isset($vars['post_types'])) {
+			self::init_post_types( $vars['post_types'] );
+		}
 
 		// Init Taxonomies
-		if (isset($vars['taxonomies'])) self::init_taxonomies( $vars['taxonomies'] );
+		if (isset($vars['taxonomies'])) {
+			self::init_taxonomies( $vars['taxonomies'] );
+		}
 
 		// Init Post Formats
-		if (isset($vars['post_formats'])) self::init_post_formats( $vars['post_formats'] );
+		if (isset($vars['post_formats'])) {
+			self::init_post_formats( $vars['post_formats'] );
+		}
 
 		// Init Sidebars
-		if (isset($vars['sidebars'])) self::init_sidebars( $vars['sidebars'] );
+		if (isset($vars['sidebars'])) {
+			self::init_sidebars( $vars['sidebars'] );
+		}
 		
 	}
 

app/classy/classy-scope.php

Doc Comments +1 added lines

@@ -12,6 +12,7 @@
 	/**
 	 * Returns basic scope
 	 * 
+	 * @param string $template_name
 	 * @return array
 	 */
 	public static function get_scope($template_name = null) {

Spacing +4 added lines, -4 removed lines

@@ -53,7 +53,7 @@ 
 	 */
 	public static function get_common_scope() {
 		
-		if ( null === self::$common ) {
+		if (null === self::$common) {
 
 			self::$common = self::require_scope('common');
 
@@ -73,15 +73,15 @@ 
 
 		$return = array();
 
-		$file = THEME_PATH . 'scope/' . $filename . '.php';
+		$file = THEME_PATH.'scope/'.$filename.'.php';
 
-		if ( file_exists($file) ) {
+		if (file_exists($file)) {
 
 			require $file;
 			
 		}
 
-		if ( isset($data) ) {
+		if (isset($data)) {
 			
 			$return = $data;
 

app/classy/classy-template.php

Doc Comments +3 added lines, -2 removed lines

@@ -52,7 +52,7 @@ 
 	 * Returns template name for render, based on type of request
 	 * 
 	 * @param  string $type 
-	 * @return array 
+	 * @return string|false 
 	 */
 	public static function get_available_template($type) {
 
@@ -77,7 +77,7 @@ 
 	 * Returns list of templates to check, based on type of request
 	 * 
 	 * @param  string $type 
-	 * @return array
+	 * @return string[]
 	 */
 	private static function get_request_templates_list($type) {
 
@@ -336,6 +336,7 @@ 
 	/**
 	 * Returns available template, based on page argument
 	 * 
+	 * @param string $page
 	 * @return string
 	 */
 	public static function get_blade_template($page = null) {

Spacing +54 added lines, -54 removed lines

@@ -29,7 +29,7 @@ 
 
 		$template = str_replace('.', '/', $template);
 
-		return THEME_PATH . self::$theme_templates_folder . '/' . $template . '.blade.php';			
+		return THEME_PATH.self::$theme_templates_folder.'/'.$template.'.blade.php';			
 
 	}
 
@@ -60,7 +60,7 @@ 
 
 		foreach ($templates as $template) {
 
-			if ( self::template_exists($template) ):
+			if (self::template_exists($template)):
 
 				return $template;
 
@@ -86,7 +86,7 @@ 
 
 		// Home
 
-		if ( $type == 'home' ) :
+		if ($type == 'home') :
 
 			$templates[] = 'home';
 			$templates[] = 'index';
@@ -94,32 +94,32 @@ 
 
 		// Single
 
-		elseif ( $type == 'single' ) :
+		elseif ($type == 'single') :
 
-			$post_type = get_query_var( 'post_type' );
+			$post_type = get_query_var('post_type');
 
-			$templates[] = 'single-' . $post_type;
+			$templates[] = 'single-'.$post_type;
 
 			$templates[] = 'single';
 
 		// Post type
 
-		elseif ( $type == 'post_type_archive' ) :
+		elseif ($type == 'post_type_archive') :
 
-			$post_type = get_query_var( 'post_type' );
+			$post_type = get_query_var('post_type');
 
-			$templates[] = 'archive-' . $post_type;
+			$templates[] = 'archive-'.$post_type;
 
 			$templates[] = 'archive';
 
 
 		// Taxonomy
 
-		elseif ( $type == 'taxonomy' ):
+		elseif ($type == 'taxonomy'):
 
 			$term = get_queried_object();
 
-			if ( ! empty( $term->slug ) ) {
+			if (!empty($term->slug)) {
 				
 				$taxonomy = $term->taxonomy;
 
@@ -132,11 +132,11 @@ 
 
 		// Category
 
-		elseif ( $type == 'category' ):
+		elseif ($type == 'category'):
 
 			$category = get_queried_object();
 
-			if ( ! empty( $category->slug ) ) {
+			if (!empty($category->slug)) {
 				$templates[] = "category-{$category->slug}";
 				$templates[] = "category-{$category->term_id}";
 			}
@@ -145,23 +145,23 @@ 
 
 		// Attachment
 
-		elseif ( $type == 'attachment' ):
+		elseif ($type == 'attachment'):
 
 			$attachment = get_queried_object();
 
-			if ( $attachment ) {
+			if ($attachment) {
 
-				if ( false !== strpos( $attachment->post_mime_type, '/' ) ) {
+				if (false !== strpos($attachment->post_mime_type, '/')) {
 				
-					list( $type, $subtype ) = explode( '/', $attachment->post_mime_type );
+					list($type, $subtype) = explode('/', $attachment->post_mime_type);
 				
 				} else {
 				
-					list( $type, $subtype ) = array( $attachment->post_mime_type, '' );
+					list($type, $subtype) = array($attachment->post_mime_type, '');
 				
 				}
 
-				if ( ! empty( $subtype ) ) {
+				if (!empty($subtype)) {
 					$templates[] = "{$type}-{$subtype}";
 					$templates[] = "{$subtype}";
 				}
@@ -173,11 +173,11 @@ 
 
 		// Tag
 
-		elseif ( $type == 'tag' ):
+		elseif ($type == 'tag'):
 
 			$tag = get_queried_object();
 
-			if ( ! empty( $tag->slug ) ) {
+			if (!empty($tag->slug)) {
 				$templates[] = "tag-{$tag->slug}";
 				$templates[] = "tag-{$tag->term_id}";
 			}
@@ -186,11 +186,11 @@ 
 
 		// Author
 
-		elseif ( $type == 'author' ):
+		elseif ($type == 'author'):
 
 			$author = get_queried_object();
 
-			if ( $author instanceof WP_User ) {
+			if ($author instanceof WP_User) {
 				$templates[] = "author-{$author->user_nicename}";
 				$templates[] = "author-{$author->ID}";
 			}
@@ -199,32 +199,32 @@ 
 
 		// Front Page
 
-		elseif ( $type == 'front-page' ):
+		elseif ($type == 'front-page'):
 
 			$id = get_queried_object_id();
 
 			$pagename = get_query_var('pagename');
 
-			if ( ! $pagename && $id ) {
+			if (!$pagename && $id) {
 				// If a static page is set as the front page, $pagename will not be set. Retrieve it from the queried object
 				$post = get_queried_object();
-				if ( $post )
+				if ($post)
 					$pagename = $post->post_name;
 			}
 
 			$template = get_post_meta('theme-page-template', $id);
 
-			if ( $template != 'index' )
+			if ($template != 'index')
 				$templates[] = $template;
-			if ( $pagename )
+			if ($pagename)
 				$templates[] = "page-$pagename";
-			if ( $id )
+			if ($id)
 				$templates[] = "page-$id";
 			$templates[] = '';
 
 		// Page
 
-		elseif ( $type == 'page' ):
+		elseif ($type == 'page'):
 
 			$id = get_queried_object_id();
 			
@@ -232,18 +232,18 @@ 
 
 			$pagename = get_query_var('pagename');
 
-			if ( ! $pagename && $id ) {
+			if (!$pagename && $id) {
 				// If a static page is set as the front page, $pagename will not be set. Retrieve it from the queried object
 				$post = get_queried_object();
-				if ( $post )
+				if ($post)
 					$pagename = $post->post_name;
 			}
 
-			if ( $template != 'index' )
+			if ($template != 'index')
 				$templates[] = $template;
-			if ( $pagename )
+			if ($pagename)
 				$templates[] = "page-$pagename";
-			if ( $id )
+			if ($id)
 				$templates[] = "page-$id";
 			$templates[] = 'page';
 
@@ -269,37 +269,37 @@ 
 	 */
 	public static function get_current_page() {
 
-		if ( is_404() && $template = self::get_available_template('404') ) :
+		if (is_404() && $template = self::get_available_template('404')) :
 
-		elseif ( is_search() && $template = self::get_available_template('search') ) :
+		elseif (is_search() && $template = self::get_available_template('search')) :
 
-		elseif ( is_front_page() && $template = self::get_available_template('front-page') ) :
+		elseif (is_front_page() && $template = self::get_available_template('front-page')) :
 
-		elseif ( is_home() && $template = self::get_available_template('home') ) :
+		elseif (is_home() && $template = self::get_available_template('home')) :
 
-		elseif ( is_post_type_archive() && $template = self::get_available_template('post_type_archive') ) :
+		elseif (is_post_type_archive() && $template = self::get_available_template('post_type_archive')) :
 
-		elseif ( is_tax() && $template = self::get_available_template('taxonomy') ) :
+		elseif (is_tax() && $template = self::get_available_template('taxonomy')) :
 
-		elseif ( is_attachment() && $template = self::get_available_template('attachment') ) :
+		elseif (is_attachment() && $template = self::get_available_template('attachment')) :
 
-		elseif ( is_single() && $template = self::get_available_template('single') ) :
+		elseif (is_single() && $template = self::get_available_template('single')) :
 
-		elseif ( is_page() && $template = self::get_available_template('page') ) :
+		elseif (is_page() && $template = self::get_available_template('page')) :
 
-		elseif ( is_singular() && $template = self::get_available_template('singular') ) :
+		elseif (is_singular() && $template = self::get_available_template('singular')) :
 
-		elseif ( is_category() && $template = self::get_available_template('category') ) :
+		elseif (is_category() && $template = self::get_available_template('category')) :
 
-		elseif ( is_tag() && $template = self::get_available_template('tag') ) :
+		elseif (is_tag() && $template = self::get_available_template('tag')) :
 
-		elseif ( is_author() && $template = self::get_available_template('author') ) :
+		elseif (is_author() && $template = self::get_available_template('author')) :
 
-		elseif ( is_date() && $template = self::get_available_template('date') ) :
+		elseif (is_date() && $template = self::get_available_template('date')) :
 
-		elseif ( is_archive() && $template = self::get_available_template('archive') ) :
+		elseif (is_archive() && $template = self::get_available_template('archive')) :
 
-		elseif ( is_paged() && $template = self::get_available_template('paged') ) :
+		elseif (is_paged() && $template = self::get_available_template('paged')) :
 
 		else :
 		
@@ -326,7 +326,7 @@ 
 
 		} else {
 
-			return $template . '.' . $template;
+			return $template.'.'.$template;
 			
 		}
 
@@ -368,8 +368,8 @@ 
 	 */
 	public static function render($template = null, $data = null) {
 
-		$views = THEME_PATH . self::$theme_templates_folder;
-		$cache = WP_CONTENT_DIR . '/templatecache';
+		$views = THEME_PATH.self::$theme_templates_folder;
+		$cache = WP_CONTENT_DIR.'/templatecache';
 		$common_scope = ClassyScope::get_common_scope();
 
 		if ($template !== null && is_string($template)) {

Braces +38 added lines, -22 removed lines

@@ -155,7 +155,8 @@ 
 				
 					list( $type, $subtype ) = explode( '/', $attachment->post_mime_type );
 				
-				} else {
+				}
+				else {
 				
 					list( $type, $subtype ) = array( $attachment->post_mime_type, '' );
 				
@@ -208,18 +209,22 @@ 
 			if ( ! $pagename && $id ) {
 				// If a static page is set as the front page, $pagename will not be set. Retrieve it from the queried object
 				$post = get_queried_object();
-				if ( $post )
-					$pagename = $post->post_name;
+				if ( $post ) {
+									$pagename = $post->post_name;
+				}
 			}
 
 			$template = get_post_meta('theme-page-template', $id);
 
-			if ( $template != 'index' )
-				$templates[] = $template;
-			if ( $pagename )
-				$templates[] = "page-$pagename";
-			if ( $id )
-				$templates[] = "page-$id";
+			if ( $template != 'index' ) {
+							$templates[] = $template;
+			}
+			if ( $pagename ) {
+							$templates[] = "page-$pagename";
+			}
+			if ( $id ) {
+							$templates[] = "page-$id";
+			}
 			$templates[] = '';
 
 		// Page
@@ -235,24 +240,30 @@ 
 			if ( ! $pagename && $id ) {
 				// If a static page is set as the front page, $pagename will not be set. Retrieve it from the queried object
 				$post = get_queried_object();
-				if ( $post )
-					$pagename = $post->post_name;
+				if ( $post ) {
+									$pagename = $post->post_name;
+				}
 			}
 
-			if ( $template != 'index' )
-				$templates[] = $template;
-			if ( $pagename )
-				$templates[] = "page-$pagename";
-			if ( $id )
-				$templates[] = "page-$id";
+			if ( $template != 'index' ) {
+							$templates[] = $template;
+			}
+			if ( $pagename ) {
+							$templates[] = "page-$pagename";
+			}
+			if ( $id ) {
+							$templates[] = "page-$id";
+			}
 			$templates[] = 'page';
 
 
 		// Default
 
-		else:
+		else {
+			:
 
 			$templates[] = $type;
+		}
 
 		endif;
 
@@ -301,9 +312,11 @@ 
 
 		elseif ( is_paged() && $template = self::get_available_template('paged') ) :
 
-		else :
+		else {
+			:
 		
 			$template = 'index';
+		}
 
 		endif;
 
@@ -324,7 +337,8 @@ 
 
 			return $template;	
 
-		} else {
+		}
+		else {
 
 			return $template . '.' . $template;
 			
@@ -378,13 +392,15 @@ 
 
 				$scope = array_merge($common_scope, $data);
 
-			} else {
+			}
+			else {
 
 				$scope = $common_scope;
 
 			}
 
-		} else {
+		}
+		else {
 
 			$current_page = self::get_current_page();
 

app/classy/classy.php

Doc Comments +2 added lines, -1 removed lines

@@ -54,6 +54,7 @@ 
 	 * 
 	 * @param  string
 	 * @param  string
+	 * @param string $name
 	 */
 	private function define( $name, $value ) {
 		if ( !defined($name) ) {
@@ -241,7 +242,7 @@ 
 
 	/**
 	 * @param array   $prefs
-	 * @return array mixed
+	 * @return stdClass mixed
 	 */
 	public static function get_pagination( $prefs = array() ) {
 		global $wp_query;

Braces +11 added lines, -5 removed lines

@@ -146,7 +146,9 @@ 
 	public static function get_config_var($name) {
 		$vars = ClassyConfig::get_vars();
 
-		if (isset($vars[$name])) return $vars[$name];
+		if (isset($vars[$name])) {
+			return $vars[$name];
+		}
 
 		return false;
 	}
@@ -207,11 +209,13 @@ 
 				
 					$_return[] = new ClassyPost($post_id);
 				
-				} elseif($return_type == 'object') {
+				}
+				elseif($return_type == 'object') {
 
 					$_return[] = get_post($post_id);
 
-				} else {
+				}
+				else {
 
 					$_return[] = $post_id;
 
@@ -263,7 +267,8 @@ 
 			$args['format'] = 'page/%#%';
 			$args['base'] = trailingslashit( $url[0] ).'%_%';
 
-		} else {
+		}
+		else {
 			$big = 999999999;
 			$args['base'] = str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) );
 		}
@@ -275,7 +280,8 @@ 
 		
 		if ( is_int( $prefs ) ) {
 			$args['mid_size'] = $prefs - 2;
-		} else {
+		}
+		else {
 			$args = array_merge( $args, $prefs );
 		}
 

Spacing +47 added lines, -47 removed lines

@@ -25,7 +25,7 @@ 
 	 * @return Classy A single instance of this class.
 	 */
 	public static function get_instance() {
-		if ( null === self::$single_instance ) {
+		if (null === self::$single_instance) {
 			self::$single_instance = new self();
 		}
 
@@ -55,10 +55,10 @@ 
 	 * @param  string
 	 * @param  string
 	 */
-	private function define( $name, $value ) {
-		if ( !defined($name) ) {
+	private function define($name, $value) {
+		if (!defined($name)) {
 			
-			define( $name, $value );
+			define($name, $value);
 
 		}
 	}
@@ -72,61 +72,61 @@ 
 	private function define_constants() {
 		$theme = wp_get_theme();
 
-		$this->define( 'THEME', $theme->template );
-		$this->define( 'THEME_NAME', $theme->get('Name') );
-		$this->define( 'THEME_PATH', get_template_directory() . '/' );
-		$this->define( 'THEME_DIR', get_template_directory_uri() . '/' );
-		$this->define( 'THEME_VERSION', $theme->get('Version') );
-		$this->define( 'THEME_FRAMEWORK_PATH', THEME_PATH . 'app/' );
-		$this->define( 'THEME_FRAMEWORK_DIR', THEME_DIR . 'app/' );
+		$this->define('THEME', $theme->template);
+		$this->define('THEME_NAME', $theme->get('Name'));
+		$this->define('THEME_PATH', get_template_directory().'/');
+		$this->define('THEME_DIR', get_template_directory_uri().'/');
+		$this->define('THEME_VERSION', $theme->get('Version'));
+		$this->define('THEME_FRAMEWORK_PATH', THEME_PATH.'app/');
+		$this->define('THEME_FRAMEWORK_DIR', THEME_DIR.'app/');
 	}
 
 	/**
 	 * Include core files that are responsible for theme render
 	 */
 	private function include_core_files() {
-		require_once THEME_PATH . 'vendor/autoload.php';
+		require_once THEME_PATH.'vendor/autoload.php';
 
 		// Basis Class
-		require_once THEME_FRAMEWORK_PATH . 'classy/classy-basis.php';
+		require_once THEME_FRAMEWORK_PATH.'classy/classy-basis.php';
 
 		// Theme Config
-		require_once THEME_FRAMEWORK_PATH . 'classy/classy-config.php';
+		require_once THEME_FRAMEWORK_PATH.'classy/classy-config.php';
 	
 		// Scope
-		require_once THEME_FRAMEWORK_PATH . 'classy/classy-scope.php';
+		require_once THEME_FRAMEWORK_PATH.'classy/classy-scope.php';
 
 		// Template Loader
-		require_once THEME_FRAMEWORK_PATH . 'classy/classy-template.php';
+		require_once THEME_FRAMEWORK_PATH.'classy/classy-template.php';
 
 		// Helper functions
-		require_once THEME_FRAMEWORK_PATH . 'classy/classy-helper.php';
+		require_once THEME_FRAMEWORK_PATH.'classy/classy-helper.php';
 
 		// Query Helper
-		require_once THEME_FRAMEWORK_PATH . 'classy/classy-query-helper.php';
+		require_once THEME_FRAMEWORK_PATH.'classy/classy-query-helper.php';
 
 		// Menu
-		require_once THEME_FRAMEWORK_PATH . 'classy/classy-menu.php';
+		require_once THEME_FRAMEWORK_PATH.'classy/classy-menu.php';
 
 		// Menu Item
-		require_once THEME_FRAMEWORK_PATH . 'classy/classy-menu-item.php';
+		require_once THEME_FRAMEWORK_PATH.'classy/classy-menu-item.php';
 
 		// Comment
-		require_once THEME_FRAMEWORK_PATH . 'classy/classy-comment.php';
+		require_once THEME_FRAMEWORK_PATH.'classy/classy-comment.php';
 
 		// Appearance
-		require_once THEME_FRAMEWORK_PATH . 'appearance.php';
+		require_once THEME_FRAMEWORK_PATH.'appearance.php';
 	}
 
 	/**
 	 * Include theme Object-Orienter models
 	 */
 	private function include_models() {
-		$files = (array) glob( THEME_FRAMEWORK_PATH . '/models/*.php' );
+		$files = (array) glob(THEME_FRAMEWORK_PATH.'/models/*.php');
 
-		foreach ( $files as $filename ) {
+		foreach ($files as $filename) {
 
-			if ( !empty($filename) ) {
+			if (!empty($filename)) {
 
 				require_once $filename;
 
@@ -212,7 +212,7 @@ 
 				
 					$_return[] = new ClassyPost($post_id);
 				
-				} elseif($return_type == 'object') {
+				} elseif ($return_type == 'object') {
 
 					$_return[] = get_post($post_id);
 
@@ -239,7 +239,7 @@ 
 	public static function get_post($args = false, $return_type = 'ClassyPost') {
 		$posts = self::get_posts($args, $return_type);
 
-		if ( $post = reset($posts ) ) {
+		if ($post = reset($posts)) {
 			return $post;
 		}
 	}
@@ -248,57 +248,57 @@ 
 	 * @param array   $prefs
 	 * @return array mixed
 	 */
-	public static function get_pagination( $prefs = array() ) {
+	public static function get_pagination($prefs = array()) {
 		global $wp_query;
 		global $paged;
 		global $wp_rewrite;
 
 		$args = array();
-		$args['total'] = ceil( $wp_query->found_posts / $wp_query->query_vars['posts_per_page'] );
+		$args['total'] = ceil($wp_query->found_posts / $wp_query->query_vars['posts_per_page']);
 		
-		if ( $wp_rewrite->using_permalinks() ) {
+		if ($wp_rewrite->using_permalinks()) {
 			
-			$url = explode( '?', get_pagenum_link( 0 ) );
+			$url = explode('?', get_pagenum_link(0));
 			
-			if ( isset( $url[1] ) ) {
-				parse_str( $url[1], $query );
+			if (isset($url[1])) {
+				parse_str($url[1], $query);
 				$args['add_args'] = $query;
 			}
 			
 			$args['format'] = 'page/%#%';
-			$args['base'] = trailingslashit( $url[0] ).'%_%';
+			$args['base'] = trailingslashit($url[0]).'%_%';
 
 		} else {
 			$big = 999999999;
-			$args['base'] = str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) );
+			$args['base'] = str_replace($big, '%#%', esc_url(get_pagenum_link($big)));
 		}
 
 		$args['type'] = 'array';
-		$args['current'] = max( 1, get_query_var( 'paged' ) );
-		$args['mid_size'] = max( 9 - $args['current'], 3 );
+		$args['current'] = max(1, get_query_var('paged'));
+		$args['mid_size'] = max(9 - $args['current'], 3);
 		$args['prev_next'] = false;
 		
-		if ( is_int( $prefs ) ) {
+		if (is_int($prefs)) {
 			$args['mid_size'] = $prefs - 2;
 		} else {
-			$args = array_merge( $args, $prefs );
+			$args = array_merge($args, $prefs);
 		}
 
 		$data = array();
-		$data['pages'] = ClassyHelper::paginate_links( $args );
-		$next = get_next_posts_page_link( $args['total'] );
+		$data['pages'] = ClassyHelper::paginate_links($args);
+		$next = get_next_posts_page_link($args['total']);
 		
-		if ( $next ) {
-			$data['next'] = array( 'link' => untrailingslashit( $next ), 'class' => 'page-numbers next' );
+		if ($next) {
+			$data['next'] = array('link' => untrailingslashit($next), 'class' => 'page-numbers next');
 		}
 
-		$prev = previous_posts( false );
+		$prev = previous_posts(false);
 		
-		if ( $prev ) {
-			$data['prev'] = array( 'link' => untrailingslashit( $prev ), 'class' => 'page-numbers prev' );
+		if ($prev) {
+			$data['prev'] = array('link' => untrailingslashit($prev), 'class' => 'page-numbers prev');
 		}
 		
-		if ( $paged < 2 ) {
+		if ($paged < 2) {
 			$data['prev'] = null;
 		}
 		

app/models/classy-user.php

Doc Comments +3 added lines

@@ -61,6 +61,9 @@
 		$this->init();
 	}
 
+	/**
+	 * @param integer|null $uid
+	 */
 	private function verify_id($uid) {
 		return $uid;
 	}

Spacing +2 added lines, -2 removed lines

@@ -80,7 +80,7 @@ 
 		$this->import($object);
 
 		if (isset($this->first_name) && isset($this->last_name)) {
-			$this->name = $this->first_name . ' ' . $this->last_name;
+			$this->name = $this->first_name.' '.$this->last_name;
 		} else {
 			$this->name = 'Anonymous';
 		}
@@ -157,7 +157,7 @@ 
 	 * @return string
 	 */
 	public function link() {
-		if ( !$this->link ) {
+		if (!$this->link) {
 			$this->link = get_author_posts_url($this->ID);
 		}
 

Braces +2 added lines, -1 removed lines

@@ -43,7 +43,8 @@
 		
 			wp_register_script( 'theme_plugins', THEME_DIR . 'assets/js/min/production.js', array( 'jquery' ), THEME_VERSION, true );
 		
-		} else {
+		}
+		else {
 			
 			wp_register_script( 'theme_plugins', THEME_DIR . 'assets/js/plugins.js', array( 'jquery' ), THEME_VERSION, true );
 

app/models/classy-post.php

Indentation +15 added lines, -15 removed lines

@@ -109,21 +109,21 @@
 	 * 
 	 * @return boolean
 	 */
-    public function can_edit() {
-        if ( !function_exists( 'current_user_can' ) ) {
-            return false;
-        }
-        if ( current_user_can( 'edit_post', $this->ID ) ) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Returns the Post Edit url
-     * 
-     * @return string
-     */
+	public function can_edit() {
+		if ( !function_exists( 'current_user_can' ) ) {
+			return false;
+		}
+		if ( current_user_can( 'edit_post', $this->ID ) ) {
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Returns the Post Edit url
+	 * 
+	 * @return string
+	 */
 	public function get_edit_url() {
 		if ( $this->can_edit() ) {
 			return get_edit_post_link($this->ID);

Spacing +28 added lines, -28 removed lines

@@ -110,10 +110,10 @@ 
 	 * @return boolean
 	 */
     public function can_edit() {
-        if ( !function_exists( 'current_user_can' ) ) {
+        if (!function_exists('current_user_can')) {
             return false;
         }
-        if ( current_user_can( 'edit_post', $this->ID ) ) {
+        if (current_user_can('edit_post', $this->ID)) {
             return true;
         }
         return false;
@@ -125,7 +125,7 @@ 
      * @return string
      */
 	public function get_edit_url() {
-		if ( $this->can_edit() ) {
+		if ($this->can_edit()) {
 			return get_edit_post_link($this->ID);
 		}
 	}
@@ -137,10 +137,10 @@ 
 	 * @return ClassyImage
 	 */
 	public function get_thumbnail() {
-		if ( function_exists('get_post_thumbnail_id') ) {
+		if (function_exists('get_post_thumbnail_id')) {
 			$image_id = get_post_thumbnail_id($this->ID);
 			
-			if ( $image_id ) {
+			if ($image_id) {
 				return new ClassyImage($image_id);
 			}
 		}
@@ -172,19 +172,19 @@ 
 	 * @param  integer $page Page number, in case our post has <!--nextpage--> tags
 	 * @return string        Post content
 	 */
-	public function get_content( $page = 0 ) {
-		if ( $page == 0 && $this->post_content ) {
+	public function get_content($page = 0) {
+		if ($page == 0 && $this->post_content) {
 			return $this->post_content;
 		}
 		
 		$content = $this->post_content;
 		
-		if ( $page ) {
+		if ($page) {
 			$contents = explode('<!--nextpage-->', $content);
 			
 			$page--;
 
-			if ( count($contents) > $page ) {
+			if (count($contents) > $page) {
 				$content = $contents[$page];
 			}
 		}
@@ -219,7 +219,7 @@ 
 	 * @return string
 	 */
 	public function get_permalink() {
-		if ( isset($this->permalink) ) {
+		if (isset($this->permalink)) {
 			return $this->permalink;
 		}
 
@@ -253,9 +253,9 @@ 
 		$text = '';
 		$trimmed = false;
 
-		if ( isset($this->post_excerpt) && strlen($this->post_excerpt) ) {
+		if (isset($this->post_excerpt) && strlen($this->post_excerpt)) {
 			
-			if ( $force ) {
+			if ($force) {
 				$text = ClassyHelper::trim_words($this->post_excerpt, $len, false);
 				$trimmed = true;
 			} else {
@@ -264,65 +264,65 @@ 
 
 		}
 
-		if ( !strlen($text) && preg_match('/<!--\s?more(.*?)?-->/', $this->post_content, $readmore_matches) ) {
+		if (!strlen($text) && preg_match('/<!--\s?more(.*?)?-->/', $this->post_content, $readmore_matches)) {
 
 			$pieces = explode($readmore_matches[0], $this->post_content);
 			$text = $pieces[0];
 
-			if ( $force ) {
+			if ($force) {
 				$text = ClassyHelper::trim_words($text, $len, false);
 				$trimmed = true;
 			}
 
-			$text = do_shortcode( $text );
+			$text = do_shortcode($text);
 
 		}
 
-		if ( !strlen($text) ) {
+		if (!strlen($text)) {
 
 			$text = ClassyHelper::trim_words($this->get_content(), $len, false);
 			$trimmed = true;
 
 		}
 
-		if ( !strlen(trim($text)) ) {
+		if (!strlen(trim($text))) {
 
 			return trim($text);
 
 		}
 
-		if ( $strip ) {
+		if ($strip) {
 
 			$text = trim(strip_tags($text));
 
 		}
 
-		if ( strlen($text) ) {
+		if (strlen($text)) {
 
 			$text = trim($text);
 			$last = $text[strlen($text) - 1];
 			
-			if ( $last != '.' && $trimmed ) {
+			if ($last != '.' && $trimmed) {
 				$text .= ' &hellip; ';
 			}
 			
-			if ( !$strip ) {
+			if (!$strip) {
 				$last_p_tag = strrpos($text, '</p>');
-				if ( $last_p_tag !== false ) {
+				if ($last_p_tag !== false) {
 					$text = substr($text, 0, $last_p_tag);
 				}
-				if ( $last != '.' && $trimmed ) {
+				if ($last != '.' && $trimmed) {
 					$text .= ' &hellip; ';
 				}
 			}
 			
-			if ( $readmore && isset($readmore_matches) && !empty($readmore_matches[1]) ) {
-				$text .= ' <a href="' . $this->get_permalink() . '" class="read-more">' . trim($readmore_matches[1]) . '</a>';
-			} elseif ( $readmore ) {
-				$text .= ' <a href="' . $this->get_permalink() . '" class="read-more">' . trim($readmore) . '</a>';
+			if ($readmore && isset($readmore_matches) && !empty($readmore_matches[1])) {
+				$text .= ' <a href="'.$this->get_permalink().'" class="read-more">'.trim($readmore_matches[1]).'</a>';
+			} elseif ($readmore) {
+				$text .= ' <a href="'.$this->get_permalink().'" class="read-more">'.trim($readmore).'</a>';
 			}
 			
-			if ( !$strip ) {
+			if (!$strip) {
 				$text .= '</p>';
 			}
 

Braces +4 added lines, -2 removed lines

@@ -258,7 +258,8 @@ 
 			if ( $force ) {
 				$text = ClassyHelper::trim_words($this->post_excerpt, $len, false);
 				$trimmed = true;
-			} else {
+			}
+			else {
 				$text = $this->post_excerpt;
 			}
 
@@ -318,7 +319,8 @@ 
 			
 			if ( $readmore && isset($readmore_matches) && !empty($readmore_matches[1]) ) {
 				$text .= ' <a href="' . $this->get_permalink() . '" class="read-more">' . trim($readmore_matches[1]) . '</a>';
-			} elseif ( $readmore ) {
+			}
+			elseif ( $readmore ) {
 				$text .= ' <a href="' . $this->get_permalink() . '" class="read-more">' . trim($readmore) . '</a>';
 			}
 			

app/appearance.php

Spacing +15 added lines, -15 removed lines

@@ -9,13 +9,13 @@ 
 
 	public function __construct() {
 
-		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_styles' ) );
+		add_action('wp_enqueue_scripts', array($this, 'enqueue_styles'));
 
-		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
+		add_action('wp_enqueue_scripts', array($this, 'enqueue_scripts'));
 
-		add_action( 'wp_print_scripts', array($this, 'init_js_vars') );
+		add_action('wp_print_scripts', array($this, 'init_js_vars'));
 
-		add_action( 'after_setup_theme', array($this, 'setup_theme') );
+		add_action('after_setup_theme', array($this, 'setup_theme'));
 
 	}
 
@@ -24,9 +24,9 @@ 
 	 */
 	public function enqueue_styles() {
 
-		wp_register_style( 'flotheme_general_css', THEME_DIR . 'assets/css/general.css', array(), THEME_VERSION, 'all' );
+		wp_register_style('flotheme_general_css', THEME_DIR.'assets/css/general.css', array(), THEME_VERSION, 'all');
 		
-		wp_enqueue_style( 'flotheme_general_css' );
+		wp_enqueue_style('flotheme_general_css');
 
 	}
 
@@ -35,27 +35,27 @@ 
 	 */
 	public function enqueue_scripts() {
 
-		wp_deregister_script( 'jquery' );
+		wp_deregister_script('jquery');
 		
-		wp_register_script( 'jquery', 'http://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js', array(), THEME_VERSION, true );
+		wp_register_script('jquery', 'http://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js', array(), THEME_VERSION, true);
 
-		if ( Classy::get_config_var('environment') == 'production' ) {
+		if (Classy::get_config_var('environment') == 'production') {
 		
-			wp_register_script( 'theme_plugins', THEME_DIR . 'assets/js/min/production.js', array( 'jquery' ), THEME_VERSION, true );
+			wp_register_script('theme_plugins', THEME_DIR.'assets/js/min/production.js', array('jquery'), THEME_VERSION, true);
 		
 		} else {
 			
-			wp_register_script( 'theme_plugins', THEME_DIR . 'assets/js/plugins.js', array( 'jquery' ), THEME_VERSION, true );
+			wp_register_script('theme_plugins', THEME_DIR.'assets/js/plugins.js', array('jquery'), THEME_VERSION, true);
 
-			wp_register_script( 'theme_scripts', THEME_DIR . 'assets/js/scripts.js', array( 'jquery' ), THEME_VERSION, true );
+			wp_register_script('theme_scripts', THEME_DIR.'assets/js/scripts.js', array('jquery'), THEME_VERSION, true);
 		
 		}
 
-		wp_enqueue_script( 'theme_plugins' );
+		wp_enqueue_script('theme_plugins');
 		
-		wp_enqueue_script( 'theme_scripts' );
+		wp_enqueue_script('theme_scripts');
 
-		wp_enqueue_script( 'theme_production' );
+		wp_enqueue_script('theme_production');
 
 	}
 

Braces +2 added lines, -1 removed lines

@@ -43,7 +43,8 @@
 		
 			wp_register_script( 'theme_plugins', THEME_DIR . 'assets/js/min/production.js', array( 'jquery' ), THEME_VERSION, true );
 		
-		} else {
+		}
+		else {
 			
 			wp_register_script( 'theme_plugins', THEME_DIR . 'assets/js/plugins.js', array( 'jquery' ), THEME_VERSION, true );
 

app/classy/classy-query-helper.php

Indentation +12 added lines, -12 removed lines

@@ -36,13 +36,13 @@ 
 	 */
 	public static function get_current_query() {
 
-        global $wp_query;
+		global $wp_query;
 
-        $query =& $wp_query;
+		$query =& $wp_query;
 
-        $query = self::handle_maybe_custom_posts_page($query);
+		$query = self::handle_maybe_custom_posts_page($query);
 
-        return $query;
+		return $query;
 
 	}
 
@@ -52,20 +52,20 @@ 
 	 * @param  object $query WP_Query
 	 * @return object        WP_Query
 	 */
-    private static function handle_maybe_custom_posts_page( $query ) {
+	private static function handle_maybe_custom_posts_page( $query ) {
 
-    	if ($custom_posts_page = get_option('page_for_posts')) {
+		if ($custom_posts_page = get_option('page_for_posts')) {
         
-        	if ( isset($query->query['p']) && $query->query['p'] == $custom_posts_page ) {
+			if ( isset($query->query['p']) && $query->query['p'] == $custom_posts_page ) {
         
-        		return new WP_Query(array('post_type' => 'post'));
+				return new WP_Query(array('post_type' => 'post'));
         
-        	}
+			}
         
-        }
+		}
         
-        return $query;
+		return $query;
 
-    }
+	}
 
 }
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -38,7 +38,7 @@ 
 
         global $wp_query;
 
-        $query =& $wp_query;
+        $query = & $wp_query;
 
         $query = self::handle_maybe_custom_posts_page($query);
 
@@ -52,11 +52,11 @@ 
 	 * @param  object $query WP_Query
 	 * @return object        WP_Query
 	 */
-    private static function handle_maybe_custom_posts_page( $query ) {
+    private static function handle_maybe_custom_posts_page($query) {
 
     	if ($custom_posts_page = get_option('page_for_posts')) {
         
-        	if ( isset($query->query['p']) && $query->query['p'] == $custom_posts_page ) {
+        	if (isset($query->query['p']) && $query->query['p'] == $custom_posts_page) {
         
         		return new WP_Query(array('post_type' => 'post'));
         

Braces +4 added lines, -2 removed lines

@@ -16,13 +16,15 @@
 		
 			return self::get_current_query();
 		
-		} elseif (is_array($args)) {
+		}
+		elseif (is_array($args)) {
 
 			$args = array_merge($default_args, $args);
 
 			return new WP_Query($args);
 
-		} else {
+		}
+		else {
 
 			return new WP_Query($default_args);
 

app/classy/classy-basis.php

Indentation +18 added lines, -18 removed lines

@@ -6,36 +6,36 @@
 
 class ClassyBasis {
 
-    /**
-     * Imports data params into the class instance
-     * 
-     * @param  object/array $data
-     * @return void
-     */
+	/**
+	 * Imports data params into the class instance
+	 * 
+	 * @param  object/array $data
+	 * @return void
+	 */
 	protected function import($data) {
 
-        if ( is_object( $data ) ) {
+		if ( is_object( $data ) ) {
         
-            $data = get_object_vars( $data );
+			$data = get_object_vars( $data );
         
-        }
+		}
 
-        if ( is_array( $data ) ) {
+		if ( is_array( $data ) ) {
             
-            foreach ( $data as $key => $value ) {
+			foreach ( $data as $key => $value ) {
             
-                if ( !empty( $key ) ) {
+				if ( !empty( $key ) ) {
             
-                    $this->$key = $value;
+					$this->$key = $value;
             
-                } else if ( !empty( $key ) && !method_exists($this, $key) ){
+				} else if ( !empty( $key ) && !method_exists($this, $key) ){
             
-                    $this->$key = $value;
+					$this->$key = $value;
             
-                }
-            }
+				}
+			}
 
-        }
+		}
 
 	}
 

Spacing +6 added lines, -6 removed lines

@@ -14,21 +14,21 @@
      */
 	protected function import($data) {
 
-        if ( is_object( $data ) ) {
+        if (is_object($data)) {
         
-            $data = get_object_vars( $data );
+            $data = get_object_vars($data);
         
         }
 
-        if ( is_array( $data ) ) {
+        if (is_array($data)) {
             
-            foreach ( $data as $key => $value ) {
+            foreach ($data as $key => $value) {
             
-                if ( !empty( $key ) ) {
+                if (!empty($key)) {
             
                     $this->$key = $value;
             
-                } else if ( !empty( $key ) && !method_exists($this, $key) ){
+                } else if (!empty($key) && !method_exists($this, $key)) {
             
                     $this->$key = $value;
             

Braces +2 added lines, -1 removed lines

@@ -28,7 +28,8 @@
             
                     $this->$key = $value;
             
-                } else if ( !empty( $key ) && !method_exists($this, $key) ){
+                }
+                else if ( !empty( $key ) && !method_exists($this, $key) ) {
             
                     $this->$key = $value;