Completed
Pull Request — master (#762)
by
unknown
05:53
created
lib/timber-post-getter.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -8,19 +8,19 @@  discard block
 block discarded – undo
8 8
 	 * @return array|bool|null
9 9
 	 */
10 10
 	static function get_post($query = false, $PostClass = 'TimberPost') {
11
-		$posts = self::get_posts( $query, $PostClass );
12
-		if ( $post = reset($posts ) ) {
11
+		$posts = self::get_posts($query, $PostClass);
12
+		if ( $post = reset($posts) ) {
13 13
 			return $post;
14 14
 		}
15 15
 	}
16 16
 
17
-	static function get_posts( $query = false, $PostClass = 'TimberPost', $return_collection = false ) {
18
-		$posts = self::query_posts( $query, $PostClass );
19
-		return apply_filters('timber_post_getter_get_posts', $posts->get_posts( $return_collection ));
17
+	static function get_posts($query = false, $PostClass = 'TimberPost', $return_collection = false) {
18
+		$posts = self::query_posts($query, $PostClass);
19
+		return apply_filters('timber_post_getter_get_posts', $posts->get_posts($return_collection));
20 20
 	}
21 21
 
22
-	static function query_post( $query = false, $PostClass = 'TimberPost' ) {
23
-		$posts = self::query_posts( $query, $PostClass );
22
+	static function query_post($query = false, $PostClass = 'TimberPost') {
23
+		$posts = self::query_posts($query, $PostClass);
24 24
 		if ( method_exists($posts, 'current') && $post = $posts->current() ) {
25 25
 			return $post;
26 26
 		}
@@ -31,32 +31,32 @@  discard block
 block discarded – undo
31 31
 	 * @param string $PostClass
32 32
 	 * @return array|bool|null
33 33
 	 */
34
-	static function query_posts($query = false, $PostClass = 'TimberPost' ) {
35
-		if (self::is_post_class_or_class_map($query)) {
34
+	static function query_posts($query = false, $PostClass = 'TimberPost') {
35
+		if ( self::is_post_class_or_class_map($query) ) {
36 36
 			$PostClass = $query;
37 37
 			$query = false;
38 38
 		}
39 39
 
40
-		if (is_object($query) && !is_a($query, 'WP_Query') ){
40
+		if ( is_object($query) && !is_a($query, 'WP_Query') ) {
41 41
 			// The only object other than a query is a type of post object
42
-			$query = array( $query );
42
+			$query = array($query);
43 43
 		}
44 44
 
45
-		if ( is_array( $query ) && count( $query ) && isset( $query[0] ) && is_object( $query[0] ) ) {
45
+		if ( is_array($query) && count($query) && isset($query[0]) && is_object($query[0]) ) {
46 46
 			// We have an array of post objects that already have data
47
-			return new TimberPostsCollection( $query, $PostClass );
47
+			return new TimberPostsCollection($query, $PostClass);
48 48
 		} else {
49 49
 			// We have a query (of sorts) to work with
50
-			$tqi = new TimberQueryIterator( $query, $PostClass );
50
+			$tqi = new TimberQueryIterator($query, $PostClass);
51 51
 			return $tqi;
52 52
 		}
53 53
 	}
54 54
 
55
-	static function get_pids($query){
55
+	static function get_pids($query) {
56 56
 		$posts = self::get_posts($query);
57 57
 		$pids = array();
58
-		foreach($posts as $post){
59
-			if (isset($post->ID)){
58
+		foreach ($posts as $post) {
59
+			if ( isset($post->ID) ) {
60 60
 				$pids[] = $post->ID;
61 61
 			}
62 62
 		}
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 	}
65 65
 
66 66
 	static function loop_to_id() {
67
-		if (!self::wp_query_has_posts()) { return false; }
67
+		if ( !self::wp_query_has_posts() ) { return false; }
68 68
 
69 69
 		global $wp_query;
70 70
 		$post_num = property_exists($wp_query, 'current_post')
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
 				  : 0
73 73
 				  ;
74 74
 
75
-		if (!isset($wp_query->posts[$post_num])) { return false; }
75
+		if ( !isset($wp_query->posts[$post_num]) ) { return false; }
76 76
 
77 77
 		return $wp_query->posts[$post_num]->ID;
78 78
 	}
@@ -89,13 +89,13 @@  discard block
 block discarded – undo
89 89
 	 * @param string|array $arg
90 90
 	 * @return bool
91 91
 	 */
92
-	static function is_post_class_or_class_map($arg){
93
-		if (is_string($arg) && class_exists($arg)) {
92
+	static function is_post_class_or_class_map($arg) {
93
+		if ( is_string($arg) && class_exists($arg) ) {
94 94
 			return true;
95 95
 		}
96
-		if (is_array($arg)) {
96
+		if ( is_array($arg) ) {
97 97
 			foreach ($arg as $item) {
98
-				if (is_string($item) && class_exists($item)) {
98
+				if ( is_string($item) && class_exists($item) ) {
99 99
 					return true;
100 100
 				}
101 101
 			}
Please login to merge, or discard this patch.
lib/timber-posts-collection.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -1,50 +1,50 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 // Exit if accessed directly
4
-if ( !defined( 'ABSPATH' ) )
4
+if ( !defined('ABSPATH') )
5 5
     exit;
6 6
 
7 7
 class TimberPostsCollection extends ArrayObject {
8 8
 
9
-    public function __construct( $posts = array(), $post_class = 'TimberPost' ) {
9
+    public function __construct($posts = array(), $post_class = 'TimberPost') {
10 10
         $returned_posts = array();
11
-        if ( is_null( $posts ) ){
11
+        if ( is_null($posts) ) {
12 12
             $posts = array();
13 13
         }
14
-        foreach ( $posts as $post_object ) {
14
+        foreach ($posts as $post_object) {
15 15
             $post_class_use = $post_class;
16 16
 
17
-            if ( is_array( $post_class ) ) {
18
-                $post_type      = get_post_type( $post_object );
17
+            if ( is_array($post_class) ) {
18
+                $post_type      = get_post_type($post_object);
19 19
                 $post_class_use = 'TimberPost';
20 20
 
21
-                if ( isset( $post_class[$post_type] ) ) {
21
+                if ( isset($post_class[$post_type]) ) {
22 22
                     $post_class_use = $post_class[$post_type];
23 23
 
24 24
                 } else {
25
-                    if ( is_array( $post_class ) ) {
26
-                        TimberHelper::error_log( $post_type . ' of ' . $post_object->ID . ' not found in ' . print_r( $post_class, true ) );
25
+                    if ( is_array($post_class) ) {
26
+                        TimberHelper::error_log($post_type . ' of ' . $post_object->ID . ' not found in ' . print_r($post_class, true));
27 27
                     } else {
28
-                        TimberHelper::error_log( $post_type . ' not found in ' . $post_class );
28
+                        TimberHelper::error_log($post_type . ' not found in ' . $post_class);
29 29
                     }
30 30
                 }
31 31
             }
32 32
 
33 33
             // Don't create yet another object if $post_object is already of the right type
34
-            if ( is_a( $post_object, $post_class_use ) ) {
34
+            if ( is_a($post_object, $post_class_use) ) {
35 35
                 $post = $post_object;
36 36
             } else {
37
-                $post = new $post_class_use( $post_object );
37
+                $post = new $post_class_use($post_object);
38 38
             }
39 39
 
40
-            if ( isset( $post->ID ) ) {
40
+            if ( isset($post->ID) ) {
41 41
                 $returned_posts[] = $post;
42 42
             }
43 43
         }
44 44
 
45 45
         $returned_posts = self::maybe_set_preview($returned_posts);
46 46
 
47
-        parent::__construct( $returned_posts, $flags = 0, 'TimberPostsIterator' );
47
+        parent::__construct($returned_posts, $flags = 0, 'TimberPostsIterator');
48 48
     }
49 49
 
50 50
     public function get_posts() {
@@ -55,17 +55,17 @@  discard block
 block discarded – undo
55 55
      * @param array $posts
56 56
      * @return array
57 57
      */
58
-    static function maybe_set_preview( $posts ) {
59
-        if ( is_array( $posts ) && isset( $_GET['preview'] ) && $_GET['preview']
60
-               && isset( $_GET['preview_id'] ) && $_GET['preview_id']
61
-               && current_user_can( 'edit_post', $_GET['preview_id'] ) ) {
58
+    static function maybe_set_preview($posts) {
59
+        if ( is_array($posts) && isset($_GET['preview']) && $_GET['preview']
60
+               && isset($_GET['preview_id']) && $_GET['preview_id']
61
+               && current_user_can('edit_post', $_GET['preview_id']) ) {
62 62
             // No need to check the nonce, that already happened in _show_post_preview on init
63 63
 
64 64
             $preview_id = $_GET['preview_id'];
65
-            foreach( $posts as &$post ) {
66
-                if ( is_object( $post ) && $post->ID == $preview_id ) {
65
+            foreach ($posts as &$post) {
66
+                if ( is_object($post) && $post->ID == $preview_id ) {
67 67
                     // Based on _set_preview( $post ), but adds import_custom
68
-                    $preview = wp_get_post_autosave( $preview_id );
68
+                    $preview = wp_get_post_autosave($preview_id);
69 69
                     if ( is_object($preview) ) {
70 70
 
71 71
                         $preview = sanitize_post($preview);
@@ -73,9 +73,9 @@  discard block
 block discarded – undo
73 73
                         $post->post_content = $preview->post_content;
74 74
                         $post->post_title = $preview->post_title;
75 75
                         $post->post_excerpt = $preview->post_excerpt;
76
-                        $post->import_custom( $preview_id );
76
+                        $post->import_custom($preview_id);
77 77
 
78
-                        add_filter( 'get_the_terms', '_wp_preview_terms_filter', 10, 3 );
78
+                        add_filter('get_the_terms', '_wp_preview_terms_filter', 10, 3);
79 79
                     }
80 80
                 }
81 81
             }
Please login to merge, or discard this patch.
lib/timber-query-iterator.php 1 patch
Spacing   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 // Exit if accessed directly
3
-if ( !defined( 'ABSPATH' ) )
3
+if ( !defined('ABSPATH') )
4 4
     exit;
5 5
 
6 6
 class TimberQueryIterator implements Iterator {
@@ -13,38 +13,38 @@  discard block
 block discarded – undo
13 13
     private $_query = null;
14 14
     private $_posts_class = 'TimberPost';
15 15
 
16
-    public function __construct( $query = false, $posts_class = 'TimberPost' ) {
17
-        add_action( 'pre_get_posts', array($this, 'fix_number_posts_wp_quirk' ));
16
+    public function __construct($query = false, $posts_class = 'TimberPost') {
17
+        add_action('pre_get_posts', array($this, 'fix_number_posts_wp_quirk'));
18 18
         if ( $posts_class )
19 19
             $this->_posts_class = $posts_class;
20 20
 
21
-        if ( is_a( $query, 'WP_Query' ) ) {
21
+        if ( is_a($query, 'WP_Query') ) {
22 22
             // We got a full-fledged WP Query, look no further!
23 23
             $the_query = $query;
24 24
 
25 25
         } elseif ( false === $query ) {
26 26
             // If query is explicitly set to false, use the main loop
27 27
             global $wp_query;
28
-            $the_query =& $wp_query;
28
+            $the_query = & $wp_query;
29 29
             //if we're on a custom posts page?
30 30
             $the_query = self::handle_maybe_custom_posts_page($the_query);
31
-        } elseif ( TimberHelper::is_array_assoc( $query ) || ( is_string( $query ) && strstr( $query, '=' ) ) ) {
31
+        } elseif ( TimberHelper::is_array_assoc($query) || (is_string($query) && strstr($query, '=')) ) {
32 32
             // We have a regularly formed WP query string or array to use
33
-            $the_query = new WP_Query( $query );
33
+            $the_query = new WP_Query($query);
34 34
 
35
-        } elseif ( is_numeric( $query ) || is_string( $query ) ) {
35
+        } elseif ( is_numeric($query) || is_string($query) ) {
36 36
             // We have what could be a post name or post ID to pull out
37
-            $the_query = self::get_query_from_string( $query );
37
+            $the_query = self::get_query_from_string($query);
38 38
 
39
-        } elseif ( is_array( $query ) && count( $query ) && ( is_integer( $query[0] ) || is_string( $query[0] ) ) ) {
39
+        } elseif ( is_array($query) && count($query) && (is_integer($query[0]) || is_string($query[0])) ) {
40 40
             // We have a list of pids (post IDs) to extract from
41
-            $the_query = self::get_query_from_array_of_ids( $query );
42
-        } elseif ( is_array($query) && empty($query)) {
41
+            $the_query = self::get_query_from_array_of_ids($query);
42
+        } elseif ( is_array($query) && empty($query) ) {
43 43
             // it's an empty array
44 44
             $the_query = array();
45 45
         } else {
46
-            TimberHelper::error_log( 'I have failed you! in ' . basename( __FILE__ ) . '::' . __LINE__ );
47
-            TimberHelper::error_log( $query );
46
+            TimberHelper::error_log('I have failed you! in ' . basename(__FILE__) . '::' . __LINE__);
47
+            TimberHelper::error_log($query);
48 48
 
49 49
             // We have failed hard, at least let get something.
50 50
             $the_query = new WP_Query();
@@ -54,49 +54,49 @@  discard block
 block discarded – undo
54 54
 
55 55
     }
56 56
 
57
-    public function get_posts( $return_collection = false ) {
58
-        if (isset($this->_query->posts)){
59
-            $posts = new TimberPostsCollection( $this->_query->posts, $this->_posts_class );
60
-            return ( $return_collection ) ? $posts : $posts->get_posts();
57
+    public function get_posts($return_collection = false) {
58
+        if ( isset($this->_query->posts) ) {
59
+            $posts = new TimberPostsCollection($this->_query->posts, $this->_posts_class);
60
+            return ($return_collection) ? $posts : $posts->get_posts();
61 61
         }
62 62
     }
63 63
 
64 64
     //
65 65
     // GET POSTS
66 66
     //
67
-    public static function get_query_from_array_of_ids( $query = array() ) {
68
-        if ( !is_array( $query ) || !count( $query ) )
67
+    public static function get_query_from_array_of_ids($query = array()) {
68
+        if ( !is_array($query) || !count($query) )
69 69
             return null;
70 70
 
71
-        return new WP_Query( array(
71
+        return new WP_Query(array(
72 72
                 'post_type'=> 'any',
73 73
                 'ignore_sticky_posts' => true,
74 74
                 'post__in' => $query,
75 75
                 'orderby'  => 'post__in',
76 76
                 'nopaging' => true
77
-            ) );
77
+            ));
78 78
     }
79 79
 
80
-    public static function get_query_from_string( $string = '' ) {
80
+    public static function get_query_from_string($string = '') {
81 81
         $post_type = false;
82 82
 
83
-        if ( is_string( $string ) && strstr( $string, '#' ) ) {
83
+        if ( is_string($string) && strstr($string, '#') ) {
84 84
             //we have a post_type directive here
85
-            list( $post_type, $string ) = explode( '#', $string );
85
+            list($post_type, $string) = explode('#', $string);
86 86
         }
87 87
 
88 88
         $query = array(
89
-            'post_type' => ( $post_type ) ? $post_type : 'any'
89
+            'post_type' => ($post_type) ? $post_type : 'any'
90 90
         );
91 91
 
92
-        if ( is_numeric( $string ) ) {
92
+        if ( is_numeric($string) ) {
93 93
             $query['p'] = $string;
94 94
 
95 95
         } else {
96 96
             $query['name'] = $string;
97 97
         }
98 98
 
99
-        return new WP_Query( $query );
99
+        return new WP_Query($query);
100 100
     }
101 101
 
102 102
     //
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
 
115 115
         // Sets up the global post, but also return the post, for use in Twig template
116 116
         $posts_class = $this->_posts_class;
117
-        return new $posts_class( $post );
117
+        return new $posts_class($post);
118 118
     }
119 119
 
120 120
     /**
@@ -131,10 +131,10 @@  discard block
 block discarded – undo
131 131
     }
132 132
 
133 133
     //get_posts users numberposts
134
-    static function fix_number_posts_wp_quirk( $query ) {
135
-        if (isset($query->query) && isset($query->query['numberposts'])
136
-                && !isset($query->query['posts_per_page'])) {
137
-            $query->set( 'posts_per_page', $query->query['numberposts'] );
134
+    static function fix_number_posts_wp_quirk($query) {
135
+        if ( isset($query->query) && isset($query->query['numberposts'])
136
+                && !isset($query->query['posts_per_page']) ) {
137
+            $query->set('posts_per_page', $query->query['numberposts']);
138 138
         }
139 139
         return $query;
140 140
     }
@@ -144,8 +144,8 @@  discard block
 block discarded – undo
144 144
      * @param  WP_Query $query the original query recived from WordPress
145 145
      * @return WP_Query
146 146
      */
147
-    static function handle_maybe_custom_posts_page( $query ) {
148
-    	if ($custom_posts_page = get_option('page_for_posts')) {
147
+    static function handle_maybe_custom_posts_page($query) {
148
+    	if ( $custom_posts_page = get_option('page_for_posts') ) {
149 149
         	if ( isset($query->query['p']) && $query->query['p'] == $custom_posts_page ) {
150 150
         		return new WP_Query(array('post_type' => 'post'));
151 151
         	}
Please login to merge, or discard this patch.
lib/timber-routes.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@
 block discarded – undo
5 5
 	/**
6 6
 	 * @deprecated since 0.21.1 use Upstatement/routes instead
7 7
 	 */
8
-	public static function init( $timber ) {
8
+	public static function init($timber) {
9 9
 		// Install ourselves in Timber
10 10
 		$timber->routes = new TimberRoutes();
11 11
 	}
Please login to merge, or discard this patch.
lib/timber-site.php 1 patch
Spacing   +33 added lines, -33 removed lines patch added patch discarded remove patch
@@ -101,10 +101,10 @@  discard block
 block discarded – undo
101 101
 	 * ```
102 102
 	 * @param string|int $site_name_or_id
103 103
 	 */
104
-	function __construct( $site_name_or_id = null ) {
104
+	function __construct($site_name_or_id = null) {
105 105
 		$this->init();
106 106
 		if ( is_multisite() ) {
107
-			$this->init_as_multisite( $site_name_or_id );
107
+			$this->init_as_multisite($site_name_or_id);
108 108
 		} else {
109 109
 			$this->init_as_singlesite();
110 110
 		}
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
 	 * @internal
115 115
 	 * @param string|int $site_name_or_id
116 116
 	 */
117
-	protected function init_as_multisite( $site_name_or_id ) {
117
+	protected function init_as_multisite($site_name_or_id) {
118 118
 		if ( $site_name_or_id === null ) {
119 119
 			//this is necessary for some reason, otherwise returns 1 all the time
120 120
 			if ( is_multisite() ) {
@@ -122,17 +122,17 @@  discard block
 block discarded – undo
122 122
 				$site_name_or_id = get_current_blog_id();
123 123
 			}
124 124
 		}
125
-		$info = get_blog_details( $site_name_or_id );
126
-		$this->import( $info );
125
+		$info = get_blog_details($site_name_or_id);
126
+		$this->import($info);
127 127
 		$this->ID = $info->blog_id;
128 128
 		$this->id = $this->ID;
129 129
 		$this->name = $this->blogname;
130 130
 		$this->title = $this->blogname;
131 131
 		$this->url = $this->siteurl;
132
-		$theme_slug = get_blog_option( $info->blog_id, 'stylesheet' );
133
-		$this->theme = new TimberTheme( $theme_slug );
134
-		$this->description = get_blog_option( $info->blog_id, 'blogdescription' );
135
-		$this->admin_email = get_blog_option( $info->blog_id, 'admin_email' );
132
+		$theme_slug = get_blog_option($info->blog_id, 'stylesheet');
133
+		$this->theme = new TimberTheme($theme_slug);
134
+		$this->description = get_blog_option($info->blog_id, 'blogdescription');
135
+		$this->admin_email = get_blog_option($info->blog_id, 'admin_email');
136 136
 		$this->multisite = true;
137 137
 	}
138 138
 
@@ -141,13 +141,13 @@  discard block
 block discarded – undo
141 141
 	 * @internal
142 142
 	 */
143 143
 	protected function init_as_singlesite() {
144
-		$this->admin_email = get_bloginfo( 'admin_email' );
145
-		$this->name = get_bloginfo( 'name' );
144
+		$this->admin_email = get_bloginfo('admin_email');
145
+		$this->name = get_bloginfo('name');
146 146
 		$this->title = $this->name;
147
-		$this->description = get_bloginfo( 'description' );
148
-		$this->url = get_bloginfo( 'url' );
147
+		$this->description = get_bloginfo('description');
148
+		$this->url = get_bloginfo('url');
149 149
 		$this->theme = new TimberTheme();
150
-		$this->language_attributes = TimberHelper::function_wrapper( 'language_attributes' );
150
+		$this->language_attributes = TimberHelper::function_wrapper('language_attributes');
151 151
 		$this->multisite = false;
152 152
 	}
153 153
 
@@ -156,16 +156,16 @@  discard block
 block discarded – undo
156 156
 	 * @internal
157 157
 	 */
158 158
 	protected function init() {
159
-		$this->rdf = get_bloginfo( 'rdf_url' );
160
-		$this->rss = get_bloginfo( 'rss_url' );
161
-		$this->rss2 = get_bloginfo( 'rss2_url' );
162
-		$this->atom = get_bloginfo( 'atom_url' );
163
-		$this->language = get_bloginfo( 'language' );
164
-		$this->charset = get_bloginfo( 'charset' );
165
-		$this->pingback = get_bloginfo( 'pingback_url' );
166
-		$this->language_attributes = TimberHelper::function_wrapper( 'language_attributes' );
159
+		$this->rdf = get_bloginfo('rdf_url');
160
+		$this->rss = get_bloginfo('rss_url');
161
+		$this->rss2 = get_bloginfo('rss2_url');
162
+		$this->atom = get_bloginfo('atom_url');
163
+		$this->language = get_bloginfo('language');
164
+		$this->charset = get_bloginfo('charset');
165
+		$this->pingback = get_bloginfo('pingback_url');
166
+		$this->language_attributes = TimberHelper::function_wrapper('language_attributes');
167 167
 		/* deprecated benath this comment */
168
-		$this->pingback_url = get_bloginfo( 'pingback_url' );
168
+		$this->pingback_url = get_bloginfo('pingback_url');
169 169
 	}
170 170
 
171 171
 	/**
@@ -174,12 +174,12 @@  discard block
 block discarded – undo
174 174
 	 * @param string  $field
175 175
 	 * @return mixed
176 176
 	 */
177
-	function __get( $field ) {
178
-		if ( !isset( $this->$field ) ) {
177
+	function __get($field) {
178
+		if ( !isset($this->$field) ) {
179 179
 			if ( is_multisite() ) {
180
-				$this->$field = get_blog_option( $this->ID, $field );
180
+				$this->$field = get_blog_option($this->ID, $field);
181 181
 			} else {
182
-				$this->$field = get_option( $field );
182
+				$this->$field = get_option($field);
183 183
 			}
184 184
 		}
185 185
 		return $this->$field;
@@ -226,8 +226,8 @@  discard block
 block discarded – undo
226 226
 	/**
227 227
 	 * @ignore
228 228
 	 */
229
-	public function meta( $field ) {
230
-		return $this->__get( $field );
229
+	public function meta($field) {
230
+		return $this->__get($field);
231 231
 	}
232 232
 
233 233
 	/**
@@ -236,12 +236,12 @@  discard block
 block discarded – undo
236 236
 	 * @param string  $key
237 237
 	 * @param mixed   $value
238 238
 	 */
239
-	public function update( $key, $value ) {
240
-		$value = apply_filters( 'timber_site_set_meta', $value, $key, $this->ID, $this );
239
+	public function update($key, $value) {
240
+		$value = apply_filters('timber_site_set_meta', $value, $key, $this->ID, $this);
241 241
 		if ( is_multisite() ) {
242
-			update_blog_option( $this->ID, $key, $value );
242
+			update_blog_option($this->ID, $key, $value);
243 243
 		} else {
244
-			update_option( $key, $value );
244
+			update_option($key, $value);
245 245
 		}
246 246
 		$this->$key = $value;
247 247
 	}
Please login to merge, or discard this patch.
lib/timber-term-getter.php 1 patch
Spacing   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -9,40 +9,40 @@  discard block
 block discarded – undo
9 9
      * @param string $TermClass
10 10
      * @return mixed
11 11
      */
12
-    public static function get_terms($args = null, $maybe_args = array(), $TermClass = 'TimberTerm'){
13
-        if (is_string($maybe_args) && !strstr($maybe_args, '=')){
12
+    public static function get_terms($args = null, $maybe_args = array(), $TermClass = 'TimberTerm') {
13
+        if ( is_string($maybe_args) && !strstr($maybe_args, '=') ) {
14 14
             //the user is sending the $TermClass in the second argument
15 15
             $TermClass = $maybe_args;
16 16
         }
17
-        if (is_string($maybe_args) && strstr($maybe_args, '=')){
17
+        if ( is_string($maybe_args) && strstr($maybe_args, '=') ) {
18 18
             parse_str($maybe_args, $maybe_args);
19 19
         }
20
-        if (is_string($args) && strstr($args, '=')){
20
+        if ( is_string($args) && strstr($args, '=') ) {
21 21
             //a string and a query string!
22 22
             $parsed = TimberTermGetter::get_term_query_from_query_string($args);
23
-            if (is_array($maybe_args)){
23
+            if ( is_array($maybe_args) ) {
24 24
                 $parsed->args = array_merge($parsed->args, $maybe_args);
25 25
             }
26 26
             return self::handle_term_query($parsed->taxonomies, $parsed->args, $TermClass);
27
-        } else if (is_string($args)){
27
+        } else if ( is_string($args) ) {
28 28
             //its just a string with a single taxonomy
29 29
             $parsed = TimberTermGetter::get_term_query_from_string($args);
30
-            if (is_array($maybe_args)){
30
+            if ( is_array($maybe_args) ) {
31 31
                 $parsed->args = array_merge($parsed->args, $maybe_args);
32 32
             }
33 33
             return self::handle_term_query($parsed->taxonomies, $parsed->args, $TermClass);
34
-        } else if (is_array($args) && TimberHelper::is_array_assoc($args)){
34
+        } else if ( is_array($args) && TimberHelper::is_array_assoc($args) ) {
35 35
             //its an associative array, like a good ole query
36 36
             $parsed = TimberTermGetter::get_term_query_from_assoc_array($args);
37 37
             return self::handle_term_query($parsed->taxonomies, $parsed->args, $TermClass);
38
-        } else if (is_array($args)){
38
+        } else if ( is_array($args) ) {
39 39
             //its just an array of strings or IDs (hopefully)
40 40
             $parsed = TimberTermGetter::get_term_query_from_array($args);
41
-            if (is_array($maybe_args)){
41
+            if ( is_array($maybe_args) ) {
42 42
                 $parsed->args = array_merge($parsed->args, $maybe_args);
43 43
             }
44 44
             return self::handle_term_query($parsed->taxonomies, $parsed->args, $TermClass);
45
-        } else if (is_null($args)) {
45
+        } else if ( is_null($args) ) {
46 46
             return self::handle_term_query(get_taxonomies(), array(), $TermClass);
47 47
         }
48 48
         return null;
@@ -54,18 +54,18 @@  discard block
 block discarded – undo
54 54
      * @param string $TermClass
55 55
      * @return mixed
56 56
      */
57
-    public static function handle_term_query($taxonomies, $args, $TermClass){
58
-        if (!isset($args['hide_empty'])){
57
+    public static function handle_term_query($taxonomies, $args, $TermClass) {
58
+        if ( !isset($args['hide_empty']) ) {
59 59
             $args['hide_empty'] = false;
60 60
         }
61
-        if (isset($args['term_id']) && is_int($args['term_id'])){
61
+        if ( isset($args['term_id']) && is_int($args['term_id']) ) {
62 62
             $args['term_id'] = array($args['term_id']);
63 63
         }
64
-        if (isset($args['term_id'])){
64
+        if ( isset($args['term_id']) ) {
65 65
             $args['include'] = $args['term_id'];
66 66
         }
67 67
         $terms = get_terms($taxonomies, $args);
68
-        foreach($terms as &$term){
68
+        foreach ($terms as &$term) {
69 69
             $term = new $TermClass($term->term_id, $term->taxonomy);
70 70
         }
71 71
         return $terms;
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
     public static function get_term_query_from_string($taxs) {
90 90
         $ret = new stdClass();
91 91
         $ret->args = array();
92
-        if (is_string($taxs)) {
92
+        if ( is_string($taxs) ) {
93 93
             $taxs = array($taxs);
94 94
         }
95 95
         $ret->taxonomies = self::correct_taxonomy_names($taxs);
@@ -103,17 +103,17 @@  discard block
 block discarded – undo
103 103
     public static function get_term_query_from_assoc_array($args) {
104 104
         $ret = new stdClass();
105 105
         $ret->args = $args;
106
-        if (isset($ret->args['tax'])) {
106
+        if ( isset($ret->args['tax']) ) {
107 107
             $ret->taxonomies = $ret->args['tax'];
108
-        } else if (isset($ret->args['taxonomies'])) {
108
+        } else if ( isset($ret->args['taxonomies']) ) {
109 109
             $ret->taxonomies = $ret->args['taxonomies'];
110
-        } else if (isset($ret->args['taxs'])) {
110
+        } else if ( isset($ret->args['taxs']) ) {
111 111
             $ret->taxonomies = $ret->args['taxs'];
112
-        } else if (isset($ret->args['taxonomy'])) {
112
+        } else if ( isset($ret->args['taxonomy']) ) {
113 113
             $ret->taxonomies = $ret->args['taxonomy'];
114 114
         }
115
-        if (isset($ret->taxonomies)) {
116
-            if (is_string($ret->taxonomies)) {
115
+        if ( isset($ret->taxonomies) ) {
116
+            if ( is_string($ret->taxonomies) ) {
117 117
                 $ret->taxonomies = array($ret->taxonomies);
118 118
             }
119 119
             $ret->taxonomies = self::correct_taxonomy_names($ret->taxonomies);
@@ -128,11 +128,11 @@  discard block
 block discarded – undo
128 128
      * @return stdClass
129 129
      */
130 130
     public static function get_term_query_from_array($args) {
131
-        if (is_array($args) && !empty($args)) {
131
+        if ( is_array($args) && !empty($args) ) {
132 132
             //okay its an array with content
133
-            if (is_int($args[0])) {
133
+            if ( is_int($args[0]) ) {
134 134
                 return self::get_term_query_from_array_of_ids($args);
135
-            } else if (is_string($args[0])) {
135
+            } else if ( is_string($args[0]) ) {
136 136
                 return self::get_term_query_from_array_of_strings($args);
137 137
             }
138 138
         }
@@ -166,13 +166,13 @@  discard block
 block discarded – undo
166 166
      * @return array
167 167
      */
168 168
     private static function correct_taxonomy_names($taxs) {
169
-        if (is_string($taxs)) {
169
+        if ( is_string($taxs) ) {
170 170
             $taxs = array($taxs);
171 171
         }
172 172
         foreach ($taxs as &$tax) {
173
-            if ($tax == 'tags' || $tax == 'tag') {
173
+            if ( $tax == 'tags' || $tax == 'tag' ) {
174 174
                 $tax = 'post_tag';
175
-            } else if ($tax == 'categories') {
175
+            } else if ( $tax == 'categories' ) {
176 176
                 $tax = 'category';
177 177
             }
178 178
         }
Please login to merge, or discard this patch.
lib/timber-term.php 1 patch
Spacing   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -54,11 +54,11 @@  discard block
 block discarded – undo
54 54
 	 * @param int $tid
55 55
 	 * @param string $tax
56 56
 	 */
57
-	public function __construct( $tid = null, $tax = '' ) {
58
-		if ($tid === null) {
57
+	public function __construct($tid = null, $tax = '') {
58
+		if ( $tid === null ) {
59 59
 			$tid = $this->get_term_from_query();
60 60
 		}
61
-		if (strlen($tax)) {
61
+		if ( strlen($tax) ) {
62 62
 			$this->taxonomy = $tax;
63 63
 		}
64 64
 		$this->init($tid);
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
 	 *
78 78
 	 * @return static
79 79
 	 */
80
-	public static function from( $tid, $taxonomy ) {
80
+	public static function from($tid, $taxonomy) {
81 81
 		return new static($tid, $taxonomy);
82 82
 	}
83 83
 
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
 		global $wp_query;
94 94
 		if ( isset($wp_query->queried_object) ) {
95 95
 			$qo = $wp_query->queried_object;
96
-			if (isset($qo->term_id)) {
96
+			if ( isset($qo->term_id) ) {
97 97
 				return $qo->term_id;
98 98
 			}
99 99
 		}
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
 	 * @internal
107 107
 	 * @param int $tid
108 108
 	 */
109
-	protected function init( $tid ) {
109
+	protected function init($tid) {
110 110
 		$term = $this->get_term($tid);
111 111
 		if ( isset($term->id) ) {
112 112
 			$term->ID = $term->id;
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
 			//echo 'bad call using '.$tid;
117 117
 			//TimberHelper::error_log(debug_backtrace());
118 118
 		}
119
-		if ( isset($term->ID) ){
119
+		if ( isset($term->ID) ) {
120 120
 			$term->id = $term->ID;
121 121
 			$this->import($term);
122 122
 			if ( isset($term->term_id) ) {
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
142 142
 	 * @param int $tid
143 143
 	 * @return mixed
144 144
 	 */
145
-	protected function get_term( $tid ) {
145
+	protected function get_term($tid) {
146 146
 		if ( is_object($tid) || is_array($tid) ) {
147 147
 			return $tid;
148 148
 		}
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
154 154
 			global $wpdb;
155 155
 			$query = $wpdb->prepare("SELECT taxonomy FROM $wpdb->term_taxonomy WHERE term_id = %d LIMIT 1", $tid);
156 156
 			$tax = $wpdb->get_var($query);
157
-			if (isset($tax) && strlen($tax)) {
157
+			if ( isset($tax) && strlen($tax) ) {
158 158
 				$this->taxonomy = $tax;
159 159
 				return get_term($tid, $tax);
160 160
 			}
@@ -167,7 +167,7 @@  discard block
 block discarded – undo
167 167
 	 * @param int $tid
168 168
 	 * @return int
169 169
 	 */
170
-	protected function get_tid( $tid ) {
170
+	protected function get_tid($tid) {
171 171
 		global $wpdb;
172 172
 		if ( is_numeric($tid) ) {
173 173
 			return $tid;
@@ -205,8 +205,8 @@  discard block
 block discarded – undo
205 205
 	 * @param string $field_name
206 206
 	 * @return string
207 207
 	 */
208
-	public function get_meta_field( $field_name ) {
209
-		if (!isset($this->$field_name)) {
208
+	public function get_meta_field($field_name) {
209
+		if ( !isset($this->$field_name) ) {
210 210
 			$field_value = '';
211 211
 			$field_value = apply_filters('timber_term_get_meta_field', $field_value, $this->ID, $field_name, $this);
212 212
 			$field_value = apply_filters('timber/term/meta/field', $field_value, $this->ID, $field_name, $this);
@@ -244,8 +244,8 @@  discard block
 block discarded – undo
244 244
 	 * @param string $PostClass
245 245
 	 * @return array|bool|null
246 246
 	 */
247
-	public function get_posts( $numberposts = 10, $post_type = 'any', $PostClass = '' ) {
248
-		if (!strlen($PostClass)) {
247
+	public function get_posts($numberposts = 10, $post_type = 'any', $PostClass = '') {
248
+		if ( !strlen($PostClass) ) {
249 249
 			$PostClass = $this->PostClass;
250 250
 		}
251 251
 		$default_tax_query = array(array(
@@ -259,10 +259,10 @@  discard block
 block discarded – undo
259 259
 			parse_str($args, $new_args);
260 260
 			$args = $new_args;
261 261
 			$args['tax_query'] = $default_tax_query;
262
-			if (!isset($args['post_type'])) {
262
+			if ( !isset($args['post_type']) ) {
263 263
 				$args['post_type'] = 'any';
264 264
 			}
265
-			if (class_exists($post_type)) {
265
+			if ( class_exists($post_type) ) {
266 266
 				$PostClass = $post_type;
267 267
 			}
268 268
 		} else if ( is_array($numberposts) ) {
@@ -308,8 +308,8 @@  discard block
 block discarded – undo
308 308
 	 * @param string  $key
309 309
 	 * @param mixed   $value
310 310
 	 */
311
-	function update( $key, $value ) {
312
-		$value = apply_filters( 'timber_term_set_meta', $value, $key, $this->ID, $this );
311
+	function update($key, $value) {
312
+		$value = apply_filters('timber_term_set_meta', $value, $key, $this->ID, $this);
313 313
 		$this->$key = $value;
314 314
 	}
315 315
 
@@ -331,11 +331,11 @@  discard block
 block discarded – undo
331 331
 	public function description() {
332 332
 		$prefix = '<p>';
333 333
 		$suffix = '</p>';
334
-		$desc = term_description( $this->ID, $this->taxonomy );
335
-		if (substr($desc, 0, strlen($prefix)) == $prefix) {
334
+		$desc = term_description($this->ID, $this->taxonomy);
335
+		if ( substr($desc, 0, strlen($prefix)) == $prefix ) {
336 336
     		$desc = substr($desc, strlen($prefix));
337 337
 		}
338
-		$desc = preg_replace('/'. preg_quote('</p>', '/') . '$/', '', $desc);
338
+		$desc = preg_replace('/' . preg_quote('</p>', '/') . '$/', '', $desc);
339 339
 		return trim($desc);
340 340
 	}
341 341
 
@@ -369,7 +369,7 @@  discard block
 block discarded – undo
369 369
 	 * @param string $field_name
370 370
 	 * @return string
371 371
 	 */
372
-	public function meta( $field_name ) {
372
+	public function meta($field_name) {
373 373
 		return $this->get_meta_field($field_name);
374 374
 	}
375 375
 
@@ -397,7 +397,7 @@  discard block
 block discarded – undo
397 397
 	 * ```
398 398
 	 * @return array|bool|null
399 399
 	 */
400
-	public function posts( $numberposts_or_args = 10, $post_type_or_class = 'any', $post_class = '' ) {
400
+	public function posts($numberposts_or_args = 10, $post_type_or_class = 'any', $post_class = '') {
401 401
 		return $this->get_posts($numberposts_or_args, $post_type_or_class, $post_class);
402 402
 	}
403 403
 
@@ -422,7 +422,7 @@  discard block
 block discarded – undo
422 422
 	 * @param int $i
423 423
 	 * @return string
424 424
 	 */
425
-	function get_page( $i ) {
425
+	function get_page($i) {
426 426
 		return $this->get_path() . '/page/' . $i;
427 427
 	}
428 428
 
Please login to merge, or discard this patch.
lib/timber-theme.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
 		$ss = $data->get_stylesheet();
77 77
 		$this->slug = $ss;
78 78
 
79
-		if ( ! function_exists( 'get_home_path' ) ) {
79
+		if ( !function_exists('get_home_path') ) {
80 80
 			require_once(ABSPATH . 'wp-admin/includes/file.php');
81 81
 		}
82 82
 
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
103 103
 	 * @return  string the relative path to the theme (ex: `/wp-content/themes/my-timber-theme`)
104 104
 	 */
105 105
 	public function path() {
106
-		return TimberURLHelper::get_rel_url( $this->link() );
106
+		return TimberURLHelper::get_rel_url($this->link());
107 107
 	}
108 108
 
109 109
 	/**
Please login to merge, or discard this patch.
lib/timber-twig.php 1 patch
Spacing   +139 added lines, -139 removed lines patch added patch discarded remove patch
@@ -12,8 +12,8 @@  discard block
 block discarded – undo
12 12
 	}
13 13
 
14 14
 	function __construct() {
15
-		add_action( 'timber/twig/filters', array( $this, 'add_timber_filters_deprecated' ) );
16
-		add_action( 'timber/twig/filters', array( $this, 'add_timber_filters' ) );
15
+		add_action('timber/twig/filters', array($this, 'add_timber_filters_deprecated'));
16
+		add_action('timber/twig/filters', array($this, 'add_timber_filters'));
17 17
 	}
18 18
 
19 19
 	/**
@@ -23,14 +23,14 @@  discard block
 block discarded – undo
23 23
 	 * @deprecated since 0.20.7
24 24
 	 * @return Twig_Environment
25 25
 	 */
26
-	function add_timber_filters_deprecated( $twig ) {
27
-		$twig->addFilter( new Twig_SimpleFilter( 'get_src_from_attachment_id', 'twig_get_src_from_attachment_id' ) );
28
-		$twig->addFilter( new Twig_SimpleFilter( 'wp_body_class', array( $this, 'body_class' ) ) );
29
-		$twig->addFilter( new Twig_SimpleFilter( 'twitterify', array( 'TimberHelper', 'twitterify' ) ) );
30
-		$twig->addFilter( new Twig_SimpleFilter( 'twitterfy', array( 'TimberHelper', 'twitterify' ) ) );
31
-		$twig->addFilter( new Twig_SimpleFilter( 'string', function($arr, $glue = ' '){
26
+	function add_timber_filters_deprecated($twig) {
27
+		$twig->addFilter(new Twig_SimpleFilter('get_src_from_attachment_id', 'twig_get_src_from_attachment_id'));
28
+		$twig->addFilter(new Twig_SimpleFilter('wp_body_class', array($this, 'body_class')));
29
+		$twig->addFilter(new Twig_SimpleFilter('twitterify', array('TimberHelper', 'twitterify')));
30
+		$twig->addFilter(new Twig_SimpleFilter('twitterfy', array('TimberHelper', 'twitterify')));
31
+		$twig->addFilter(new Twig_SimpleFilter('string', function($arr, $glue = ' ') {
32 32
 			return twig_join_filter($arr, $glue);
33
-		} ) );
33
+		} ));
34 34
 		return $twig;
35 35
 	}
36 36
 
@@ -40,150 +40,150 @@  discard block
 block discarded – undo
40 40
 	 * @param Twig_Environment $twig
41 41
 	 * @return Twig_Environment
42 42
 	 */
43
-	function add_timber_filters( $twig ) {
43
+	function add_timber_filters($twig) {
44 44
 		/* image filters */
45
-		$twig->addFilter( new Twig_SimpleFilter( 'resize', array( 'TimberImageHelper', 'resize' ) ) );
46
-		$twig->addFilter( new Twig_SimpleFilter( 'retina', array( 'TimberImageHelper', 'retina_resize' ) ) );
47
-		$twig->addFilter( new Twig_SimpleFilter( 'letterbox', array( 'TimberImageHelper', 'letterbox' ) ) );
48
-		$twig->addFilter( new Twig_SimpleFilter( 'tojpg', array( 'TimberImageHelper', 'img_to_jpg' ) ) );
45
+		$twig->addFilter(new Twig_SimpleFilter('resize', array('TimberImageHelper', 'resize')));
46
+		$twig->addFilter(new Twig_SimpleFilter('retina', array('TimberImageHelper', 'retina_resize')));
47
+		$twig->addFilter(new Twig_SimpleFilter('letterbox', array('TimberImageHelper', 'letterbox')));
48
+		$twig->addFilter(new Twig_SimpleFilter('tojpg', array('TimberImageHelper', 'img_to_jpg')));
49 49
 
50 50
 		/* debugging filters */
51
-		$twig->addFilter( new Twig_SimpleFilter( 'docs', 'twig_object_docs' ) );
52
-		$twig->addFilter( new Twig_SimpleFilter( 'get_class',  'get_class' ) );
53
-		$twig->addFilter( new Twig_SimpleFilter( 'get_type', 'get_type' ) );
54
-		$twig->addFilter( new Twig_SimpleFilter( 'print_r', function( $arr ) {
55
-					return print_r( $arr, true );
56
-				} ) );
57
-		$twig->addFilter( new Twig_SimpleFilter( 'print_a', function( $arr ) {
58
-					return '<pre>' . self::object_docs( $arr, true ) . '</pre>';
59
-				} ) );
51
+		$twig->addFilter(new Twig_SimpleFilter('docs', 'twig_object_docs'));
52
+		$twig->addFilter(new Twig_SimpleFilter('get_class', 'get_class'));
53
+		$twig->addFilter(new Twig_SimpleFilter('get_type', 'get_type'));
54
+		$twig->addFilter(new Twig_SimpleFilter('print_r', function($arr) {
55
+					return print_r($arr, true);
56
+				} ));
57
+		$twig->addFilter(new Twig_SimpleFilter('print_a', function($arr) {
58
+					return '<pre>' . self::object_docs($arr, true) . '</pre>';
59
+				} ));
60 60
 
61 61
 		/* other filters */
62
-		$twig->addFilter( new Twig_SimpleFilter( 'stripshortcodes', 'strip_shortcodes' ) );
63
-		$twig->addFilter( new Twig_SimpleFilter( 'array', array( $this, 'to_array' ) ) );
64
-		$twig->addFilter( new Twig_SimpleFilter( 'excerpt', 'wp_trim_words' ) );
65
-		$twig->addFilter( new Twig_SimpleFilter( 'function', array( $this, 'exec_function' ) ) );
66
-		$twig->addFilter( new Twig_SimpleFilter( 'pretags', array( $this, 'twig_pretags' ) ) );
67
-		$twig->addFilter( new Twig_SimpleFilter( 'sanitize', 'sanitize_title' ) );
68
-		$twig->addFilter( new Twig_SimpleFilter( 'shortcodes', 'do_shortcode' ) );
69
-		$twig->addFilter( new Twig_SimpleFilter( 'time_ago', array( $this, 'time_ago' ) ) );
70
-		$twig->addFilter( new Twig_SimpleFilter( 'wpautop', 'wpautop' ) );
62
+		$twig->addFilter(new Twig_SimpleFilter('stripshortcodes', 'strip_shortcodes'));
63
+		$twig->addFilter(new Twig_SimpleFilter('array', array($this, 'to_array')));
64
+		$twig->addFilter(new Twig_SimpleFilter('excerpt', 'wp_trim_words'));
65
+		$twig->addFilter(new Twig_SimpleFilter('function', array($this, 'exec_function')));
66
+		$twig->addFilter(new Twig_SimpleFilter('pretags', array($this, 'twig_pretags')));
67
+		$twig->addFilter(new Twig_SimpleFilter('sanitize', 'sanitize_title'));
68
+		$twig->addFilter(new Twig_SimpleFilter('shortcodes', 'do_shortcode'));
69
+		$twig->addFilter(new Twig_SimpleFilter('time_ago', array($this, 'time_ago')));
70
+		$twig->addFilter(new Twig_SimpleFilter('wpautop', 'wpautop'));
71 71
 
72
-		$twig->addFilter( new Twig_SimpleFilter( 'relative', function ( $link ) {
73
-					return TimberURLHelper::get_rel_url( $link, true );
74
-				} ) );
72
+		$twig->addFilter(new Twig_SimpleFilter('relative', function($link) {
73
+					return TimberURLHelper::get_rel_url($link, true);
74
+				} ));
75 75
 
76
-		$twig->addFilter( new Twig_SimpleFilter( 'date', array( $this, 'intl_date' ) ) );
76
+		$twig->addFilter(new Twig_SimpleFilter('date', array($this, 'intl_date')));
77 77
 
78
-		$twig->addFilter( new Twig_SimpleFilter( 'truncate', function ( $text, $len ) {
79
-					return TimberHelper::trim_words( $text, $len );
80
-				} ) );
78
+		$twig->addFilter(new Twig_SimpleFilter('truncate', function($text, $len) {
79
+					return TimberHelper::trim_words($text, $len);
80
+				} ));
81 81
 
82 82
 		/* actions and filters */
83
-		$twig->addFunction( new Twig_SimpleFunction( 'action', function ( $context ) {
83
+		$twig->addFunction(new Twig_SimpleFunction('action', function($context) {
84 84
 					$args = func_get_args();
85
-					array_shift( $args );
85
+					array_shift($args);
86 86
 					$args[] = $context;
87
-					call_user_func_array( 'do_action', $args );
88
-				}, array( 'needs_context' => true ) ) );
87
+					call_user_func_array('do_action', $args);
88
+				}, array('needs_context' => true)));
89 89
 
90
-		$twig->addFilter( new Twig_SimpleFilter( 'apply_filters', function () {
90
+		$twig->addFilter(new Twig_SimpleFilter('apply_filters', function() {
91 91
 					$args = func_get_args();
92
-					$tag = current( array_splice( $args, 1, 1 ) );
92
+					$tag = current(array_splice($args, 1, 1));
93 93
 
94
-					return apply_filters_ref_array( $tag, $args );
95
-				} ) );
96
-		$twig->addFunction( new Twig_SimpleFunction( 'function', array( &$this, 'exec_function' ) ) );
97
-		$twig->addFunction( new Twig_SimpleFunction( 'fn', array( &$this, 'exec_function' ) ) );
94
+					return apply_filters_ref_array($tag, $args);
95
+				} ));
96
+		$twig->addFunction(new Twig_SimpleFunction('function', array(&$this, 'exec_function')));
97
+		$twig->addFunction(new Twig_SimpleFunction('fn', array(&$this, 'exec_function')));
98 98
 
99
-		$twig->addFunction( new Twig_SimpleFunction( 'shortcode', 'do_shortcode' ) );
99
+		$twig->addFunction(new Twig_SimpleFunction('shortcode', 'do_shortcode'));
100 100
 
101 101
 		/* TimberObjects */
102
-		$twig->addFunction( new Twig_SimpleFunction( 'TimberPost', function ( $pid, $PostClass = 'TimberPost' ) {
103
-					if ( is_array( $pid ) && !TimberHelper::is_array_assoc( $pid ) ) {
104
-						foreach ( $pid as &$p ) {
105
-							$p = new $PostClass( $p );
102
+		$twig->addFunction(new Twig_SimpleFunction('TimberPost', function($pid, $PostClass = 'TimberPost') {
103
+					if ( is_array($pid) && !TimberHelper::is_array_assoc($pid) ) {
104
+						foreach ($pid as &$p) {
105
+							$p = new $PostClass($p);
106 106
 						}
107 107
 						return $pid;
108 108
 					}
109
-					return new $PostClass( $pid );
110
-				} ) );
111
-		$twig->addFunction( new Twig_SimpleFunction( 'TimberImage', function ( $pid, $ImageClass = 'TimberImage' ) {
112
-					if ( is_array( $pid ) && !TimberHelper::is_array_assoc( $pid ) ) {
113
-						foreach ( $pid as &$p ) {
114
-							$p = new $ImageClass( $p );
109
+					return new $PostClass($pid);
110
+				} ));
111
+		$twig->addFunction(new Twig_SimpleFunction('TimberImage', function($pid, $ImageClass = 'TimberImage') {
112
+					if ( is_array($pid) && !TimberHelper::is_array_assoc($pid) ) {
113
+						foreach ($pid as &$p) {
114
+							$p = new $ImageClass($p);
115 115
 						}
116 116
 						return $pid;
117 117
 					}
118
-					return new $ImageClass( $pid );
119
-				} ) );
120
-		$twig->addFunction( new Twig_SimpleFunction( 'TimberTerm', function ( $pid, $TermClass = 'TimberTerm' ) {
121
-					if ( is_array( $pid ) && !TimberHelper::is_array_assoc( $pid ) ) {
122
-						foreach ( $pid as &$p ) {
123
-							$p = new $TermClass( $p );
118
+					return new $ImageClass($pid);
119
+				} ));
120
+		$twig->addFunction(new Twig_SimpleFunction('TimberTerm', function($pid, $TermClass = 'TimberTerm') {
121
+					if ( is_array($pid) && !TimberHelper::is_array_assoc($pid) ) {
122
+						foreach ($pid as &$p) {
123
+							$p = new $TermClass($p);
124 124
 						}
125 125
 						return $pid;
126 126
 					}
127
-					return new $TermClass( $pid );
128
-				} ) );
129
-		$twig->addFunction( new Twig_SimpleFunction( 'TimberUser', function ( $pid, $UserClass = 'TimberUser' ) {
130
-					if ( is_array( $pid ) && !TimberHelper::is_array_assoc( $pid ) ) {
131
-						foreach ( $pid as &$p ) {
132
-							$p = new $UserClass( $p );
127
+					return new $TermClass($pid);
128
+				} ));
129
+		$twig->addFunction(new Twig_SimpleFunction('TimberUser', function($pid, $UserClass = 'TimberUser') {
130
+					if ( is_array($pid) && !TimberHelper::is_array_assoc($pid) ) {
131
+						foreach ($pid as &$p) {
132
+							$p = new $UserClass($p);
133 133
 						}
134 134
 						return $pid;
135 135
 					}
136
-					return new $UserClass( $pid );
137
-				} ) );
136
+					return new $UserClass($pid);
137
+				} ));
138 138
 
139 139
 		/* TimberObjects Alias */
140
-		$twig->addFunction( new Twig_SimpleFunction( 'Post', function ( $pid, $PostClass = 'TimberPost' ) {
141
-					if ( is_array( $pid ) && !TimberHelper::is_array_assoc( $pid ) ) {
142
-						foreach ( $pid as &$p ) {
143
-							$p = new $PostClass( $p );
140
+		$twig->addFunction(new Twig_SimpleFunction('Post', function($pid, $PostClass = 'TimberPost') {
141
+					if ( is_array($pid) && !TimberHelper::is_array_assoc($pid) ) {
142
+						foreach ($pid as &$p) {
143
+							$p = new $PostClass($p);
144 144
 						}
145 145
 						return $pid;
146 146
 					}
147
-					return new $PostClass( $pid );
148
-				} ) );
149
-		$twig->addFunction( new Twig_SimpleFunction( 'Image', function ( $pid, $ImageClass = 'TimberImage' ) {
150
-					if ( is_array( $pid ) && !TimberHelper::is_array_assoc( $pid ) ) {
151
-						foreach ( $pid as &$p ) {
152
-							$p = new $ImageClass( $p );
147
+					return new $PostClass($pid);
148
+				} ));
149
+		$twig->addFunction(new Twig_SimpleFunction('Image', function($pid, $ImageClass = 'TimberImage') {
150
+					if ( is_array($pid) && !TimberHelper::is_array_assoc($pid) ) {
151
+						foreach ($pid as &$p) {
152
+							$p = new $ImageClass($p);
153 153
 						}
154 154
 						return $pid;
155 155
 					}
156
-					return new $ImageClass( $pid );
157
-				} ) );
158
-		$twig->addFunction( new Twig_SimpleFunction( 'Term', function ( $pid, $TermClass = 'TimberTerm' ) {
159
-					if ( is_array( $pid ) && !TimberHelper::is_array_assoc( $pid ) ) {
160
-						foreach ( $pid as &$p ) {
161
-							$p = new $TermClass( $p );
156
+					return new $ImageClass($pid);
157
+				} ));
158
+		$twig->addFunction(new Twig_SimpleFunction('Term', function($pid, $TermClass = 'TimberTerm') {
159
+					if ( is_array($pid) && !TimberHelper::is_array_assoc($pid) ) {
160
+						foreach ($pid as &$p) {
161
+							$p = new $TermClass($p);
162 162
 						}
163 163
 						return $pid;
164 164
 					}
165
-					return new $TermClass( $pid );
166
-				} ) );
167
-		$twig->addFunction( new Twig_SimpleFunction( 'User', function ( $pid, $UserClass = 'TimberUser' ) {
168
-					if ( is_array( $pid ) && !TimberHelper::is_array_assoc( $pid ) ) {
169
-						foreach ( $pid as &$p ) {
170
-							$p = new $UserClass( $p );
165
+					return new $TermClass($pid);
166
+				} ));
167
+		$twig->addFunction(new Twig_SimpleFunction('User', function($pid, $UserClass = 'TimberUser') {
168
+					if ( is_array($pid) && !TimberHelper::is_array_assoc($pid) ) {
169
+						foreach ($pid as &$p) {
170
+							$p = new $UserClass($p);
171 171
 						}
172 172
 						return $pid;
173 173
 					}
174
-					return new $UserClass( $pid );
175
-				} ) );
174
+					return new $UserClass($pid);
175
+				} ));
176 176
 
177 177
 		/* bloginfo and translate */
178
-		$twig->addFunction( 'bloginfo', new Twig_SimpleFunction( 'bloginfo', function ( $show = '', $filter = 'raw' ) {
179
-					return get_bloginfo( $show, $filter );
180
-				} ) );
181
-		$twig->addFunction( '__', new Twig_SimpleFunction( '__', function ( $text, $domain = 'default' ) {
182
-					return __( $text, $domain );
183
-				} ) );
178
+		$twig->addFunction('bloginfo', new Twig_SimpleFunction('bloginfo', function($show = '', $filter = 'raw') {
179
+					return get_bloginfo($show, $filter);
180
+				} ));
181
+		$twig->addFunction('__', new Twig_SimpleFunction('__', function($text, $domain = 'default') {
182
+					return __($text, $domain);
183
+				} ));
184 184
 		/* get_twig is deprecated, use timber/twig */
185
-		$twig = apply_filters( 'get_twig', $twig );
186
-		$twig = apply_filters( 'timber/twig', $twig );
185
+		$twig = apply_filters('get_twig', $twig);
186
+		$twig = apply_filters('timber/twig', $twig);
187 187
 		return $twig;
188 188
 	}
189 189
 
@@ -193,11 +193,11 @@  discard block
 block discarded – undo
193 193
 	 * @param mixed   $arr
194 194
 	 * @return array
195 195
 	 */
196
-	function to_array( $arr ) {
197
-		if ( is_array( $arr ) ) {
196
+	function to_array($arr) {
197
+		if ( is_array($arr) ) {
198 198
 			return $arr;
199 199
 		}
200
-		$arr = array( $arr );
200
+		$arr = array($arr);
201 201
 		return $arr;
202 202
 	}
203 203
 
@@ -207,13 +207,13 @@  discard block
 block discarded – undo
207 207
 	 * @param string  $function_name
208 208
 	 * @return mixed
209 209
 	 */
210
-	function exec_function( $function_name ) {
210
+	function exec_function($function_name) {
211 211
 		$args = func_get_args();
212
-		array_shift( $args );
212
+		array_shift($args);
213 213
 		if ( is_string($function_name) ) {
214
-			$function_name = trim( $function_name );
214
+			$function_name = trim($function_name);
215 215
 		}
216
-		return call_user_func_array( $function_name, ( $args ) );
216
+		return call_user_func_array($function_name, ($args));
217 217
 	}
218 218
 
219 219
 	/**
@@ -222,8 +222,8 @@  discard block
 block discarded – undo
222 222
 	 * @param string  $content
223 223
 	 * @return string
224 224
 	 */
225
-	function twig_pretags( $content ) {
226
-		return preg_replace_callback( '|<pre.*>(.*)</pre|isU', array( &$this, 'convert_pre_entities' ), $content );
225
+	function twig_pretags($content) {
226
+		return preg_replace_callback('|<pre.*>(.*)</pre|isU', array(&$this, 'convert_pre_entities'), $content);
227 227
 	}
228 228
 
229 229
 	/**
@@ -232,8 +232,8 @@  discard block
 block discarded – undo
232 232
 	 * @param array   $matches
233 233
 	 * @return string
234 234
 	 */
235
-	function convert_pre_entities( $matches ) {
236
-		return str_replace( $matches[1], htmlentities( $matches[1] ), $matches[0] );
235
+	function convert_pre_entities($matches) {
236
+		return str_replace($matches[1], htmlentities($matches[1]), $matches[0]);
237 237
 	}
238 238
 
239 239
 	/**
@@ -241,12 +241,12 @@  discard block
 block discarded – undo
241 241
 	 * @deprecated 0.20.7
242 242
 	 * @return string
243 243
 	 */
244
-	function body_class( $body_classes ) {
244
+	function body_class($body_classes) {
245 245
 		ob_start();
246
-		if ( is_array( $body_classes ) ) {
247
-			$body_classes = explode( ' ', $body_classes );
246
+		if ( is_array($body_classes) ) {
247
+			$body_classes = explode(' ', $body_classes);
248 248
 		}
249
-		body_class( $body_classes );
249
+		body_class($body_classes);
250 250
 		$return = ob_get_contents();
251 251
 		ob_end_clean();
252 252
 		return $return;
@@ -259,20 +259,20 @@  discard block
 block discarded – undo
259 259
 	 * @param string  $format (optional)
260 260
 	 * @return string
261 261
 	 */
262
-	function intl_date( $date, $format = null ) {
262
+	function intl_date($date, $format = null) {
263 263
 		if ( $format === null ) {
264
-			$format = get_option( 'date_format' );
264
+			$format = get_option('date_format');
265 265
 		}
266 266
 
267 267
 		if ( $date instanceof DateTime ) {
268 268
 			$timestamp = $date->getTimestamp();
269
-		} else if (is_numeric( $date ) && strtotime( $date ) === false ) {
270
-			$timestamp = intval( $date );
269
+		} else if ( is_numeric($date) && strtotime($date) === false ) {
270
+			$timestamp = intval($date);
271 271
 		} else {
272
-			$timestamp = strtotime( $date );
272
+			$timestamp = strtotime($date);
273 273
 		}
274 274
 
275
-		return date_i18n( $format, $timestamp );
275
+		return date_i18n($format, $timestamp);
276 276
 	}
277 277
 
278 278
 	//debug
@@ -284,17 +284,17 @@  discard block
 block discarded – undo
284 284
 	 * @param bool    $methods
285 285
 	 * @return string
286 286
 	 */
287
-	function object_docs( $obj, $methods = true ) {
288
-		$class = get_class( $obj );
289
-		$properties = (array)$obj;
287
+	function object_docs($obj, $methods = true) {
288
+		$class = get_class($obj);
289
+		$properties = (array) $obj;
290 290
 		if ( $methods ) {
291 291
 			/** @var array $methods */
292 292
 			$methods = $obj->get_method_values();
293 293
 		}
294
-		$rets = array_merge( $properties, $methods );
295
-		ksort( $rets );
296
-		$str = print_r( $rets, true );
297
-		$str = str_replace( 'Array', $class . ' Object', $str );
294
+		$rets = array_merge($properties, $methods);
295
+		ksort($rets);
296
+		$str = print_r($rets, true);
297
+		$str = str_replace('Array', $class . ' Object', $str);
298 298
 		return $str;
299 299
 	}
300 300
 
@@ -305,15 +305,15 @@  discard block
 block discarded – undo
305 305
 	 * @param string $format_future
306 306
 	 * @return string
307 307
 	 */
308
-	function time_ago( $from, $to = null, $format_past = '%s ago', $format_future = '%s from now' ) {
308
+	function time_ago($from, $to = null, $format_past = '%s ago', $format_future = '%s from now') {
309 309
 		$to = $to === null ? time() : $to;
310
-		$to = is_int( $to ) ? $to : strtotime( $to );
311
-		$from = is_int( $from ) ? $from : strtotime( $from );
310
+		$to = is_int($to) ? $to : strtotime($to);
311
+		$from = is_int($from) ? $from : strtotime($from);
312 312
 
313 313
 		if ( $from < $to ) {
314
-			return sprintf( $format_past, human_time_diff( $from, $to ) );
314
+			return sprintf($format_past, human_time_diff($from, $to));
315 315
 		} else {
316
-			return sprintf( $format_future, human_time_diff( $to, $from ) );
316
+			return sprintf($format_future, human_time_diff($to, $from));
317 317
 		}
318 318
 	}
319 319
 
Please login to merge, or discard this patch.