@@ -43,29 +43,29 @@ discard block |
||
43 | 43 | |
44 | 44 | public function __construct(Google_Client $client) |
45 | 45 | { |
46 | - if (!function_exists('memcache_connect') && !class_exists("Memcached")) { |
|
47 | - $error = "Memcache functions not available"; |
|
48 | - |
|
49 | - $client->getLogger()->error($error); |
|
50 | - throw new Google_Cache_Exception($error); |
|
51 | - } |
|
52 | - |
|
53 | - $this->client = $client; |
|
54 | - |
|
55 | - if ($client->isAppEngine()) { |
|
56 | - // No credentials needed for GAE. |
|
57 | - $this->mc = new Memcached(); |
|
58 | - $this->connection = true; |
|
59 | - } else { |
|
60 | - $this->host = $client->getClassConfig($this, 'host'); |
|
61 | - $this->port = $client->getClassConfig($this, 'port'); |
|
62 | - if (empty($this->host) || (empty($this->port) && (string) $this->port != "0")) { |
|
63 | - $error = "You need to supply a valid memcache host and port"; |
|
64 | - |
|
65 | - $client->getLogger()->error($error); |
|
66 | - throw new Google_Cache_Exception($error); |
|
67 | - } |
|
68 | - } |
|
46 | + if (!function_exists('memcache_connect') && !class_exists("Memcached")) { |
|
47 | + $error = "Memcache functions not available"; |
|
48 | + |
|
49 | + $client->getLogger()->error($error); |
|
50 | + throw new Google_Cache_Exception($error); |
|
51 | + } |
|
52 | + |
|
53 | + $this->client = $client; |
|
54 | + |
|
55 | + if ($client->isAppEngine()) { |
|
56 | + // No credentials needed for GAE. |
|
57 | + $this->mc = new Memcached(); |
|
58 | + $this->connection = true; |
|
59 | + } else { |
|
60 | + $this->host = $client->getClassConfig($this, 'host'); |
|
61 | + $this->port = $client->getClassConfig($this, 'port'); |
|
62 | + if (empty($this->host) || (empty($this->port) && (string) $this->port != "0")) { |
|
63 | + $error = "You need to supply a valid memcache host and port"; |
|
64 | + |
|
65 | + $client->getLogger()->error($error); |
|
66 | + throw new Google_Cache_Exception($error); |
|
67 | + } |
|
68 | + } |
|
69 | 69 | } |
70 | 70 | |
71 | 71 | /** |
@@ -73,35 +73,35 @@ discard block |
||
73 | 73 | */ |
74 | 74 | public function get($key, $expiration = false) |
75 | 75 | { |
76 | - $this->connect(); |
|
77 | - $ret = false; |
|
78 | - if ($this->mc) { |
|
79 | - $ret = $this->mc->get($key); |
|
80 | - } else { |
|
81 | - $ret = memcache_get($this->connection, $key); |
|
82 | - } |
|
83 | - if ($ret === false) { |
|
84 | - $this->client->getLogger()->debug( |
|
85 | - 'Memcache cache miss', |
|
86 | - array('key' => $key) |
|
87 | - ); |
|
88 | - return false; |
|
89 | - } |
|
90 | - if (is_numeric($expiration) && (time() - $ret['time'] > $expiration)) { |
|
91 | - $this->client->getLogger()->debug( |
|
92 | - 'Memcache cache miss (expired)', |
|
93 | - array('key' => $key, 'var' => $ret) |
|
94 | - ); |
|
95 | - $this->delete($key); |
|
96 | - return false; |
|
97 | - } |
|
98 | - |
|
99 | - $this->client->getLogger()->debug( |
|
100 | - 'Memcache cache hit', |
|
101 | - array('key' => $key, 'var' => $ret) |
|
102 | - ); |
|
103 | - |
|
104 | - return $ret['data']; |
|
76 | + $this->connect(); |
|
77 | + $ret = false; |
|
78 | + if ($this->mc) { |
|
79 | + $ret = $this->mc->get($key); |
|
80 | + } else { |
|
81 | + $ret = memcache_get($this->connection, $key); |
|
82 | + } |
|
83 | + if ($ret === false) { |
|
84 | + $this->client->getLogger()->debug( |
|
85 | + 'Memcache cache miss', |
|
86 | + array('key' => $key) |
|
87 | + ); |
|
88 | + return false; |
|
89 | + } |
|
90 | + if (is_numeric($expiration) && (time() - $ret['time'] > $expiration)) { |
|
91 | + $this->client->getLogger()->debug( |
|
92 | + 'Memcache cache miss (expired)', |
|
93 | + array('key' => $key, 'var' => $ret) |
|
94 | + ); |
|
95 | + $this->delete($key); |
|
96 | + return false; |
|
97 | + } |
|
98 | + |
|
99 | + $this->client->getLogger()->debug( |
|
100 | + 'Memcache cache hit', |
|
101 | + array('key' => $key, 'var' => $ret) |
|
102 | + ); |
|
103 | + |
|
104 | + return $ret['data']; |
|
105 | 105 | } |
106 | 106 | |
107 | 107 | /** |
@@ -112,29 +112,29 @@ discard block |
||
112 | 112 | */ |
113 | 113 | public function set($key, $value) |
114 | 114 | { |
115 | - $this->connect(); |
|
116 | - // we store it with the cache_time default expiration so objects will at |
|
117 | - // least get cleaned eventually. |
|
118 | - $data = array('time' => time(), 'data' => $value); |
|
119 | - $rc = false; |
|
120 | - if ($this->mc) { |
|
121 | - $rc = $this->mc->set($key, $data); |
|
122 | - } else { |
|
123 | - $rc = memcache_set($this->connection, $key, $data, false); |
|
124 | - } |
|
125 | - if ($rc == false) { |
|
126 | - $this->client->getLogger()->error( |
|
127 | - 'Memcache cache set failed', |
|
128 | - array('key' => $key, 'var' => $data) |
|
129 | - ); |
|
130 | - |
|
131 | - throw new Google_Cache_Exception("Couldn't store data in cache"); |
|
132 | - } |
|
133 | - |
|
134 | - $this->client->getLogger()->debug( |
|
135 | - 'Memcache cache set', |
|
136 | - array('key' => $key, 'var' => $data) |
|
137 | - ); |
|
115 | + $this->connect(); |
|
116 | + // we store it with the cache_time default expiration so objects will at |
|
117 | + // least get cleaned eventually. |
|
118 | + $data = array('time' => time(), 'data' => $value); |
|
119 | + $rc = false; |
|
120 | + if ($this->mc) { |
|
121 | + $rc = $this->mc->set($key, $data); |
|
122 | + } else { |
|
123 | + $rc = memcache_set($this->connection, $key, $data, false); |
|
124 | + } |
|
125 | + if ($rc == false) { |
|
126 | + $this->client->getLogger()->error( |
|
127 | + 'Memcache cache set failed', |
|
128 | + array('key' => $key, 'var' => $data) |
|
129 | + ); |
|
130 | + |
|
131 | + throw new Google_Cache_Exception("Couldn't store data in cache"); |
|
132 | + } |
|
133 | + |
|
134 | + $this->client->getLogger()->debug( |
|
135 | + 'Memcache cache set', |
|
136 | + array('key' => $key, 'var' => $data) |
|
137 | + ); |
|
138 | 138 | } |
139 | 139 | |
140 | 140 | /** |
@@ -143,17 +143,17 @@ discard block |
||
143 | 143 | */ |
144 | 144 | public function delete($key) |
145 | 145 | { |
146 | - $this->connect(); |
|
147 | - if ($this->mc) { |
|
148 | - $this->mc->delete($key, 0); |
|
149 | - } else { |
|
150 | - memcache_delete($this->connection, $key, 0); |
|
151 | - } |
|
152 | - |
|
153 | - $this->client->getLogger()->debug( |
|
154 | - 'Memcache cache delete', |
|
155 | - array('key' => $key) |
|
156 | - ); |
|
146 | + $this->connect(); |
|
147 | + if ($this->mc) { |
|
148 | + $this->mc->delete($key, 0); |
|
149 | + } else { |
|
150 | + memcache_delete($this->connection, $key, 0); |
|
151 | + } |
|
152 | + |
|
153 | + $this->client->getLogger()->debug( |
|
154 | + 'Memcache cache delete', |
|
155 | + array('key' => $key) |
|
156 | + ); |
|
157 | 157 | } |
158 | 158 | |
159 | 159 | /** |
@@ -162,23 +162,23 @@ discard block |
||
162 | 162 | */ |
163 | 163 | private function connect() |
164 | 164 | { |
165 | - if ($this->connection) { |
|
166 | - return; |
|
167 | - } |
|
168 | - |
|
169 | - if (class_exists("Memcached")) { |
|
170 | - $this->mc = new Memcached(); |
|
171 | - $this->mc->addServer($this->host, $this->port); |
|
172 | - $this->connection = true; |
|
173 | - } else { |
|
174 | - $this->connection = memcache_pconnect($this->host, $this->port); |
|
175 | - } |
|
176 | - |
|
177 | - if (! $this->connection) { |
|
178 | - $error = "Couldn't connect to memcache server"; |
|
179 | - |
|
180 | - $this->client->getLogger()->error($error); |
|
181 | - throw new Google_Cache_Exception($error); |
|
182 | - } |
|
165 | + if ($this->connection) { |
|
166 | + return; |
|
167 | + } |
|
168 | + |
|
169 | + if (class_exists("Memcached")) { |
|
170 | + $this->mc = new Memcached(); |
|
171 | + $this->mc->addServer($this->host, $this->port); |
|
172 | + $this->connection = true; |
|
173 | + } else { |
|
174 | + $this->connection = memcache_pconnect($this->host, $this->port); |
|
175 | + } |
|
176 | + |
|
177 | + if (! $this->connection) { |
|
178 | + $error = "Couldn't connect to memcache server"; |
|
179 | + |
|
180 | + $this->client->getLogger()->error($error); |
|
181 | + throw new Google_Cache_Exception($error); |
|
182 | + } |
|
183 | 183 | } |
184 | 184 | } |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | */ |
17 | 17 | |
18 | 18 | if (!class_exists('Google_Client')) { |
19 | - require_once dirname(__FILE__) . '/../autoload.php'; |
|
19 | + require_once dirname(__FILE__).'/../autoload.php'; |
|
20 | 20 | } |
21 | 21 | |
22 | 22 | /** |
@@ -174,7 +174,7 @@ discard block |
||
174 | 174 | $this->connection = memcache_pconnect($this->host, $this->port); |
175 | 175 | } |
176 | 176 | |
177 | - if (! $this->connection) { |
|
177 | + if (!$this->connection) { |
|
178 | 178 | $error = "Couldn't connect to memcache server"; |
179 | 179 | |
180 | 180 | $this->client->getLogger()->error($error); |
@@ -31,11 +31,11 @@ discard block |
||
31 | 31 | } |
32 | 32 | |
33 | 33 | /** |
34 | - * @inheritDoc |
|
35 | - */ |
|
34 | + * @inheritDoc |
|
35 | + */ |
|
36 | 36 | public function get($key, $expiration = false) |
37 | 37 | { |
38 | - return false; |
|
38 | + return false; |
|
39 | 39 | } |
40 | 40 | |
41 | 41 | /** |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | */ |
44 | 44 | public function set($key, $value) |
45 | 45 | { |
46 | - // Nop. |
|
46 | + // Nop. |
|
47 | 47 | } |
48 | 48 | |
49 | 49 | /** |
@@ -52,6 +52,6 @@ discard block |
||
52 | 52 | */ |
53 | 53 | public function delete($key) |
54 | 54 | { |
55 | - // Nop. |
|
55 | + // Nop. |
|
56 | 56 | } |
57 | 57 | } |
@@ -16,7 +16,7 @@ |
||
16 | 16 | */ |
17 | 17 | |
18 | 18 | if (!class_exists('Google_Client')) { |
19 | - require_once dirname(__FILE__) . '/../autoload.php'; |
|
19 | + require_once dirname(__FILE__).'/../autoload.php'; |
|
20 | 20 | } |
21 | 21 | |
22 | 22 | /** |
@@ -16,7 +16,7 @@ |
||
16 | 16 | */ |
17 | 17 | |
18 | 18 | if (!class_exists('Google_Client')) { |
19 | - require_once dirname(__FILE__) . '/../autoload.php'; |
|
19 | + require_once dirname(__FILE__).'/../autoload.php'; |
|
20 | 20 | } |
21 | 21 | |
22 | 22 | class Google_Cache_Exception extends Google_Exception |
@@ -83,72 +83,72 @@ discard block |
||
83 | 83 | * @throws Google_Task_Exception when misconfigured |
84 | 84 | */ |
85 | 85 | public function __construct( |
86 | - Google_Client $client, |
|
87 | - $name, |
|
88 | - $action, |
|
89 | - array $arguments = array() |
|
86 | + Google_Client $client, |
|
87 | + $name, |
|
88 | + $action, |
|
89 | + array $arguments = array() |
|
90 | 90 | ) { |
91 | - $config = (array) $client->getClassConfig('Google_Task_Runner'); |
|
91 | + $config = (array) $client->getClassConfig('Google_Task_Runner'); |
|
92 | 92 | |
93 | - if (isset($config['initial_delay'])) { |
|
94 | - if ($config['initial_delay'] < 0) { |
|
95 | - throw new Google_Task_Exception( |
|
96 | - 'Task configuration `initial_delay` must not be negative.' |
|
97 | - ); |
|
98 | - } |
|
93 | + if (isset($config['initial_delay'])) { |
|
94 | + if ($config['initial_delay'] < 0) { |
|
95 | + throw new Google_Task_Exception( |
|
96 | + 'Task configuration `initial_delay` must not be negative.' |
|
97 | + ); |
|
98 | + } |
|
99 | 99 | |
100 | - $this->delay = $config['initial_delay']; |
|
101 | - } |
|
100 | + $this->delay = $config['initial_delay']; |
|
101 | + } |
|
102 | 102 | |
103 | - if (isset($config['max_delay'])) { |
|
104 | - if ($config['max_delay'] <= 0) { |
|
105 | - throw new Google_Task_Exception( |
|
106 | - 'Task configuration `max_delay` must be greater than 0.' |
|
107 | - ); |
|
108 | - } |
|
103 | + if (isset($config['max_delay'])) { |
|
104 | + if ($config['max_delay'] <= 0) { |
|
105 | + throw new Google_Task_Exception( |
|
106 | + 'Task configuration `max_delay` must be greater than 0.' |
|
107 | + ); |
|
108 | + } |
|
109 | 109 | |
110 | - $this->maxDelay = $config['max_delay']; |
|
111 | - } |
|
110 | + $this->maxDelay = $config['max_delay']; |
|
111 | + } |
|
112 | 112 | |
113 | - if (isset($config['factor'])) { |
|
114 | - if ($config['factor'] <= 0) { |
|
115 | - throw new Google_Task_Exception( |
|
116 | - 'Task configuration `factor` must be greater than 0.' |
|
117 | - ); |
|
118 | - } |
|
113 | + if (isset($config['factor'])) { |
|
114 | + if ($config['factor'] <= 0) { |
|
115 | + throw new Google_Task_Exception( |
|
116 | + 'Task configuration `factor` must be greater than 0.' |
|
117 | + ); |
|
118 | + } |
|
119 | 119 | |
120 | - $this->factor = $config['factor']; |
|
121 | - } |
|
120 | + $this->factor = $config['factor']; |
|
121 | + } |
|
122 | 122 | |
123 | - if (isset($config['jitter'])) { |
|
124 | - if ($config['jitter'] <= 0) { |
|
125 | - throw new Google_Task_Exception( |
|
126 | - 'Task configuration `jitter` must be greater than 0.' |
|
127 | - ); |
|
128 | - } |
|
123 | + if (isset($config['jitter'])) { |
|
124 | + if ($config['jitter'] <= 0) { |
|
125 | + throw new Google_Task_Exception( |
|
126 | + 'Task configuration `jitter` must be greater than 0.' |
|
127 | + ); |
|
128 | + } |
|
129 | 129 | |
130 | - $this->jitter = $config['jitter']; |
|
131 | - } |
|
130 | + $this->jitter = $config['jitter']; |
|
131 | + } |
|
132 | 132 | |
133 | - if (isset($config['retries'])) { |
|
134 | - if ($config['retries'] < 0) { |
|
135 | - throw new Google_Task_Exception( |
|
136 | - 'Task configuration `retries` must not be negative.' |
|
137 | - ); |
|
138 | - } |
|
139 | - $this->maxAttempts += $config['retries']; |
|
140 | - } |
|
133 | + if (isset($config['retries'])) { |
|
134 | + if ($config['retries'] < 0) { |
|
135 | + throw new Google_Task_Exception( |
|
136 | + 'Task configuration `retries` must not be negative.' |
|
137 | + ); |
|
138 | + } |
|
139 | + $this->maxAttempts += $config['retries']; |
|
140 | + } |
|
141 | 141 | |
142 | - if (!is_callable($action)) { |
|
143 | - throw new Google_Task_Exception( |
|
144 | - 'Task argument `$action` must be a valid callable.' |
|
145 | - ); |
|
146 | - } |
|
142 | + if (!is_callable($action)) { |
|
143 | + throw new Google_Task_Exception( |
|
144 | + 'Task argument `$action` must be a valid callable.' |
|
145 | + ); |
|
146 | + } |
|
147 | 147 | |
148 | - $this->name = $name; |
|
149 | - $this->client = $client; |
|
150 | - $this->action = $action; |
|
151 | - $this->arguments = $arguments; |
|
148 | + $this->name = $name; |
|
149 | + $this->client = $client; |
|
150 | + $this->action = $action; |
|
151 | + $this->arguments = $arguments; |
|
152 | 152 | } |
153 | 153 | |
154 | 154 | /** |
@@ -158,7 +158,7 @@ discard block |
||
158 | 158 | */ |
159 | 159 | public function canAttmpt() |
160 | 160 | { |
161 | - return $this->attempts < $this->maxAttempts; |
|
161 | + return $this->attempts < $this->maxAttempts; |
|
162 | 162 | } |
163 | 163 | |
164 | 164 | /** |
@@ -169,24 +169,24 @@ discard block |
||
169 | 169 | */ |
170 | 170 | public function run() |
171 | 171 | { |
172 | - while ($this->attempt()) { |
|
173 | - try { |
|
174 | - return call_user_func_array($this->action, $this->arguments); |
|
175 | - } catch (Google_Task_Retryable $exception) { |
|
176 | - $allowedRetries = $exception->allowedRetries(); |
|
172 | + while ($this->attempt()) { |
|
173 | + try { |
|
174 | + return call_user_func_array($this->action, $this->arguments); |
|
175 | + } catch (Google_Task_Retryable $exception) { |
|
176 | + $allowedRetries = $exception->allowedRetries(); |
|
177 | 177 | |
178 | - if (!$this->canAttmpt() || !$allowedRetries) { |
|
179 | - throw $exception; |
|
180 | - } |
|
178 | + if (!$this->canAttmpt() || !$allowedRetries) { |
|
179 | + throw $exception; |
|
180 | + } |
|
181 | 181 | |
182 | - if ($allowedRetries > 0) { |
|
183 | - $this->maxAttempts = min( |
|
184 | - $this->maxAttempts, |
|
185 | - $this->attempts + $allowedRetries |
|
186 | - ); |
|
187 | - } |
|
188 | - } |
|
189 | - } |
|
182 | + if ($allowedRetries > 0) { |
|
183 | + $this->maxAttempts = min( |
|
184 | + $this->maxAttempts, |
|
185 | + $this->attempts + $allowedRetries |
|
186 | + ); |
|
187 | + } |
|
188 | + } |
|
189 | + } |
|
190 | 190 | } |
191 | 191 | |
192 | 192 | /** |
@@ -200,16 +200,16 @@ discard block |
||
200 | 200 | */ |
201 | 201 | public function attempt() |
202 | 202 | { |
203 | - if (!$this->canAttmpt()) { |
|
204 | - return false; |
|
205 | - } |
|
203 | + if (!$this->canAttmpt()) { |
|
204 | + return false; |
|
205 | + } |
|
206 | 206 | |
207 | - if ($this->attempts > 0) { |
|
208 | - $this->backOff(); |
|
209 | - } |
|
207 | + if ($this->attempts > 0) { |
|
208 | + $this->backOff(); |
|
209 | + } |
|
210 | 210 | |
211 | - $this->attempts++; |
|
212 | - return true; |
|
211 | + $this->attempts++; |
|
212 | + return true; |
|
213 | 213 | } |
214 | 214 | |
215 | 215 | /** |
@@ -217,18 +217,18 @@ discard block |
||
217 | 217 | */ |
218 | 218 | private function backOff() |
219 | 219 | { |
220 | - $delay = $this->getDelay(); |
|
220 | + $delay = $this->getDelay(); |
|
221 | 221 | |
222 | - $this->client->getLogger()->debug( |
|
223 | - 'Retrying task with backoff', |
|
224 | - array( |
|
225 | - 'request' => $this->name, |
|
226 | - 'retry' => $this->attempts, |
|
227 | - 'backoff_seconds' => $delay |
|
228 | - ) |
|
229 | - ); |
|
222 | + $this->client->getLogger()->debug( |
|
223 | + 'Retrying task with backoff', |
|
224 | + array( |
|
225 | + 'request' => $this->name, |
|
226 | + 'retry' => $this->attempts, |
|
227 | + 'backoff_seconds' => $delay |
|
228 | + ) |
|
229 | + ); |
|
230 | 230 | |
231 | - usleep($delay * 1000000); |
|
231 | + usleep($delay * 1000000); |
|
232 | 232 | } |
233 | 233 | |
234 | 234 | /** |
@@ -238,10 +238,10 @@ discard block |
||
238 | 238 | */ |
239 | 239 | private function getDelay() |
240 | 240 | { |
241 | - $jitter = $this->getJitter(); |
|
242 | - $factor = $this->attempts > 1 ? $this->factor + $jitter : 1 + abs($jitter); |
|
241 | + $jitter = $this->getJitter(); |
|
242 | + $factor = $this->attempts > 1 ? $this->factor + $jitter : 1 + abs($jitter); |
|
243 | 243 | |
244 | - return $this->delay = min($this->maxDelay, $this->delay * $factor); |
|
244 | + return $this->delay = min($this->maxDelay, $this->delay * $factor); |
|
245 | 245 | } |
246 | 246 | |
247 | 247 | /** |
@@ -252,6 +252,6 @@ discard block |
||
252 | 252 | */ |
253 | 253 | private function getJitter() |
254 | 254 | { |
255 | - return $this->jitter * 2 * mt_rand() / mt_getrandmax() - $this->jitter; |
|
255 | + return $this->jitter * 2 * mt_rand() / mt_getrandmax() - $this->jitter; |
|
256 | 256 | } |
257 | 257 | } |
@@ -16,7 +16,7 @@ |
||
16 | 16 | */ |
17 | 17 | |
18 | 18 | if (!class_exists('Google_Client')) { |
19 | - require_once dirname(__FILE__) . '/../autoload.php'; |
|
19 | + require_once dirname(__FILE__).'/../autoload.php'; |
|
20 | 20 | } |
21 | 21 | |
22 | 22 | /** |
@@ -16,7 +16,7 @@ |
||
16 | 16 | */ |
17 | 17 | |
18 | 18 | if (!class_exists('Google_Client')) { |
19 | - require_once dirname(__FILE__) . '/../autoload.php'; |
|
19 | + require_once dirname(__FILE__).'/../autoload.php'; |
|
20 | 20 | } |
21 | 21 | |
22 | 22 | class Google_Task_Exception extends Google_Exception |
@@ -39,117 +39,117 @@ discard block |
||
39 | 39 | */ |
40 | 40 | public function __construct($ini_file_location = null) |
41 | 41 | { |
42 | - $this->configuration = array( |
|
43 | - // The application_name is included in the User-Agent HTTP header. |
|
44 | - 'application_name' => '', |
|
45 | - |
|
46 | - // Which Authentication, Storage and HTTP IO classes to use. |
|
47 | - 'auth_class' => 'Google_Auth_OAuth2', |
|
48 | - 'io_class' => self::USE_AUTO_IO_SELECTION, |
|
49 | - 'cache_class' => 'Google_Cache_File', |
|
50 | - 'logger_class' => 'Google_Logger_Null', |
|
51 | - |
|
52 | - // Don't change these unless you're working against a special development |
|
53 | - // or testing environment. |
|
54 | - 'base_path' => 'https://www.googleapis.com', |
|
55 | - |
|
56 | - // Definition of class specific values, like file paths and so on. |
|
57 | - 'classes' => array( |
|
58 | - 'Google_IO_Abstract' => array( |
|
59 | - 'request_timeout_seconds' => 100, |
|
60 | - ), |
|
61 | - 'Google_Logger_Abstract' => array( |
|
62 | - 'level' => 'debug', |
|
63 | - 'log_format' => "[%datetime%] %level%: %message% %context%\n", |
|
64 | - 'date_format' => 'd/M/Y:H:i:s O', |
|
65 | - 'allow_newlines' => true |
|
66 | - ), |
|
67 | - 'Google_Logger_File' => array( |
|
68 | - 'file' => 'php://stdout', |
|
69 | - 'mode' => 0640, |
|
70 | - 'lock' => false, |
|
71 | - ), |
|
72 | - 'Google_Http_Request' => array( |
|
73 | - // Disable the use of gzip on calls if set to true. Defaults to false. |
|
74 | - 'disable_gzip' => self::GZIP_ENABLED, |
|
75 | - |
|
76 | - // We default gzip to disabled on uploads even if gzip is otherwise |
|
77 | - // enabled, due to some issues seen with small packet sizes for uploads. |
|
78 | - // Please test with this option before enabling gzip for uploads in |
|
79 | - // a production environment. |
|
80 | - 'enable_gzip_for_uploads' => self::GZIP_UPLOADS_DISABLED, |
|
81 | - ), |
|
82 | - // If you want to pass in OAuth 2.0 settings, they will need to be |
|
83 | - // structured like this. |
|
84 | - 'Google_Auth_OAuth2' => array( |
|
85 | - // Keys for OAuth 2.0 access, see the API console at |
|
86 | - // https://developers.google.com/console |
|
87 | - 'client_id' => '', |
|
88 | - 'client_secret' => '', |
|
89 | - 'redirect_uri' => '', |
|
90 | - |
|
91 | - // Simple API access key, also from the API console. Ensure you get |
|
92 | - // a Server key, and not a Browser key. |
|
93 | - 'developer_key' => '', |
|
94 | - |
|
95 | - // Other parameters. |
|
96 | - 'hd' => '', |
|
97 | - 'prompt' => '', |
|
98 | - 'openid.realm' => '', |
|
99 | - 'include_granted_scopes' => '', |
|
100 | - 'login_hint' => '', |
|
101 | - 'request_visible_actions' => '', |
|
102 | - 'access_type' => 'online', |
|
103 | - 'approval_prompt' => 'auto', |
|
104 | - 'federated_signon_certs_url' => |
|
105 | - 'https://www.googleapis.com/oauth2/v1/certs', |
|
106 | - ), |
|
107 | - 'Google_Task_Runner' => array( |
|
108 | - // Delays are specified in seconds |
|
109 | - 'initial_delay' => 1, |
|
110 | - 'max_delay' => 60, |
|
111 | - // Base number for exponential backoff |
|
112 | - 'factor' => 2, |
|
113 | - // A random number between -jitter and jitter will be added to the |
|
114 | - // factor on each iteration to allow for better distribution of |
|
115 | - // retries. |
|
116 | - 'jitter' => .5, |
|
117 | - // Maximum number of retries allowed |
|
118 | - 'retries' => 0 |
|
119 | - ), |
|
120 | - 'Google_Service_Exception' => array( |
|
121 | - 'retry_map' => array( |
|
122 | - '500' => self::TASK_RETRY_ALWAYS, |
|
123 | - '503' => self::TASK_RETRY_ALWAYS, |
|
124 | - 'rateLimitExceeded' => self::TASK_RETRY_ALWAYS, |
|
125 | - 'userRateLimitExceeded' => self::TASK_RETRY_ALWAYS |
|
126 | - ) |
|
127 | - ), |
|
128 | - 'Google_IO_Exception' => array( |
|
129 | - 'retry_map' => !extension_loaded('curl') ? array() : array( |
|
130 | - CURLE_COULDNT_RESOLVE_HOST => self::TASK_RETRY_ALWAYS, |
|
131 | - CURLE_COULDNT_CONNECT => self::TASK_RETRY_ALWAYS, |
|
132 | - CURLE_OPERATION_TIMEOUTED => self::TASK_RETRY_ALWAYS, |
|
133 | - CURLE_SSL_CONNECT_ERROR => self::TASK_RETRY_ALWAYS, |
|
134 | - CURLE_GOT_NOTHING => self::TASK_RETRY_ALWAYS |
|
135 | - ) |
|
136 | - ), |
|
137 | - // Set a default directory for the file cache. |
|
138 | - 'Google_Cache_File' => array( |
|
139 | - 'directory' => sys_get_temp_dir() . '/Google_Client' |
|
140 | - ) |
|
141 | - ), |
|
142 | - ); |
|
143 | - if ($ini_file_location) { |
|
144 | - $ini = parse_ini_file($ini_file_location, true); |
|
145 | - if (is_array($ini) && count($ini)) { |
|
146 | - $merged_configuration = $ini + $this->configuration; |
|
147 | - if (isset($ini['classes']) && isset($this->configuration['classes'])) { |
|
148 | - $merged_configuration['classes'] = $ini['classes'] + $this->configuration['classes']; |
|
149 | - } |
|
150 | - $this->configuration = $merged_configuration; |
|
151 | - } |
|
152 | - } |
|
42 | + $this->configuration = array( |
|
43 | + // The application_name is included in the User-Agent HTTP header. |
|
44 | + 'application_name' => '', |
|
45 | + |
|
46 | + // Which Authentication, Storage and HTTP IO classes to use. |
|
47 | + 'auth_class' => 'Google_Auth_OAuth2', |
|
48 | + 'io_class' => self::USE_AUTO_IO_SELECTION, |
|
49 | + 'cache_class' => 'Google_Cache_File', |
|
50 | + 'logger_class' => 'Google_Logger_Null', |
|
51 | + |
|
52 | + // Don't change these unless you're working against a special development |
|
53 | + // or testing environment. |
|
54 | + 'base_path' => 'https://www.googleapis.com', |
|
55 | + |
|
56 | + // Definition of class specific values, like file paths and so on. |
|
57 | + 'classes' => array( |
|
58 | + 'Google_IO_Abstract' => array( |
|
59 | + 'request_timeout_seconds' => 100, |
|
60 | + ), |
|
61 | + 'Google_Logger_Abstract' => array( |
|
62 | + 'level' => 'debug', |
|
63 | + 'log_format' => "[%datetime%] %level%: %message% %context%\n", |
|
64 | + 'date_format' => 'd/M/Y:H:i:s O', |
|
65 | + 'allow_newlines' => true |
|
66 | + ), |
|
67 | + 'Google_Logger_File' => array( |
|
68 | + 'file' => 'php://stdout', |
|
69 | + 'mode' => 0640, |
|
70 | + 'lock' => false, |
|
71 | + ), |
|
72 | + 'Google_Http_Request' => array( |
|
73 | + // Disable the use of gzip on calls if set to true. Defaults to false. |
|
74 | + 'disable_gzip' => self::GZIP_ENABLED, |
|
75 | + |
|
76 | + // We default gzip to disabled on uploads even if gzip is otherwise |
|
77 | + // enabled, due to some issues seen with small packet sizes for uploads. |
|
78 | + // Please test with this option before enabling gzip for uploads in |
|
79 | + // a production environment. |
|
80 | + 'enable_gzip_for_uploads' => self::GZIP_UPLOADS_DISABLED, |
|
81 | + ), |
|
82 | + // If you want to pass in OAuth 2.0 settings, they will need to be |
|
83 | + // structured like this. |
|
84 | + 'Google_Auth_OAuth2' => array( |
|
85 | + // Keys for OAuth 2.0 access, see the API console at |
|
86 | + // https://developers.google.com/console |
|
87 | + 'client_id' => '', |
|
88 | + 'client_secret' => '', |
|
89 | + 'redirect_uri' => '', |
|
90 | + |
|
91 | + // Simple API access key, also from the API console. Ensure you get |
|
92 | + // a Server key, and not a Browser key. |
|
93 | + 'developer_key' => '', |
|
94 | + |
|
95 | + // Other parameters. |
|
96 | + 'hd' => '', |
|
97 | + 'prompt' => '', |
|
98 | + 'openid.realm' => '', |
|
99 | + 'include_granted_scopes' => '', |
|
100 | + 'login_hint' => '', |
|
101 | + 'request_visible_actions' => '', |
|
102 | + 'access_type' => 'online', |
|
103 | + 'approval_prompt' => 'auto', |
|
104 | + 'federated_signon_certs_url' => |
|
105 | + 'https://www.googleapis.com/oauth2/v1/certs', |
|
106 | + ), |
|
107 | + 'Google_Task_Runner' => array( |
|
108 | + // Delays are specified in seconds |
|
109 | + 'initial_delay' => 1, |
|
110 | + 'max_delay' => 60, |
|
111 | + // Base number for exponential backoff |
|
112 | + 'factor' => 2, |
|
113 | + // A random number between -jitter and jitter will be added to the |
|
114 | + // factor on each iteration to allow for better distribution of |
|
115 | + // retries. |
|
116 | + 'jitter' => .5, |
|
117 | + // Maximum number of retries allowed |
|
118 | + 'retries' => 0 |
|
119 | + ), |
|
120 | + 'Google_Service_Exception' => array( |
|
121 | + 'retry_map' => array( |
|
122 | + '500' => self::TASK_RETRY_ALWAYS, |
|
123 | + '503' => self::TASK_RETRY_ALWAYS, |
|
124 | + 'rateLimitExceeded' => self::TASK_RETRY_ALWAYS, |
|
125 | + 'userRateLimitExceeded' => self::TASK_RETRY_ALWAYS |
|
126 | + ) |
|
127 | + ), |
|
128 | + 'Google_IO_Exception' => array( |
|
129 | + 'retry_map' => !extension_loaded('curl') ? array() : array( |
|
130 | + CURLE_COULDNT_RESOLVE_HOST => self::TASK_RETRY_ALWAYS, |
|
131 | + CURLE_COULDNT_CONNECT => self::TASK_RETRY_ALWAYS, |
|
132 | + CURLE_OPERATION_TIMEOUTED => self::TASK_RETRY_ALWAYS, |
|
133 | + CURLE_SSL_CONNECT_ERROR => self::TASK_RETRY_ALWAYS, |
|
134 | + CURLE_GOT_NOTHING => self::TASK_RETRY_ALWAYS |
|
135 | + ) |
|
136 | + ), |
|
137 | + // Set a default directory for the file cache. |
|
138 | + 'Google_Cache_File' => array( |
|
139 | + 'directory' => sys_get_temp_dir() . '/Google_Client' |
|
140 | + ) |
|
141 | + ), |
|
142 | + ); |
|
143 | + if ($ini_file_location) { |
|
144 | + $ini = parse_ini_file($ini_file_location, true); |
|
145 | + if (is_array($ini) && count($ini)) { |
|
146 | + $merged_configuration = $ini + $this->configuration; |
|
147 | + if (isset($ini['classes']) && isset($this->configuration['classes'])) { |
|
148 | + $merged_configuration['classes'] = $ini['classes'] + $this->configuration['classes']; |
|
149 | + } |
|
150 | + $this->configuration = $merged_configuration; |
|
151 | + } |
|
152 | + } |
|
153 | 153 | } |
154 | 154 | |
155 | 155 | /** |
@@ -162,26 +162,26 @@ discard block |
||
162 | 162 | */ |
163 | 163 | public function setClassConfig($class, $config, $value = null) |
164 | 164 | { |
165 | - if (!is_array($config)) { |
|
166 | - if (!isset($this->configuration['classes'][$class])) { |
|
167 | - $this->configuration['classes'][$class] = array(); |
|
168 | - } |
|
169 | - $this->configuration['classes'][$class][$config] = $value; |
|
170 | - } else { |
|
171 | - $this->configuration['classes'][$class] = $config; |
|
172 | - } |
|
165 | + if (!is_array($config)) { |
|
166 | + if (!isset($this->configuration['classes'][$class])) { |
|
167 | + $this->configuration['classes'][$class] = array(); |
|
168 | + } |
|
169 | + $this->configuration['classes'][$class][$config] = $value; |
|
170 | + } else { |
|
171 | + $this->configuration['classes'][$class] = $config; |
|
172 | + } |
|
173 | 173 | } |
174 | 174 | |
175 | 175 | public function getClassConfig($class, $key = null) |
176 | 176 | { |
177 | - if (!isset($this->configuration['classes'][$class])) { |
|
178 | - return null; |
|
179 | - } |
|
180 | - if ($key === null) { |
|
181 | - return $this->configuration['classes'][$class]; |
|
182 | - } else { |
|
183 | - return $this->configuration['classes'][$class][$key]; |
|
184 | - } |
|
177 | + if (!isset($this->configuration['classes'][$class])) { |
|
178 | + return null; |
|
179 | + } |
|
180 | + if ($key === null) { |
|
181 | + return $this->configuration['classes'][$class]; |
|
182 | + } else { |
|
183 | + return $this->configuration['classes'][$class][$key]; |
|
184 | + } |
|
185 | 185 | } |
186 | 186 | |
187 | 187 | /** |
@@ -190,7 +190,7 @@ discard block |
||
190 | 190 | */ |
191 | 191 | public function getCacheClass() |
192 | 192 | { |
193 | - return $this->configuration['cache_class']; |
|
193 | + return $this->configuration['cache_class']; |
|
194 | 194 | } |
195 | 195 | |
196 | 196 | /** |
@@ -199,7 +199,7 @@ discard block |
||
199 | 199 | */ |
200 | 200 | public function getLoggerClass() |
201 | 201 | { |
202 | - return $this->configuration['logger_class']; |
|
202 | + return $this->configuration['logger_class']; |
|
203 | 203 | } |
204 | 204 | |
205 | 205 | /** |
@@ -208,7 +208,7 @@ discard block |
||
208 | 208 | */ |
209 | 209 | public function getAuthClass() |
210 | 210 | { |
211 | - return $this->configuration['auth_class']; |
|
211 | + return $this->configuration['auth_class']; |
|
212 | 212 | } |
213 | 213 | |
214 | 214 | /** |
@@ -218,13 +218,13 @@ discard block |
||
218 | 218 | */ |
219 | 219 | public function setAuthClass($class) |
220 | 220 | { |
221 | - $prev = $this->configuration['auth_class']; |
|
222 | - if (!isset($this->configuration['classes'][$class]) && |
|
223 | - isset($this->configuration['classes'][$prev])) { |
|
224 | - $this->configuration['classes'][$class] = |
|
225 | - $this->configuration['classes'][$prev]; |
|
226 | - } |
|
227 | - $this->configuration['auth_class'] = $class; |
|
221 | + $prev = $this->configuration['auth_class']; |
|
222 | + if (!isset($this->configuration['classes'][$class]) && |
|
223 | + isset($this->configuration['classes'][$prev])) { |
|
224 | + $this->configuration['classes'][$class] = |
|
225 | + $this->configuration['classes'][$prev]; |
|
226 | + } |
|
227 | + $this->configuration['auth_class'] = $class; |
|
228 | 228 | } |
229 | 229 | |
230 | 230 | /** |
@@ -234,13 +234,13 @@ discard block |
||
234 | 234 | */ |
235 | 235 | public function setIoClass($class) |
236 | 236 | { |
237 | - $prev = $this->configuration['io_class']; |
|
238 | - if (!isset($this->configuration['classes'][$class]) && |
|
239 | - isset($this->configuration['classes'][$prev])) { |
|
240 | - $this->configuration['classes'][$class] = |
|
241 | - $this->configuration['classes'][$prev]; |
|
242 | - } |
|
243 | - $this->configuration['io_class'] = $class; |
|
237 | + $prev = $this->configuration['io_class']; |
|
238 | + if (!isset($this->configuration['classes'][$class]) && |
|
239 | + isset($this->configuration['classes'][$prev])) { |
|
240 | + $this->configuration['classes'][$class] = |
|
241 | + $this->configuration['classes'][$prev]; |
|
242 | + } |
|
243 | + $this->configuration['io_class'] = $class; |
|
244 | 244 | } |
245 | 245 | |
246 | 246 | /** |
@@ -250,13 +250,13 @@ discard block |
||
250 | 250 | */ |
251 | 251 | public function setCacheClass($class) |
252 | 252 | { |
253 | - $prev = $this->configuration['cache_class']; |
|
254 | - if (!isset($this->configuration['classes'][$class]) && |
|
255 | - isset($this->configuration['classes'][$prev])) { |
|
256 | - $this->configuration['classes'][$class] = |
|
257 | - $this->configuration['classes'][$prev]; |
|
258 | - } |
|
259 | - $this->configuration['cache_class'] = $class; |
|
253 | + $prev = $this->configuration['cache_class']; |
|
254 | + if (!isset($this->configuration['classes'][$class]) && |
|
255 | + isset($this->configuration['classes'][$prev])) { |
|
256 | + $this->configuration['classes'][$class] = |
|
257 | + $this->configuration['classes'][$prev]; |
|
258 | + } |
|
259 | + $this->configuration['cache_class'] = $class; |
|
260 | 260 | } |
261 | 261 | |
262 | 262 | /** |
@@ -266,13 +266,13 @@ discard block |
||
266 | 266 | */ |
267 | 267 | public function setLoggerClass($class) |
268 | 268 | { |
269 | - $prev = $this->configuration['logger_class']; |
|
270 | - if (!isset($this->configuration['classes'][$class]) && |
|
271 | - isset($this->configuration['classes'][$prev])) { |
|
272 | - $this->configuration['classes'][$class] = |
|
273 | - $this->configuration['classes'][$prev]; |
|
274 | - } |
|
275 | - $this->configuration['logger_class'] = $class; |
|
269 | + $prev = $this->configuration['logger_class']; |
|
270 | + if (!isset($this->configuration['classes'][$class]) && |
|
271 | + isset($this->configuration['classes'][$prev])) { |
|
272 | + $this->configuration['classes'][$class] = |
|
273 | + $this->configuration['classes'][$prev]; |
|
274 | + } |
|
275 | + $this->configuration['logger_class'] = $class; |
|
276 | 276 | } |
277 | 277 | |
278 | 278 | /** |
@@ -282,7 +282,7 @@ discard block |
||
282 | 282 | */ |
283 | 283 | public function getIoClass() |
284 | 284 | { |
285 | - return $this->configuration['io_class']; |
|
285 | + return $this->configuration['io_class']; |
|
286 | 286 | } |
287 | 287 | |
288 | 288 | /** |
@@ -291,7 +291,7 @@ discard block |
||
291 | 291 | */ |
292 | 292 | public function setApplicationName($name) |
293 | 293 | { |
294 | - $this->configuration['application_name'] = $name; |
|
294 | + $this->configuration['application_name'] = $name; |
|
295 | 295 | } |
296 | 296 | |
297 | 297 | /** |
@@ -299,7 +299,7 @@ discard block |
||
299 | 299 | */ |
300 | 300 | public function getApplicationName() |
301 | 301 | { |
302 | - return $this->configuration['application_name']; |
|
302 | + return $this->configuration['application_name']; |
|
303 | 303 | } |
304 | 304 | |
305 | 305 | /** |
@@ -308,7 +308,7 @@ discard block |
||
308 | 308 | */ |
309 | 309 | public function setClientId($clientId) |
310 | 310 | { |
311 | - $this->setAuthConfig('client_id', $clientId); |
|
311 | + $this->setAuthConfig('client_id', $clientId); |
|
312 | 312 | } |
313 | 313 | |
314 | 314 | /** |
@@ -317,7 +317,7 @@ discard block |
||
317 | 317 | */ |
318 | 318 | public function setClientSecret($secret) |
319 | 319 | { |
320 | - $this->setAuthConfig('client_secret', $secret); |
|
320 | + $this->setAuthConfig('client_secret', $secret); |
|
321 | 321 | } |
322 | 322 | |
323 | 323 | /** |
@@ -328,7 +328,7 @@ discard block |
||
328 | 328 | */ |
329 | 329 | public function setRedirectUri($uri) |
330 | 330 | { |
331 | - $this->setAuthConfig('redirect_uri', $uri); |
|
331 | + $this->setAuthConfig('redirect_uri', $uri); |
|
332 | 332 | } |
333 | 333 | |
334 | 334 | /** |
@@ -337,7 +337,7 @@ discard block |
||
337 | 337 | */ |
338 | 338 | public function setRequestVisibleActions($rva) |
339 | 339 | { |
340 | - $this->setAuthConfig('request_visible_actions', $rva); |
|
340 | + $this->setAuthConfig('request_visible_actions', $rva); |
|
341 | 341 | } |
342 | 342 | |
343 | 343 | /** |
@@ -346,7 +346,7 @@ discard block |
||
346 | 346 | */ |
347 | 347 | public function setAccessType($access) |
348 | 348 | { |
349 | - $this->setAuthConfig('access_type', $access); |
|
349 | + $this->setAuthConfig('access_type', $access); |
|
350 | 350 | } |
351 | 351 | |
352 | 352 | /** |
@@ -355,7 +355,7 @@ discard block |
||
355 | 355 | */ |
356 | 356 | public function setApprovalPrompt($approval) |
357 | 357 | { |
358 | - $this->setAuthConfig('approval_prompt', $approval); |
|
358 | + $this->setAuthConfig('approval_prompt', $approval); |
|
359 | 359 | } |
360 | 360 | |
361 | 361 | /** |
@@ -364,7 +364,7 @@ discard block |
||
364 | 364 | */ |
365 | 365 | public function setLoginHint($hint) |
366 | 366 | { |
367 | - $this->setAuthConfig('login_hint', $hint); |
|
367 | + $this->setAuthConfig('login_hint', $hint); |
|
368 | 368 | } |
369 | 369 | |
370 | 370 | /** |
@@ -374,7 +374,7 @@ discard block |
||
374 | 374 | */ |
375 | 375 | public function setDeveloperKey($key) |
376 | 376 | { |
377 | - $this->setAuthConfig('developer_key', $key); |
|
377 | + $this->setAuthConfig('developer_key', $key); |
|
378 | 378 | } |
379 | 379 | |
380 | 380 | /** |
@@ -390,7 +390,7 @@ discard block |
||
390 | 390 | */ |
391 | 391 | public function setHostedDomain($hd) |
392 | 392 | { |
393 | - $this->setAuthConfig('hd', $hd); |
|
393 | + $this->setAuthConfig('hd', $hd); |
|
394 | 394 | } |
395 | 395 | |
396 | 396 | /** |
@@ -401,7 +401,7 @@ discard block |
||
401 | 401 | */ |
402 | 402 | public function setPrompt($prompt) |
403 | 403 | { |
404 | - $this->setAuthConfig('prompt', $prompt); |
|
404 | + $this->setAuthConfig('prompt', $prompt); |
|
405 | 405 | } |
406 | 406 | |
407 | 407 | /** |
@@ -412,7 +412,7 @@ discard block |
||
412 | 412 | */ |
413 | 413 | public function setOpenidRealm($realm) |
414 | 414 | { |
415 | - $this->setAuthConfig('openid.realm', $realm); |
|
415 | + $this->setAuthConfig('openid.realm', $realm); |
|
416 | 416 | } |
417 | 417 | |
418 | 418 | /** |
@@ -423,10 +423,10 @@ discard block |
||
423 | 423 | */ |
424 | 424 | public function setIncludeGrantedScopes($include) |
425 | 425 | { |
426 | - $this->setAuthConfig( |
|
427 | - 'include_granted_scopes', |
|
428 | - $include ? "true" : "false" |
|
429 | - ); |
|
426 | + $this->setAuthConfig( |
|
427 | + 'include_granted_scopes', |
|
428 | + $include ? "true" : "false" |
|
429 | + ); |
|
430 | 430 | } |
431 | 431 | |
432 | 432 | /** |
@@ -434,7 +434,7 @@ discard block |
||
434 | 434 | */ |
435 | 435 | public function getBasePath() |
436 | 436 | { |
437 | - return $this->configuration['base_path']; |
|
437 | + return $this->configuration['base_path']; |
|
438 | 438 | } |
439 | 439 | |
440 | 440 | /** |
@@ -444,9 +444,9 @@ discard block |
||
444 | 444 | */ |
445 | 445 | private function setAuthConfig($key, $value) |
446 | 446 | { |
447 | - if (!isset($this->configuration['classes'][$this->getAuthClass()])) { |
|
448 | - $this->configuration['classes'][$this->getAuthClass()] = array(); |
|
449 | - } |
|
450 | - $this->configuration['classes'][$this->getAuthClass()][$key] = $value; |
|
447 | + if (!isset($this->configuration['classes'][$this->getAuthClass()])) { |
|
448 | + $this->configuration['classes'][$this->getAuthClass()] = array(); |
|
449 | + } |
|
450 | + $this->configuration['classes'][$this->getAuthClass()][$key] = $value; |
|
451 | 451 | } |
452 | 452 | } |
@@ -136,7 +136,7 @@ |
||
136 | 136 | ), |
137 | 137 | // Set a default directory for the file cache. |
138 | 138 | 'Google_Cache_File' => array( |
139 | - 'directory' => sys_get_temp_dir() . '/Google_Client' |
|
139 | + 'directory' => sys_get_temp_dir().'/Google_Client' |
|
140 | 140 | ) |
141 | 141 | ), |
142 | 142 | ); |
@@ -16,17 +16,17 @@ |
||
16 | 16 | */ |
17 | 17 | |
18 | 18 | spl_autoload_register( |
19 | - function ($className) { |
|
20 | - $classPath = explode('_', $className); |
|
21 | - if ($classPath[0] != 'Google') { |
|
22 | - return; |
|
23 | - } |
|
24 | - // Drop 'Google', and maximum class file path depth in this project is 3. |
|
25 | - $classPath = array_slice($classPath, 1, 2); |
|
19 | + function ($className) { |
|
20 | + $classPath = explode('_', $className); |
|
21 | + if ($classPath[0] != 'Google') { |
|
22 | + return; |
|
23 | + } |
|
24 | + // Drop 'Google', and maximum class file path depth in this project is 3. |
|
25 | + $classPath = array_slice($classPath, 1, 2); |
|
26 | 26 | |
27 | - $filePath = dirname(__FILE__) . '/' . implode('/', $classPath) . '.php'; |
|
28 | - if (file_exists($filePath)) { |
|
29 | - require_once($filePath); |
|
30 | - } |
|
31 | - } |
|
27 | + $filePath = dirname(__FILE__) . '/' . implode('/', $classPath) . '.php'; |
|
28 | + if (file_exists($filePath)) { |
|
29 | + require_once($filePath); |
|
30 | + } |
|
31 | + } |
|
32 | 32 | ); |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | */ |
17 | 17 | |
18 | 18 | spl_autoload_register( |
19 | - function ($className) { |
|
19 | + function($className) { |
|
20 | 20 | $classPath = explode('_', $className); |
21 | 21 | if ($classPath[0] != 'Google') { |
22 | 22 | return; |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | // Drop 'Google', and maximum class file path depth in this project is 3. |
25 | 25 | $classPath = array_slice($classPath, 1, 2); |
26 | 26 | |
27 | - $filePath = dirname(__FILE__) . '/' . implode('/', $classPath) . '.php'; |
|
27 | + $filePath = dirname(__FILE__).'/'.implode('/', $classPath).'.php'; |
|
28 | 28 | if (file_exists($filePath)) { |
29 | 29 | require_once($filePath); |
30 | 30 | } |
@@ -38,11 +38,11 @@ discard block |
||
38 | 38 | */ |
39 | 39 | public function __construct(Google_Client $client, /*Psr\Log\LoggerInterface*/ $logger = null) |
40 | 40 | { |
41 | - parent::__construct($client); |
|
41 | + parent::__construct($client); |
|
42 | 42 | |
43 | - if ($logger) { |
|
44 | - $this->setLogger($logger); |
|
45 | - } |
|
43 | + if ($logger) { |
|
44 | + $this->setLogger($logger); |
|
45 | + } |
|
46 | 46 | } |
47 | 47 | |
48 | 48 | /** |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | */ |
57 | 57 | public function setLogger(/*Psr\Log\LoggerInterface*/ $logger) |
58 | 58 | { |
59 | - $this->logger = $logger; |
|
59 | + $this->logger = $logger; |
|
60 | 60 | } |
61 | 61 | |
62 | 62 | /** |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | */ |
65 | 65 | public function shouldHandle($level) |
66 | 66 | { |
67 | - return isset($this->logger) && parent::shouldHandle($level); |
|
67 | + return isset($this->logger) && parent::shouldHandle($level); |
|
68 | 68 | } |
69 | 69 | |
70 | 70 | /** |
@@ -72,16 +72,16 @@ discard block |
||
72 | 72 | */ |
73 | 73 | public function log($level, $message, array $context = array()) |
74 | 74 | { |
75 | - if (!$this->shouldHandle($level)) { |
|
76 | - return false; |
|
77 | - } |
|
75 | + if (!$this->shouldHandle($level)) { |
|
76 | + return false; |
|
77 | + } |
|
78 | 78 | |
79 | - if ($context) { |
|
80 | - $this->reverseJsonInContext($context); |
|
81 | - } |
|
79 | + if ($context) { |
|
80 | + $this->reverseJsonInContext($context); |
|
81 | + } |
|
82 | 82 | |
83 | - $levelName = is_int($level) ? array_search($level, self::$levels) : $level; |
|
84 | - $this->logger->log($levelName, $message, $context); |
|
83 | + $levelName = is_int($level) ? array_search($level, self::$levels) : $level; |
|
84 | + $this->logger->log($levelName, $message, $context); |
|
85 | 85 | } |
86 | 86 | |
87 | 87 | /** |
@@ -16,7 +16,7 @@ |
||
16 | 16 | */ |
17 | 17 | |
18 | 18 | if (!class_exists('Google_Client')) { |
19 | - require_once dirname(__FILE__) . '/../autoload.php'; |
|
19 | + require_once dirname(__FILE__).'/../autoload.php'; |
|
20 | 20 | } |
21 | 21 | |
22 | 22 | /** |
@@ -31,7 +31,7 @@ |
||
31 | 31 | */ |
32 | 32 | public function shouldHandle($level) |
33 | 33 | { |
34 | - return false; |
|
34 | + return false; |
|
35 | 35 | } |
36 | 36 | |
37 | 37 | /** |
@@ -16,7 +16,7 @@ |
||
16 | 16 | */ |
17 | 17 | |
18 | 18 | if (!class_exists('Google_Client')) { |
19 | - require_once dirname(__FILE__) . '/../autoload.php'; |
|
19 | + require_once dirname(__FILE__).'/../autoload.php'; |
|
20 | 20 | } |
21 | 21 | |
22 | 22 | /** |