@@ -43,7 +43,7 @@ |
||
| 43 | 43 | * @return DataResponse |
| 44 | 44 | */ |
| 45 | 45 | public function getStatus() { |
| 46 | - return $this->handleNotFound(function () { |
|
| 46 | + return $this->handleNotFound(function() { |
|
| 47 | 47 | return $this->service->getStatus(); |
| 48 | 48 | }); |
| 49 | 49 | } |
@@ -171,7 +171,7 @@ |
||
| 171 | 171 | * Delete an ocr job for a given id and userId. |
| 172 | 172 | * |
| 173 | 173 | * @param |
| 174 | - * $jobId |
|
| 174 | + integer $jobId |
|
| 175 | 175 | * @param string $userId |
| 176 | 176 | * @return OcrJob |
| 177 | 177 | */ |
@@ -81,7 +81,7 @@ |
||
| 81 | 81 | * @throws NotFoundException |
| 82 | 82 | */ |
| 83 | 83 | public function setAppValue($key, $value) { |
| 84 | - if(empty($key)) { |
|
| 84 | + if (empty($key)) { |
|
| 85 | 85 | throw new NotFoundException($this->l10n->t('The given settings key is empty.')); |
| 86 | 86 | } |
| 87 | 87 | switch ($key) { |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | */ |
| 53 | 53 | public function getLanguages() { |
| 54 | 54 | return $this->handleNotFound( |
| 55 | - function () { |
|
| 55 | + function() { |
|
| 56 | 56 | return [ |
| 57 | 57 | 'languages' => $this->appConfig->getAppValue(OcrConstants::LANGUAGES_CONFIG_KEY) |
| 58 | 58 | ]; |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | */ |
| 67 | 67 | public function evaluateRedisSettings() { |
| 68 | 68 | return $this->handleNotFound( |
| 69 | - function () { |
|
| 69 | + function() { |
|
| 70 | 70 | return [ |
| 71 | 71 | 'set' => $this->appConfig->evaluateRedisSettings() |
| 72 | 72 | ]; |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | */ |
| 82 | 82 | public function setLanguages($languages) { |
| 83 | 83 | return $this->handleNotFound( |
| 84 | - function () use ($languages) { |
|
| 84 | + function() use ($languages) { |
|
| 85 | 85 | $this->appConfig->setAppValue(OcrConstants::LANGUAGES_CONFIG_KEY, $languages); |
| 86 | 86 | return $this->l10n->t('Saved'); |
| 87 | 87 | }); |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | */ |
| 98 | 98 | public function setRedis($redisHost, $redisPort, $redisDb) { |
| 99 | 99 | return $this->handleNotFound( |
| 100 | - function () use ($redisHost, $redisPort, $redisDb) { |
|
| 100 | + function() use ($redisHost, $redisPort, $redisDb) { |
|
| 101 | 101 | $this->appConfig->setAppValue(OcrConstants::REDIS_CONFIG_KEY_HOST, $redisHost); |
| 102 | 102 | $this->appConfig->setAppValue(OcrConstants::REDIS_CONFIG_KEY_PORT, $redisPort); |
| 103 | 103 | $this->appConfig->setAppValue(OcrConstants::REDIS_CONFIG_KEY_DB, $redisDb); |
@@ -63,7 +63,7 @@ discard block |
||
| 63 | 63 | */ |
| 64 | 64 | public function process($languages, $files) { |
| 65 | 65 | return $this->handleNotFound( |
| 66 | - function () use ($languages, $files) { |
|
| 66 | + function() use ($languages, $files) { |
|
| 67 | 67 | return $this->service->process($languages, $files); |
| 68 | 68 | }); |
| 69 | 69 | } |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | */ |
| 76 | 76 | public function getAllJobs() { |
| 77 | 77 | return $this->handleNotFound( |
| 78 | - function () { |
|
| 78 | + function() { |
|
| 79 | 79 | return $this->service->getAllJobsForUser($this->userId); |
| 80 | 80 | }); |
| 81 | 81 | } |
@@ -88,7 +88,7 @@ discard block |
||
| 88 | 88 | */ |
| 89 | 89 | public function deleteJob($id) { |
| 90 | 90 | return $this->handleNotFound( |
| 91 | - function () use ($id) { |
|
| 91 | + function() use ($id) { |
|
| 92 | 92 | return $this->service->deleteJob($id, $this->userId); |
| 93 | 93 | }); |
| 94 | 94 | } |
@@ -51,7 +51,7 @@ discard block |
||
| 51 | 51 | */ |
| 52 | 52 | $eventDispatcher = \OC::$server->getEventDispatcher(); |
| 53 | 53 | $eventDispatcher->addListener('OCA\Files::loadAdditionalScripts', |
| 54 | - function () { |
|
| 54 | + function() { |
|
| 55 | 55 | script('ocr', 'dist/ocrapp'); |
| 56 | 56 | style('ocr', 'ocrstyle'); |
| 57 | 57 | // if not loaded before - load select2 for multi select languages |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | * Register core services |
| 63 | 63 | */ |
| 64 | 64 | $container->registerService('CurrentUID', |
| 65 | - function (IContainer $c) { |
|
| 65 | + function(IContainer $c) { |
|
| 66 | 66 | /** @var \OC\Server $server */ |
| 67 | 67 | $server = $c->query('ServerContainer'); |
| 68 | 68 | $user = $server->getUserSession() |
@@ -70,14 +70,14 @@ discard block |
||
| 70 | 70 | return ($user) ? $user->getUID() : ''; |
| 71 | 71 | }); |
| 72 | 72 | // Allow automatic DI for the View, until they migrated to Nodes API |
| 73 | - $container->registerService(View::class, function () { |
|
| 73 | + $container->registerService(View::class, function() { |
|
| 74 | 74 | return new View(''); |
| 75 | 75 | }, false); |
| 76 | 76 | /** |
| 77 | 77 | * Register the PHPUtil |
| 78 | 78 | */ |
| 79 | 79 | $container->registerService('PHPUtil', |
| 80 | - function (IContainer $c) { |
|
| 80 | + function(IContainer $c) { |
|
| 81 | 81 | /** @var \OC\Server $server */ |
| 82 | 82 | $server = $c->query('ServerContainer'); |
| 83 | 83 | return new PHPUtil($server->getL10N('ocr')); |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | * Register the RedisUtil |
| 87 | 87 | */ |
| 88 | 88 | $container->registerService('RedisUtil', |
| 89 | - function (IContainer $c) { |
|
| 89 | + function(IContainer $c) { |
|
| 90 | 90 | /** @var \OC\Server $server */ |
| 91 | 91 | $server = $c->query('ServerContainer'); |
| 92 | 92 | return new RedisUtil($server->getL10N('ocr'), $server->getLogger(), $server->getConfig()); |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | * Register the FileUtil |
| 96 | 96 | */ |
| 97 | 97 | $container->registerService('FileUtil', |
| 98 | - function (IContainer $c) { |
|
| 98 | + function(IContainer $c) { |
|
| 99 | 99 | /** @var \OC\Server $server */ |
| 100 | 100 | $server = $c->query('ServerContainer'); |
| 101 | 101 | return new FileUtil(); |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | * Register the Ocr Job mapper |
| 105 | 105 | */ |
| 106 | 106 | $container->registerService('OcrJobMapper', |
| 107 | - function (IContainer $c) { |
|
| 107 | + function(IContainer $c) { |
|
| 108 | 108 | /** @var \OC\Server $server */ |
| 109 | 109 | $server = $c->query('ServerContainer'); |
| 110 | 110 | return new OcrJobMapper($server->getDatabaseConnection()); |
@@ -113,7 +113,7 @@ discard block |
||
| 113 | 113 | * Register the File mapper |
| 114 | 114 | */ |
| 115 | 115 | $container->registerService('FileMapper', |
| 116 | - function (IContainer $c) { |
|
| 116 | + function(IContainer $c) { |
|
| 117 | 117 | /** @var \OC\Server $server */ |
| 118 | 118 | $server = $c->query('ServerContainer'); |
| 119 | 119 | return new FileMapper($server->getDatabaseConnection()); |
@@ -122,7 +122,7 @@ discard block |
||
| 122 | 122 | * Register the Share mapper |
| 123 | 123 | */ |
| 124 | 124 | $container->registerService('ShareMapper', |
| 125 | - function (IContainer $c) { |
|
| 125 | + function(IContainer $c) { |
|
| 126 | 126 | /** @var \OC\Server $server */ |
| 127 | 127 | $server = $c->query('ServerContainer'); |
| 128 | 128 | return new ShareMapper($server->getDatabaseConnection()); |
@@ -131,7 +131,7 @@ discard block |
||
| 131 | 131 | * Register the App Config Service |
| 132 | 132 | */ |
| 133 | 133 | $container->registerService('AppConfigService', |
| 134 | - function (IAppContainer $c) { |
|
| 134 | + function(IAppContainer $c) { |
|
| 135 | 135 | /** @var \OC\Server $server */ |
| 136 | 136 | $server = $c->query('ServerContainer'); |
| 137 | 137 | return new AppConfigService($server->getConfig(), $server->getL10N('ocr')); |
@@ -140,7 +140,7 @@ discard block |
||
| 140 | 140 | * Register the Job Service |
| 141 | 141 | */ |
| 142 | 142 | $container->registerService('FileService', |
| 143 | - function (IAppContainer $c) { |
|
| 143 | + function(IAppContainer $c) { |
|
| 144 | 144 | /** @var \OC\Server $server */ |
| 145 | 145 | $server = $c->query('ServerContainer'); |
| 146 | 146 | return new FileService($server->getL10N('ocr'), $server->getLogger(), $c->query('CurrentUID'), |
@@ -150,7 +150,7 @@ discard block |
||
| 150 | 150 | * Register the Redis Service |
| 151 | 151 | */ |
| 152 | 152 | $container->registerService('RedisService', |
| 153 | - function (IAppContainer $c) { |
|
| 153 | + function(IAppContainer $c) { |
|
| 154 | 154 | /** @var \OC\Server $server */ |
| 155 | 155 | $server = $c->query('ServerContainer'); |
| 156 | 156 | return new RedisService($c->query('OcrJobMapper'), $c->query('FileUtil'), $c->query('RedisUtil'), |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | * Register the Job Service |
| 161 | 161 | */ |
| 162 | 162 | $container->registerService('JobService', |
| 163 | - function (IAppContainer $c) { |
|
| 163 | + function(IAppContainer $c) { |
|
| 164 | 164 | /** @var \OC\Server $server */ |
| 165 | 165 | $server = $c->query('ServerContainer'); |
| 166 | 166 | return new JobService($server->getL10N('ocr'), $server->getLogger(), $c->query('CurrentUID'), |
@@ -172,7 +172,7 @@ discard block |
||
| 172 | 172 | * Register the Status Service |
| 173 | 173 | */ |
| 174 | 174 | $container->registerService('StatusService', |
| 175 | - function (IAppContainer $c) { |
|
| 175 | + function(IAppContainer $c) { |
|
| 176 | 176 | /** @var \OC\Server $server */ |
| 177 | 177 | $server = $c->query('ServerContainer'); |
| 178 | 178 | return new StatusService($server->getL10N('ocr'), $server->getLogger(), $c->query('CurrentUID'), |
@@ -182,7 +182,7 @@ discard block |
||
| 182 | 182 | * Controller |
| 183 | 183 | */ |
| 184 | 184 | $container->registerService('StatusController', |
| 185 | - function (IAppContainer $c) { |
|
| 185 | + function(IAppContainer $c) { |
|
| 186 | 186 | /** @var \OC\Server $server */ |
| 187 | 187 | $server = $c->query('ServerContainer'); |
| 188 | 188 | return new StatusController($c->getAppName(), $server->getRequest(), $c->query('StatusService')); |
@@ -191,7 +191,7 @@ discard block |
||
| 191 | 191 | * Controller |
| 192 | 192 | */ |
| 193 | 193 | $container->registerService('JobController', |
| 194 | - function (IAppContainer $c) { |
|
| 194 | + function(IAppContainer $c) { |
|
| 195 | 195 | /** @var \OC\Server $server */ |
| 196 | 196 | $server = $c->query('ServerContainer'); |
| 197 | 197 | return new JobController($c->getAppName(), $server->getRequest(), $c->query('JobService'), |
@@ -72,7 +72,7 @@ |
||
| 72 | 72 | throw new NotFoundException($this->l10n->t('Message queueing capabilities are missing on the server.')); |
| 73 | 73 | } |
| 74 | 74 | $redis = new \Redis(); |
| 75 | - if (!$redis->connect($this->config->getAppValue($this->appName, 'redisHost'), intval($this->config->getAppValue($this->appName, 'redisPort')), 2.5, NULL, 100)) { |
|
| 75 | + if (!$redis->connect($this->config->getAppValue($this->appName, 'redisHost'), intval($this->config->getAppValue($this->appName, 'redisPort')), 2.5, null, 100)) { |
|
| 76 | 76 | $this->logger->debug('Cannot connect to Redis.'); |
| 77 | 77 | throw new NotFoundException($this->l10n->t('Cannot connect to Redis.')); |
| 78 | 78 | } |