anrw / classy

app/classy/classy-comment.php

Doc Comments +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
 	/**
 	 * Returns ClassyUser object of comment author
 	 * 
-	 * @return object ClassyUser
+	 * @return ClassyUser ClassyUser
 	 */
 	public function author() {
 		

Spacing +10 added lines, -10 removed lines

@@ -110,9 +110,9 @@ 
 	 * @param  string $date_format
 	 * @return string
 	 */
-	public function date( $date_format = '' ) {
+	public function date($date_format = '') {
 		$df = $date_format ? $date_format : get_option('date_format');
-		$the_date = (string)mysql2date($df, $this->comment_date);
+		$the_date = (string) mysql2date($df, $this->comment_date);
 
 		return apply_filters('get_comment_date ', $the_date, $df);
 	}
@@ -169,7 +169,7 @@ 
 	 */
 	protected function get_avatar_email() {
 
-		$id = (int)$this->user_id;
+		$id = (int) $this->user_id;
 		$user = get_userdata($id);
 
 		if ($user) {
@@ -194,7 +194,7 @@ 
 	protected function get_default_avatar($default, $email, $size, $host) {
 		
 		if (substr($default, 0, 1) == '/') {
-			$default = home_url() . $default;
+			$default = home_url().$default;
 		}
 
 		if (empty($default)) {
@@ -207,16 +207,16 @@ 
 		}
 
 		if ('mystery' == $default) {
-			$default = $host . '/avatar/ad516503a11cd5ca435acc9bb6523536?s=' . $size;
+			$default = $host.'/avatar/ad516503a11cd5ca435acc9bb6523536?s='.$size;
 			// ad516503a11cd5ca435acc9bb6523536 == md5('unknown@gravatar.com')
 		} else if ('blank' == $default) {
 			$default = $email ? 'blank' : includes_url('images/blank.gif');
 		} else if (!empty($email) && 'gravatar_default' == $default) {
 			$default = '';
 		} else if ('gravatar_default' == $default) {
-			$default = $host . '/avatar/?s=' . $size;
+			$default = $host.'/avatar/?s='.$size;
 		} else if (empty($email) && !strstr($default, 'http://')) {
-			$default = $host . '/avatar/?d=' . $default . '&s=' . $size;
+			$default = $host.'/avatar/?d='.$default.'&s='.$size;
 		}
 
 		return $default;
@@ -256,11 +256,11 @@ 
 	 */
 	protected function get_avatar_url($default, $host, $email_hash, $size) {
 		
-		$_return = $host . '/avatar/' . $email_hash . '?s=' . $size . '&d=' . urlencode($default);
+		$_return = $host.'/avatar/'.$email_hash.'?s='.$size.'&d='.urlencode($default);
 		$rating = get_option('avatar_rating');
 		
 		if (!empty($rating)) {
-			$_return .= '&r=' . $rating;
+			$_return .= '&r='.$rating;
 		}
 		
 		return str_replace('&', '&', esc_url($_return));
@@ -293,7 +293,7 @@ 
 
 		if (is_array($this->children)) {
 		
-			foreach( $this->children as $child ) {
+			foreach ($this->children as $child) {
 				$child->level = $this->level + 1;
 				$child->update_child_levels();
 			}

Braces +23 added lines, -11 removed lines

@@ -70,7 +70,8 @@ 
 			
 			return new ClassyUser($this->user_id);
 		
-		} else {
+		}
+		else {
 
 			$author = new ClassyUser(0);
 			
@@ -139,7 +140,9 @@ 
 			return false;
 		}
 		
-		if (!is_numeric($size)) $size = '92';
+		if (!is_numeric($size)) {
+			$size = '92';
+		}
 
 
 		$email = $this->get_avatar_email();
@@ -154,7 +157,8 @@ 
 
 		if (!empty($email)) {
 			$avatar = $this->get_avatar_url($default, $host, $email_hash, $size);
-		} else {
+		}
+		else {
 			$avatar = $default;
 		}
 
@@ -174,7 +178,8 @@ 
 
 		if ($user) {
 			$email = $user->user_email;
-		} else {
+		}
+		else {
 			$email = $this->comment_author_email;
 		}
 		
@@ -201,7 +206,8 @@ 
 			$avatar_default = get_option('avatar_default');
 			if (empty($avatar_default)) {
 				$default = 'mystery';
-			} else {
+			}
+			else {
 				$default = $avatar_default;
 			}
 		}
@@ -209,13 +215,17 @@ 
 		if ('mystery' == $default) {
 			$default = $host . '/avatar/ad516503a11cd5ca435acc9bb6523536?s=' . $size;
 			// ad516503a11cd5ca435acc9bb6523536 == md5('unknown@gravatar.com')
-		} else if ('blank' == $default) {
+		}
+		else if ('blank' == $default) {
 			$default = $email ? 'blank' : includes_url('images/blank.gif');
-		} else if (!empty($email) && 'gravatar_default' == $default) {
+		}
+		else if (!empty($email) && 'gravatar_default' == $default) {
 			$default = '';
-		} else if ('gravatar_default' == $default) {
+		}
+		else if ('gravatar_default' == $default) {
 			$default = $host . '/avatar/?s=' . $size;
-		} else if (empty($email) && !strstr($default, 'http://')) {
+		}
+		else if (empty($email) && !strstr($default, 'http://')) {
 			$default = $host . '/avatar/?d=' . $default . '&s=' . $size;
 		}
 
@@ -233,10 +243,12 @@ 
 		
 		if (is_ssl()) {
 			$host = 'https://secure.gravatar.com';
-		} else {
+		}
+		else {
 			if (!empty($email_hash)) {
 				$host = sprintf("http://%d.gravatar.com", (hexdec($email_hash[0]) % 2));
-			} else {
+			}
+			else {
 				$host = 'http://0.gravatar.com';
 			}
 		}

app/classy/classy-menu-item.php

Spacing +4 added lines, -4 removed lines

@@ -124,8 +124,8 @@ 
 	 */
 	public function add_child($item) {
 
-		if ( !$this->has_child ) {
-			$this->add_class( 'menu-item-has-children' );
+		if (!$this->has_child) {
+			$this->add_class('menu-item-has-children');
 			$this->has_child = true;
 		}
 
@@ -145,7 +145,7 @@ 
 	 */
 	protected function filter_classes() {
 
-		$this->classes = apply_filters( 'nav_menu_css_class', $this->classes, $this );
+		$this->classes = apply_filters('nav_menu_css_class', $this->classes, $this);
 	
 	}
 
@@ -158,7 +158,7 @@ 
 
 		if (is_array($this->children)) {
 		
-			foreach( $this->children as $child ) {
+			foreach ($this->children as $child) {
 				$child->level = $this->level + 1;
 				$child->update_child_levels();
 			}

app/classy/classy-hierarchy.php

Doc Comments +5 added lines, -4 removed lines

@@ -111,7 +111,7 @@ 
 	 * Checks if template exists
 	 * 
 	 * @param  string $type template/scope
-	 * @param  string $template in blade path format, ex: layout/header
+	 * @param string|false $file
 	 * @return boolean true/false
 	 */
 	public static function file_exists($type = 'template', $file) {
@@ -129,8 +129,9 @@ 
 	 * Returns template name for render, based on type of request
 	 *
 	 * @param  string $type template/scope
-	 * @param  string $type 
-	 * @return array 
+	 * @param  string $type
+	 * @param string $page 
+	 * @return string|false 
 	 */
 	public static function get_available_file($type = 'template', $page) {
 
@@ -377,7 +378,7 @@ 
 	/**
 	 * Returns classy template name or boolean if this is not classy template
 	 * 
-	 * @return mixed
+	 * @return string|false
 	 */
 	public static function get_classy_template() {
 

Spacing +51 added lines, -51 removed lines

@@ -21,39 +21,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 :
 		
@@ -70,7 +70,7 @@ 
 	 */
 	public static function get_current_request() {
 
-		if ( null === self::$current_request ) {
+		if (null === self::$current_request) {
 
 			self::$current_request = self::check_request();
 
@@ -94,13 +94,13 @@ 
 
 			$folder = ClassyTemplate::$folder;
 
-			return THEME_PATH . $folder . '/' . $template . '.blade.php';			
+			return THEME_PATH.$folder.'/'.$template.'.blade.php';			
 		
 		} elseif ($type == 'scope') {
 
 			$folder = ClassyScope::$folder;
 
-			return THEME_PATH . $folder . '/' . $template . '.php';			
+			return THEME_PATH.$folder.'/'.$template.'.php';			
 
 		}
 
@@ -138,7 +138,7 @@ 
 
 		foreach ($templates as $template) {
 
-			if ( self::file_exists($type, $template) ):
+			if (self::file_exists($type, $template)):
 
 				return $template;
 
@@ -163,38 +163,38 @@ 
 
 		// Home
 
-		if ( $type == 'home' ) :
+		if ($type == 'home') :
 
 			$templates[] = 'home';
 
 		// Single
 
-		elseif ( $type == 'single' ) :
+		elseif ($type == 'single') :
 
 			$post_type = get_post_type();
 
-			$templates[] = $post_type . '.single';
+			$templates[] = $post_type.'.single';
 
 			$templates[] = 'single';
 
 		// Post type
 
-		elseif ( $type == 'post_type_archive' ) :
+		elseif ($type == 'post_type_archive') :
 
 			$post_type = get_post_type();
 
-			$templates[] = $post_type . '.archive';
+			$templates[] = $post_type.'.archive';
 
 			$templates[] = 'archive';
 
 
 		// Taxonomy
 
-		elseif ( $type == 'taxonomy' ):
+		elseif ($type == 'taxonomy'):
 
 			$term = get_queried_object();
 
-			if ( ! empty( $term->slug ) ) {
+			if (!empty($term->slug)) {
 				
 				$taxonomy = $term->taxonomy;
 
@@ -209,11 +209,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}";
 			}
@@ -225,23 +225,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[] = "attachment.{$type}.{$subtype}";
 					$templates[] = "attachment.{$subtype}";
 
@@ -261,11 +261,11 @@ 
 
 		// Tag
 
-		elseif ( $type == 'tag' ):
+		elseif ($type == 'tag'):
 
 			$tag = get_queried_object();
 
-			if ( ! empty( $tag->slug ) ) {
+			if (!empty($tag->slug)) {
 				$templates[] = "post.tag.{$tag->slug}";
 				$templates[] = "post.tag.{$tag->term_id}";
 
@@ -279,11 +279,11 @@ 
 
 		// Author
 
-		elseif ( $type == 'author' ):
+		elseif ($type == 'author'):
 
 			$author = get_queried_object();
 
-			if ( $author instanceof WP_User ) {
+			if ($author instanceof WP_User) {
 				$templates[] = "post.author.{$author->user_nicename}";
 				$templates[] = "post.author.{$author->ID}";
 
@@ -298,7 +298,7 @@ 
 
 		// Front Page
 
-		elseif ( $type == 'front-page' ):
+		elseif ($type == 'front-page'):
 
 			$templates[] = 'front-page.front-page';
 			$templates[] = 'front-page';
@@ -310,18 +310,18 @@ 
 
 		// Page
 
-		elseif ( $type == 'classy-template' ):
+		elseif ($type == 'classy-template'):
 
 			$template = self::get_classy_template();
 
 			$templates[] = $template;
 
-			$templates[] = 'page.' . $template;
+			$templates[] = 'page.'.$template;
 
-			$templates[] = 'template.' . $template;
+			$templates[] = 'template.'.$template;
 
 
-		elseif ( $type == 'page' ):
+		elseif ($type == 'page'):
 
 			$id = get_queried_object_id();
 			
@@ -329,18 +329,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 && $template != 'index' )
+			if ($template && $template != 'index')
 				$templates[] = $template;
-			if ( $pagename )
+			if ($pagename)
 				$templates[] = "page.$pagename";
-			if ( $id )
+			if ($id)
 				$templates[] = "page.$id";
 
 			$templates[] = 'page.page';
@@ -385,7 +385,7 @@ 
 
 		preg_match('/classy\-(.*)/', $template_slug, $matches);
 
-		if ( $matches && isset($matches[1]) ) return $matches[1];
+		if ($matches && isset($matches[1])) return $matches[1];
 
 		return false;
 

Braces +25 added lines, -13 removed lines

@@ -55,9 +55,11 @@ 
 
 		elseif ( is_paged() ) : return 'paged';
 
-		else :
+		else {
+			:
 		
 			return 'index';
+		}
 
 		endif;
 
@@ -96,7 +98,8 @@ 
 
 			return THEME_PATH . $folder . '/' . $template . '.blade.php';			
 		
-		} elseif ($type == 'scope') {
+		}
+		elseif ($type == 'scope') {
 
 			$folder = ClassyScope::$folder;
 
@@ -235,7 +238,8 @@ 
 				
 					list( $type, $subtype ) = explode( '/', $attachment->post_mime_type );
 				
-				} else {
+				}
+				else {
 				
 					list( $type, $subtype ) = array( $attachment->post_mime_type, '' );
 				
@@ -332,16 +336,20 @@ 
 			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 && $template != 'index' )
-				$templates[] = $template;
-			if ( $pagename )
-				$templates[] = "page.$pagename";
-			if ( $id )
-				$templates[] = "page.$id";
+			if ( $template && $template != 'index' ) {
+							$templates[] = $template;
+			}
+			if ( $pagename ) {
+							$templates[] = "page.$pagename";
+			}
+			if ( $id ) {
+							$templates[] = "page.$id";
+			}
 
 			$templates[] = 'page.page';
 			
@@ -350,9 +358,11 @@ 
 
 		// Default
 
-		else:
+		else {
+			:
 
 			$templates[] = $type;
+		}
 
 		endif;
 
@@ -385,7 +395,9 @@ 
 
 		preg_match('/classy\-(.*)/', $template_slug, $matches);
 
-		if ( $matches && isset($matches[1]) ) return $matches[1];
+		if ( $matches && isset($matches[1]) ) {
+			return $matches[1];
+		}
 
 		return false;
 

app/classy/classy-template.php

Indentation +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
 
 		$templates = array();
 		
-	    $files = (array) glob( THEME_PATH . '/' . self::$folder . '/*/*.blade.php' );
+		$files = (array) glob( THEME_PATH . '/' . self::$folder . '/*/*.blade.php' );
 
 		foreach ( $files as $filename ) {
 			

Spacing +5 added lines, -5 removed lines

@@ -54,19 +54,19 @@
 
 		$templates = array();
 		
-	    $files = (array) glob( THEME_PATH . '/' . self::$folder . '/*/*.blade.php' );
+	    $files = (array) glob(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]);
 
 				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;
 				

Braces +3 added lines, -1 removed lines

@@ -60,7 +60,9 @@
 			
 			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]);