scriptotek / colligator-backend

app/XisbnResponse.php

Spacing +5 added lines, -5 removed lines

@@ -10,12 +10,12 @@ 
         'AA'    => 'audio',
         'AA BA' => 'audio book',
         'BA'    => 'book',
-        'BA DA' => 'ebook',      // Yes, we DO actually get these
+        'BA DA' => 'ebook', // Yes, we DO actually get these
         'BB'    => 'hardcover',
-        'BB BC' => 'book',       // ... and these
-        'BB DA' => 'ebook',      // ... and these
+        'BB BC' => 'book', // ... and these
+        'BB DA' => 'ebook', // ... and these
         'BC'    => 'paperback',
-        'BC DA' => 'ebook',      // ... and these
+        'BC DA' => 'ebook', // ... and these
         'DA'    => 'digital',
         'FA'    => 'film/transp.',
         'MA'    => 'microform',
@@ -49,7 +49,7 @@ 
         if (isset($this->formats[$formStr])) {
             return $this->formats[$formStr];
         }
-        $formStr = implode(' ', array_map(function ($el) {
+        $formStr = implode(' ', array_map(function($el) {
             return $this->formats[$el];
         }, $forms));
         \Log::warning(sprintf('Unknown form: %s', $formStr));

app/Http/Controllers/CollectionsController.php

Doc Comments +2 added lines, -2 removed lines

@@ -9,7 +9,7 @@ 
     /**
      * Display a listing of the resource.
      *
-     * @return Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function index()
     {
@@ -21,7 +21,7 @@ 
      *
      * @param int $id
      *
-     * @return Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function show($id)
     {

app/Console/Commands/OaiPmhHarvestInfo.php

Spacing +8 added lines, -8 removed lines

@@ -57,7 +57,7 @@ 
         $name = $this->argument('name');
         $parser = new MarcParser();
 
-        $files = Storage::disk('local')->files('harvests/' . $name);
+        $files = Storage::disk('local')->files('harvests/'.$name);
 
         $info = [
             'count'                => 0,
@@ -101,29 +101,29 @@ 
                     if ($localHoldingsCount > 10) {
                         $localHoldingsCount = 10;
                     }
-                    $info['holdings_count'][$holdingsCount] = array_get($info, 'holdings_count.' . $holdingsCount, 0) + 1;
-                    $info['local_holdings_count'][$localHoldingsCount] = array_get($info, 'local_holdings_count.' . $localHoldingsCount, 0) + 1;
+                    $info['holdings_count'][$holdingsCount] = array_get($info, 'holdings_count.'.$holdingsCount, 0) + 1;
+                    $info['local_holdings_count'][$localHoldingsCount] = array_get($info, 'local_holdings_count.'.$localHoldingsCount, 0) + 1;
 
                     if (is_null($biblio)) {
                         $this->error('No bibliographic records!');
                     } else {
                         $c = count($biblio->isbns);
-                        $info['isbn_count'][$c] = array_get($info, 'isbn_count.' . $c, 0) + 1;
+                        $info['isbn_count'][$c] = array_get($info, 'isbn_count.'.$c, 0) + 1;
                     }
                 }
             } catch (InvalidXMLException $e) {
-                $this->error('Invalid XML found! Skipping file: ' . $filename);
+                $this->error('Invalid XML found! Skipping file: '.$filename);
             }
         }
         $this->output->progressFinish();
 
-        $this->comment('Antall dokumenter: ' . $info['count']);
+        $this->comment('Antall dokumenter: '.$info['count']);
 
         $keys = array_keys($info['isbn_count']);
         sort($keys);
         $this->comment('Antall ISBN-numre per dokument:');
         foreach ($keys as $key) {
-            $this->comment('  - ' . $key . ': ' . $info['isbn_count'][$key]);
+            $this->comment('  - '.$key.': '.$info['isbn_count'][$key]);
         }
 
         $keys = array_keys($info['local_holdings_count']);
@@ -134,7 +134,7 @@ 
             if ($key == 10) {
                 $key = '>= 10';
             }
-            $this->comment('  - ' . $key . ': ' . $val);
+            $this->comment('  - '.$key.': '.$val);
         }
     }
 }

app/Console/Commands/Reindex.php

Spacing +4 added lines, -4 removed lines

@@ -40,7 +40,7 @@ 
         //$docIndex->dropVersion();
         $oldVersion = $docIndex->getCurrentVersion();
         $newVersion = $oldVersion + 1;
-        $this->comment(' Old version: ' . $oldVersion . ', new version: ' . $newVersion);
+        $this->comment(' Old version: '.$oldVersion.', new version: '.$newVersion);
 
         if ($docIndex->versionExists($newVersion)) {
             $this->comment(' New version already existed, probably from a crashed job. Removing.');
@@ -58,7 +58,7 @@ 
         $docCount = Document::count();
         $this->output->progressStart($docCount);
 
-        Document::with('subjects', 'genres', 'cover')->chunk(1000, function ($docs) use ($docIndex, $newVersion) {
+        Document::with('subjects', 'genres', 'cover')->chunk(1000, function($docs) use ($docIndex, $newVersion) {
             foreach ($docs as $doc) {
                 $docIndex->index($doc, $newVersion);
                 $this->output->progressAdvance();
@@ -73,7 +73,7 @@ 
         $docIndex->dropVersion($oldVersion);
 
         $dt = microtime(true) - $t0;
-        $this->info(' Completed in ' . round($dt) . ' seconds.');
-        \Log::info('[ReindexJob] Completed in ' . round($dt) . ' seconds.');
+        $this->info(' Completed in '.round($dt).' seconds.');
+        \Log::info('[ReindexJob] Completed in '.round($dt).' seconds.');
     }
 }

app/Console/Commands/ImportOntosaur.php

Spacing +4 added lines, -4 removed lines

@@ -85,13 +85,13 @@ 
             $field = 'genres';
             $entity = Genre::where('term', '=', $labels['nb'])->where('vocabulary', '=', 'noubomn')->first();
             if (is_null($entity)) {
-                $this->error('[ImportOntosaur] Entity not found: "' . $labels['nb'] . '"');
+                $this->error('[ImportOntosaur] Entity not found: "'.$labels['nb'].'"');
             }
         }
         if (!is_null($entity)) {
             $node['local_id'] = $entity->id;
             $node['documents'] = action('DocumentsController@index', [
-                'q' => $field . '.noubomn.id:' . $entity->id,
+                'q' => $field.'.noubomn.id:'.$entity->id,
             ]);
             // Can be used e.g. to determine bubble size in a visualization
             $node['document_count'] = $entity->documents()->count();
@@ -145,7 +145,7 @@ 
         }
 
         if (count($topNodes) != 1) {
-            throw new \Exception('Found ' . count($topNodes) . ' topnodes rather than 1: ' . implode(', ', $topNodes));
+            throw new \Exception('Found '.count($topNodes).' topnodes rather than 1: '.implode(', ', $topNodes));
         }
 
         return [$nodes, $links, $topNodes[0]];
@@ -167,6 +167,6 @@ 
         $saur->links = $links;
         $saur->topnode = $topnode;
         $saur->save();
-        $this->info('[ImportOntosaur] Completed. Have ' . count($nodes) . ' nodes, ' . count($links) . ' links.');
+        $this->info('[ImportOntosaur] Completed. Have '.count($nodes).' nodes, '.count($links).' links.');
     }
 }

app/Console/Commands/HarvestXisbn.php

Spacing +2 added lines, -2 removed lines

@@ -49,8 +49,8 @@
      */
     public function handleDocuments(XisbnClient $client, $docs)
     {
-        $this->info('Will check ' . count($docs) . ' documents');
-        Log::info('[HarvestXisbnJob] Starting job. ' . count($docs) . ' documents to be checked.');
+        $this->info('Will check '.count($docs).' documents');
+        Log::info('[HarvestXisbnJob] Starting job. '.count($docs).' documents to be checked.');
 
         $this->output->progressStart(count($docs));
         foreach ($docs as $doc) {

app/Marc21Importer.php

Spacing +5 added lines, -5 removed lines

@@ -57,8 +57,8 @@ 
             $rec = MarcRecord::fromString($q);
 
             $itemMap = [
-                'x' => 'location',  // OBS: 1030310
-                'y' => 'shelvinglocation',  // OBS: k00475
+                'x' => 'location', // OBS: 1030310
+                'y' => 'shelvinglocation', // OBS: k00475
                 'c' => 'barcode',
                 'z' => 'callcode',
                 'a' => 'id',
@@ -193,7 +193,7 @@ 
             try {
                 $doc->storeCover($biblio['cover_image']);
             } catch (\ErrorException $e) {
-                \Log::error('Failed to store cover: ' . $biblio['cover_image']);
+                \Log::error('Failed to store cover: '.$biblio['cover_image']);
             }
         }
 
@@ -208,14 +208,14 @@ 
         try {
             list($biblio, $holdings) = $this->parseRecord($record);
         } catch (ParserException $e) {
-            $this->error('Failed to parse MARC record. Error "' . $e->getMessage() . '" in: ' . $e->getFile() . ':' . $e->getLine() . "\nStack trace:\n" . $e->getTraceAsString());
+            $this->error('Failed to parse MARC record. Error "'.$e->getMessage().'" in: '.$e->getFile().':'.$e->getLine()."\nStack trace:\n".$e->getTraceAsString());
 
             return;
         }
 
         $doc = $this->importParsedRecord($biblio, $holdings);
 
-        \Log::debug('[Marc21Importer] Imported ' . $doc->bibsys_id . ' as ' . $doc->id);
+        \Log::debug('[Marc21Importer] Imported '.$doc->bibsys_id.' as '.$doc->id);
 
         if (!is_null($doc)) {
             Event::fire(new Marc21RecordImported($doc->id));

app/Http/Requests/SearchDocumentsRequest.php

Spacing +2 added lines, -2 removed lines

@@ -25,7 +25,7 @@ 
                 $this->warnings[] = 'Offset cannot be negative.';
             } elseif ($input['offset'] > $maxPaginationDepth) {
                 $input['offset'] = $maxPaginationDepth;
-                $this->warnings[] = 'Pagination depth is limited to ' . $maxPaginationDepth . ' results.';
+                $this->warnings[] = 'Pagination depth is limited to '.$maxPaginationDepth.' results.';
             }
         }
 
@@ -36,7 +36,7 @@ 
                 $this->warnings[] = 'Limit cannot be negative.';
             } elseif ($input['limit'] > $maxResultsPerRequest) {
                 $input['limit'] = $maxResultsPerRequest;
-                $this->warnings[] = 'Limiting to max ' . $maxResultsPerRequest . ' results per request.';
+                $this->warnings[] = 'Limiting to max '.$maxResultsPerRequest.' results per request.';
             }
         }
 

app/GoogleBooksService.php

Unused Use Statements -1 removed lines

@@ -3,7 +3,6 @@
 namespace Colligator;
 
 use Scriptotek\GoogleBooks\GoogleBooks;
-use Scriptotek\GoogleBooks\Exceptions\UsageRateExceeded;
 
 class GoogleBooksService implements EnrichmentService
 {

Spacing +4 added lines, -4 removed lines

@@ -19,7 +19,7 @@ 
     {
         foreach ($isbns as $isbn) {
             $volume = $this->books->volumes->byIsbn($isbn);
-            \Log::debug('[GoogleBooksService] - ' . $isbn . ': ' . (is_null($volume) ? 'not found' : 'found'));
+            \Log::debug('[GoogleBooksService] - '.$isbn.': '.(is_null($volume) ? 'not found' : 'found'));
             if (!is_null($volume)) {
                 return $volume;
             }
@@ -29,7 +29,7 @@ 
 
     public function enrich(Document $doc)
     {
-        \Log::debug('[GoogleBooksService] Checking document ' . $doc->id);
+        \Log::debug('[GoogleBooksService] Checking document '.$doc->id);
 
         $volume = $this->get($doc->bibliographic['isbns']);
 
@@ -47,11 +47,11 @@ 
         if ($volume) {
             $cover_url = $volume->getCover();
             if (!is_null($cover_url) && is_null($doc->cover)) {
-                \Log::debug('[GoogleBooksService] Setting new cover to document #' . $doc->id);
+                \Log::debug('[GoogleBooksService] Setting new cover to document #'.$doc->id);
                 try {
                     $doc->storeCover($cover_url);
                 } catch (\ErrorException $e) {
-                    \Log::error('[GoogleBooksService] Failed to store cover: ' . $cover_url . "\n" . $e->getMessage());
+                    \Log::error('[GoogleBooksService] Failed to store cover: '.$cover_url."\n".$e->getMessage());
                 }
             }
         }