scriptotek / colligator-backend

app/Console/Kernel.php

Indentation +3 added lines, -3 removed lines

@@ -24,15 +24,15 @@
     protected function schedule(Schedule $schedule)
     {
         $schedule->command('colligator:harvest-oaipmh samling42 --daily')
-                 ->dailyAt('02:00');
+                    ->dailyAt('02:00');
 
         // Bring subject heading usage counts up-to-date
         $schedule->command('colligator:reindex')
-                 ->weekly()->sundays()->at('04:00');
+                    ->weekly()->sundays()->at('04:00');
 
         // Check new documents for xisbn
         $schedule->command('colligator:harvest-xisbn')
-                 ->weekly()->saturdays()->at('04:00');
+                    ->weekly()->saturdays()->at('04:00');
     }
 
     /**

app/Providers/CoverCacheServiceProvider.php

Indentation +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
 
 class CoverCacheServiceProvider extends ServiceProvider
 {
-	/**
+    /**
      * Indicates if loading of the provider is deferred.
      *
      * @var bool

Spacing +2 added lines, -2 removed lines

@@ -23,12 +23,12 @@
      */
     public function register()
     {
-        $this->app->singleton(CoverCache::class, function ($app) {
+        $this->app->singleton(CoverCache::class, function($app) {
             $fs = \Storage::disk('s3')->getAdapter();
             $im = $this->app->make(ImageManager::class);
             $conf = new FlysystemConfig([
                 // Default: 30 days
-                'CacheControl' => 'max-age=' . env('IMAGE_CACHE_TIME', 3153600) . ', public',
+                'CacheControl' => 'max-age='.env('IMAGE_CACHE_TIME', 3153600).', public',
             ]);
             return new CoverCache($fs, $im, $conf);
         });

app/CoverCache.php

Spacing +5 added lines, -5 removed lines

@@ -85,7 +85,7 @@ 
         if (is_null($data)) {
             $data = $this->download($sourceUrl);
             if (!$data) {
-                throw new \ErrorException('[CoverCache] Failed to download ' . $sourceUrl);
+                throw new \ErrorException('[CoverCache] Failed to download '.$sourceUrl);
             }
         }
 
@@ -93,7 +93,7 @@ 
 
         $img = $this->imageManager->make($data);
         if ($maxHeight && $img->height() > $maxHeight) {
-            \Log::debug('[CachedImage] Resizing from ' . $img->height() . ' to ' . $maxHeight);
+            \Log::debug('[CachedImage] Resizing from '.$img->height().' to '.$maxHeight);
             $img->heighten($maxHeight);
             $data = strval($img->encode('jpg'));
         }
@@ -103,12 +103,12 @@ 
         }
 
 
-        \Log::debug('[CachedImage] Storing image as ' . $img->width() . ' x ' . $img->height() . ', ' . strlen($data) . ' bytes');
+        \Log::debug('[CachedImage] Storing image as '.$img->width().' x '.$img->height().', '.strlen($data).' bytes');
         if (!$this->filesystem->write($cacheKey, $data, $this->fsConfig)) {
             throw new \ErrorException('[CoverCache] Failed to upload thumb to S3');
         }
 
-        \Log::debug('[CachedImage] Wrote cached version as ' . $cacheKey);
+        \Log::debug('[CachedImage] Wrote cached version as '.$cacheKey);
 
         return new CachedImage($this, $cacheKey);
     }
@@ -139,7 +139,7 @@ 
     {
         $data = $this->filesystem->read($cacheKey);
         $blob = strval($data['contents']);
-        \Log::debug('[CachedImage] Read ' .$cacheKey . ': ' . strlen($blob) . ' bytes');
+        \Log::debug('[CachedImage] Read '.$cacheKey.': '.strlen($blob).' bytes');
 
         return $this->putBlob($blob, $maxHeight);
     }

app/Search/DocumentsIndex.php

Spacing +19 added lines, -19 removed lines

@@ -100,7 +100,7 @@ 
     public function sanitizeForQuery($value)
     {
         $chars = preg_quote('\\+-&|!(){}[]^~*?:');
-        $value = preg_replace('/([' . $chars . '])/', '\\\\\1', $value);
+        $value = preg_replace('/(['.$chars.'])/', '\\\\\1', $value);
 
         return $value;
         //
@@ -132,20 +132,20 @@ 
         }
         if ($request->has('collection')) {
             $col = Collection::findOrFail($request->collection);
-            $query[] = 'collections:"' . $this->sanitizeForQuery($col->name) . '"';
+            $query[] = 'collections:"'.$this->sanitizeForQuery($col->name).'"';
         }
         if ($request->has('subject')) {
-            $query[] = '(subjects.noubomn.prefLabel:"' . $this->sanitizeForQuery($request->subject) . '"' .
-                    ' OR subjects.bare.prefLabel:"' . $this->sanitizeForQuery($request->subject) . '"' .
-                    ' OR genres.noubomn.prefLabel:"' . $this->sanitizeForQuery($request->subject) . '")';
+            $query[] = '(subjects.noubomn.prefLabel:"'.$this->sanitizeForQuery($request->subject).'"'.
+                    ' OR subjects.bare.prefLabel:"'.$this->sanitizeForQuery($request->subject).'"'.
+                    ' OR genres.noubomn.prefLabel:"'.$this->sanitizeForQuery($request->subject).'")';
                 // TODO: Vi bør vel antakelig skille mellom X som emne og X som form/sjanger ?
                 //       Men da må frontend si fra hva den ønsker, noe den ikke gjør enda.
         }
         if ($request->has('language')) {
-            $query[] = 'language:"' . $this->sanitizeForQuery($request->language) . '"' ;
+            $query[] = 'language:"'.$this->sanitizeForQuery($request->language).'"';
         }
         if ($request->has('genre')) {
-            $query[] = 'genres.noubomn.prefLabel:"' . $this->sanitizeForQuery($request->genre) . '"';
+            $query[] = 'genres.noubomn.prefLabel:"'.$this->sanitizeForQuery($request->genre).'"';
         }
         if ($request->has('real')) {
             dd('`real` is (very) deprecated, please use `subject` instead.');
@@ -183,7 +183,7 @@ 
     public function getUsageCount($id, $type)
     {
         $this->getFullType($type);
-        $arg = $type . '.' . $id;
+        $arg = $type.'.'.$id;
         if (is_null(array_get($this->usage, $arg))) {
             $this->addToUsageCache($id, $type);
         }
@@ -212,11 +212,11 @@ 
             ->get();
 
         foreach ($entity_ids as $sid) {
-            array_set($this->usage, $type . '.' . $sid, 0);
+            array_set($this->usage, $type.'.'.$sid, 0);
         }
 
         foreach ($res as $row) {
-            array_set($this->usage, $type . '.' . $row->entity_id, intval($row->doc_count));
+            array_set($this->usage, $type.'.'.$row->entity_id, intval($row->doc_count));
         }
     }
 
@@ -226,10 +226,10 @@ 
         $query = \DB::table('entities')
                     ->select(['entity_id', 'entity_type', \DB::raw('count(document_id) as doc_count')])
                     ->groupBy('entity_id', 'entity_type');
-        $query->orderBy('entity_id')->orderBy('entity_type')->chunk(5000, function ($rows) use ($typemap) {
+        $query->orderBy('entity_id')->orderBy('entity_type')->chunk(5000, function($rows) use ($typemap) {
             foreach ($rows as $row) {
                 $type = $typemap[$row->entity_type];
-                array_set($this->usage, $type . '.' . $row->entity_id, intval($row->doc_count));
+                array_set($this->usage, $type.'.'.$row->entity_id, intval($row->doc_count));
             }
         });
     }
@@ -246,7 +246,7 @@ 
     {
         $payload = $this->basePayload();
         if (!is_null($indexVersion)) {
-            $payload['index'] = $this->esIndex . '_v' . $indexVersion;
+            $payload['index'] = $this->esIndex.'_v'.$indexVersion;
         }
         $payload['id'] = $doc->id;
 
@@ -256,8 +256,8 @@ 
         try {
             $this->client->index($payload);
         } catch (BadRequest400Exception $e) {
-            \Log::error('ElasticSearch returned error: ' . $e->getMessage() . '. Our request: ' . var_export($payload, true));
-            throw new \ErrorException('ElasticSearch failed to index the document ' . $doc->id . '. Please see the log for payload and full error response. Error message: ' . $e->getMessage());
+            \Log::error('ElasticSearch returned error: '.$e->getMessage().'. Our request: '.var_export($payload, true));
+            throw new \ErrorException('ElasticSearch failed to index the document '.$doc->id.'. Please see the log for payload and full error response. Error message: '.$e->getMessage());
         }
     }
 
@@ -278,7 +278,7 @@ 
         if (is_null($version)) {
             $version = $this->getCurrentVersion() + 1;
         }
-        $indexParams = ['index' => $this->esIndex . '_v' . $version];
+        $indexParams = ['index' => $this->esIndex.'_v'.$version];
         $indexParams['body']['settings']['analysis']['char_filter']['isbn_filter'] = [
             'type'        => 'pattern_replace',
             'pattern'     => '-',
@@ -326,7 +326,7 @@ 
     {
         try {
             $this->client->indices()->delete([
-                'index' => $this->esIndex . '_v' . $version,
+                'index' => $this->esIndex.'_v'.$version,
             ]);
         } catch (Missing404Exception $e) {
             # Didn't exist in the beginning, that's ok.
@@ -336,7 +336,7 @@ 
     public function addAction(&$actions, $action, $version)
     {
         if ($version) {
-            $actions[] = [$action => ['index' => $this->esIndex . '_v' . $version, 'alias' => $this->esIndex]];
+            $actions[] = [$action => ['index' => $this->esIndex.'_v'.$version, 'alias' => $this->esIndex]];
         }
     }
 
@@ -353,7 +353,7 @@ 
 
     public function versionExists($version)
     {
-        return $this->client->indices()->exists(['index' => $this->esIndex . '_v' . $version]);
+        return $this->client->indices()->exists(['index' => $this->esIndex.'_v'.$version]);
     }
 
     public function getCurrentVersion()