@@ -310,11 +310,11 @@ |
||
310 | 310 | return $this->files; |
311 | 311 | } |
312 | 312 | |
313 | - /** |
|
314 | - * Get the cache key prefix. |
|
315 | - * |
|
316 | - * @return string |
|
317 | - */ |
|
313 | + /** |
|
314 | + * Get the cache key prefix. |
|
315 | + * |
|
316 | + * @return string |
|
317 | + */ |
|
318 | 318 | public function getPrefix() |
319 | 319 | { |
320 | 320 | return ''; |
@@ -148,13 +148,13 @@ |
||
148 | 148 | return $this->memcached->decrement($this->prefix.$key, $value = 1); |
149 | 149 | } |
150 | 150 | |
151 | - /** |
|
152 | - * Remove a specific item from the cache store. |
|
153 | - * |
|
154 | - * @param string $key |
|
155 | - * |
|
156 | - * @return bool |
|
157 | - */ |
|
151 | + /** |
|
152 | + * Remove a specific item from the cache store. |
|
153 | + * |
|
154 | + * @param string $key |
|
155 | + * |
|
156 | + * @return bool |
|
157 | + */ |
|
158 | 158 | public function delete($key) |
159 | 159 | { |
160 | 160 | return $this->memcached->delete($this->prefix.$key); |
@@ -51,7 +51,9 @@ |
||
51 | 51 | */ |
52 | 52 | public function get($key) |
53 | 53 | { |
54 | - if ( ! isset($this->storage[$key])) return; |
|
54 | + if ( ! isset($this->storage[$key])) { |
|
55 | + return; |
|
56 | + } |
|
55 | 57 | |
56 | 58 | $item = $this->storage[$key]; |
57 | 59 |
@@ -303,7 +303,7 @@ |
||
303 | 303 | */ |
304 | 304 | public function getDefaultDriver() |
305 | 305 | { |
306 | - return $this->app['config']['cache.default']; |
|
306 | + return $this->app['config']['cache.default']; |
|
307 | 307 | } |
308 | 308 | |
309 | 309 | /** |
@@ -105,7 +105,7 @@ |
||
105 | 105 | */ |
106 | 106 | public function pull($key, $default = null) |
107 | 107 | { |
108 | - return take($this->get($key, $default), function () use ($key) { |
|
108 | + return take($this->get($key, $default), function() use ($key) { |
|
109 | 109 | $this->delete($key); |
110 | 110 | }); |
111 | 111 | } |
@@ -66,12 +66,10 @@ |
||
66 | 66 | if ($time instanceof static) |
67 | 67 | { |
68 | 68 | $time = $time->toDateTime()->setTimezone(new DateTimeZone('UTC')); |
69 | - } |
|
70 | - elseif ($time instanceof DateTime) |
|
69 | + } elseif ($time instanceof DateTime) |
|
71 | 70 | { |
72 | 71 | $time = $time->setTimezone(new DateTimeZone('UTC')); |
73 | - } |
|
74 | - elseif (is_string($time)) |
|
72 | + } elseif (is_string($time)) |
|
75 | 73 | { |
76 | 74 | $timezone = $timezone ?: $this->timezone; |
77 | 75 | $timezone = $timezone instanceof DateTimeZone ? $timezone : new DateTimeZone('UTC'); |
@@ -45,8 +45,8 @@ discard block |
||
45 | 45 | { |
46 | 46 | $testTime = $this->getConvertedUTC($time, $timezone); |
47 | 47 | $ourTime = $this->toDateTime() |
48 | - ->setTimezone(new DateTimeZone('UTC')) |
|
49 | - ->format('Y-m-d H:i:s'); |
|
48 | + ->setTimezone(new DateTimeZone('UTC')) |
|
49 | + ->format('Y-m-d H:i:s'); |
|
50 | 50 | |
51 | 51 | return $testTime->format('Y-m-d H:i:s') === $ourTime; |
52 | 52 | } |
@@ -68,15 +68,15 @@ discard block |
||
68 | 68 | return $testTime < $ourTime; |
69 | 69 | } |
70 | 70 | |
71 | - /** |
|
72 | - * Determines if the current instance's time is after test time, |
|
73 | - * after converting to UTC. |
|
74 | - * |
|
75 | - * @param \DateTime|string $time |
|
76 | - * @param \DatetimeZone|string|null $timezone |
|
77 | - * |
|
78 | - * @return bool |
|
79 | - */ |
|
71 | + /** |
|
72 | + * Determines if the current instance's time is after test time, |
|
73 | + * after converting to UTC. |
|
74 | + * |
|
75 | + * @param \DateTime|string $time |
|
76 | + * @param \DatetimeZone|string|null $timezone |
|
77 | + * |
|
78 | + * @return bool |
|
79 | + */ |
|
80 | 80 | public function isAfter($time, string $timezone = null) |
81 | 81 | { |
82 | 82 | $testTime = $this->getConvertedUTC($time, $timezone)->getTimestamp(); |
@@ -100,8 +100,7 @@ |
||
100 | 100 | if ($time instanceof DateTime) |
101 | 101 | { |
102 | 102 | $testTime = $time->format('Y-m-d H:i:s'); |
103 | - } |
|
104 | - elseif (is_string($time)) |
|
103 | + } elseif (is_string($time)) |
|
105 | 104 | { |
106 | 105 | $timezone = $timezone ?: $this->timezone; |
107 | 106 | $timezone = $timezone instanceof DateTimeZone ? $timezone : new DateTimeZone($timezone); |
@@ -61,14 +61,14 @@ discard block |
||
61 | 61 | $this->timezone = $timezone instanceof DateTimeZone ? $timezone : new DateTimeZone($timezone); |
62 | 62 | |
63 | 63 | if ( ! empty($time)) |
64 | - { |
|
65 | - if (is_string($time) && static::hasRelativeKeywords($time)) |
|
66 | - { |
|
67 | - $dateTime = new DateTime('now', $this->timezone); |
|
68 | - $dateTime->modify($time); |
|
64 | + { |
|
65 | + if (is_string($time) && static::hasRelativeKeywords($time)) |
|
66 | + { |
|
67 | + $dateTime = new DateTime('now', $this->timezone); |
|
68 | + $dateTime->modify($time); |
|
69 | 69 | |
70 | - $time = $dateTime->format('Y-m-d H:i:s'); |
|
71 | - } |
|
70 | + $time = $dateTime->format('Y-m-d H:i:s'); |
|
71 | + } |
|
72 | 72 | } |
73 | 73 | |
74 | 74 | return parent::__construct($time, $this->timezone); |
@@ -123,8 +123,8 @@ discard block |
||
123 | 123 | * @return \Syscodes\Support\Chronos\Time |
124 | 124 | */ |
125 | 125 | public static function yesterday($timezone = null, string $locale = null) |
126 | - { |
|
127 | - return static::parse(date('Y-m-d 00:00:00', strtotime('-1 day')), $timezone, $locale); |
|
126 | + { |
|
127 | + return static::parse(date('Y-m-d 00:00:00', strtotime('-1 day')), $timezone, $locale); |
|
128 | 128 | } |
129 | 129 | |
130 | 130 | /** |
@@ -136,8 +136,8 @@ discard block |
||
136 | 136 | * @return \Syscodes\Support\Chronos\Time |
137 | 137 | */ |
138 | 138 | public static function tomorrow($timezone = null, string $locale = null) |
139 | - { |
|
140 | - return static::parse(date('Y-m-d 00:00:00', strtotime('+1 day')), $timezone, $locale); |
|
139 | + { |
|
140 | + return static::parse(date('Y-m-d 00:00:00', strtotime('+1 day')), $timezone, $locale); |
|
141 | 141 | } |
142 | 142 | |
143 | 143 | /** |
@@ -269,7 +269,7 @@ discard block |
||
269 | 269 | |
270 | 270 | /** |
271 | 271 | * Creates an instance of Time that will be returned during testing |
272 | - * when calling 'Time::now' instead of the current time. |
|
272 | + * when calling 'Time::now' instead of the current time. |
|
273 | 273 | * |
274 | 274 | * @param \Syscodes\Support\Chronos\Time|string $datetime (null by default) |
275 | 275 | * @param string|null $timezone (null by default) |
@@ -289,8 +289,7 @@ |
||
289 | 289 | if (is_string($datetime)) |
290 | 290 | { |
291 | 291 | $time = static::parse($datetime, $timezone, $locale); |
292 | - } |
|
293 | - elseif ($datetime instanceof DateTime && ! $datetime instanceof static) |
|
292 | + } elseif ($datetime instanceof DateTime && ! $datetime instanceof static) |
|
294 | 293 | { |
295 | 294 | $time = static::parse($datetime->format('Y-m-d H:i:s'), $timezone); |
296 | 295 | } |
@@ -228,34 +228,28 @@ |
||
228 | 228 | { |
229 | 229 | $phrase = __('time.years', [abs($years)], $locale); |
230 | 230 | $before = $years < 0; |
231 | - } |
|
232 | - else if ($months !== 0) |
|
231 | + } else if ($months !== 0) |
|
233 | 232 | { |
234 | 233 | $phrase = __('time.months', [abs($months)], $locale); |
235 | 234 | $before = $months < 0; |
236 | - } |
|
237 | - else if ($days !== 0 && (abs($days) >= 7)) |
|
235 | + } else if ($days !== 0 && (abs($days) >= 7)) |
|
238 | 236 | { |
239 | 237 | $weeks = ceil($days / 7); |
240 | 238 | $phrase = __('time.weeks', [abs($weeks)], $locale); |
241 | 239 | $before = $days < 0; |
242 | - } |
|
243 | - else if ($days !== 0) |
|
240 | + } else if ($days !== 0) |
|
244 | 241 | { |
245 | 242 | $phrase = __('time.days', [abs($days)], $locale); |
246 | 243 | $before = $days < 0; |
247 | - } |
|
248 | - else if ($hours !== 0) |
|
244 | + } else if ($hours !== 0) |
|
249 | 245 | { |
250 | 246 | $phrase = __('time.hours', [abs($hours)], $locale); |
251 | 247 | $before = $hours < 0; |
252 | - } |
|
253 | - else if ($minutes !== 0) |
|
248 | + } else if ($minutes !== 0) |
|
254 | 249 | { |
255 | 250 | $phrase = __('time.minutes', [abs($minutes)], $locale); |
256 | 251 | $before = $minutes < 0; |
257 | - } |
|
258 | - else |
|
252 | + } else |
|
259 | 253 | { |
260 | 254 | return __('time.now', [], $locale); |
261 | 255 | } |