janis91 / ocr

lib/Controller/StatusController.php

Spacing +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
      * @return DataResponse
      */
     public function getStatus() {
-        return $this->handleNotFound(function () {
+        return $this->handleNotFound(function() {
             return $this->service->getStatus();
         });
     }

lib/Service/JobService.php

Doc Comments +1 added lines, -1 removed lines

@@ -171,7 +171,7 @@
      * Delete an ocr job for a given id and userId.
      * 
      * @param
-     *            $jobId
+     integer            $jobId
      * @param string $userId            
      * @return OcrJob
      */

Spacing +5 added lines, -5 removed lines

@@ -157,7 +157,7 @@ 
                 foreach ($fileInfo as $fInfo) {
                     // Check Shared
                     $shared = $this->fileService->checkSharedWithInitiator($fInfo);
-                    if($shared && $replace) {
+                    if ($shared && $replace) {
                         throw new NotFoundException($this->l10n->t('Cannot replace shared files.'));
                     }
                     $target = $this->fileService->buildTarget($fInfo, $shared, $replace);
@@ -276,11 +276,11 @@ 
             $this->logger->debug('Check if files were processed by ocr and if so, put them to the right dirs.', ['app' => OcrConstants::APP_NAME]);
             $processed = $this->jobMapper->findAllProcessed($this->userId);
             foreach ($processed as $job) {
-                if ($this->fileUtil->fileExists($this->tempM->getTempBaseDir().'/'.$job->getTempFile().'.pdf')) {
+                if ($this->fileUtil->fileExists($this->tempM->getTempBaseDir() . '/' . $job->getTempFile() . '.pdf')) {
                     // Save the tmp file with newname
                     $this->pullResult($job);
                     $this->jobMapper->delete($job);
-                    $this->fileUtil->execRemove($this->tempM->getTempBaseDir().'/'.$job->getTempFile().'.pdf');
+                    $this->fileUtil->execRemove($this->tempM->getTempBaseDir() . '/' . $job->getTempFile() . '.pdf');
                 } else {
                     $job->setStatus(OcrConstants::STATUS_FAILED);
                     $job->setErrorLog('Temp file does not exist.');
@@ -304,7 +304,7 @@ 
             $failed = $this->jobMapper->findAllFailed($this->userId);
             foreach ($failed as $job) {
                 // clean the tempfile
-                $this->fileUtil->execRemove($this->tempM->getTempBaseDir().'/'.$job->getTempFile().'.pdf');
+                $this->fileUtil->execRemove($this->tempM->getTempBaseDir() . '/' . $job->getTempFile() . '.pdf');
                 // set error displayed
                 $job->setErrorDisplayed(true);
                 $this->jobMapper->update($job);
@@ -329,7 +329,7 @@ 
         if ($job->getReplace()) {
             $this->view->unlink(str_replace($this->userId . '/files', '', $job->getSource()));
         }
-        $result = $this->view->file_put_contents($job->getTarget(), $this->fileUtil->getFileContents($this->tempM->getTempBaseDir().'/'.$job->getTempFile().'.pdf'));
+        $result = $this->view->file_put_contents($job->getTarget(), $this->fileUtil->getFileContents($this->tempM->getTempBaseDir() . '/' . $job->getTempFile() . '.pdf'));
         if (!$result) {
             throw new NotFoundException($this->l10n->t('OCR could not put processed file to the right target folder. If you selected the replace option, you can restore the file by using the trash bin.'));
         }

lib/Controller/AdminSettingsController.php

Spacing +4 added lines, -4 removed lines

@@ -52,7 +52,7 @@ 
      */
     public function getLanguages() {
         return $this->handleNotFound(
-                function () {
+                function() {
                     return [
                             'languages' => $this->appConfig->getAppValue(OcrConstants::LANGUAGES_CONFIG_KEY)
                     ];
@@ -66,7 +66,7 @@ 
      */
     public function evaluateRedisSettings() {
         return $this->handleNotFound(
-                function () {
+                function() {
                     return [
                             'set' => $this->appConfig->evaluateRedisSettings()
                     ];
@@ -81,7 +81,7 @@ 
      */
     public function setLanguages($languages) {
         return $this->handleNotFound(
-                function () use ($languages) {
+                function() use ($languages) {
                     $this->appConfig->setAppValue(OcrConstants::LANGUAGES_CONFIG_KEY, $languages);
                     return $this->l10n->t('Saved');
                 });
@@ -98,7 +98,7 @@ 
      */
     public function setRedis($redisHost, $redisPort, $redisDb, $redisPassword) {
         return $this->handleNotFound(
-                function () use ($redisHost, $redisPort, $redisDb, $redisPassword) {
+                function() use ($redisHost, $redisPort, $redisDb, $redisPassword) {
                     $this->appConfig->setAppValue(OcrConstants::REDIS_CONFIG_KEY_HOST, $redisHost);
                     $this->appConfig->setAppValue(OcrConstants::REDIS_CONFIG_KEY_PORT, $redisPort);
                     $this->appConfig->setAppValue(OcrConstants::REDIS_CONFIG_KEY_DB, $redisDb);

lib/Util/RedisUtil.php

Spacing +2 added lines, -2 removed lines

@@ -82,7 +82,7 @@ 
             throw new NotFoundException($this->l10n->t('Cannot connect to Redis.'));
         }
         $password = $this->config->getAppValue($this->appName, 'redisPassword', '');
-        if($password !== '') {
+        if ($password !== '') {
             $authenticated = $redis->auth($password);
         }
         if ($password !== '' && !$authenticated) {
@@ -96,7 +96,7 @@ 
         $redis->setOption(\Redis::OPT_PREFIX, OcrConstants::REDIS_KEY_PREFIX);
         return $redis;
         } catch (\RedisException $e) {
-            if($e->getMessage() === 'Failed to AUTH connection') {
+            if ($e->getMessage() === 'Failed to AUTH connection') {
                 throw new NotFoundException($this->l10n->t('Redis authentication error.'));
             }
         }

lib/Controller/JobController.php

Spacing +3 added lines, -3 removed lines

@@ -64,7 +64,7 @@ 
      */
     public function process($languages, $files, $replace) {
         return $this->handleNotFound(
-                function () use ($languages, $files, $replace) {
+                function() use ($languages, $files, $replace) {
                     return $this->service->process($languages, $files, $replace);
                 });
     }
@@ -76,7 +76,7 @@ 
      */
     public function getAllJobs() {
         return $this->handleNotFound(
-                function () {
+                function() {
                     return $this->service->getAllJobsForUser($this->userId);
                 });
     }
@@ -89,7 +89,7 @@ 
      */
     public function deleteJob($id) {
         return $this->handleNotFound(
-                function () use ($id) {
+                function() use ($id) {
                     return $this->service->deleteJob($id, $this->userId);
                 });
     }

lib/Service/FileService.php

Spacing +3 added lines, -3 removed lines

@@ -189,10 +189,10 @@ 
         if ($fileInfo->getMimetype() === OcrConstants::MIME_TYPE_PDF) {
             // PDFs:
             if ($replace) {
-                if($filePath === '/') {
+                if ($filePath === '/') {
                     $filePath = '';
                 }
-                return $filePath . '/'. $fileName . '.pdf';
+                return $filePath . '/' . $fileName . '.pdf';
             } else {
                 return $this->fileUtil->buildNotExistingFilename($filePath, $fileName . '.pdf');
             }
@@ -231,7 +231,7 @@ 
         if ($fileInfo->getMimetype() === OcrConstants::MIME_TYPE_PDF) {
             // PDFs:
             if ($replace) {
-                if($filePath === '/') {
+                if ($filePath === '/') {
                     $filePath = '';
                 }
                 return $filePath . '/' . $fileName . '.pdf';

lib/Service/RedisService.php

Spacing +1 added lines, -1 removed lines

@@ -107,7 +107,7 @@
                 throw new NotFoundException($this->l10n->t('Could not add files to the Redis OCR processing queue.'));
             }
         } catch (Exception $e) {
-            $this->fileUtil->execRemove($this->tempM->getTempBaseDir().'/'.$job->getTempFile().'.pdf');
+            $this->fileUtil->execRemove($this->tempM->getTempBaseDir() . '/' . $job->getTempFile() . '.pdf');
             $job->setStatus(OcrConstants::STATUS_FAILED);
             $job->setErrorLog($e->getMessage());
             $this->mapper->update($job);

lib/AppInfo/Application.php

Spacing +17 added lines, -17 removed lines

@@ -52,7 +52,7 @@ 
          */
         $eventDispatcher = \OC::$server->getEventDispatcher();
         $eventDispatcher->addListener('OCA\Files::loadAdditionalScripts', 
-                function () {
+                function() {
                     script(OcrConstants::APP_NAME, 'dist/ocrapp');
                     style(OcrConstants::APP_NAME, 'ocrstyle');
                     // if not loaded before - load select2 for multi select languages
@@ -63,7 +63,7 @@ 
          * Register core services
          */
         $container->registerService('CurrentUID', 
-                function (IContainer $c) {
+                function(IContainer $c) {
                     /** @var \OC\Server $server */
                     $server = $c->query('ServerContainer');
                     $user = $server->getUserSession()
@@ -71,14 +71,14 @@ 
                     return ($user) ? $user->getUID() : '';
                 });
         // Allow automatic DI for the View, until they migrated to Nodes API
-        $container->registerService(View::class, function () {
+        $container->registerService(View::class, function() {
             return new View('');
         }, false);
         /**
          * Register the PHPUtil
          */
         $container->registerService('PHPUtil', 
-                function (IContainer $c) {
+                function(IContainer $c) {
                     /** @var \OC\Server $server */
                     $server = $c->query('ServerContainer');
                     return new PHPUtil($server->getL10N(OcrConstants::APP_NAME));
@@ -87,7 +87,7 @@ 
          * Register the RedisUtil
          */
         $container->registerService('RedisUtil', 
-                function (IContainer $c) {
+                function(IContainer $c) {
                     /** @var \OC\Server $server */
                     $server = $c->query('ServerContainer');
                     return new RedisUtil($server->getL10N(OcrConstants::APP_NAME), $server->getLogger(), $server->getConfig());
@@ -96,14 +96,14 @@ 
          * Register the FileUtil
          */
         $container->registerService('FileUtil', 
-                function (IContainer $c) {
+                function(IContainer $c) {
                     return new FileUtil();
                 });
         /**
          * Register the Ocr Job mapper
          */
         $container->registerService('OcrJobMapper', 
-                function (IContainer $c) {
+                function(IContainer $c) {
                     /** @var \OC\Server $server */
                     $server = $c->query('ServerContainer');
                     return new OcrJobMapper($server->getDatabaseConnection());
@@ -112,7 +112,7 @@ 
          * Register the File mapper
          */
         $container->registerService('FileMapper', 
-                function (IContainer $c) {
+                function(IContainer $c) {
                     /** @var \OC\Server $server */
                     $server = $c->query('ServerContainer');
                     return new FileMapper($server->getDatabaseConnection());
@@ -121,7 +121,7 @@ 
          * Register the Share mapper
          */
         $container->registerService('ShareMapper', 
-                function (IContainer $c) {
+                function(IContainer $c) {
                     /** @var \OC\Server $server */
                     $server = $c->query('ServerContainer');
                     return new ShareMapper($server->getDatabaseConnection());
@@ -130,7 +130,7 @@ 
          * Register the App Config Service
          */
         $container->registerService('AppConfigService', 
-                function (IAppContainer $c) {
+                function(IAppContainer $c) {
                     /** @var \OC\Server $server */
                     $server = $c->query('ServerContainer');
                     return new AppConfigService($server->getConfig(), $server->getL10N(OcrConstants::APP_NAME), $c->query('RedisUtil'), 
@@ -140,7 +140,7 @@ 
          * Register the Job Service
          */
         $container->registerService('FileService', 
-                function (IAppContainer $c) {
+                function(IAppContainer $c) {
                     /** @var \OC\Server $server */
                     $server = $c->query('ServerContainer');
                     return new FileService($server->getL10N(OcrConstants::APP_NAME), $server->getLogger(), $c->query('CurrentUID'), 
@@ -150,7 +150,7 @@ 
          * Register the Redis Service
          */
         $container->registerService('RedisService', 
-                function (IAppContainer $c) {
+                function(IAppContainer $c) {
                     /** @var \OC\Server $server */
                     $server = $c->query('ServerContainer');
                     return new RedisService($c->query('OcrJobMapper'), $c->query('FileUtil'), $c->query('RedisUtil'), 
@@ -160,7 +160,7 @@ 
          * Register the Job Service
          */
         $container->registerService('JobService', 
-                function (IAppContainer $c) {
+                function(IAppContainer $c) {
                     /** @var \OC\Server $server */
                     $server = $c->query('ServerContainer');
                     return new JobService($server->getL10N(OcrConstants::APP_NAME), $server->getLogger(), $c->query('CurrentUID'), 
@@ -172,7 +172,7 @@ 
          * Register the Status Service
          */
         $container->registerService('StatusService', 
-                function (IAppContainer $c) {
+                function(IAppContainer $c) {
                     /** @var \OC\Server $server */
                     $server = $c->query('ServerContainer');
                     return new StatusService($server->getL10N(OcrConstants::APP_NAME), $server->getLogger(), $c->query('CurrentUID'), 
@@ -182,7 +182,7 @@ 
          * Controller
          */
         $container->registerService('StatusController', 
-                function (IAppContainer $c) {
+                function(IAppContainer $c) {
                     /** @var \OC\Server $server */
                     $server = $c->query('ServerContainer');
                     return new StatusController($c->getAppName(), $server->getRequest(), $c->query('StatusService'));
@@ -191,7 +191,7 @@ 
          * Controller
          */
         $container->registerService('JobController', 
-                function (IAppContainer $c) {
+                function(IAppContainer $c) {
                     /** @var \OC\Server $server */
                     $server = $c->query('ServerContainer');
                     return new JobController($c->getAppName(), $server->getRequest(), $c->query('JobService'), 
@@ -201,7 +201,7 @@ 
          * Controller
          */
         $container->registerService('UserHooks', 
-                function (IAppContainer $c) {
+                function(IAppContainer $c) {
                     /** @var \OC\Server $server */
                     $server = $c->query('ServerContainer');
                     return new UserHooks($c->query('ServerContainer')

lib/Hooks/UserHooks.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
      * Registers the user hooks.
      */
     public function register() {
-        $postDelete = function ($user) {
+        $postDelete = function($user) {
             $this->logger->debug('Deleting all jobs for user "{user}" after user deletion (Hook).', [
                     'user' => $user->getUID(),
                     'app' => OcrConstants::APP_NAME