anrw / classy

app/classy/classy-hierarchy.php

Doc Comments +5 added lines, -4 removed lines

@@ -111,7 +111,7 @@ 
 	 * Checks if view exists
 	 * 
 	 * @param  string $type view/scope
-	 * @param  string $view in blade path format, ex: layout/header
+	 * @param string|false $file
 	 * @return boolean true/false
 	 */
 	public static function file_exists($type = 'view', $file) {
@@ -129,8 +129,9 @@ 
 	 * Returns view name for render, based on type of request
 	 *
 	 * @param  string $type view/scope
-	 * @param  string $type 
-	 * @return array 
+	 * @param  string $type
+	 * @param string $page 
+	 * @return string|false 
 	 */
 	public static function get_available_file($type = 'view', $page) {
 
@@ -378,7 +379,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 +52 added lines, -52 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 = ClassyView::$folder;
 
-			return THEME_PATH . $folder . '/' . $view . '.blade.php';			
+			return THEME_PATH.$folder.'/'.$view.'.blade.php';			
 		
 		} elseif ($type == 'scope') {
 
 			$folder = ClassyScope::$folder;
 
-			return THEME_PATH . $folder . '/' . $view . '.php';			
+			return THEME_PATH.$folder.'/'.$view.'.php';			
 
 		}
 
@@ -138,7 +138,7 @@ 
 
 		foreach ($views as $view) {
 
-			if ( self::file_exists($type, $view) ):
+			if (self::file_exists($type, $view)):
 
 				return $view;
 
@@ -163,38 +163,38 @@ 
 
 		// Home
 
-		if ( $type == 'home' ) :
+		if ($type == 'home') :
 
 			$views[] = 'home';
 
 		// Single
 
-		elseif ( $type == 'single' ) :
+		elseif ($type == 'single') :
 
 			$post_type = get_post_type();
 
-			$views[] = $post_type . '.single';
+			$views[] = $post_type.'.single';
 
 			$views[] = 'single';
 
 		// Post type
 
-		elseif ( $type == 'post_type_archive' ) :
+		elseif ($type == 'post_type_archive') :
 
 			$post_type = get_post_type();
 
-			$views[] = $post_type . '.archive';
+			$views[] = $post_type.'.archive';
 
 			$views[] = '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)) {
 				$views[] = "category.{$category->slug}";
 				$views[] = "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)) {
 					$views[] = "attachment.{$type}.{$subtype}";
 					$views[] = "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)) {
 				$views[] = "post.tag.{$tag->slug}";
 				$views[] = "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) {
 				$views[] = "post.author.{$author->user_nicename}";
 				$views[] = "post.author.{$author->ID}";
 
@@ -298,7 +298,7 @@ 
 
 		// Front Page
 
-		elseif ( $type == 'front-page' ):
+		elseif ($type == 'front-page'):
 
 			$views[] = 'front-page.front-page';
 			$views[] = 'front-page';
@@ -310,38 +310,38 @@ 
 
 		// Page
 
-		elseif ( $type == 'classy-template' ):
+		elseif ($type == 'classy-template'):
 
 			$template = self::get_classy_template();
 
 			$views[] = $template;
 
-			$views[] = 'page.' . $template;
+			$views[] = 'page.'.$template;
 
-			$views[] = 'template.' . $template;
+			$views[] = 'template.'.$template;
 
 
-		elseif ( $type == 'page' ):
+		elseif ($type == '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;
 				}
 			}
 
-			if ( $pagename ) {
-				$views[] = 'page.' . $pagename;
+			if ($pagename) {
+				$views[] = 'page.'.$pagename;
 			}
 			
-			if ( $id ) {
-				$views[] = 'page.' . $id;
+			if ($id) {
+				$views[] = 'page.'.$id;
 			}
 
 			$views[] = 'page.page';
@@ -386,7 +386,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 +13 added lines, -5 removed lines

@@ -55,9 +55,11 @@ 
 
 		elseif ( is_paged() ) : return 'paged';
 
-		else :
+		else {
+			:
 		
 			return 'index';
+		}
 
 		endif;
 
@@ -96,7 +98,8 @@ 
 
 			return THEME_PATH . $folder . '/' . $view . '.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, '' );
 				
@@ -351,9 +355,11 @@ 
 
 		// Default
 
-		else:
+		else {
+			:
 
 			$views[] = $type;
+		}
 
 		endif;
 
@@ -386,7 +392,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-scope.php

Doc Comments +1 added lines

@@ -43,6 +43,7 @@
 	/**
 	 * Extends Scope with scope that is defined in theme_name/scope folder
 	 * 
+	 * @param string|false $view_name
 	 * @return array
 	 */
 	public static function extend_scope($scope, $view_name) {

app/classy/classy.php

Spacing +50 added lines, -50 removed lines

@@ -29,7 +29,7 @@ 
 	 */
 	public static function get_instance() {
 		
-		if ( null === self::$single_instance ) {
+		if (null === self::$single_instance) {
 		
 			self::$single_instance = new self();
 		
@@ -66,11 +66,11 @@ 
 	 * @param  string
 	 * @param  string
 	 */
-	private function define( $name, $value ) {
+	private function define($name, $value) {
 		
-		if ( !defined($name) ) {
+		if (!defined($name)) {
 			
-			define( $name, $value );
+			define($name, $value);
 
 		}
 
@@ -86,13 +86,13 @@ 
 
 		$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/');
 
 	}
 
@@ -101,40 +101,40 @@ 
 	 */
 	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';
 
 		// Hierarchy
-		require_once THEME_FRAMEWORK_PATH . 'classy/classy-hierarchy.php';
+		require_once THEME_FRAMEWORK_PATH.'classy/classy-hierarchy.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';
 
 		// View Loader
-		require_once THEME_FRAMEWORK_PATH . 'classy/classy-view.php';
+		require_once THEME_FRAMEWORK_PATH.'classy/classy-view.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';
 
 	}
 
@@ -143,11 +143,11 @@ 
 	 */
 	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;
 
@@ -220,8 +220,8 @@ 
 	 */
 	public static function render($view = null, $data = null) {
 		
-		$views = THEME_PATH . ClassyView::$folder;
-		$cache = WP_CONTENT_DIR . '/viewcache';
+		$views = THEME_PATH.ClassyView::$folder;
+		$cache = WP_CONTENT_DIR.'/viewcache';
 		$common_scope = ClassyScope::get_common_scope();
 
 		if ($view !== null && is_string($view)) {
@@ -285,7 +285,7 @@ 
 				
 					$_return[] = new ClassyPost($post_id);
 				
-				} elseif($return_type == 'object') {
+				} elseif ($return_type == 'object') {
 
 					$_return[] = get_post($post_id);
 
@@ -313,7 +313,7 @@ 
 
 		$posts = self::get_posts($args, $return_type);
 
-		if ( $post = reset($posts ) ) {
+		if ($post = reset($posts)) {
 			return $post;
 		}
 
@@ -323,58 +323,58 @@ 
 	 * @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;
 		}