scriptotek / colligator-backend

app/Console/Commands/OaiPmhHarvest.php

Spacing +6 added lines, -6 removed lines

@@ -48,7 +48,7 @@ 
         $this->comment('Available configurations:');
         $config = \Config::get('oaipmh.harvests', null);
         foreach (array_keys($config) as $key) {
-            $this->comment(' - ' . $key);
+            $this->comment(' - '.$key);
         }
     }
 
@@ -59,7 +59,7 @@ 
 
             return false;
         }
-        $harvestConfig = \Config::get('oaipmh.harvests.' . $this->argument('name'), null);
+        $harvestConfig = \Config::get('oaipmh.harvests.'.$this->argument('name'), null);
         if (is_null($harvestConfig)) {
             $this->error('Unknown configuration specified.');
             $this->listConfigurations();
@@ -108,16 +108,16 @@ 
         }
 
         $harvestName = $this->argument('name');
-        $harvestConfig = \Config::get('oaipmh.harvests.' . $harvestName, null);
+        $harvestConfig = \Config::get('oaipmh.harvests.'.$harvestName, null);
 
         $this->comment(sprintf('Dispatching new harvest job'));
 
         if ($this->option('from-dump')) {
             $this->comment(' - From local dump');
         } else {
-            $this->comment(' - Repo: ' . $harvestConfig['url']);
-            $this->comment(' - Schema: ' . $harvestConfig['schema']);
-            $this->comment(' - Set: ' . $harvestConfig['set']);
+            $this->comment(' - Repo: '.$harvestConfig['url']);
+            $this->comment(' - Schema: '.$harvestConfig['schema']);
+            $this->comment(' - Set: '.$harvestConfig['set']);
 
             foreach (['from', 'until', 'resume', 'daily'] as $key) {
                 if (!is_null($this->option($key))) {

app/Jobs/OaiPmhHarvest.php

Spacing +10 added lines, -10 removed lines

@@ -88,7 +88,7 @@ 
      */
     public function fromDump()
     {
-        $files = Storage::disk('local')->files('harvests/' . $this->name);
+        $files = Storage::disk('local')->files('harvests/'.$this->name);
         $recordsHarvested = 0;
         foreach ($files as $filename) {
             if (!preg_match('/.xml$/', $filename)) {
@@ -111,11 +111,11 @@ 
 
     public function fromNetwork()
     {
-        $dest_path = 'harvests/' . $this->name . '/';
+        $dest_path = 'harvests/'.$this->name.'/';
 
         Storage::disk('local')->deleteDir($dest_path);
 
-        $latest = $dest_path . 'latest.xml';
+        $latest = $dest_path.'latest.xml';
 
         $client = new OaiPmhClient($this->url, [
             'schema'              => $this->schema,
@@ -124,12 +124,12 @@ 
             'sleep-time-on-error' => $this->sleepTimeOnError,
         ]);
 
-        $client->on('request.error', function ($msg) {
+        $client->on('request.error', function($msg) {
             $this->error($msg);
         });
 
         // Store each response to disk just in case
-        $client->on('request.complete', function ($verb, $args, $body) use ($latest) {
+        $client->on('request.complete', function($verb, $args, $body) use ($latest) {
             Storage::disk('local')->put($latest, $body);
         });
 
@@ -153,9 +153,9 @@ 
             if ($this->resume != $records->getResumptionToken()) {
                 $this->resume = $records->getResumptionToken();
                 if (is_null($this->resume)) {
-                    Storage::disk('local')->delete($dest_path . '/resumption_token');
+                    Storage::disk('local')->delete($dest_path.'/resumption_token');
                 } else {
-                    Storage::disk('local')->put($dest_path . '/resumption_token', $this->resume);
+                    Storage::disk('local')->put($dest_path.'/resumption_token', $this->resume);
                 }
             }
 
@@ -188,7 +188,7 @@ 
                 } catch (BadRequestError $e) {
                     $this->error($e->getMessage());
                     $this->error($e->getCode());
-                    $this->error('Bad request. Attempt ' . $attempt . ' of 100. Sleeping 10 secs.');
+                    $this->error('Bad request. Attempt '.$attempt.' of 100. Sleeping 10 secs.');
                     if ($attempt > 100) {
                         throw $e;
                     }
@@ -209,7 +209,7 @@ 
      */
     public function handle()
     {
-        Log::info('[OaiPmhHarvest] Starting job. Requesting records from ' . ($this->start ?: '(no limit)') . ' until ' . ($this->until ?: '(no limit)') . '.');
+        Log::info('[OaiPmhHarvest] Starting job. Requesting records from '.($this->start ?: '(no limit)').' until '.($this->until ?: '(no limit)').'.');
 
         // For timing
         $this->startTime = $this->batchTime = microtime(true) - 1;
@@ -227,7 +227,7 @@ 
             $recordsHarvested = $this->fromNetwork();
         }
 
-        Log::info('[OaiPmhHarvest] Harvest complete, got ' . $recordsHarvested . ' records.');
+        Log::info('[OaiPmhHarvest] Harvest complete, got '.$recordsHarvested.' records.');
     }
 
     /**

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
                 'b' => 'barcode',
                 'z' => 'callcode',
                 'a' => 'id',
@@ -190,7 +190,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']);
             }
         }
 
@@ -207,14 +207,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 null;
         }
 
         $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/Cover.php

Spacing +2 added lines, -2 removed lines

@@ -78,7 +78,7 @@ 
     public function invalidateCache()
     {
         if (!is_null($this->width) && !is_null($this->height)) {
-            \Log::debug('[Cover] Invalidating cache. Old version was ' . $this->width . ' x ' . $this->height);
+            \Log::debug('[Cover] Invalidating cache. Old version was '.$this->width.' x '.$this->height);
         }
         $this->width = null;
         $this->height = null;
@@ -133,7 +133,7 @@ 
             $orig = \CoverCache::putBlob($blob);
 
         } else {
-            \Log::debug('[Cover] Add to cache from url: ' . $this->url);
+            \Log::debug('[Cover] Add to cache from url: '.$this->url);
             $orig = \CoverCache::putUrl($this->url);
         }
 

app/CachedImage.php

Doc Comments +3 added lines

@@ -14,6 +14,9 @@
     public $cacheKey;
     protected $_metadata;
 
+    /**
+     * @param string|null $url
+     */
     public function __construct($url, $maxHeight = 0, AdapterInterface $filesystem = null, ImageManager $imageManager = null)
     {
         $this->sourceUrl = $url;

Spacing +5 added lines, -5 removed lines

@@ -22,7 +22,7 @@ 
         $this->imageManager = $imageManager ?: app('Intervention\Image\ImageManager');
         $maxAge = 3153600; // 30 days
         $this->fsConfig = new FlysystemConfig([
-            'CacheControl' => 'max-age=' . $maxAge . ', public',
+            'CacheControl' => 'max-age='.$maxAge.', public',
         ]);
     }
 
@@ -92,13 +92,13 @@ 
         if (is_null($data)) {
             $data = $this->download();
             if (!$data) {
-                throw new \ErrorException('[CoverCache] Failed to download ' . $this->sourceUrl);
+                throw new \ErrorException('[CoverCache] Failed to download '.$this->sourceUrl);
             }
         }
 
         $img = $this->imageManager->make($data);
         if ($this->maxHeight && $img->height() > $this->maxHeight) {
-            \Log::debug('[CachedImage] Resizing from ' . $img->height() . ' to ' . $this->maxHeight);
+            \Log::debug('[CachedImage] Resizing from '.$img->height().' to '.$this->maxHeight);
             $img->heighten($this->maxHeight);
             $data = strval($img->encode('jpg'));
         }
@@ -109,12 +109,12 @@ 
 
         $this->setMetadata($data, $img);
 
-        \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($this->cacheKey, $data, $this->fsConfig)) {
             throw new \ErrorException('[CoverCache] Failed to upload thumb to S3');
         }
 
-        \Log::debug('[CachedImage] Wrote cached version as ' . $this->cacheKey);
+        \Log::debug('[CachedImage] Wrote cached version as '.$this->cacheKey);
 
         return $this;
     }