@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | * @param Api|Data $caller |
31 | 31 | * @param array $data |
32 | 32 | */ |
33 | - public function __construct ($caller, array $data = []) { |
|
33 | + public function __construct($caller, array $data = []) { |
|
34 | 34 | $this->api = $caller instanceof self ? $caller->api : $caller; |
35 | 35 | $this->_setData($data); |
36 | 36 | } |
@@ -44,9 +44,9 @@ discard block |
||
44 | 44 | * @uses _is() |
45 | 45 | * @uses _set() |
46 | 46 | */ |
47 | - public function __call (string $method, array $args) { |
|
47 | + public function __call(string $method, array $args) { |
|
48 | 48 | static $cache = []; |
49 | - if (!$call =& $cache[$method]) { |
|
49 | + if (!$call = & $cache[$method]) { |
|
50 | 50 | preg_match('/^(get|has|is|set)(.+)$/', $method, $call); |
51 | 51 | $call[1] = '_' . $call[1]; |
52 | 52 | $call[2] = preg_replace_callback('/[A-Z]/', function(array $match) { |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | return $this->{$call[1]}($call[2], ...$args); |
57 | 57 | } |
58 | 58 | |
59 | - public function __debugInfo (): array { |
|
59 | + public function __debugInfo(): array { |
|
60 | 60 | return $this->data; |
61 | 61 | } |
62 | 62 | |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | * @param string $key |
69 | 69 | * @return mixed |
70 | 70 | */ |
71 | - protected function _get (string $key) { |
|
71 | + protected function _get(string $key) { |
|
72 | 72 | return $this->data[$key] ?? null; |
73 | 73 | } |
74 | 74 | |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | * |
81 | 81 | * @return array |
82 | 82 | */ |
83 | - protected function _getMap (): array { |
|
83 | + protected function _getMap(): array { |
|
84 | 84 | return []; |
85 | 85 | } |
86 | 86 | |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | * @param null|self|array $value |
90 | 90 | * @return null|Data|Data[] |
91 | 91 | */ |
92 | - protected function _getMapped ($class, $value) { |
|
92 | + protected function _getMapped($class, $value) { |
|
93 | 93 | // use empty|Data|Data[] as-is |
94 | 94 | if (!$value or $value instanceof self or current($value) instanceof self) { |
95 | 95 | return $value; |
@@ -122,7 +122,7 @@ discard block |
||
122 | 122 | * |
123 | 123 | * @return array |
124 | 124 | */ |
125 | - protected function _getPatch (): array { |
|
125 | + protected function _getPatch(): array { |
|
126 | 126 | $convert = function($each) use (&$convert) { |
127 | 127 | // convert existing entities to gids |
128 | 128 | if ($each instanceof AbstractEntity and $each->hasGid()) { |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | * @param string $key |
153 | 153 | * @return bool |
154 | 154 | */ |
155 | - protected function _has (string $key): bool { |
|
155 | + protected function _has(string $key): bool { |
|
156 | 156 | $value = $this->_get($key); |
157 | 157 | if (isset($value)) { |
158 | 158 | if (is_countable($value)) { |
@@ -175,7 +175,7 @@ discard block |
||
175 | 175 | * @param string $key |
176 | 176 | * @return bool |
177 | 177 | */ |
178 | - protected function _is (string $key): bool { |
|
178 | + protected function _is(string $key): bool { |
|
179 | 179 | return !empty($this->_get($key)); |
180 | 180 | } |
181 | 181 | |
@@ -188,7 +188,7 @@ discard block |
||
188 | 188 | * @param mixed $value |
189 | 189 | * @return $this |
190 | 190 | */ |
191 | - protected function _set (string $key, $value) { |
|
191 | + protected function _set(string $key, $value) { |
|
192 | 192 | $this->data[$key] = $value; |
193 | 193 | $this->diff[$key] = true; |
194 | 194 | return $this; |
@@ -200,7 +200,7 @@ discard block |
||
200 | 200 | * @param array $data |
201 | 201 | * @return $this |
202 | 202 | */ |
203 | - protected function _setData (array $data) { |
|
203 | + protected function _setData(array $data) { |
|
204 | 204 | $map = $this->_getMap(); |
205 | 205 | /** @var null|self|array $value */ |
206 | 206 | foreach (array_intersect_key($data, $map) as $key => $value) { |
@@ -218,7 +218,7 @@ discard block |
||
218 | 218 | * @param array $data |
219 | 219 | * @return mixed |
220 | 220 | */ |
221 | - final protected function factory (string $class, array $data = []) { |
|
221 | + final protected function factory(string $class, array $data = []) { |
|
222 | 222 | return $this->api->factory($class, $this, $data); |
223 | 223 | } |
224 | 224 | |
@@ -227,7 +227,7 @@ discard block |
||
227 | 227 | * |
228 | 228 | * @return bool |
229 | 229 | */ |
230 | - final public function isDiff (): bool { |
|
230 | + final public function isDiff(): bool { |
|
231 | 231 | return (bool)$this->diff; |
232 | 232 | } |
233 | 233 | |
@@ -235,7 +235,7 @@ discard block |
||
235 | 235 | * @see toArray() |
236 | 236 | * @return array |
237 | 237 | */ |
238 | - public function jsonSerialize (): array { |
|
238 | + public function jsonSerialize(): array { |
|
239 | 239 | return $this->toArray(); |
240 | 240 | } |
241 | 241 | |
@@ -249,7 +249,7 @@ discard block |
||
249 | 249 | * @param array $query |
250 | 250 | * @return null|mixed|AbstractEntity |
251 | 251 | */ |
252 | - final protected function load (string $class, string $path, array $query = []) { |
|
252 | + final protected function load(string $class, string $path, array $query = []) { |
|
253 | 253 | return $this->api->load($class, $this, $path, $query); |
254 | 254 | } |
255 | 255 | |
@@ -264,7 +264,7 @@ discard block |
||
264 | 264 | * @param int $pages |
265 | 265 | * @return array|AbstractEntity[] |
266 | 266 | */ |
267 | - final protected function loadAll (string $class, string $path, array $query = [], int $pages = 0) { |
|
267 | + final protected function loadAll(string $class, string $path, array $query = [], int $pages = 0) { |
|
268 | 268 | return $this->api->loadAll($class, $this, $path, $query, $pages); |
269 | 269 | } |
270 | 270 | |
@@ -275,7 +275,7 @@ discard block |
||
275 | 275 | * |
276 | 276 | * @inheritDoc |
277 | 277 | */ |
278 | - public function serialize (): string { |
|
278 | + public function serialize(): string { |
|
279 | 279 | return serialize($this->toArray()); |
280 | 280 | } |
281 | 281 | |
@@ -284,7 +284,7 @@ discard block |
||
284 | 284 | * |
285 | 285 | * @return array |
286 | 286 | */ |
287 | - public function toArray (): array { |
|
287 | + public function toArray(): array { |
|
288 | 288 | if (!$this->api) { |
289 | 289 | return $this->data; |
290 | 290 | } |
@@ -310,7 +310,7 @@ discard block |
||
310 | 310 | * |
311 | 311 | * @inheritDoc |
312 | 312 | */ |
313 | - public function unserialize ($serialized) { |
|
313 | + public function unserialize($serialized) { |
|
314 | 314 | $this->data = unserialize($serialized); |
315 | 315 | } |
316 | 316 | } |
317 | 317 | \ No newline at end of file |
@@ -291,11 +291,9 @@ |
||
291 | 291 | $dehydrate = function($each) use (&$dehydrate) { |
292 | 292 | if ($each instanceof AbstractEntity and $each->hasGid()) { |
293 | 293 | return $each->getGid(); |
294 | - } |
|
295 | - elseif ($each instanceof self) { |
|
294 | + } elseif ($each instanceof self) { |
|
296 | 295 | return $each->toArray(); |
297 | - } |
|
298 | - elseif (is_array($each)) { |
|
296 | + } elseif (is_array($each)) { |
|
299 | 297 | return array_map($dehydrate, $each); |
300 | 298 | } |
301 | 299 | return $each; |
@@ -30,15 +30,15 @@ discard block |
||
30 | 30 | |
31 | 31 | const TYPE = 'portfolio'; |
32 | 32 | |
33 | - final public function __toString (): string { |
|
33 | + final public function __toString(): string { |
|
34 | 34 | return "portfolios/{$this->getGid()}"; |
35 | 35 | } |
36 | 36 | |
37 | - final protected function _getDir (): string { |
|
37 | + final protected function _getDir(): string { |
|
38 | 38 | return 'portfolios'; |
39 | 39 | } |
40 | 40 | |
41 | - protected function _getMap (): array { |
|
41 | + protected function _getMap(): array { |
|
42 | 42 | return [ |
43 | 43 | 'created_by' => User::class, |
44 | 44 | 'owner' => User::class, |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | * @param Project $item |
53 | 53 | * @return $this |
54 | 54 | */ |
55 | - public function addItem (Project $item) { |
|
55 | + public function addItem(Project $item) { |
|
56 | 56 | $this->api->post("{$this}/addItem", ['item' => $item->getGid()]); |
57 | 57 | return $this; |
58 | 58 | } |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | * @param User $user |
62 | 62 | * @return $this |
63 | 63 | */ |
64 | - public function addMember (User $user) { |
|
64 | + public function addMember(User $user) { |
|
65 | 65 | return $this->addMembers([$user]); |
66 | 66 | } |
67 | 67 | |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | * @param User[] $users |
70 | 70 | * @return $this |
71 | 71 | */ |
72 | - public function addMembers (array $users) { |
|
72 | + public function addMembers(array $users) { |
|
73 | 73 | if ($this->hasGid()) { |
74 | 74 | $this->api->post("{$this}/addMembers", ['members' => static::_getGids($users)]); |
75 | 75 | $this->_merge('members', $users); |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | * @after-create |
85 | 85 | * @return Project[] |
86 | 86 | */ |
87 | - public function getItems () { |
|
87 | + public function getItems() { |
|
88 | 88 | return $this->loadAll(Project::class, "{$this}/items"); |
89 | 89 | } |
90 | 90 | |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | * @param Project $item |
94 | 94 | * @return $this |
95 | 95 | */ |
96 | - public function removeItem (Project $item) { |
|
96 | + public function removeItem(Project $item) { |
|
97 | 97 | $this->api->post("{$this}/removeItem", ['item' => $item->getGid()]); |
98 | 98 | return $this; |
99 | 99 | } |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | * @param User $user |
103 | 103 | * @return $this |
104 | 104 | */ |
105 | - public function removeMember (User $user) { |
|
105 | + public function removeMember(User $user) { |
|
106 | 106 | return $this->removeMembers([$user]); |
107 | 107 | } |
108 | 108 | |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | * @param User[] $users |
111 | 111 | * @return $this |
112 | 112 | */ |
113 | - public function removeMembers (array $users) { |
|
113 | + public function removeMembers(array $users) { |
|
114 | 114 | if ($this->hasGid()) { |
115 | 115 | $this->api->post("{$this}/removeMembers", ['members' => static::_getGids($users)]); |
116 | 116 | } |
@@ -73,8 +73,7 @@ |
||
73 | 73 | if ($this->hasGid()) { |
74 | 74 | $this->api->post("{$this}/addMembers", ['members' => static::_getGids($users)]); |
75 | 75 | $this->_merge('members', $users); |
76 | - } |
|
77 | - else { |
|
76 | + } else { |
|
78 | 77 | $this->_merge('members', $users, true); |
79 | 78 | } |
80 | 79 | return $this; |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | * |
33 | 33 | * @param AbstractEntity $entity |
34 | 34 | */ |
35 | - public function add (AbstractEntity $entity): void { |
|
35 | + public function add(AbstractEntity $entity): void { |
|
36 | 36 | if ($gid = $entity->getGid() and !$entity->isDiff()) { |
37 | 37 | $this->entities[$gid] = $entity; |
38 | 38 | foreach ($this->getKeys($entity) as $key) { |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | * @param Closure $factory `fn($caller): null|AbstractEntity` |
53 | 53 | * @return null|mixed|AbstractEntity |
54 | 54 | */ |
55 | - public function get (string $key, $caller, Closure $factory) { |
|
55 | + public function get(string $key, $caller, Closure $factory) { |
|
56 | 56 | if ($gid = $this->gids[$key] ?? null) { |
57 | 57 | return $this->entities[$gid]; |
58 | 58 | } |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | * @param AbstractEntity $entity |
82 | 82 | * @return string[] |
83 | 83 | */ |
84 | - protected function getKeys (AbstractEntity $entity) { |
|
84 | + protected function getKeys(AbstractEntity $entity) { |
|
85 | 85 | if (!$gid = $entity->getGid() or $entity->isDiff()) { |
86 | 86 | return []; |
87 | 87 | } |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | * |
98 | 98 | * @param AbstractEntity $entity |
99 | 99 | */ |
100 | - public function remove (AbstractEntity $entity): void { |
|
100 | + public function remove(AbstractEntity $entity): void { |
|
101 | 101 | unset($this->entities[$entity->getGid()]); |
102 | 102 | foreach ($this->getKeys($entity) as $key) { |
103 | 103 | unset($this->gids[$key]); |
@@ -12,5 +12,5 @@ |
||
12 | 12 | * @param string $path |
13 | 13 | * @param null|array $payload |
14 | 14 | */ |
15 | - public function log (string $info, string $path, ?array $payload): void; |
|
15 | + public function log(string $info, string $path, ?array $payload): void; |
|
16 | 16 | } |
17 | 17 | \ No newline at end of file |
@@ -11,11 +11,11 @@ |
||
11 | 11 | |
12 | 12 | const NAME = 'asana'; |
13 | 13 | |
14 | - public function boot () { |
|
14 | + public function boot() { |
|
15 | 15 | $this->mergeConfigFrom(App::configPath('asana.php'), self::NAME); |
16 | 16 | } |
17 | 17 | |
18 | - public function register () { |
|
18 | + public function register() { |
|
19 | 19 | $this->app->singleton(self::NAME, function($app) { |
20 | 20 | $config = $app->config->get(self::NAME); |
21 | 21 | return new Api($config['token']); |
@@ -46,14 +46,14 @@ |
||
46 | 46 | */ |
47 | 47 | class Asana extends Facade { |
48 | 48 | |
49 | - public static function getFacadeAccessor () { |
|
49 | + public static function getFacadeAccessor() { |
|
50 | 50 | return AsanaServiceProvider::NAME; |
51 | 51 | } |
52 | 52 | |
53 | 53 | /** |
54 | 54 | * @return Api |
55 | 55 | */ |
56 | - public static function getFacadeRoot () { |
|
56 | + public static function getFacadeRoot() { |
|
57 | 57 | return parent::getFacadeRoot(); |
58 | 58 | } |
59 | 59 | } |
60 | 60 | \ No newline at end of file |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | * @param Api $api |
37 | 37 | * @param PSR16 $cache |
38 | 38 | */ |
39 | - public function __construct (Api $api, PSR16 $cache) { |
|
39 | + public function __construct(Api $api, PSR16 $cache) { |
|
40 | 40 | $this->api = $api; |
41 | 41 | $this->cache = $cache; |
42 | 42 | } |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | * @inheritDoc |
46 | 46 | * @throws InvalidArgumentException |
47 | 47 | */ |
48 | - public function add (AbstractEntity $entity): void { |
|
48 | + public function add(AbstractEntity $entity): void { |
|
49 | 49 | if ($gid = $entity->getGid() and !$entity->isDiff()) { |
50 | 50 | parent::add($entity); |
51 | 51 | foreach ($this->getKeys($entity) as $key) { |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | /** |
61 | 61 | * @inheritDoc |
62 | 62 | */ |
63 | - public function get (string $key, $caller, Closure $factory) { |
|
63 | + public function get(string $key, $caller, Closure $factory) { |
|
64 | 64 | return parent::get($key, $caller, function($caller) use ($key, $factory) { |
65 | 65 | /** @var null|string|AbstractEntity $entity */ |
66 | 66 | if ($entity = $this->cache->get($key)) { // hit? |
@@ -104,7 +104,7 @@ discard block |
||
104 | 104 | * @param Api|Data $caller |
105 | 105 | * @return AbstractEntity |
106 | 106 | */ |
107 | - protected function hydrate (AbstractEntity $proto, $caller) { |
|
107 | + protected function hydrate(AbstractEntity $proto, $caller) { |
|
108 | 108 | return $this->api->factory(get_class($proto), $caller, $proto->toArray()); |
109 | 109 | } |
110 | 110 | |
@@ -112,7 +112,7 @@ discard block |
||
112 | 112 | * @inheritDoc |
113 | 113 | * @throws InvalidArgumentException |
114 | 114 | */ |
115 | - public function remove (AbstractEntity $entity): void { |
|
115 | + public function remove(AbstractEntity $entity): void { |
|
116 | 116 | parent::remove($entity); |
117 | 117 | $this->cache->deleteMultiple($this->getKeys($entity)); |
118 | 118 | } |
@@ -68,8 +68,7 @@ |
||
68 | 68 | /** @var null|AbstractEntity $entity */ |
69 | 69 | if ($entity = $this->get($entity, $caller, $factory)) { |
70 | 70 | $this->cache->set($key, $entity->getGid()); // renew potentially nonstandard key |
71 | - } |
|
72 | - else { |
|
71 | + } else { |
|
73 | 72 | $this->cache->delete($key); // remove invalid key |
74 | 73 | } |
75 | 74 | return $entity; // null or hydrated. parent calls add() |
@@ -12,7 +12,7 @@ |
||
12 | 12 | * |
13 | 13 | * @inheritDoc |
14 | 14 | */ |
15 | - public function log (string $info, string $path, ?array $payload): void { |
|
15 | + public function log(string $info, string $path, ?array $payload): void { |
|
16 | 16 | // stub |
17 | 17 | } |
18 | 18 | } |
19 | 19 | \ No newline at end of file |
@@ -20,7 +20,7 @@ discard block |
||
20 | 20 | */ |
21 | 21 | protected $curlInfo; |
22 | 22 | |
23 | - public function __construct (int $code, string $message, array $curlInfo) { |
|
23 | + public function __construct(int $code, string $message, array $curlInfo) { |
|
24 | 24 | parent::__construct($message, $code); |
25 | 25 | $this->curlInfo = $curlInfo; |
26 | 26 | } |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | /** |
29 | 29 | * @return array |
30 | 30 | */ |
31 | - public function getCurlInfo (): array { |
|
31 | + public function getCurlInfo(): array { |
|
32 | 32 | return $this->curlInfo; |
33 | 33 | } |
34 | 34 | } |
35 | 35 | \ No newline at end of file |