@@ -629,7 +629,7 @@ |
||
| 629 | 629 | return true; |
| 630 | 630 | } |
| 631 | 631 | |
| 632 | - return $this->doRecursiveAction(function ($node) use ($conflict, $recursion) { |
|
| 632 | + return $this->doRecursiveAction(function($node) use ($conflict, $recursion) { |
|
| 633 | 633 | $node->undelete($conflict, $recursion, false); |
| 634 | 634 | }, NodeInterface::DELETED_ONLY); |
| 635 | 635 | } |
@@ -1078,6 +1078,8 @@ |
||
| 1078 | 1078 | |
| 1079 | 1079 | /** |
| 1080 | 1080 | * Duplicate name with a uniqid within name. |
| 1081 | + * @param string $name |
|
| 1082 | + * @param string $class |
|
| 1081 | 1083 | */ |
| 1082 | 1084 | protected function getDuplicateName(?string $name = null, ?string $class = null): string |
| 1083 | 1085 | { |
@@ -45,14 +45,14 @@ |
||
| 45 | 45 | * @param array |
| 46 | 46 | **/ |
| 47 | 47 | protected $temp_files = [ |
| 48 | - '/^\._(.*)$/', // OS/X resource forks |
|
| 49 | - '/^.DS_Store$/', // OS/X custom folder settings |
|
| 48 | + '/^\._(.*)$/', // OS/X resource forks |
|
| 49 | + '/^.DS_Store$/', // OS/X custom folder settings |
|
| 50 | 50 | '/^desktop.ini$/', // Windows custom folder settings |
| 51 | - '/^Thumbs.db$/', // Windows thumbnail cache |
|
| 52 | - '/^.(.*).swpx$/', // ViM temporary files |
|
| 53 | - '/^.(.*).swx$/', // ViM temporary files |
|
| 54 | - '/^.(.*).swp$/', // ViM temporary files |
|
| 55 | - '/^\.dat(.*)$/', // Smultron seems to create these |
|
| 51 | + '/^Thumbs.db$/', // Windows thumbnail cache |
|
| 52 | + '/^.(.*).swpx$/', // ViM temporary files |
|
| 53 | + '/^.(.*).swx$/', // ViM temporary files |
|
| 54 | + '/^.(.*).swp$/', // ViM temporary files |
|
| 55 | + '/^\.dat(.*)$/', // Smultron seems to create these |
|
| 56 | 56 | '/^~lock.(.*)#$/', // Windows 7 lockfiles |
| 57 | 57 | ]; |
| 58 | 58 | |
@@ -171,7 +171,7 @@ |
||
| 171 | 171 | */ |
| 172 | 172 | protected function setExceptionHandler(): self |
| 173 | 173 | { |
| 174 | - set_exception_handler(function ($e) { |
|
| 174 | + set_exception_handler(function($e) { |
|
| 175 | 175 | $this->logger->emergency('uncaught exception: '.$e->getMessage(), [ |
| 176 | 176 | 'category' => get_class($this), |
| 177 | 177 | 'exception' => $e, |
@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | |
| 86 | 86 | if ($this->auth->requireOne()) { |
| 87 | 87 | if (!($this->auth->getIdentity()->getAdapter() instanceof AuthNone)) { |
| 88 | - $this->auth->getIdentity()->getAttributeMap()->addMapper('binary', function ($value) { |
|
| 88 | + $this->auth->getIdentity()->getAttributeMap()->addMapper('binary', function($value) { |
|
| 89 | 89 | return new Binary($value, Binary::TYPE_GENERIC); |
| 90 | 90 | }); |
| 91 | 91 | |
@@ -138,7 +138,7 @@ discard block |
||
| 138 | 138 | */ |
| 139 | 139 | protected function setExceptionHandler(): self |
| 140 | 140 | { |
| 141 | - set_exception_handler(function ($e) { |
|
| 141 | + set_exception_handler(function($e) { |
|
| 142 | 142 | $this->logger->emergency('uncaught exception: '.$e->getMessage(), [ |
| 143 | 143 | 'category' => get_class($this), |
| 144 | 144 | 'exception' => $e, |
@@ -42,7 +42,7 @@ |
||
| 42 | 42 | */ |
| 43 | 43 | protected function setErrorHandler(): self |
| 44 | 44 | { |
| 45 | - set_error_handler(function ($severity, $message, $file, $line) { |
|
| 45 | + set_error_handler(function($severity, $message, $file, $line) { |
|
| 46 | 46 | $log = $message.' in '.$file.':'.$line; |
| 47 | 47 | |
| 48 | 48 | switch ($severity) { |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | ->prependRoute(new Route('/api/v2/nodes|files|collections/subscription(/|\z)', v2\Subscription::class)) |
| 33 | 33 | ->prependRoute(new Route('/api/v2/nodes|files|collections/{id:#([0-9a-z]{24})#}/subscription(/|\z)', v2\Subscription::class)); |
| 34 | 34 | |
| 35 | - $decorator->addDecorator('subscription', function ($node) use ($notifier, $server) { |
|
| 35 | + $decorator->addDecorator('subscription', function($node) use ($notifier, $server) { |
|
| 36 | 36 | $subscription = $notifier->getSubscription($node, $server->getIdentity()); |
| 37 | 37 | if ($subscription === null) { |
| 38 | 38 | return false; |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | return true; |
| 42 | 42 | }); |
| 43 | 43 | |
| 44 | - $decorator->addDecorator('subscription_exclude_me', function ($node) use ($notifier, $server) { |
|
| 44 | + $decorator->addDecorator('subscription_exclude_me', function($node) use ($notifier, $server) { |
|
| 45 | 45 | $subscription = $notifier->getSubscription($node, $server->getIdentity()); |
| 46 | 46 | if ($subscription === null) { |
| 47 | 47 | return false; |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | return $subscription['exclude_me']; |
| 51 | 51 | }); |
| 52 | 52 | |
| 53 | - $decorator->addDecorator('subscription_recursive', function ($node) use ($notifier, $server) { |
|
| 53 | + $decorator->addDecorator('subscription_recursive', function($node) use ($notifier, $server) { |
|
| 54 | 54 | if (!($node instanceof Collection)) { |
| 55 | 55 | return null; |
| 56 | 56 | } |
@@ -64,7 +64,7 @@ |
||
| 64 | 64 | ->setHeader('Content-Type', 'application/octet-stream') |
| 65 | 65 | ->setHeader('Content-Transfer-Encoding', 'binary') |
| 66 | 66 | ->setOutputFormat(null) |
| 67 | - ->setBody(function () use ($url) { |
|
| 67 | + ->setBody(function() use ($url) { |
|
| 68 | 68 | $stream = fopen($url, 'r'); |
| 69 | 69 | while (!feof($stream)) { |
| 70 | 70 | echo fread($stream, 8192); |
@@ -34,7 +34,7 @@ |
||
| 34 | 34 | ->prependRoute(new Route('/api/v2/files/convert(/|\z)', Convert::class)) |
| 35 | 35 | ->prependRoute(new Route('/api/v2/files/{id:#([0-9a-z]{24})#}/convert(/|\z)', Convert::class)); |
| 36 | 36 | |
| 37 | - $node_decorator->addDecorator('master', function ($node) use ($convert_decorator, $converter) { |
|
| 37 | + $node_decorator->addDecorator('master', function($node) use ($convert_decorator, $converter) { |
|
| 38 | 38 | $master = $node->getAppAttribute('Balloon\\App\\Convert', 'master'); |
| 39 | 39 | if (null === $master) { |
| 40 | 40 | return null; |
@@ -101,14 +101,14 @@ |
||
| 101 | 101 | return [ |
| 102 | 102 | 'id' => (string) $slave['_id'], |
| 103 | 103 | 'format' => (string) $slave['format'], |
| 104 | - 'master' => function ($slave) use ($fs, $node_decorator) { |
|
| 104 | + 'master' => function($slave) use ($fs, $node_decorator) { |
|
| 105 | 105 | try { |
| 106 | 106 | return $node_decorator->decorate($fs->findNodeById($slave['master']), ['_links', 'id', 'name']); |
| 107 | 107 | } catch (\Exception $e) { |
| 108 | 108 | return null; |
| 109 | 109 | } |
| 110 | 110 | }, |
| 111 | - 'slave' => function ($slave) use ($fs, $node_decorator) { |
|
| 111 | + 'slave' => function($slave) use ($fs, $node_decorator) { |
|
| 112 | 112 | if (!isset($slave['slave'])) { |
| 113 | 113 | return null; |
| 114 | 114 | } |