anrw / classy

app/classes/classy.php

Doc Comments +1 added lines, -1 removed lines

@@ -259,7 +259,7 @@
 	 *
 	 * @param array $prefs Args for paginate_links.
 	 *
-	 * @return array mixed
+	 * @return \stdClass mixed
 	 */
 	public static function get_pagination( $prefs = array() ) {
 

Spacing +55 added lines, -55 removed lines

@@ -32,7 +32,7 @@ 
 	 */
 	public static function get_instance() {
 
-		if ( null === self::$single_instance ) {
+		if (null === self::$single_instance) {
 
 			self::$single_instance = new self();
 
@@ -58,7 +58,7 @@ 
 
 		$this->init_config();
 
-		add_filter( 'theme_page_templates', array( $this, 'filter_templates' ) );
+		add_filter('theme_page_templates', array($this, 'filter_templates'));
 	}
 
 	/**
@@ -72,7 +72,7 @@ 
 	 * Load template functions.
 	 */
 	private function load_template_function() {
-		require_once( CLASSY_THEME_PATH . 'app/functions/template-functions.php' );
+		require_once(CLASSY_THEME_PATH.'app/functions/template-functions.php');
 	}
 
 	/**
@@ -85,13 +85,13 @@ 
 
 		$theme = wp_get_theme();
 
-		define( 'CLASSY_THEME', $theme->template );
-		define( 'CLASSY_THEME_NAME', $theme->get( 'Name' ) );
-		define( 'CLASSY_THEME_PATH', get_template_directory() . '/' );
-		define( 'CLASSY_THEME_DIR', get_template_directory_uri() . '/' );
-		define( 'CLASSY_THEME_VERSION', $theme->get( 'Version' ) );
-		define( 'CLASSY_THEME_FRAMEWORK_PATH', CLASSY_THEME_PATH . 'app/' );
-		define( 'CLASSY_THEME_FRAMEWORK_DIR', CLASSY_THEME_DIR . 'app/' );
+		define('CLASSY_THEME', $theme->template);
+		define('CLASSY_THEME_NAME', $theme->get('Name'));
+		define('CLASSY_THEME_PATH', get_template_directory().'/');
+		define('CLASSY_THEME_DIR', get_template_directory_uri().'/');
+		define('CLASSY_THEME_VERSION', $theme->get('Version'));
+		define('CLASSY_THEME_FRAMEWORK_PATH', CLASSY_THEME_PATH.'app/');
+		define('CLASSY_THEME_FRAMEWORK_DIR', CLASSY_THEME_DIR.'app/');
 
 	}
 
@@ -109,11 +109,11 @@ 
 	 *
 	 * @return array
 	 */
-	public function filter_templates( $page_templates = array() ) {
+	public function filter_templates($page_templates = array()) {
 
 		$custom_templates = View::get_page_templates_list();
 
-		return array_merge( $page_templates, $custom_templates );
+		return array_merge($page_templates, $custom_templates);
 
 	}
 
@@ -124,11 +124,11 @@ 
 	 *
 	 * @return mixed|bool Return false if variable not found.
 	 */
-	public static function get_config_var( $name ) {
+	public static function get_config_var($name) {
 
 		$vars = Config::get_vars();
 
-		return ( isset( $vars[ $name ] ) ) ? $vars[ $name ] : false;
+		return (isset($vars[$name])) ? $vars[$name] : false;
 
 	}
 
@@ -139,7 +139,7 @@ 
 	 */
 	public static function textdomain() {
 
-		$textdomain = Classy::get_config_var( 'textdomain' );
+		$textdomain = Classy::get_config_var('textdomain');
 
 		return $textdomain ? $textdomain : CLASSY_THEME;
 
@@ -154,17 +154,17 @@ 
 	 * @param  array|null  $data Additional params.
 	 * @return void
 	 */
-	public static function render( $view = null, $data = null ) {
+	public static function render($view = null, $data = null) {
 
-		$views = CLASSY_THEME_PATH . View::$folder;
-		$cache = WP_CONTENT_DIR . '/viewcache';
+		$views = CLASSY_THEME_PATH.View::$folder;
+		$cache = WP_CONTENT_DIR.'/viewcache';
 		$common_scope = Scope::get_common_scope();
 
-		if ( null !== $view && is_string( $view ) ) {
+		if (null !== $view && is_string($view)) {
 
-			if ( $data && is_array( $data ) ) {
+			if ($data && is_array($data)) {
 
-				$scope = array_merge( $common_scope, $data );
+				$scope = array_merge($common_scope, $data);
 
 			} else {
 
@@ -179,9 +179,9 @@ 
 
 		}
 
-		$renderer = new BladeRenderer( $views, array( 'cache_path' => $cache ) );
+		$renderer = new BladeRenderer($views, array('cache_path' => $cache));
 
-		echo $renderer->render( $view, $scope ); // XSS: xss ok.
+		echo $renderer->render($view, $scope); // XSS: xss ok.
 
 	}
 
@@ -206,27 +206,27 @@ 
 	 *
 	 * @return array
 	 */
-	public static function get_posts( $args = false, $return = '\Classy\Models\Post' ) {
+	public static function get_posts($args = false, $return = '\Classy\Models\Post') {
 
 		$_return = array();
 
-		$query = Query_Helper::find_query( $args );
+		$query = Query_Helper::find_query($args);
 
-		if ( isset( $query->posts ) ) {
+		if (isset($query->posts)) {
 
-			foreach ( $query->posts as $post ) {
+			foreach ($query->posts as $post) {
 
-				if ( 'id' === $return ) {
+				if ('id' === $return) {
 
 					$_return[] = $post->id;
 
-				} elseif ( 'object' === $return ) {
+				} elseif ('object' === $return) {
 
 					$_return[] = $post;
 
-				} elseif ( class_exists( $return ) ) {
+				} elseif (class_exists($return)) {
 
-					$_return[] = new $return( $post );
+					$_return[] = new $return($post);
 
 				}
 			}
@@ -244,11 +244,11 @@ 
 	 *
 	 * @return mixed
 	 */
-	public static function get_post( $args = false, $return_type = '\Classy\Models\Post' ) {
+	public static function get_post($args = false, $return_type = '\Classy\Models\Post') {
 
-		$posts = self::get_posts( $args, $return_type );
+		$posts = self::get_posts($args, $return_type);
 
-		if ( $post = reset( $posts ) ) {
+		if ($post = reset($posts)) {
 			return $post;
 		}
 
@@ -261,62 +261,62 @@ 
 	 *
 	 * @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'] = Helper::paginate_links( $args );
-		$next = get_next_posts_page_link( $args['total'] );
+		$data['pages'] = Helper::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;
 		}
 
-		return Helper::array_to_object( $data );
+		return Helper::array_to_object($data);
 
 	}
 }

Braces +12 added lines, -6 removed lines

@@ -229,12 +229,14 @@ 
 
 				$scope = array_merge( $common_scope, $data );
 
-			} else {
+			}
+			else {
 
 				$scope = $common_scope;
 
 			}
-		} else {
+		}
+		else {
 
 			$view = ClassyView::get_view();
 
@@ -283,11 +285,13 @@ 
 
 					$_return[] = $post->id;
 
-				} elseif ( 'object' === $return ) {
+				}
+				elseif ( 'object' === $return ) {
 
 					$_return[] = $post;
 
-				} elseif ( class_exists( $return ) ) {
+				}
+				elseif ( class_exists( $return ) ) {
 
 					$_return[] = new $return( $post );
 
@@ -341,7 +345,8 @@ 
 			$args['format'] = 'page/%#%';
 			$args['base'] = trailingslashit( $url[0] ).'%_%';
 
-		} else {
+		}
+		else {
 			$big = 999999999;
 			$args['base'] = str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) );
 		}
@@ -353,7 +358,8 @@ 
 
 		if ( is_int( $prefs ) ) {
 			$args['mid_size'] = $prefs - 2;
-		} else {
+		}
+		else {
 			$args = array_merge( $args, $prefs );
 		}
 

app/classes/models/post.php

Doc Comments +1 added lines, -1 removed lines

@@ -186,7 +186,7 @@
 	/**
 	 * Returns first attached image id
 	 *
-	 * @return int|boolean
+	 * @return integer|null
 	 */
 	public function get_first_attached_image_id() {
 

Braces +6 added lines, -3 removed lines

@@ -97,7 +97,8 @@ 
 		if ( is_integer( $post ) ) {
 			$this->ID = $post;
 			$this->init();
-		} elseif ( is_a( $post, '\WP_Post' ) ) {
+		}
+		elseif ( is_a( $post, '\WP_Post' ) ) {
 			$this->import( $post );
 		}
 	}
@@ -375,7 +376,8 @@ 
 			if ( $force ) {
 				$text = Helper::trim_words( $this->post_excerpt, $len, false );
 				$trimmed = true;
-			} else {
+			}
+			else {
 				$text = $this->post_excerpt;
 			}
 		}
@@ -434,7 +436,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>';
 			}
 

Spacing +75 added lines, -75 removed lines

@@ -98,12 +98,12 @@ 
 	 *
 	 * @param object|int $post WP_Post or WP_Post.ID.
 	 */
-	public function __construct( $post = null ) {
-		if ( is_integer( $post ) ) {
+	public function __construct($post = null) {
+		if (is_integer($post)) {
 			$this->ID = $post;
 			$this->init();
-		} elseif ( is_a( $post, '\WP_Post' ) ) {
-			$this->import( $post );
+		} elseif (is_a($post, '\WP_Post')) {
+			$this->import($post);
 		}
 	}
 
@@ -113,8 +113,8 @@ 
 	protected function init() {
 		$post = $this->get_object();
 
-		if ( is_a( $post, '\WP_Post' ) ) {
-			$this->import( $post );
+		if (is_a($post, '\WP_Post')) {
+			$this->import($post);
 		}
 	}
 
@@ -124,7 +124,7 @@ 
 	 * @return \WP_Post
 	 */
 	public function get_object() {
-		return get_post( $this->ID );
+		return get_post($this->ID);
 	}
 
 	/**
@@ -133,10 +133,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;
 		}
 
@@ -149,8 +149,8 @@ 
 	 * @return string
 	 */
 	public function get_edit_url() {
-		if ( $this->can_edit() ) {
-			return get_edit_post_link( $this->ID );
+		if ($this->can_edit()) {
+			return get_edit_post_link($this->ID);
 		}
 
 		return '';
@@ -173,9 +173,9 @@ 
 			'fields' => 'ids',
 		);
 
-		$images = get_children( $attrs );
+		$images = get_children($attrs);
 
-		if ( ! count( $images ) ) {
+		if (!count($images)) {
 			return false;
 		}
 
@@ -192,11 +192,11 @@ 
 
 		$images = $this->get_attached_images();
 
-		if ( $images ) {
+		if ($images) {
 
-			foreach ( $images as $image_id ) {
+			foreach ($images as $image_id) {
 
-				$_return[] = new Image( $image_id );
+				$_return[] = new Image($image_id);
 
 			}
 		}
@@ -222,13 +222,13 @@ 
 			'fields' => 'ids',
 		);
 
-		$images = get_children( $attrs );
+		$images = get_children($attrs);
 
-		if ( ! count( $images ) ) {
+		if (!count($images)) {
 			return false;
 		}
 
-		$images = array_values( $images );
+		$images = array_values($images);
 
 		return $images[0];
 	}
@@ -242,8 +242,8 @@ 
 
 		$image_id = $this->get_first_attached_image_id();
 
-		if ( $image_id ) {
-			return new Image( $image_id );
+		if ($image_id) {
+			return new Image($image_id);
 		}
 
 		return new Image();
@@ -255,12 +255,12 @@ 
 	 * @return Image
 	 */
 	public function thumbnail() {
-		if ( function_exists( 'get_post_thumbnail_id' ) ) {
-			$image_id = get_post_thumbnail_id( $this->ID );
+		if (function_exists('get_post_thumbnail_id')) {
+			$image_id = get_post_thumbnail_id($this->ID);
 
-			if ( $image_id ) {
+			if ($image_id) {
 
-				return new Image( $image_id );
+				return new Image($image_id);
 
 			}
 		}
@@ -274,7 +274,7 @@ 
 	 * @return string
 	 */
 	public function get_title() {
-		return apply_filters( 'the_title', $this->post_title, $this->ID );
+		return apply_filters('the_title', $this->post_title, $this->ID);
 	}
 
 	/**
@@ -293,24 +293,24 @@ 
 	 *
 	 * @return string Post content
 	 */
-	public function get_content( $page = 0 ) {
-		if ( 0 === absint( $page ) && $this->post_content ) {
+	public function get_content($page = 0) {
+		if (0 === absint($page) && $this->post_content) {
 			return $this->post_content;
 		}
 
 		$content = $this->post_content;
 
-		if ( $page ) {
-			$contents = explode( '<!--nextpage-->', $content );
+		if ($page) {
+			$contents = explode('<!--nextpage-->', $content);
 
 			$page--;
 
-			if ( count( $contents ) > $page ) {
-				$content = $contents[ $page ];
+			if (count($contents) > $page) {
+				$content = $contents[$page];
 			}
 		}
 
-		$content = apply_filters( 'the_content', ($content) );
+		$content = apply_filters('the_content', ($content));
 
 		return $content;
 	}
@@ -330,7 +330,7 @@ 
 	 * @return object
 	 */
 	public function get_post_type() {
-		return get_post_type_object( $this->post_type );
+		return get_post_type_object($this->post_type);
 	}
 
 	/**
@@ -339,11 +339,11 @@ 
 	 * @return string
 	 */
 	public function get_permalink() {
-		if ( isset( $this->permalink ) ) {
+		if (isset($this->permalink)) {
 			return $this->permalink;
 		}
 
-		$this->permalink = get_permalink( $this->ID );
+		$this->permalink = get_permalink($this->ID);
 
 		return $this->permalink;
 	}
@@ -369,84 +369,84 @@ 
 	 *
 	 * @return string            Post preview.
 	 */
-	public function get_preview( $len = 50, $force = false, $readmore = 'Read More', $strip = true ) {
+	public function get_preview($len = 50, $force = false, $readmore = 'Read More', $strip = true) {
 		$text = '';
 		$trimmed = false;
 
-		if ( isset( $this->post_excerpt ) && strlen( $this->post_excerpt ) ) {
+		if (isset($this->post_excerpt) && strlen($this->post_excerpt)) {
 
-			if ( $force ) {
-				$text = Helper::trim_words( $this->post_excerpt, $len, false );
+			if ($force) {
+				$text = Helper::trim_words($this->post_excerpt, $len, false);
 				$trimmed = true;
 			} else {
 				$text = $this->post_excerpt;
 			}
 		}
 
-		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 );
+			$pieces = explode($readmore_matches[0], $this->post_content);
 			$text = $pieces[0];
 
-			if ( $force ) {
-				$text = Helper::trim_words( $text, $len, false );
+			if ($force) {
+				$text = Helper::trim_words($text, $len, false);
 				$trimmed = true;
 			}
 
-			$text = do_shortcode( $text );
+			$text = do_shortcode($text);
 
 		}
 
-		if ( ! strlen( $text ) ) {
+		if (!strlen($text)) {
 
-			$text = Helper::trim_words( $this->get_content(), $len, false );
+			$text = Helper::trim_words($this->get_content(), $len, false);
 			$trimmed = true;
 
 		}
 
-		if ( ! strlen( trim( $text ) ) ) {
+		if (!strlen(trim($text))) {
 
-			return trim( $text );
+			return trim($text);
 
 		}
 
-		if ( $strip ) {
+		if ($strip) {
 
-			$text = trim( strip_tags( $text ) );
+			$text = trim(strip_tags($text));
 
 		}
 
-		if ( strlen( $text ) ) {
+		if (strlen($text)) {
 
-			$text = trim( $text );
-			$last = $text[ strlen( $text ) - 1 ];
+			$text = trim($text);
+			$last = $text[strlen($text) - 1];
 
-			if ( '.' !== $last && $trimmed ) {
+			if ('.' !== $last && $trimmed) {
 				$text .= ' &hellip; ';
 			}
 
-			if ( ! $strip ) {
-				$last_p_tag = strrpos( $text, '</p>' );
-				if ( false !== $last_p_tag ) {
-					$text = substr( $text, 0, $last_p_tag );
+			if (!$strip) {
+				$last_p_tag = strrpos($text, '</p>');
+				if (false !== $last_p_tag) {
+					$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>';
 			}
 		}
 
-		return trim( $text );
+		return trim($text);
 	}
 
 	/**
@@ -457,7 +457,7 @@ 
 	 *
 	 * @return array
 	 */
-	public function get_comments( $status = 'approve', $order = 'DESC' ) {
+	public function get_comments($status = 'approve', $order = 'DESC') {
 
 		$_return = array();
 
@@ -467,25 +467,25 @@ 
 			'order' => $order,
 		);
 
-		$comments = get_comments( $args );
+		$comments = get_comments($args);
 
-		foreach ( $comments as $comment ) {
+		foreach ($comments as $comment) {
 
-			$_return[ $comment->comment_ID ] = new Comment( $comment );
+			$_return[$comment->comment_ID] = new Comment($comment);
 
 		}
 
-		foreach ( $_return as $key => $comment ) {
+		foreach ($_return as $key => $comment) {
 
-			if ( $comment->has_parent() ) {
+			if ($comment->has_parent()) {
 
-				$_return[ $comment->comment_parent ]->add_child( $comment );
+				$_return[$comment->comment_parent]->add_child($comment);
 
-				unset( $_return[ $key ] );
+				unset($_return[$key]);
 
 			}
 		}
 
-		return array_values( $_return );
+		return array_values($_return);
 	}
 }

functions.php

Spacing +1 added lines, -1 removed lines

@@ -2,5 +2,5 @@
 /**
  * Init our WordPress Theme.
  */
-require_once( __DIR__ . '/vendor/autoload.php' );
+require_once(__DIR__.'/vendor/autoload.php');
 \Classy\Classy::get_instance();

comments.php

Spacing +2 added lines, -2 removed lines

@@ -2,6 +2,6 @@
 
 global $post;
 
-$classypost = new \Classy\Models\Post( $post );
+$classypost = new \Classy\Models\Post($post);
 
-Classy\Classy::render( 'layout.comments', array( 'post' => $classypost ) );
+Classy\Classy::render('layout.comments', array('post' => $classypost));

app/classes/models/user.php

Spacing +9 added lines, -9 removed lines

@@ -66,8 +66,8 @@ 
 	 *
 	 * @param int $uid User id.
 	 */
-	public function __construct( $uid = null ) {
-		$this->ID = $this->verify_id( $uid );
+	public function __construct($uid = null) {
+		$this->ID = $this->verify_id($uid);
 
 		$this->init();
 	}
@@ -79,7 +79,7 @@ 
 	 *
 	 * @return int
 	 */
-	private function verify_id( $uid ) {
+	private function verify_id($uid) {
 		// @todo: Realize this method.
 		return $uid;
 	}
@@ -90,7 +90,7 @@ 
 	private function init() {
 		$this->object = $this->get_object();
 
-		$this->import( $this->object );
+		$this->import($this->object);
 
 		$this->setup_user_name();
 	}
@@ -101,7 +101,7 @@ 
 	 * @return object
 	 */
 	private function get_object() {
-		return get_user_by( 'id', $this->ID );
+		return get_user_by('id', $this->ID);
 	}
 
 	/**
@@ -155,8 +155,8 @@ 
 	 * @return string
 	 */
 	public function link() {
-		if ( ! $this->link ) {
-			$this->link = get_author_posts_url( $this->ID );
+		if (!$this->link) {
+			$this->link = get_author_posts_url($this->ID);
 		}
 
 		return $this->link;
@@ -167,8 +167,8 @@ 
 	 */
 	private function setup_user_name() {
 		$this->name = 'Anonymous';
-		if ( isset( $this->object->first_name ) && isset( $this->object->last_name ) ) {
-			$this->name = $this->object->first_name . ' ' . $this->object->last_name;
+		if (isset($this->object->first_name) && isset($this->object->last_name)) {
+			$this->name = $this->object->first_name.' '.$this->object->last_name;
 		}
 
 		$this->display_name = $this->object->display_name;

app/classes/view.php

Spacing +12 added lines, -12 removed lines

@@ -29,9 +29,9 @@ 
 
 		$request = Hierarchy::get_current_request();
 
-		$file = Hierarchy::get_available_file( 'view', $request );
+		$file = Hierarchy::get_available_file('view', $request);
 
-		$view = self::get_blade_view( $file );
+		$view = self::get_blade_view($file);
 
 		return $view;
 
@@ -44,9 +44,9 @@ 
 	 *
 	 * @return string
 	 */
-	public static function get_blade_view( $view ) {
+	public static function get_blade_view($view) {
 
-		return str_replace( '/', '.', $view );
+		return str_replace('/', '.', $view);
 
 	}
 
@@ -59,21 +59,21 @@ 
 
 		$templates = array();
 
-		$files = (array) glob( CLASSY_THEME_PATH . '/' . self::$folder . '/*/*.blade.php' );
+		$files = (array) glob(CLASSY_THEME_PATH.'/'.self::$folder.'/*/*.blade.php');
 
-		foreach ( $files as $filename ) {
+		foreach ($files as $filename) {
 
-			if ( ! empty( $filename ) ) {
+			if (!empty($filename)) {
 
-				if ( ! preg_match( '/\{\{\-\-\s*Template Name:(.*)\s*\-\-\}\}/mi', file_get_contents( $filename ), $header ) ) { continue; }
+				if (!preg_match('/\{\{\-\-\s*Template Name:(.*)\s*\-\-\}\}/mi', file_get_contents($filename), $header)) { continue; }
 
-				$template_name = trim( $header[1] );
+				$template_name = trim($header[1]);
 
-				preg_match( '/\/([^\/]*)\.blade.php$/is', $filename, $filename_match );
+				preg_match('/\/([^\/]*)\.blade.php$/is', $filename, $filename_match);
 
-				$template_file = 'classy-' . $filename_match[1];
+				$template_file = 'classy-'.$filename_match[1];
 
-				$templates[ $template_file ] = $template_name;
+				$templates[$template_file] = $template_name;
 
 			}
 		}

app/classes/appearance.php

Spacing +14 added lines, -14 removed lines

@@ -12,13 +12,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'));
 
 	}
 
@@ -27,7 +27,7 @@ 
 	 */
 	public function enqueue_styles() {
 
-		wp_register_style( 'general_css', CLASSY_THEME_DIR . 'assets/css/general.css', array(), CLASSY_THEME_VERSION, 'all' );
+		wp_register_style('general_css', CLASSY_THEME_DIR.'assets/css/general.css', array(), CLASSY_THEME_VERSION, 'all');
 
 	}
 
@@ -36,13 +36,13 @@ 
 	 */
 	public function enqueue_scripts() {
 
-		if ( 'production' === Classy::get_config_var( 'environment' ) ) {
+		if ('production' === Classy::get_config_var('environment')) {
 
-			wp_register_script( 'theme_scripts', CLASSY_THEME_DIR . 'assets/js/min/production.js', array( 'jquery' ), CLASSY_THEME_VERSION, true );
+			wp_register_script('theme_scripts', CLASSY_THEME_DIR.'assets/js/min/production.js', array('jquery'), CLASSY_THEME_VERSION, true);
 
 		} else {
 
-			wp_register_script( 'theme_scripts', CLASSY_THEME_DIR . 'assets/js/scripts.js', array( 'jquery' ), CLASSY_THEME_VERSION, true );
+			wp_register_script('theme_scripts', CLASSY_THEME_DIR.'assets/js/scripts.js', array('jquery'), CLASSY_THEME_VERSION, true);
 
 		}
 
@@ -54,10 +54,10 @@ 
 	public function init_js_vars() {
 
 		$options = array(
-			'base_url'          => home_url( '' ),
-			'blog_url'          => home_url( 'archives/' ),
+			'base_url'          => home_url(''),
+			'blog_url'          => home_url('archives/'),
 			'template_dir'      => CLASSY_THEME_DIR,
-			'ajax_load_url'     => admin_url( 'admin-ajax.php' ),
+			'ajax_load_url'     => admin_url('admin-ajax.php'),
 			'is_mobile'         => (int) wp_is_mobile(),
 		);
 
@@ -85,12 +85,12 @@ 
 		 * @link http://codex.wordpress.org/Function_Reference/add_theme_support#Post_Thumbnails
 		 */
 
-		add_theme_support( 'post-thumbnails' );
+		add_theme_support('post-thumbnails');
 
 		// This theme uses wp_nav_menu() in one location.
 		register_nav_menus(array(
-			'header-menu' => __( 'Header Menu', Classy::textdomain() ),
-			'footer-menu' => __( 'Footer Menu', Classy::textdomain() ),
+			'header-menu' => __('Header Menu', Classy::textdomain()),
+			'footer-menu' => __('Footer Menu', Classy::textdomain()),
 		));
 
 		/*

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/classes/hierarchy.php

Braces +10 added lines, -4 removed lines

@@ -54,9 +54,11 @@ 
 
 		elseif ( is_paged() ) : return 'paged';
 
-		else :
+		else {
+			:
 
 			return 'index';
+		}
 
 		endif;
 
@@ -97,7 +99,8 @@ 
 
 			return THEME_PATH . $folder . '/' . $view . '.blade.php';
 
-		} elseif ( 'scope' === $type ) {
+		}
+		elseif ( 'scope' === $type ) {
 
 			$folder = ClassyScope::$folder;
 
@@ -234,7 +237,8 @@ 
 
 					list( $type, $subtype ) = explode( '/', $attachment->post_mime_type );
 
-				} else {
+				}
+				else {
 
 					list( $type, $subtype ) = array( $attachment->post_mime_type, '' );
 
@@ -347,9 +351,11 @@ 
 
 			// Default
 
-		else :
+		else {
+			:
 
 			$views[] = $type;
+		}
 
 		endif;
 

Doc Comments +2 added lines, -2 removed lines

@@ -121,7 +121,7 @@ 
 	 * @param string $type View|scope.
 	 * @param string $page Request type like: home, single etc.
 	 *
-	 * @return array|bool
+	 * @return string|false
 	 */
 	public static function get_available_file( $type = 'view', $page ) {
 		$views = self::get_request_hierarchy_list( $page );
@@ -306,7 +306,7 @@ 
 	/**
 	 * Returns classy template name or boolean if this is not classy template.
 	 *
-	 * @return mixed
+	 * @return string|false
 	 */
 	public static function get_classy_template() {
 		preg_match( '/classy\-(.*)/', get_page_template_slug(), $matches );

Spacing +65 added lines, -65 removed lines

@@ -26,39 +26,39 @@ 
 	 */
 	protected static function check_request() {
 
-		if ( is_404() ) : return '404';
+		if (is_404()) : return '404';
 
-		elseif ( is_search() ) : return 'search';
+		elseif (is_search()) : return 'search';
 
-		elseif ( is_front_page() ) : return 'front-page';
+		elseif (is_front_page()) : return 'front-page';
 
-		elseif ( is_home() ) : return 'home';
+		elseif (is_home()) : return 'home';
 
-		elseif ( is_post_type_archive() ) : return 'post_type_archive';
+		elseif (is_post_type_archive()) : return 'post_type_archive';
 
-		elseif ( is_tax() ) : return 'taxonomy';
+		elseif (is_tax()) : return 'taxonomy';
 
-		elseif ( is_attachment() ) : return 'attachment';
+		elseif (is_attachment()) : return 'attachment';
 
-		elseif ( is_single() ) : return 'single';
+		elseif (is_single()) : return 'single';
 
-		elseif ( self::is_classy_template() ) : return 'classy-template';
+		elseif (self::is_classy_template()) : return 'classy-template';
 
-		elseif ( is_page() ) : return 'page';
+		elseif (is_page()) : return 'page';
 
-		elseif ( is_singular() ) : return 'singular';
+		elseif (is_singular()) : return 'singular';
 
-		elseif ( is_category() ) : return 'category';
+		elseif (is_category()) : return 'category';
 
-		elseif ( is_tag() ) : return 'tag';
+		elseif (is_tag()) : return 'tag';
 
-		elseif ( is_author() ) : return 'author';
+		elseif (is_author()) : return 'author';
 
-		elseif ( is_date() ) : return 'date';
+		elseif (is_date()) : return 'date';
 
-		elseif ( is_archive() ) : return 'archive';
+		elseif (is_archive()) : return 'archive';
 
-		elseif ( is_paged() ) : return 'paged';
+		elseif (is_paged()) : return 'paged';
 
 		else :
 
@@ -73,7 +73,7 @@ 
 	 * @return string
 	 */
 	public static function get_current_request() {
-		if ( is_null( self::$current_request ) ) {
+		if (is_null(self::$current_request)) {
 			self::$current_request = self::check_request();
 		}
 
@@ -89,13 +89,13 @@ 
 	 *
 	 * @return string Full file path.
 	 */
-	public static function get_file_path( $type = 'view', $view ) {
-		$view = str_replace( '.', '/', $view );
+	public static function get_file_path($type = 'view', $view) {
+		$view = str_replace('.', '/', $view);
 
-		if ( 'view' === $type ) {
-			return CLASSY_THEME_PATH . View::$folder . '/' . $view . '.blade.php';
-		} elseif ( 'scope' === $type ) {
-			return CLASSY_THEME_PATH . Scope::$folder . '/' . $view . '.php';
+		if ('view' === $type) {
+			return CLASSY_THEME_PATH.View::$folder.'/'.$view.'.blade.php';
+		} elseif ('scope' === $type) {
+			return CLASSY_THEME_PATH.Scope::$folder.'/'.$view.'.php';
 		}
 
 		return '';
@@ -109,9 +109,9 @@ 
 	 *
 	 * @return boolean true|false
 	 */
-	public static function file_exists( $type = 'view', $file ) {
+	public static function file_exists($type = 'view', $file) {
 		return file_exists(
-			self::get_file_path( $type, str_replace( '.', '/', $file ) )
+			self::get_file_path($type, str_replace('.', '/', $file))
 		);
 	}
 
@@ -123,11 +123,11 @@ 
 	 *
 	 * @return array|bool
 	 */
-	public static function get_available_file( $type = 'view', $page ) {
-		$views = self::get_request_hierarchy_list( $page );
+	public static function get_available_file($type = 'view', $page) {
+		$views = self::get_request_hierarchy_list($page);
 
-		foreach ( $views as $view ) {
-			if ( self::file_exists( $type, $view ) ) {
+		foreach ($views as $view) {
+			if (self::file_exists($type, $view)) {
 				return $view;
 			}
 		}
@@ -142,26 +142,26 @@ 
 	 *
 	 * @return array
 	 */
-	private static function get_request_hierarchy_list( $type ) {
+	private static function get_request_hierarchy_list($type) {
 		$views = array();
 
-		if ( 'home' === $type ) :
+		if ('home' === $type) :
 			$views[] = 'home';
-		elseif ( 'single' === $type ) :
+		elseif ('single' === $type) :
 
-			$views[] = get_post_type() . '.single';
+			$views[] = get_post_type().'.single';
 			$views[] = 'single';
 
-		elseif ( 'post_type_archive' === $type ) :
+		elseif ('post_type_archive' === $type) :
 
-			$views[] = get_post_type() . '.archive';
+			$views[] = get_post_type().'.archive';
 			$views[] = 'archive';
 
-		elseif ( 'taxonomy' === $type ) :
+		elseif ('taxonomy' === $type) :
 
 			$term = get_queried_object();
 
-			if ( ! empty( $term->slug ) ) {
+			if (!empty($term->slug)) {
 				$taxonomy = $term->taxonomy;
 
 				$views[] = "taxonomy.$taxonomy-{$term->slug}";
@@ -171,11 +171,11 @@ 
 			$views[] = 'taxonomy.taxonomy';
 			$views[] = 'taxonomy';
 
-		elseif ( 'category' === $type ) :
+		elseif ('category' === $type) :
 
 			$category = get_queried_object();
 
-			if ( ! empty( $category->slug ) ) {
+			if (!empty($category->slug)) {
 				$views[] = "category.{$category->slug}";
 				$views[] = "category.{$category->term_id}";
 			}
@@ -183,18 +183,18 @@ 
 			$views[] = 'category.category';
 			$views[] = 'category';
 
-		elseif ( 'attachment' === $type ) :
+		elseif ('attachment' === $type) :
 
 			$attachment = get_queried_object();
 
-			if ( $attachment ) {
-				if ( false !== strpos( $attachment->post_mime_type, '/' ) ) {
-					list( $type, $subtype ) = explode( '/', $attachment->post_mime_type );
+			if ($attachment) {
+				if (false !== strpos($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)) {
 					$views[] = "attachment.{$type}.{$subtype}";
 					$views[] = "attachment.{$subtype}";
 
@@ -209,11 +209,11 @@ 
 			$views[] = 'attachment.attachment';
 			$views[] = 'attachment';
 
-		elseif ( 'tag' === $type ) :
+		elseif ('tag' === $type) :
 
 			$tag = get_queried_object();
 
-			if ( ! empty( $tag->slug ) ) {
+			if (!empty($tag->slug)) {
 				$views[] = "post.tag.{$tag->slug}";
 				$views[] = "post.tag.{$tag->term_id}";
 
@@ -224,11 +224,11 @@ 
 			$views[] = 'post.tag';
 			$views[] = 'tag';
 
-		elseif ( 'author' === $type ) :
+		elseif ('author' === $type) :
 
 			$author = get_queried_object();
 
-			if ( $author instanceof \WP_User ) {
+			if ($author instanceof \WP_User) {
 				$views[] = "post.author.{$author->user_nicename}";
 				$views[] = "post.author.{$author->ID}";
 
@@ -239,7 +239,7 @@ 
 			$views[] = 'post.author';
 			$views[] = 'author';
 
-		elseif ( 'front-page' === $type ) :
+		elseif ('front-page' === $type) :
 
 			$views[] = 'front-page.front-page';
 			$views[] = 'front-page';
@@ -247,37 +247,37 @@ 
 			$views[] = 'home.home';
 			$views[] = 'home';
 
-			$views = array_merge( $views, self::get_request_hierarchy_list( 'post_type_archive' ) );
+			$views = array_merge($views, self::get_request_hierarchy_list('post_type_archive'));
 
-		elseif ( 'classy-template' === $type ) :
+		elseif ('classy-template' === $type) :
 
 			$template = self::get_classy_template();
 
 			$views[] = $template;
-			$views[] = 'page.' . $template;
-			$views[] = 'template.' . $template;
+			$views[] = 'page.'.$template;
+			$views[] = 'template.'.$template;
 			$views[] = 'page.page';
 			$views[] = 'page';
 
-		elseif ( 'page' === $type ) :
+		elseif ('page' === $type) :
 
 			$id = get_queried_object_id();
 
-			$pagename = get_query_var( 'pagename' );
+			$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.
-				if ( $post = get_queried_object() ) {
+				if ($post = get_queried_object()) {
 					$pagename = $post->post_name;
 				}
 			}
 
-			if ( $pagename ) {
-				$views[] = 'page.' . $pagename;
+			if ($pagename) {
+				$views[] = 'page.'.$pagename;
 			}
 
-			if ( $id ) {
-				$views[] = 'page.' . $id;
+			if ($id) {
+				$views[] = 'page.'.$id;
 			}
 
 			$views[] = 'page.page';
@@ -309,9 +309,9 @@ 
 	 * @return mixed
 	 */
 	public static function get_classy_template() {
-		preg_match( '/classy\-(.*)/', get_page_template_slug(), $matches );
+		preg_match('/classy\-(.*)/', get_page_template_slug(), $matches);
 
-		if ( ! empty( $matches ) && isset( $matches[1] ) ) {
+		if (!empty($matches) && isset($matches[1])) {
 			return $matches[1];
 		}
 

app/classes/scope.php

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 );
 

Spacing +13 added lines, -13 removed lines

@@ -35,15 +35,15 @@ 
 	 *
 	 * @return array
 	 */
-	public static function get_scope( $view_name = null ) {
+	public static function get_scope($view_name = null) {
 		$scope = self::get_common_scope();
 
-		if ( is_string( $view_name ) ) {
-			$scope = self::extend_scope( $scope, $view_name );
+		if (is_string($view_name)) {
+			$scope = self::extend_scope($scope, $view_name);
 		} else {
 			$request = Hierarchy::get_current_request();
-			$file = Hierarchy::get_available_file( 'scope', $request );
-			$scope = self::extend_scope( $scope, $file );
+			$file = Hierarchy::get_available_file('scope', $request);
+			$scope = self::extend_scope($scope, $file);
 		}
 
 		return $scope;
@@ -57,8 +57,8 @@ 
 	 *
 	 * @return array
 	 */
-	public static function extend_scope( $scope, $view_name ) {
-		return array_merge( $scope, self::require_scope( $view_name ) );
+	public static function extend_scope($scope, $view_name) {
+		return array_merge($scope, self::require_scope($view_name));
 	}
 
 	/**
@@ -67,8 +67,8 @@ 
 	 * @return array
 	 */
 	public static function get_common_scope() {
-		if ( is_null( self::$common ) ) {
-			self::$common = self::require_scope( 'common' );
+		if (is_null(self::$common)) {
+			self::$common = self::require_scope('common');
 		}
 
 		return self::$common;
@@ -81,16 +81,16 @@ 
 	 *
 	 * @return array
 	 */
-	public static function require_scope( $filename ) {
+	public static function require_scope($filename) {
 		$_return = array();
 
-		$file = Hierarchy::get_file_path( 'scope', $filename );
+		$file = Hierarchy::get_file_path('scope', $filename);
 
-		if ( file_exists( $file ) ) {
+		if (file_exists($file)) {
 			require $file;
 		}
 
-		if ( isset( $data ) ) {
+		if (isset($data)) {
 			$_return = $data;
 		}