anrw / classy

app/classy/classy-template.php

Doc Comments +4 added lines, -3 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) {
 
@@ -87,7 +87,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) {
 
@@ -284,7 +284,7 @@ 
 	/**
 	 * Returns classy template name or boolean if this is not classy template
 	 * 
-	 * @return mixed
+	 * @return string|false
 	 */
 	public static function get_classy_template() {
 
@@ -373,6 +373,7 @@ 
 	/**
 	 * Returns available template, based on page argument
 	 * 
+	 * @param string $page
 	 * @return string
 	 */
 	public static function get_blade_template($page = null) {

Indentation +1 added lines, -1 removed lines

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

Spacing +61 added lines, -61 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';			
 
 	}
 
@@ -58,7 +58,7 @@ 
 
 		// Classy template?
 
-		if ( $template = self::get_classy_template() ) {
+		if ($template = self::get_classy_template()) {
 		
 			return $template;
 		
@@ -70,7 +70,7 @@ 
 
 		foreach ($templates as $template) {
 
-			if ( self::template_exists($template) ):
+			if (self::template_exists($template)):
 
 				return $template;
 
@@ -96,7 +96,7 @@ 
 
 		// Home
 
-		if ( $type == 'home' ) :
+		if ($type == 'home') :
 
 			$templates[] = 'home';
 			$templates[] = 'index';
@@ -104,32 +104,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;
 
@@ -142,11 +142,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}";
 			}
@@ -155,23 +155,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}";
 				}
@@ -183,11 +183,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}";
 			}
@@ -196,11 +196,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}";
 			}
@@ -209,32 +209,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();
 			
@@ -242,18 +242,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';
 
@@ -292,7 +292,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;
 
@@ -306,37 +306,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 :
 		
@@ -363,7 +363,7 @@ 
 
 		} else {
 
-			return $template . '.' . $template;
+			return $template.'.'.$template;
 			
 		}
 
@@ -404,8 +404,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)) {
@@ -445,19 +445,19 @@ 
 
 		$templates = array();
 		
-	    $files = (array) glob( THEME_PATH . '/' . self::$theme_templates_folder . '/*/*.blade.php' );
+	    $files = (array) glob(THEME_PATH.'/'.self::$theme_templates_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 +44 added lines, -24 removed lines

@@ -165,7 +165,8 @@ 
 				
 					list( $type, $subtype ) = explode( '/', $attachment->post_mime_type );
 				
-				} else {
+				}
+				else {
 				
 					list( $type, $subtype ) = array( $attachment->post_mime_type, '' );
 				
@@ -218,18 +219,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
@@ -245,24 +250,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;
 
@@ -292,7 +303,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;
 
@@ -338,9 +351,11 @@ 
 
 		elseif ( is_paged() && $template = self::get_available_template('paged') ) :
 
-		else :
+		else {
+			:
 		
 			$template = 'index';
+		}
 
 		endif;
 
@@ -361,7 +376,8 @@ 
 
 			return $template;	
 
-		} else {
+		}
+		else {
 
 			return $template . '.' . $template;
 			
@@ -414,13 +430,15 @@ 
 
 				$scope = array_merge($common_scope, $data);
 
-			} else {
+			}
+			else {
 
 				$scope = $common_scope;
 
 			}
 
-		} else {
+		}
+		else {
 
 			$current_page = self::get_current_page();
 
@@ -451,7 +469,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]);