anrw / classy

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

Spacing +72 added lines, -72 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();
 
@@ -56,7 +56,7 @@ 
 
 		$this->init_config();
 
-		add_filter( 'theme_page_templates', array( $this, 'filter_templates' ) );
+		add_filter('theme_page_templates', array($this, 'filter_templates'));
 
 	}
 
@@ -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;
 
@@ -172,11 +172,11 @@ 
 	 *
 	 * @return array
 	 */
-	public function filter_templates( $page_templates = array() ) {
+	public function filter_templates($page_templates = array()) {
 
 		$custom_templates = ClassyView::get_page_templates_list();
 
-		return array_merge( $page_templates, $custom_templates );
+		return array_merge($page_templates, $custom_templates);
 
 	}
 
@@ -187,11 +187,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 = ClassyConfig::get_vars();
 
-		return ( isset( $vars[ $name ] ) ) ? $vars[ $name ] : false;
+		return (isset($vars[$name])) ? $vars[$name] : false;
 
 	}
 
@@ -202,7 +202,7 @@ 
 	 */
 	public static function textdomain() {
 
-		$textdomain = Classy::get_config_var( 'textdomain' );
+		$textdomain = Classy::get_config_var('textdomain');
 
 		return $textdomain ? $textdomain : THEME;
 
@@ -217,17 +217,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 = 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 ( 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 {
 
@@ -242,9 +242,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.
 
 	}
 
@@ -269,27 +269,27 @@ 
 	 * @param  string  $return object/id/ClassyPost
 	 * @return mixed
 	 */
-	public static function get_posts( $args = false, $return = 'ClassyPost' ) {
+	public static function get_posts($args = false, $return = 'ClassyPost') {
 
 		$_return = array();
 
-		$query = ClassyQueryHelper::find_query( $args );
+		$query = ClassyQueryHelper::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);
 
 				}
 			}
@@ -306,11 +306,11 @@ 
 	 * @param  string  $return_type ClassyPost/object/id
 	 * @return mixed
 	 */
-	public static function get_post( $args = false, $return_type = 'ClassyPost' ) {
+	public static function get_post($args = false, $return_type = 'ClassyPost') {
 
-		$posts = self::get_posts( $args, $return_type );
+		$posts = self::get_posts($args, $return_type);
 
-		if ( $post = reset( $posts ) ) {
+		if ($post = reset($posts)) {
 			return $post;
 		}
 
@@ -320,62 +320,62 @@ 
 	 * @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;
 		}
 
-		return ClassyHelper::array_to_object( $data );
+		return ClassyHelper::array_to_object($data);
 
 	}
 }

app/appearance.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 +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', THEME_DIR . 'assets/css/general.css', array(), THEME_VERSION, 'all' );
+		wp_register_style('general_css', THEME_DIR.'assets/css/general.css', array(), 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', THEME_DIR . 'assets/js/min/production.js', array( 'jquery' ), THEME_VERSION, true );
+			wp_register_script('theme_scripts', THEME_DIR.'assets/js/min/production.js', array('jquery'), THEME_VERSION, true);
 
 		} else {
 
-			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);
 
 		}
 
@@ -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'      => 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()),
 		));
 
 		/*

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 +52 added lines, -52 removed lines

@@ -80,11 +80,11 @@ 
 	 *
 	 * @param WP_Comment $item
 	 */
-	public function __construct( $item ) {
+	public function __construct($item) {
 
-		if ( is_a( $item, 'WP_Comment' ) ) {
+		if (is_a($item, 'WP_Comment')) {
 
-			$this->import( $item );
+			$this->import($item);
 
 		}
 
@@ -97,15 +97,15 @@ 
 	 */
 	public function author() {
 
-		if ( $this->user_id ) {
+		if ($this->user_id) {
 
-			return new ClassyUser( $this->user_id );
+			return new ClassyUser($this->user_id);
 
 		} else {
 
-			$author = new ClassyUser( 0 );
+			$author = new ClassyUser(0);
 
-			if ( isset( $this->comment_author ) && $this->comment_author ) {
+			if (isset($this->comment_author) && $this->comment_author) {
 
 				$author->name = $this->comment_author;
 
@@ -122,7 +122,7 @@ 
 	 * @return string
 	 */
 	public function content() {
-		return apply_filters( 'get_comment_text ', $this->comment_content );
+		return apply_filters('get_comment_text ', $this->comment_content);
 	}
 
 	/**
@@ -140,11 +140,11 @@ 
 	 * @param  string $date_format
 	 * @return string
 	 */
-	public function date( $date_format = '' ) {
-		$df = $date_format ? $date_format : get_option( 'date_format' );
-		$the_date = (string) mysql2date( $df, $this->comment_date );
+	public function date($date_format = '') {
+		$df = $date_format ? $date_format : get_option('date_format');
+		$the_date = (string) mysql2date($df, $this->comment_date);
 
-		return apply_filters( 'get_comment_date ', $the_date, $df );
+		return apply_filters('get_comment_date ', $the_date, $df);
 	}
 
 	/**
@@ -163,26 +163,26 @@ 
 	 * @param  string $default
 	 * @return string
 	 */
-	public function avatar( $size = 92, $default = '' ) {
+	public function avatar($size = 92, $default = '') {
 
-		if ( ! get_option( 'show_avatars' ) ) {
+		if (!get_option('show_avatars')) {
 			return false;
 		}
 
-		if ( ! is_numeric( $size ) ) { $size = '92'; }
+		if (!is_numeric($size)) { $size = '92'; }
 
 		$email = $this->get_avatar_email();
 		$email_hash = '';
 
-		if ( ! empty( $email ) ) {
-			$email_hash = md5( strtolower( trim( $email ) ) );
+		if (!empty($email)) {
+			$email_hash = md5(strtolower(trim($email)));
 		}
 
-		$host = $this->get_avatar_host( $email_hash );
-		$default = $this->get_default_avatar( $default, $email, $size, $host );
+		$host = $this->get_avatar_host($email_hash);
+		$default = $this->get_default_avatar($default, $email, $size, $host);
 
-		if ( ! empty( $email ) ) {
-			$avatar = $this->get_avatar_url( $default, $host, $email_hash, $size );
+		if (!empty($email)) {
+			$avatar = $this->get_avatar_url($default, $host, $email_hash, $size);
 		} else {
 			$avatar = $default;
 		}
@@ -199,9 +199,9 @@ 
 	protected function get_avatar_email() {
 
 		$id = (int) $this->user_id;
-		$user = get_userdata( $id );
+		$user = get_userdata($id);
 
-		if ( $user ) {
+		if ($user) {
 			$email = $user->user_email;
 		} else {
 			$email = $this->comment_author_email;
@@ -220,32 +220,32 @@ 
 	 * @param  string $host
 	 * @return string
 	 */
-	protected function get_default_avatar( $default, $email, $size, $host ) {
+	protected function get_default_avatar($default, $email, $size, $host) {
 
-		if ( '/' === substr( $default, 0, 1 ) ) {
-			$default = home_url() . $default;
+		if ('/' === substr($default, 0, 1)) {
+			$default = home_url().$default;
 		}
 
-		if ( empty( $default ) ) {
-			$avatar_default = get_option( 'avatar_default' );
-			if ( empty( $avatar_default ) ) {
+		if (empty($default)) {
+			$avatar_default = get_option('avatar_default');
+			if (empty($avatar_default)) {
 				$default = 'mystery';
 			} else {
 				$default = $avatar_default;
 			}
 		}
 
-		if ( 'mystery' === $default ) {
-			$default = $host . '/avatar/ad516503a11cd5ca435acc9bb6523536?s=' . $size;
+		if ('mystery' === $default) {
+			$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 ) {
+		} 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;
-		} else if ( empty( $email ) && ! strstr( $default, 'http://' ) ) {
-			$default = $host . '/avatar/?d=' . $default . '&s=' . $size;
+		} else if ('gravatar_default' === $default) {
+			$default = $host.'/avatar/?s='.$size;
+		} else if (empty($email) && !strstr($default, 'http://')) {
+			$default = $host.'/avatar/?d='.$default.'&s='.$size;
 		}
 
 		return $default;
@@ -258,13 +258,13 @@ 
 	 * @param  string $email_hash
 	 * @return string
 	 */
-	protected function get_avatar_host( $email_hash ) {
+	protected function get_avatar_host($email_hash) {
 
-		if ( is_ssl() ) {
+		if (is_ssl()) {
 			$host = 'https://secure.gravatar.com';
 		} else {
-			if ( ! empty( $email_hash ) ) {
-				$host = sprintf( 'http://%d.gravatar.com', (hexdec( $email_hash[0] ) % 2) );
+			if (!empty($email_hash)) {
+				$host = sprintf('http://%d.gravatar.com', (hexdec($email_hash[0]) % 2));
 			} else {
 				$host = 'http://0.gravatar.com';
 			}
@@ -283,16 +283,16 @@ 
 	 * @param  int $size
 	 * @return string
 	 */
-	protected function get_avatar_url( $default, $host, $email_hash, $size ) {
+	protected function get_avatar_url($default, $host, $email_hash, $size) {
 
-		$_return = $host . '/avatar/' . $email_hash . '?s=' . $size . '&d=' . urlencode( $default );
-		$rating = get_option( 'avatar_rating' );
+		$_return = $host.'/avatar/'.$email_hash.'?s='.$size.'&d='.urlencode($default);
+		$rating = get_option('avatar_rating');
 
-		if ( ! empty( $rating ) ) {
-			$_return .= '&r=' . $rating;
+		if (!empty($rating)) {
+			$_return .= '&r='.$rating;
 		}
 
-		return str_replace( '&', '&', esc_url( $_return ) );
+		return str_replace('&', '&', esc_url($_return));
 
 	}
 
@@ -301,12 +301,12 @@ 
 	 *
 	 * @param ClassyComment $comment
 	 */
-	public function add_child( $comment ) {
+	public function add_child($comment) {
 
 		$this->children[] = $comment;
 		$item->level = $this->level + 1;
 
-		if ( $item->children ) {
+		if ($item->children) {
 			$this->update_child_levels();
 		}
 
@@ -320,9 +320,9 @@ 
 	 */
 	protected function update_child_levels() {
 
-		if ( is_array( $this->children ) ) {
+		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 +20 added lines, -10 removed lines

@@ -101,7 +101,8 @@ 
 
 			return new ClassyUser( $this->user_id );
 
-		} else {
+		}
+		else {
 
 			$author = new ClassyUser( 0 );
 
@@ -183,7 +184,8 @@ 
 
 		if ( ! empty( $email ) ) {
 			$avatar = $this->get_avatar_url( $default, $host, $email_hash, $size );
-		} else {
+		}
+		else {
 			$avatar = $default;
 		}
 
@@ -203,7 +205,8 @@ 
 
 		if ( $user ) {
 			$email = $user->user_email;
-		} else {
+		}
+		else {
 			$email = $this->comment_author_email;
 		}
 
@@ -230,7 +233,8 @@ 
 			$avatar_default = get_option( 'avatar_default' );
 			if ( empty( $avatar_default ) ) {
 				$default = 'mystery';
-			} else {
+			}
+			else {
 				$default = $avatar_default;
 			}
 		}
@@ -238,13 +242,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;
 		}
 
@@ -262,10 +270,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-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 );
 

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

Spacing +13 added lines, -13 removed lines

@@ -16,21 +16,21 @@ 
 	 *
 	 * @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 ) ) {
+		if (is_string($view_name)) {
 
-			$scope = self::extend_scope( $scope, $view_name );
+			$scope = self::extend_scope($scope, $view_name);
 
 		} else {
 
 			$request = ClassyHierarchy::get_current_request();
 
-			$file = ClassyHierarchy::get_available_file( 'scope', $request );
+			$file = ClassyHierarchy::get_available_file('scope', $request);
 
-			$scope = self::extend_scope( $scope, $file );
+			$scope = self::extend_scope($scope, $file);
 
 		}
 
@@ -44,9 +44,9 @@ 
 	 *
 	 * @return array
 	 */
-	public static function extend_scope( $scope, $view_name ) {
+	public static function extend_scope($scope, $view_name) {
 
-		$scope = array_merge( $scope, self::require_scope( $view_name ) );
+		$scope = array_merge($scope, self::require_scope($view_name));
 
 		return $scope;
 
@@ -60,9 +60,9 @@ 
 	 */
 	public static function get_common_scope() {
 
-		if ( null === self::$common ) {
+		if (null === self::$common) {
 
-			self::$common = self::require_scope( 'common' );
+			self::$common = self::require_scope('common');
 
 		}
 
@@ -76,19 +76,19 @@ 
 	 * @param  string $filename
 	 * @return array
 	 */
-	public static function require_scope( $filename ) {
+	public static function require_scope($filename) {
 
 		$_return = array();
 
-		$file = ClassyHierarchy::get_file_path( 'scope', $filename );
+		$file = ClassyHierarchy::get_file_path('scope', $filename);
 
-		if ( file_exists( $file ) ) {
+		if (file_exists($file)) {
 
 			require $file;
 
 		}
 
-		if ( isset( $data ) ) {
+		if (isset($data)) {
 
 			$_return = $data;
 

app/models/classy-post.php

Braces +6 added lines, -3 removed lines

@@ -77,7 +77,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 );
 		}
 	}
@@ -259,7 +260,8 @@ 
 			if ( $force ) {
 				$text = ClassyHelper::trim_words( $this->post_excerpt, $len, false );
 				$trimmed = true;
-			} else {
+			}
+			else {
 				$text = $this->post_excerpt;
 			}
 		}
@@ -318,7 +320,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>';
 			}
 

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() {
 

Spacing +75 added lines, -75 removed lines

@@ -73,12 +73,12 @@ 
 	 * Main constructor function. If ID won't be provided we will try to find it, based on your query
 	 * @param object/int $post
 	 */
-	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);
 		}
 	}
 
@@ -88,8 +88,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);
 		}
 	}
 
@@ -100,7 +100,7 @@ 
 	 */
 
 	public function get_object() {
-		$object = get_post( $this->ID );
+		$object = get_post($this->ID);
 
 		return $object;
 	}
@@ -111,10 +111,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;
@@ -126,8 +126,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);
 		}
 	}
 
@@ -149,9 +149,9 @@ 
 			'fields' => 'ids',
 		);
 
-		$images = get_children( $attrs );
+		$images = get_children($attrs);
 
-		if ( ! count( $images ) ) {
+		if (!count($images)) {
 			return false;
 		}
 
@@ -170,11 +170,11 @@ 
 
 		$images = $this->get_attached_images();
 
-		if ( $images ) {
+		if ($images) {
 
-			foreach ( $images as $image_id ) {
+			foreach ($images as $image_id) {
 
-				$_return[] = new ClassyImage( $image_id );
+				$_return[] = new ClassyImage($image_id);
 
 			}
 		}
@@ -201,13 +201,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];
 
@@ -223,8 +223,8 @@ 
 
 		$image_id = $this->get_first_attached_image_id();
 
-		if ( $image_id ) {
-			return new ClassyImage( $image_id );
+		if ($image_id) {
+			return new ClassyImage($image_id);
 		}
 
 		return new ClassyImage();
@@ -238,12 +238,12 @@ 
 	 */
 	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 ClassyImage( $image_id );
+				return new ClassyImage($image_id);
 
 			}
 		}
@@ -259,7 +259,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);
 	}
 
 	/**
@@ -278,24 +278,24 @@ 
 	 * @param  integer $page Page number, in case our post has <!--nextpage--> tags
 	 * @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;
 	}
@@ -316,7 +316,7 @@ 
 	 * @return object
 	 */
 	public function get_post_type() {
-		return get_post_type_object( $this->post_type );
+		return get_post_type_object($this->post_type);
 	}
 
 	/**
@@ -325,11 +325,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;
 	}
@@ -355,84 +355,84 @@ 
 	 * @param  boolean $strip    Should we strip tags?
 	 * @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 = ClassyHelper::trim_words( $this->post_excerpt, $len, false );
+			if ($force) {
+				$text = ClassyHelper::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 = ClassyHelper::trim_words( $text, $len, false );
+			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 );
+			$text = ClassyHelper::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);
 	}
 
 	/**
@@ -443,7 +443,7 @@ 
 	 *
 	 * @return array
 	 */
-	public function get_comments( $status = 'approve', $order = 'DESC' ) {
+	public function get_comments($status = 'approve', $order = 'DESC') {
 
 		$_return = array();
 
@@ -453,26 +453,26 @@ 
 			'order' => $order,
 		);
 
-		$comments = get_comments( $args );
+		$comments = get_comments($args);
 
-		foreach ( $comments as $comment ) {
+		foreach ($comments as $comment) {
 
-			$_return[ $comment->comment_ID ] = new ClassyComment( $comment );
+			$_return[$comment->comment_ID] = new ClassyComment($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);
 
 	}
 }

app/classy/classy-query-helper.php

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

Spacing +12 added lines, -12 removed lines

@@ -8,23 +8,23 @@ 
 	 * @param  array|boolean $args
 	 * @return object        WP_Query
 	 */
-	public static function find_query( $args = false ) {
+	public static function find_query($args = false) {
 
 		$default_args = array();
 
-		if ( ! $args ) {
+		if (!$args) {
 
 			return self::get_current_query();
 
-		} elseif ( is_array( $args ) ) {
+		} elseif (is_array($args)) {
 
-			$args = array_merge( $default_args, $args );
+			$args = array_merge($default_args, $args);
 
-			return new WP_Query( $args );
+			return new WP_Query($args);
 
 		} else {
 
-			return new WP_Query( $default_args );
+			return new WP_Query($default_args);
 
 		}
 	}
@@ -38,9 +38,9 @@ 
 
 		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;
 
@@ -52,13 +52,13 @@ 
 	 * @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'] ) && absint( $query->query['p'] ) === absint( $custom_posts_page ) ) {
+			if (isset($query->query['p']) && absint($query->query['p']) === absint($custom_posts_page)) {
 
-				return new WP_Query( array( 'post_type' => 'post' ) );
+				return new WP_Query(array('post_type' => 'post'));
 
 			}
 		}

app/classy/classy-helper.php

Indentation +26 added lines, -26 removed lines

@@ -247,57 +247,57 @@
 
 		$textdomain = Classy::textdomain();
 
-	    $archives_title = '';
+		$archives_title = '';
 
-	    if ( is_category() ) {
+		if ( is_category() ) {
 
-	        $archives_title = single_cat_title( '', false );
+			$archives_title = single_cat_title( '', false );
 
-	    } else if ( is_tag() ) {
+		} else if ( is_tag() ) {
 
-	        $archives_title = 'Tag: ' . single_tag_title( '', false );
+			$archives_title = 'Tag: ' . single_tag_title( '', false );
 
-	    } else if ( is_author() ) {
+		} else if ( is_author() ) {
 
-	        if ( have_posts() ) {
+			if ( have_posts() ) {
 
-	            the_post();
-	            $archives_title = 'Author: ' . get_the_author();
+				the_post();
+				$archives_title = 'Author: ' . get_the_author();
 
-	        }
+			}
 
-	        rewind_posts();
+			rewind_posts();
 
-	    } else if ( is_search() ) {
+		} else if ( is_search() ) {
 
-	        $archives_title = sprintf( __( 'Search Results for: %s', $textdomain ), '<span>' . get_search_query() . '</span>' );
+			$archives_title = sprintf( __( 'Search Results for: %s', $textdomain ), '<span>' . get_search_query() . '</span>' );
 
-	    } else if ( is_archive() ) {
+		} else if ( is_archive() ) {
 
-	        if ( is_day() ) {
+			if ( is_day() ) {
 
-	            $archives_title = get_the_date();
+				$archives_title = get_the_date();
 
-	        } elseif ( is_month() ) {
+			} elseif ( is_month() ) {
 
-	            $archives_title = get_the_date( _x( 'F Y', 'monthly archives date format', $textdomain ) );
+				$archives_title = get_the_date( _x( 'F Y', 'monthly archives date format', $textdomain ) );
 
-	        } elseif ( is_year() ) {
+			} elseif ( is_year() ) {
 
-	            $archives_title = get_the_date( _x( 'Y', 'yearly archives date format', $textdomain ) );
+				$archives_title = get_the_date( _x( 'Y', 'yearly archives date format', $textdomain ) );
 
-	        } else {
+			} else {
 
-	            $archives_title = 'Archives';
+				$archives_title = 'Archives';
 
-	        }
+			}
 		} else {
 
-	        $archives_title = 'Archives';
+			$archives_title = 'Archives';
 
-	    }
+		}
 
-	    return $archives_title;
+		return $archives_title;
 
 	}
 }

Braces +28 added lines, -14 removed lines

@@ -37,7 +37,8 @@ 
 			preg_match_all( '/./u', $text, $words_array );
 			$words_array = array_slice( $words_array[0], 0, $num_words + 1 );
 			$sep = '';
-		} else {
+		}
+		else {
 			$words_array = preg_split( "/[\n\r\t ]+/", $text, $num_words + 1, PREG_SPLIT_NO_EMPTY );
 			$sep = ' ';
 		}
@@ -46,7 +47,8 @@ 
 			array_pop( $words_array );
 			$text = implode( $sep, $words_array );
 			$text = $text . $more;
-		} else {
+		}
+		else {
 			$text = implode( $sep, $words_array );
 		}
 
@@ -85,7 +87,8 @@ 
 		for ( $i = 0; $i < $len_opened; $i++ ) {
 			if ( ! in_array( $openedtags[ $i ], $closedtags ) ) {
 				$html .= '</' . $openedtags[ $i ] . '>';
-			} else {
+			}
+			else {
 				unset( $closedtags[ array_search( $openedtags[ $i ], $closedtags ) ] );
 			}
 		}
@@ -170,7 +173,8 @@ 
 					'current' => true,
 				);
 				$dots = true;
-			} else {
+			}
+			else {
 				if ( $args['show_all'] || ( $n <= $args['end_size'] || ( $args['current'] && $n >= $args['current'] - $args['mid_size'] && $n <= $args['current'] + $args['mid_size'] ) || $n > $args['total'] - $args['end_size'] ) ) {
 					$link = str_replace( '%_%', 1 == $n ? '' : $args['format'], $args['base'] );
 					$link = str_replace( '%#%', $n, $link );
@@ -188,7 +192,8 @@ 
 						'current' => $args['current'] == $n,
 					);
 					$dots = true;
-				} elseif ( $dots && ! $args['show_all'] ) {
+				}
+				elseif ( $dots && ! $args['show_all'] ) {
 					$page_links[] = array(
 						'class' => 'dots',
 						'title' => __( '&hellip;' ),
@@ -227,7 +232,8 @@ 
 			if ( strlen( $k ) ) {
 				if ( is_array( $v ) ) {
 					$obj->{$k} = self::array_to_object( $v ); //RECURSION
-				} else {
+				}
+				else {
 					$obj->{$k} = $v;
 				}
 			}
@@ -253,11 +259,13 @@ 
 
 	        $archives_title = single_cat_title( '', false );
 
-	    } else if ( is_tag() ) {
+	    }
+	    else if ( is_tag() ) {
 
 	        $archives_title = 'Tag: ' . single_tag_title( '', false );
 
-	    } else if ( is_author() ) {
+	    }
+	    else if ( is_author() ) {
 
 	        if ( have_posts() ) {
 
@@ -268,30 +276,36 @@ 
 
 	        rewind_posts();
 
-	    } else if ( is_search() ) {
+	    }
+	    else if ( is_search() ) {
 
 	        $archives_title = sprintf( __( 'Search Results for: %s', $textdomain ), '<span>' . get_search_query() . '</span>' );
 
-	    } else if ( is_archive() ) {
+	    }
+	    else if ( is_archive() ) {
 
 	        if ( is_day() ) {
 
 	            $archives_title = get_the_date();
 
-	        } elseif ( is_month() ) {
+	        }
+	        elseif ( is_month() ) {
 
 	            $archives_title = get_the_date( _x( 'F Y', 'monthly archives date format', $textdomain ) );
 
-	        } elseif ( is_year() ) {
+	        }
+	        elseif ( is_year() ) {
 
 	            $archives_title = get_the_date( _x( 'Y', 'yearly archives date format', $textdomain ) );
 
-	        } else {
+	        }
+	        else {
 
 	            $archives_title = 'Archives';
 
 	        }
-		} else {
+		}
+		else {
 
 	        $archives_title = 'Archives';
 

Spacing +91 added lines, -91 removed lines

@@ -15,44 +15,44 @@ 
 	 * @param string  $allowed_tags
 	 * @return string
 	 */
-	public static function trim_words( $text, $num_words = 55, $more = null, $allowed_tags = 'p a span b i br blockquote' ) {
-		if ( null === $more ) {
-			$more = __( '…' );
+	public static function trim_words($text, $num_words = 55, $more = null, $allowed_tags = 'p a span b i br blockquote') {
+		if (null === $more) {
+			$more = __('…');
 		}
 
 		$original_text = $text;
 		$allowed_tag_string = '';
 
-		foreach ( explode( ' ', $allowed_tags ) as $tag ) {
-			$allowed_tag_string .= '<' . $tag . '>';
+		foreach (explode(' ', $allowed_tags) as $tag) {
+			$allowed_tag_string .= '<'.$tag.'>';
 		}
 
-		$text = strip_tags( $text, $allowed_tag_string );
+		$text = strip_tags($text, $allowed_tag_string);
 
 		/* translators: If your word count is based on single characters (East Asian characters),
 		enter 'characters'. Otherwise, enter 'words'. Do not translate into your own language. */
 
-		if ( 'characters' === _x( 'words', 'word count: words or characters?' ) && preg_match( '/^utf\-?8$/i', get_option( 'blog_charset' ) ) ) {
-			$text = trim( preg_replace( "/[\n\r\t ]+/", ' ', $text ), ' ' );
-			preg_match_all( '/./u', $text, $words_array );
-			$words_array = array_slice( $words_array[0], 0, $num_words + 1 );
+		if ('characters' === _x('words', 'word count: words or characters?') && preg_match('/^utf\-?8$/i', get_option('blog_charset'))) {
+			$text = trim(preg_replace("/[\n\r\t ]+/", ' ', $text), ' ');
+			preg_match_all('/./u', $text, $words_array);
+			$words_array = array_slice($words_array[0], 0, $num_words + 1);
 			$sep = '';
 		} else {
-			$words_array = preg_split( "/[\n\r\t ]+/", $text, $num_words + 1, PREG_SPLIT_NO_EMPTY );
+			$words_array = preg_split("/[\n\r\t ]+/", $text, $num_words + 1, PREG_SPLIT_NO_EMPTY);
 			$sep = ' ';
 		}
 
-		if ( count( $words_array ) > $num_words ) {
-			array_pop( $words_array );
-			$text = implode( $sep, $words_array );
-			$text = $text . $more;
+		if (count($words_array) > $num_words) {
+			array_pop($words_array);
+			$text = implode($sep, $words_array);
+			$text = $text.$more;
 		} else {
-			$text = implode( $sep, $words_array );
+			$text = implode($sep, $words_array);
 		}
 
-		$text = self::close_tags( $text );
+		$text = self::close_tags($text);
 
-		return apply_filters( 'wp_trim_words', $text, $num_words, $more, $original_text );
+		return apply_filters('wp_trim_words', $text, $num_words, $more, $original_text);
 	}
 
 
@@ -62,36 +62,36 @@ 
 	 * @param string  $html
 	 * @return string
 	 */
-	public static function close_tags( $html ) {
+	public static function close_tags($html) {
 		//put all opened tags into an array
-		preg_match_all( '#<([a-z]+)(?: .*)?(?<![/|/ ])>#iU', $html, $result );
+		preg_match_all('#<([a-z]+)(?: .*)?(?<![/|/ ])>#iU', $html, $result);
 
 		$openedtags = $result[1];
 
 		//put all closed tags into an array
-		preg_match_all( '#</([a-z]+)>#iU', $html, $result );
+		preg_match_all('#</([a-z]+)>#iU', $html, $result);
 
 		$closedtags = $result[1];
-		$len_opened = count( $openedtags );
+		$len_opened = count($openedtags);
 
 		// all tags are closed
-		if ( count( $closedtags ) === $len_opened ) {
+		if (count($closedtags) === $len_opened) {
 			return $html;
 		}
 
-		$openedtags = array_reverse( $openedtags );
+		$openedtags = array_reverse($openedtags);
 
 		// close tags
-		for ( $i = 0; $i < $len_opened; $i++ ) {
-			if ( ! in_array( $openedtags[ $i ], $closedtags, true ) ) {
-				$html .= '</' . $openedtags[ $i ] . '>';
+		for ($i = 0; $i < $len_opened; $i++) {
+			if (!in_array($openedtags[$i], $closedtags, true)) {
+				$html .= '</'.$openedtags[$i].'>';
 			} else {
-				unset( $closedtags[ array_search( $openedtags[ $i ], $closedtags ) ] );
+				unset($closedtags[array_search($openedtags[$i], $closedtags)]);
 			}
 		}
 
-		$html = str_replace( array( '</br>', '</hr>', '</wbr>' ), '', $html );
-		$html = str_replace( array( '<br>', '<hr>', '<wbr>' ), array( '<br />', '<hr />', '<wbr />' ), $html );
+		$html = str_replace(array('</br>', '</hr>', '</wbr>'), '', $html);
+		$html = str_replace(array('<br>', '<hr>', '<wbr>'), array('<br />', '<hr />', '<wbr />'), $html);
 
 		return $html;
 	}
@@ -103,14 +103,14 @@ 
 	 *
 	 * @return bool
 	 */
-	public static function error_log( $arg ) {
-		if ( ! WP_DEBUG ) {
+	public static function error_log($arg) {
+		if (!WP_DEBUG) {
 			return true;
 		}
-		if ( is_object( $arg ) || is_array( $arg ) ) {
-			$arg = print_r( $arg, true );
+		if (is_object($arg) || is_array($arg)) {
+			$arg = print_r($arg, true);
 		}
-		return error_log( $arg );
+		return error_log($arg);
 	}
 
 	/**
@@ -119,7 +119,7 @@ 
 	 * @param string  $args
 	 * @return array
 	 */
-	public static function paginate_links( $args = '' ) {
+	public static function paginate_links($args = '') {
 		$defaults = array(
 			'base' => '%_%', // http://example.com/all_posts.php%_% : %_% is replaced by format (below)
 			'format' => '?page=%#%', // ?page=%#% : %#% is replaced by the page number
@@ -127,43 +127,43 @@ 
 			'current' => 0,
 			'show_all' => false,
 			'prev_next' => true,
-			'prev_text' => __( '&laquo; Previous' ),
-			'next_text' => __( 'Next &raquo;' ),
+			'prev_text' => __('&laquo; Previous'),
+			'next_text' => __('Next &raquo;'),
 			'end_size' => 1,
 			'mid_size' => 2,
 			'type' => 'array',
 			'add_args' => false, // array of query args to add
 			'add_fragment' => '',
 		);
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 		// Who knows what else people pass in $args
-		$args['total'] = intval( (int) $args['total'] );
-		if ( $args['total'] < 2 ) {
+		$args['total'] = intval((int) $args['total']);
+		if ($args['total'] < 2) {
 			return array();
 		}
 		$args['current'] = (int) $args['current'];
 		$args['end_size'] = 0 < (int) $args['end_size'] ? (int) $args['end_size'] : 1; // Out of bounds?  Make it the default.
 		$args['mid_size'] = 0 <= (int) $args['mid_size'] ? (int) $args['mid_size'] : 2;
-		$args['add_args'] = is_array( $args['add_args'] ) ? $args['add_args'] : false;
+		$args['add_args'] = is_array($args['add_args']) ? $args['add_args'] : false;
 		$page_links = array();
 		$dots = false;
-		if ( $args['prev_next'] && $args['current'] && 1 < $args['current'] ) {
-			$link = str_replace( '%_%', 2 === absint( $args['current'] ) ? '' : $args['format'], $args['base'] );
-			$link = str_replace( '%#%', $args['current'] - 1, $link );
-			if ( $args['add_args'] ) {
-				$link = add_query_arg( $args['add_args'], $link );
+		if ($args['prev_next'] && $args['current'] && 1 < $args['current']) {
+			$link = str_replace('%_%', 2 === absint($args['current']) ? '' : $args['format'], $args['base']);
+			$link = str_replace('%#%', $args['current'] - 1, $link);
+			if ($args['add_args']) {
+				$link = add_query_arg($args['add_args'], $link);
 			}
 			$link .= $args['add_fragment'];
-			$link = untrailingslashit( $link );
+			$link = untrailingslashit($link);
 			$page_links[] = array(
 				'class' => 'prev page-numbers',
-				'link' => esc_url( apply_filters( 'paginate_links', $link ) ),
+				'link' => esc_url(apply_filters('paginate_links', $link)),
 				'title' => $args['prev_text'],
 			);
 		}
-		for ( $n = 1; $n <= $args['total']; $n++ ) {
-			$n_display = number_format_i18n( $n );
-			if ( absint( $args['current'] ) === $n ) {
+		for ($n = 1; $n <= $args['total']; $n++) {
+			$n_display = number_format_i18n($n);
+			if (absint($args['current']) === $n) {
 				$page_links[] = array(
 					'class' => 'page-number page-numbers current',
 					'title' => $n_display,
@@ -173,42 +173,42 @@ 
 				);
 				$dots = true;
 			} else {
-				if ( $args['show_all'] || ( $n <= $args['end_size'] || ( $args['current'] && $n >= $args['current'] - $args['mid_size'] && $n <= $args['current'] + $args['mid_size'] ) || $n > $args['total'] - $args['end_size'] ) ) {
-					$link = str_replace( '%_%', 1 === absint( $n ) ? '' : $args['format'], $args['base'] );
-					$link = str_replace( '%#%', $n, $link );
-					$link = trailingslashit( $link ) . ltrim( $args['add_fragment'], '/' );
-					if ( $args['add_args'] ) {
-						$link = rtrim( add_query_arg( $args['add_args'], $link ), '/' );
+				if ($args['show_all'] || ($n <= $args['end_size'] || ($args['current'] && $n >= $args['current'] - $args['mid_size'] && $n <= $args['current'] + $args['mid_size']) || $n > $args['total'] - $args['end_size'])) {
+					$link = str_replace('%_%', 1 === absint($n) ? '' : $args['format'], $args['base']);
+					$link = str_replace('%#%', $n, $link);
+					$link = trailingslashit($link).ltrim($args['add_fragment'], '/');
+					if ($args['add_args']) {
+						$link = rtrim(add_query_arg($args['add_args'], $link), '/');
 					}
-					$link = str_replace( ' ', '+', $link );
-					$link = untrailingslashit( $link );
+					$link = str_replace(' ', '+', $link);
+					$link = untrailingslashit($link);
 					$page_links[] = array(
 						'class' => 'page-number page-numbers',
-						'link' => esc_url( apply_filters( 'paginate_links', $link ) ),
+						'link' => esc_url(apply_filters('paginate_links', $link)),
 						'title' => $n_display,
 						'name' => $n_display,
-						'current' => absint( $args['current'] ) === $n,
+						'current' => absint($args['current']) === $n,
 					);
 					$dots = true;
-				} elseif ( $dots && ! $args['show_all'] ) {
+				} elseif ($dots && !$args['show_all']) {
 					$page_links[] = array(
 						'class' => 'dots',
-						'title' => __( '&hellip;' ),
+						'title' => __('&hellip;'),
 					);
 					$dots = false;
 				}
 			}
 		}
-		if ( $args['prev_next'] && $args['current'] && ( $args['current'] < $args['total'] || -1 === intval( $args['total'] ) ) ) {
-			$link = str_replace( '%_%', $args['format'], $args['base'] );
-			$link = str_replace( '%#%', $args['current'] + 1, $link );
-			if ( $args['add_args'] ) {
-				$link = add_query_arg( $args['add_args'], $link );
+		if ($args['prev_next'] && $args['current'] && ($args['current'] < $args['total'] || -1 === intval($args['total']))) {
+			$link = str_replace('%_%', $args['format'], $args['base']);
+			$link = str_replace('%#%', $args['current'] + 1, $link);
+			if ($args['add_args']) {
+				$link = add_query_arg($args['add_args'], $link);
 			}
-			$link = untrailingslashit( trailingslashit( $link ) . $args['add_fragment'] );
+			$link = untrailingslashit(trailingslashit($link).$args['add_fragment']);
 			$page_links[] = array(
 				'class' => 'next page-numbers',
-				'link' => esc_url( apply_filters( 'paginate_links', $link ) ),
+				'link' => esc_url(apply_filters('paginate_links', $link)),
 				'title' => $args['next_text'],
 			);
 		}
@@ -222,13 +222,13 @@ 
 	 * @param  array $array
 	 * @return object
 	 */
-	public static function array_to_object( $array ) {
+	public static function array_to_object($array) {
 		$obj = new stdClass;
 
-		foreach ( $array as $k => $v ) {
-			if ( strlen( $k ) ) {
-				if ( is_array( $v ) ) {
-					$obj->{$k} = self::array_to_object( $v ); //RECURSION
+		foreach ($array as $k => $v) {
+			if (strlen($k)) {
+				if (is_array($v)) {
+					$obj->{$k} = self::array_to_object($v); //RECURSION
 				} else {
 					$obj->{$k} = $v;
 				}
@@ -251,42 +251,42 @@ 
 
 	    $archives_title = '';
 
-	    if ( is_category() ) {
+	    if (is_category()) {
 
-	        $archives_title = single_cat_title( '', false );
+	        $archives_title = single_cat_title('', false);
 
-	    } else if ( is_tag() ) {
+	    } else if (is_tag()) {
 
-	        $archives_title = 'Tag: ' . single_tag_title( '', false );
+	        $archives_title = 'Tag: '.single_tag_title('', false);
 
-	    } else if ( is_author() ) {
+	    } else if (is_author()) {
 
-	        if ( have_posts() ) {
+	        if (have_posts()) {
 
 	            the_post();
-	            $archives_title = 'Author: ' . get_the_author();
+	            $archives_title = 'Author: '.get_the_author();
 
 	        }
 
 	        rewind_posts();
 
-	    } else if ( is_search() ) {
+	    } else if (is_search()) {
 
-	        $archives_title = sprintf( __( 'Search Results for: %s', $textdomain ), '<span>' . get_search_query() . '</span>' );
+	        $archives_title = sprintf(__('Search Results for: %s', $textdomain), '<span>'.get_search_query().'</span>');
 
-	    } else if ( is_archive() ) {
+	    } else if (is_archive()) {
 
-	        if ( is_day() ) {
+	        if (is_day()) {
 
 	            $archives_title = get_the_date();
 
-	        } elseif ( is_month() ) {
+	        } elseif (is_month()) {
 
-	            $archives_title = get_the_date( _x( 'F Y', 'monthly archives date format', $textdomain ) );
+	            $archives_title = get_the_date(_x('F Y', 'monthly archives date format', $textdomain));
 
-	        } elseif ( is_year() ) {
+	        } elseif (is_year()) {
 
-	            $archives_title = get_the_date( _x( 'Y', 'yearly archives date format', $textdomain ) );
+	            $archives_title = get_the_date(_x('Y', 'yearly archives date format', $textdomain));
 
 	        } else {
 

app/classy/classy-basis.php

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;
 

Spacing +8 added lines, -8 removed lines

@@ -12,28 +12,28 @@
 	 * @param  object|array $data
 	 * @return void
 	 */
-	protected function import( $data ) {
+	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)) {
 
 			// In case if we import WP_User object.
-			if ( isset( $data['data'] ) ) {
+			if (isset($data['data'])) {
 				$data = $data['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;
 

app/classy/classy-view.php

Spacing +12 added lines, -12 removed lines

@@ -23,9 +23,9 @@ 
 
 		$request = ClassyHierarchy::get_current_request();
 
-		$file = ClassyHierarchy::get_available_file( 'view', $request );
+		$file = ClassyHierarchy::get_available_file('view', $request);
 
-		$view = self::get_blade_view( $file );
+		$view = self::get_blade_view($file);
 
 		return $view;
 
@@ -38,9 +38,9 @@ 
 	 * @param  string $view
 	 * @return string
 	 */
-	public static function get_blade_view( $view ) {
+	public static function get_blade_view($view) {
 
-		return str_replace( '/', '.', $view );
+		return str_replace('/', '.', $view);
 
 	}
 
@@ -54,21 +54,21 @@ 
 
 		$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] );
+				$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;
 
 			}
 		}