anrw / classy

app/classy/classy-config.php

Doc Comments +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 	/**
 	 * Returns list of allowed variables that can be used in theme config
 	 * 
-	 * @return array
+	 * @return string[]
 	 */
 	private static function get_allowed_variables() {
 		

Spacing +57 added lines, -57 removed lines

@@ -16,7 +16,7 @@ 
 	 */
 	private static function get_allowed_variables() {
 
-		return array( 'environment', 'textdomain', 'post_types', 'taxonomies', 'post_formats', 'sidebars' );;
+		return array('environment', 'textdomain', 'post_types', 'taxonomies', 'post_formats', 'sidebars'); ;
 
 	}
 
@@ -27,30 +27,30 @@ 
 	 */
 	public static function get_vars() {
 
-		if ( null === self::$vars ) {
+		if (null === self::$vars) {
 
 			// Check for a theme config
-			$config_file = THEME_FRAMEWORK_PATH . 'config.php';
+			$config_file = THEME_FRAMEWORK_PATH.'config.php';
 
-			if ( file_exists( $config_file ) ) {
+			if (file_exists($config_file)) {
 
-				require_once THEME_FRAMEWORK_PATH . 'config.php';
+				require_once THEME_FRAMEWORK_PATH.'config.php';
 
 				$vars = self::get_allowed_variables();
 
-				foreach ( $vars as $var ) {
+				foreach ($vars as $var) {
 
-					if ( isset( $$var ) ) {
+					if (isset($$var)) {
 
-						self::$vars[ $var ] = $$var;
+						self::$vars[$var] = $$var;
 
-						unset( $$var ); // We don't require it anymore
+						unset($$var); // We don't require it anymore
 
 					}
 				}
 			} else {
 
-				die( 'There is no config file in ' . THEME . ' custom/config.php' );
+				die('There is no config file in '.THEME.' custom/config.php');
 
 			}
 		}
@@ -69,16 +69,16 @@ 
 		$vars = self::get_vars();
 
 		// Init Post Types
-		if ( isset( $vars['post_types'] ) ) { self::init_post_types( $vars['post_types'] ); }
+		if (isset($vars['post_types'])) { self::init_post_types($vars['post_types']); }
 
 		// Init Taxonomies
-		if ( isset( $vars['taxonomies'] ) ) { self::init_taxonomies( $vars['taxonomies'] ); }
+		if (isset($vars['taxonomies'])) { self::init_taxonomies($vars['taxonomies']); }
 
 		// Init Post Formats
-		if ( isset( $vars['post_formats'] ) ) { self::init_post_formats( $vars['post_formats'] ); }
+		if (isset($vars['post_formats'])) { self::init_post_formats($vars['post_formats']); }
 
 		// Init Sidebars
-		if ( isset( $vars['sidebars'] ) ) { self::init_sidebars( $vars['sidebars'] ); }
+		if (isset($vars['sidebars'])) { self::init_sidebars($vars['sidebars']); }
 
 	}
 
@@ -89,13 +89,13 @@ 
 	 *
 	 * @param  array $post_types
 	 */
-	private static function init_post_types( $post_types ) {
+	private static function init_post_types($post_types) {
 
-		if ( is_array( $post_types ) ) {
+		if (is_array($post_types)) {
 
-			foreach ( $post_types as $type => $options ) {
+			foreach ($post_types as $type => $options) {
 
-				self::add_post_type( $type, $options['config'], $options['singular'], $options['multiple'] );
+				self::add_post_type($type, $options['config'], $options['singular'], $options['multiple']);
 
 			}
 		}
@@ -111,28 +111,28 @@ 
 	 * @param string $singular
 	 * @param string $multiple
 	 */
-	private static function add_post_type( $name, $config, $singular = 'Entry', $multiple = 'Entries' ) {
+	private static function add_post_type($name, $config, $singular = 'Entry', $multiple = 'Entries') {
 
 		$domain = Classy::textdomain();
 
-		if ( ! isset( $config['labels'] ) ) {
+		if (!isset($config['labels'])) {
 
 			$config['labels'] = array(
-				'name' => __( $multiple, $domain ),
-				'singular_name' => __( $singular, $domain ),
-				'not_found' => __( 'No ' . $multiple . ' Found', $domain ),
-				'not_found_in_trash' => __( 'No ' . $multiple . ' found in Trash', $domain ),
-				'edit_item' => __( 'Edit ', $singular, $domain ),
-				'search_items' => __( 'Search ' . $multiple, $domain ),
-				'view_item' => __( 'View ', $singular, $domain ),
-				'new_item' => __( 'New ' . $singular, $domain ),
-				'add_new' => __( 'Add New', $domain ),
-				'add_new_item' => __( 'Add New ' . $singular, $domain ),
+				'name' => __($multiple, $domain),
+				'singular_name' => __($singular, $domain),
+				'not_found' => __('No '.$multiple.' Found', $domain),
+				'not_found_in_trash' => __('No '.$multiple.' found in Trash', $domain),
+				'edit_item' => __('Edit ', $singular, $domain),
+				'search_items' => __('Search '.$multiple, $domain),
+				'view_item' => __('View ', $singular, $domain),
+				'new_item' => __('New '.$singular, $domain),
+				'add_new' => __('Add New', $domain),
+				'add_new_item' => __('Add New '.$singular, $domain),
 			);
 
 		}
 
-		register_post_type( $name, $config );
+		register_post_type($name, $config);
 
 	}
 
@@ -141,13 +141,13 @@ 
 	 *
 	 * @param  array $taxonomies
 	 */
-	private static function init_taxonomies( $taxonomies ) {
+	private static function init_taxonomies($taxonomies) {
 
-		if ( is_array( $taxonomies ) ) {
+		if (is_array($taxonomies)) {
 
-			foreach ( $taxonomies as $type => $options ) {
+			foreach ($taxonomies as $type => $options) {
 
-				self::add_taxonomy( $type, $options['for'], $options['config'], $options['singular'], $options['multiple'] );
+				self::add_taxonomy($type, $options['for'], $options['config'], $options['singular'], $options['multiple']);
 
 			}
 		}
@@ -163,29 +163,29 @@ 
 	 * @param string $singular
 	 * @param string $multiple
 	 */
-	private static function add_taxonomy( $name, $object_type, $config, $singular = 'Entry', $multiple = 'Entries' ) {
+	private static function add_taxonomy($name, $object_type, $config, $singular = 'Entry', $multiple = 'Entries') {
 
 		$domain = Classy::textdomain();
 
-		if ( ! isset( $config['labels'] ) ) {
+		if (!isset($config['labels'])) {
 
 			$config['labels'] = array(
-				'name' => __( $multiple, $domain ),
-				'singular_name' => __( $singular, $domain ),
-				'search_items' => __( 'Search ' . $multiple, $domain ),
-				'all_items' => __( 'All ' . $multiple, $domain ),
-				'parent_item' => __( 'Parent ' . $singular, $domain ),
-				'parent_item_colon' => __( 'Parent ' . $singular . ':', $domain ),
-				'edit_item' => __( 'Edit ' . $singular, $domain ),
-				'update_item' => __( 'Update ' . $singular, $domain ),
-				'add_new_item' => __( 'Add New ' . $singular, $domain ),
-				'new_item_name' => __( 'New ' . $singular . ' Name', $domain ),
-				'menu_name' => __( $singular, $domain ),
+				'name' => __($multiple, $domain),
+				'singular_name' => __($singular, $domain),
+				'search_items' => __('Search '.$multiple, $domain),
+				'all_items' => __('All '.$multiple, $domain),
+				'parent_item' => __('Parent '.$singular, $domain),
+				'parent_item_colon' => __('Parent '.$singular.':', $domain),
+				'edit_item' => __('Edit '.$singular, $domain),
+				'update_item' => __('Update '.$singular, $domain),
+				'add_new_item' => __('Add New '.$singular, $domain),
+				'new_item_name' => __('New '.$singular.' Name', $domain),
+				'menu_name' => __($singular, $domain),
 			);
 
 		}
 
-		register_taxonomy( $name, $object_type, $config );
+		register_taxonomy($name, $object_type, $config);
 
 	}
 
@@ -194,11 +194,11 @@ 
 	 *
 	 * @param  array $post_formats
 	 */
-	private static function init_post_formats( $post_formats ) {
+	private static function init_post_formats($post_formats) {
 
-		if ( is_array( $post_formats ) ) {
+		if (is_array($post_formats)) {
 
-			add_theme_support( 'post-formats', $post_formats );
+			add_theme_support('post-formats', $post_formats);
 
 		}
 
@@ -209,19 +209,19 @@ 
 	 *
 	 * @param  array $sidebars
 	 */
-	private static function init_sidebars( $sidebars ) {
+	private static function init_sidebars($sidebars) {
 
 		$domain = Classy::textdomain();
 
-		if ( is_array( $sidebars ) ) {
+		if (is_array($sidebars)) {
 
-			foreach ( $sidebars as $id => $title ) {
+			foreach ($sidebars as $id => $title) {
 
 				register_sidebar(
 					array(
 						'id' => $id,
-						'name' => __( $title, $domain ),
-						'description' => __( $title, $domain ),
+						'name' => __($title, $domain),
+						'description' => __($title, $domain),
 						'before_widget' => '<div id="%1$s" class="widget %2$s"><div class="widget-inner">',
 						'after_widget' => '</div></div>',
 						'before_title' => '<h3>',

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;

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' ), 3 );
+		add_filter('theme_page_templates', array($this, 'filter_templates'), 3);
 
 	}
 
@@ -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;
 
@@ -171,11 +171,11 @@ 
 	 * @return array
 	 */
 
-	public function filter_templates( $page_templates = array(), $object = null, $post = null ) {
+	public function filter_templates($page_templates = array(), $object = null, $post = null) {
 
 		$custom_templates = ClassyView::get_page_templates_list();
 
-		return array_merge( $page_templates, $custom_templates );
+		return array_merge($page_templates, $custom_templates);
 
 	}
 
@@ -185,11 +185,11 @@ 
 	 * @param  string $name
 	 * @return any
 	 */
-	public static function get_config_var( $name ) {
+	public static function get_config_var($name) {
 
 		$vars = ClassyConfig::get_vars();
 
-		if ( isset( $vars[ $name ] ) ) { return $vars[ $name ]; }
+		if (isset($vars[$name])) { return $vars[$name]; }
 
 		return 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 );
+		echo $renderer->render($view, $scope);
 
 	}
 
@@ -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/models/classy-user.php

Doc Comments +3 added lines

@@ -61,6 +61,9 @@
 		$this->init();
 	}
 
+	/**
+	 * @param integer|null $uid
+	 */
 	private function verify_id($uid) {
 		return $uid;
 	}

Spacing +9 added lines, -9 removed lines

@@ -60,13 +60,13 @@ 
 	 * Main constructor function. Requires user id
 	 * @param int $uid
 	 */
-	public function __construct( $uid = null ) {
-		$this->ID = $this->verify_id( $uid );
+	public function __construct($uid = null) {
+		$this->ID = $this->verify_id($uid);
 
 		$this->init();
 	}
 
-	private function verify_id( $uid ) {
+	private function verify_id($uid) {
 		return $uid;
 	}
 
@@ -76,10 +76,10 @@ 
 	private function init() {
 		$object = (array) $this->get_object();
 
-		$this->import( $object );
+		$this->import($object);
 
-		if ( isset( $this->first_name ) && isset( $this->last_name ) ) {
-			$this->name = $this->first_name . ' ' . $this->last_name;
+		if (isset($this->first_name) && isset($this->last_name)) {
+			$this->name = $this->first_name.' '.$this->last_name;
 		} else {
 			$this->name = 'Anonymous';
 		}
@@ -92,7 +92,7 @@ 
 	 * @return object
 	 */
 	private function get_object() {
-		return get_userdata( $this->ID );
+		return get_userdata($this->ID);
 	}
 
 	/**
@@ -156,8 +156,8 @@ 
 	 * @return string
 	 */
 	public function link() {
-		if ( ! $this->link ) {
-			$this->link = get_author_posts_url( $this->ID );
+		if (!$this->link) {
+			$this->link = get_author_posts_url($this->ID);
 		}
 
 		return $this->link;

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

@@ -49,11 +49,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);
 
 		}
 
@@ -66,15 +66,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;
 
@@ -91,7 +91,7 @@ 
 	 * @return string
 	 */
 	public function content() {
-		return apply_filters( 'get_comment_text ', $this->comment_content );
+		return apply_filters('get_comment_text ', $this->comment_content);
 	}
 
 	/**
@@ -109,11 +109,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);
 	}
 
 	/**
@@ -132,26 +132,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;
 		}
@@ -168,9 +168,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;
@@ -189,32 +189,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;
@@ -227,13 +227,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';
 			}
@@ -252,16 +252,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));
 
 	}
 
@@ -270,12 +270,12 @@ 
 	 *
 	 * @param ClassyComment $comment
 	 */
-	public function add_child( $comment ) {
+	public function add_child($comment) {
 
 		$this->children[] = $item;
 		$item->level = $this->level + 1;
 
-		if ( $item->children ) {
+		if ($item->children) {
 			$this->update_child_levels();
 		}
 
@@ -289,9 +289,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();
 			}

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

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

Doc Comments +4 added lines, -3 removed lines

@@ -110,7 +110,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,7 +129,8 @@ 
 	 *
 	 * @param  string $type view/scope
 	 * @param  string $type
-	 * @return array
+	 * @param string $page
+	 * @return string|false
 	 */
 	public static function get_available_file( $type = 'view', $page ) {
 
@@ -370,7 +371,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 +67 added lines, -67 removed lines

@@ -20,39 +20,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 :
 
@@ -69,7 +69,7 @@ 
 	 */
 	public static function get_current_request() {
 
-		if ( null === self::$current_request ) {
+		if (null === self::$current_request) {
 
 			self::$current_request = self::check_request();
 
@@ -87,21 +87,21 @@ 
 	 * @param  string $view path to view ex: "post/archive"
 	 * @return string           full fule path
 	 */
-	public static function get_file_path( $type = 'view', $view ) {
+	public static function get_file_path($type = 'view', $view) {
 
-		$view = str_replace( '.', '/', $view );
+		$view = str_replace('.', '/', $view);
 
-		if ( 'view' == $type ) {
+		if ('view' == $type) {
 
 			$folder = ClassyView::$folder;
 
-			return THEME_PATH . $folder . '/' . $view . '.blade.php';
+			return THEME_PATH.$folder.'/'.$view.'.blade.php';
 
-		} elseif ( 'scope' == $type ) {
+		} elseif ('scope' == $type) {
 
 			$folder = ClassyScope::$folder;
 
-			return THEME_PATH . $folder . '/' . $view . '.php';
+			return THEME_PATH.$folder.'/'.$view.'.php';
 
 		}
 
@@ -115,13 +115,13 @@ 
 	 * @param  string $view in blade path format, ex: layout/header
 	 * @return boolean true/false
 	 */
-	public static function file_exists( $type = 'view', $file ) {
+	public static function file_exists($type = 'view', $file) {
 
-		$file = str_replace( '.', '/', $file );
+		$file = str_replace('.', '/', $file);
 
-		$file_path = self::get_file_path( $type, $file );
+		$file_path = self::get_file_path($type, $file);
 
-		return file_exists( $file_path );
+		return file_exists($file_path);
 
 	}
 
@@ -133,13 +133,13 @@ 
 	 * @param  string $type
 	 * @return array
 	 */
-	public static function get_available_file( $type = 'view', $page ) {
+	public static function get_available_file($type = 'view', $page) {
 
-		$views = self::get_request_hierarchy_list( $page );
+		$views = self::get_request_hierarchy_list($page);
 
-		foreach ( $views as $view ) {
+		foreach ($views as $view) {
 
-			if ( self::file_exists( $type, $view ) ) :
+			if (self::file_exists($type, $view)) :
 
 				return $view;
 
@@ -158,43 +158,43 @@ 
 	 * @param  string $type
 	 * @return array
 	 */
-	private static function get_request_hierarchy_list( $type ) {
+	private static function get_request_hierarchy_list($type) {
 
 		$views = array();
 
 		// Home
 
-		if ( 'home' == $type ) :
+		if ('home' == $type) :
 
 			$views[] = 'home';
 
 			// Single
 
-		elseif ( 'single' == $type ) :
+		elseif ('single' == $type) :
 
 			$post_type = get_post_type();
 
-			$views[] = $post_type . '.single';
+			$views[] = $post_type.'.single';
 
 			$views[] = 'single';
 
 			// Post type
 
-		elseif ( 'post_type_archive' == $type ) :
+		elseif ('post_type_archive' == $type) :
 
 			$post_type = get_post_type();
 
-			$views[] = $post_type . '.archive';
+			$views[] = $post_type.'.archive';
 
 			$views[] = 'archive';
 
 			// Taxonomy
 
-		elseif ( 'taxonomy' == $type ) :
+		elseif ('taxonomy' == $type) :
 
 			$term = get_queried_object();
 
-			if ( ! empty( $term->slug ) ) {
+			if (!empty($term->slug)) {
 
 				$taxonomy = $term->taxonomy;
 
@@ -209,11 +209,11 @@ 
 
 			// Category
 
-		elseif ( 'category' == $type ) :
+		elseif ('category' == $type) :
 
 			$category = get_queried_object();
 
-			if ( ! empty( $category->slug ) ) {
+			if (!empty($category->slug)) {
 				$views[] = "category.{$category->slug}";
 				$views[] = "category.{$category->term_id}";
 			}
@@ -224,23 +224,23 @@ 
 
 			// Attachment
 
-		elseif ( 'attachment' == $type ) :
+		elseif ('attachment' == $type) :
 
 			$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}";
 
@@ -259,11 +259,11 @@ 
 
 			// Tag
 
-		elseif ( 'tag' == $type ) :
+		elseif ('tag' == $type) :
 
 			$tag = get_queried_object();
 
-			if ( ! empty( $tag->slug ) ) {
+			if (!empty($tag->slug)) {
 				$views[] = "post.tag.{$tag->slug}";
 				$views[] = "post.tag.{$tag->term_id}";
 
@@ -276,11 +276,11 @@ 
 
 			// Author
 
-		elseif ( 'author' == $type ) :
+		elseif ('author' == $type) :
 
 			$author = get_queried_object();
 
-			if ( $author instanceof WP_User ) {
+			if ($author instanceof WP_User) {
 				$views[] = "post.author.{$author->user_nicename}";
 				$views[] = "post.author.{$author->ID}";
 
@@ -294,7 +294,7 @@ 
 
 			// Front Page
 
-		elseif ( 'front-page' == $type ) :
+		elseif ('front-page' == $type) :
 
 			$views[] = 'front-page.front-page';
 			$views[] = 'front-page';
@@ -302,41 +302,41 @@ 
 			$views[] = 'home.home';
 			$views[] = 'home';
 
-			$views = array_merge( $views, self::get_request_hierarchy_list( 'post_type_archive' ) );
+			$views = array_merge($views, self::get_request_hierarchy_list('post_type_archive'));
 
 			// Page
 
-		elseif ( 'classy-template' == $type ) :
+		elseif ('classy-template' == $type) :
 
 			$template = self::get_classy_template();
 
 			$views[] = $template;
 
-			$views[] = 'page.' . $template;
+			$views[] = 'page.'.$template;
 
-			$views[] = 'template.' . $template;
+			$views[] = 'template.'.$template;
 
-		elseif ( 'page' == $type ) :
+		elseif ('page' == $type) :
 
 			$id = get_queried_object_id();
 
-			$pagename = get_query_var( 'pagename' );
+			$pagename = get_query_var('pagename');
 
-			if ( ! $pagename && $id ) {
+			if (!$pagename && $id) {
 				// If a static page is set as the front page, $pagename will not be set. Retrieve it from the queried object
 				$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';
@@ -378,9 +378,9 @@ 
 
 		$template_slug = get_page_template_slug();
 
-		preg_match( '/classy\-(.*)/', $template_slug, $matches );
+		preg_match('/classy\-(.*)/', $template_slug, $matches);
 
-		if ( $matches && isset( $matches[1] ) ) { return $matches[1]; }
+		if ($matches && isset($matches[1])) { return $matches[1]; }
 
 		return false;
 

footer.php

Spacing +1 added lines, -1 removed lines

@@ -1,1 +1,1 @@
-<?php Classy::render( 'layout.footer' ); ?>
\ No newline at end of file
+<?php Classy::render('layout.footer'); ?>
\ No newline at end of file

app/classy/classy-query-helper.php

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'] ) && $query->query['p'] == $custom_posts_page ) {
+			if (isset($query->query['p']) && $query->query['p'] == $custom_posts_page) {
 
-				return new WP_Query( array( 'post_type' => 'post' ) );
+				return new WP_Query(array('post_type' => 'post'));
 
 			}
 		}

app/classy/classy-helper.php

Spacing +90 added lines, -90 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 ) ) {
-				$html .= '</' . $openedtags[ $i ] . '>';
+		for ($i = 0; $i < $len_opened; $i++) {
+			if (!in_array($openedtags[$i], $closedtags)) {
+				$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;
 	}
@@ -101,14 +101,14 @@ 
 	 *
 	 * @param  mixed $arg
 	 */
-	public static function error_log( $arg ) {
-		if ( ! WP_DEBUG ) {
+	public static function error_log($arg) {
+		if (!WP_DEBUG) {
 			return;
 		}
-		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);
 	}
 
 	/**
@@ -117,7 +117,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
@@ -125,43 +125,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 == $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 == $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 ( $n == $args['current'] ) {
+		for ($n = 1; $n <= $args['total']; $n++) {
+			$n_display = number_format_i18n($n);
+			if ($n == $args['current']) {
 				$page_links[] = array(
 					'class' => 'page-number page-numbers current',
 					'title' => $n_display,
@@ -171,42 +171,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 == $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 == $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' => $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 == $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 == $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'],
 			);
 		}
@@ -220,13 +220,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;
 				}
@@ -249,42 +249,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 {