Merge pull request #17 from triadev/scrutinizer

Scrutinizer
triadev · Oct 26, 2018 · 2090045 · 2090045
2 parents 65c982b + 1e64b91
commit 2090045
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -4,6 +4,7 @@
 [![Travis][ico-travis]][link-travis]
 [![Coveralls](https://coveralls.io/repos/github/triadev/LaravelElasticsearchMigration/badge.svg?branch=master)](https://coveralls.io/github/triadev/LaravelElasticsearchMigration?branch=master)
 [![CodeCov](https://codecov.io/gh/triadev/LaravelElasticsearchMigration/branch/master/graph/badge.svg)](https://codecov.io/gh/triadev/LaravelElasticsearchMigration)
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/triadev/LaravelElasticsearchMigration/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/triadev/LaravelElasticsearchMigration/?branch=master)
 [![Latest stable][ico-version-stable]][link-packagist]
 [![Latest development][ico-version-dev]][link-packagist]
 [![Monthly installs][ico-downloads-monthly]][link-downloads]

diff --git a/src/Business/Repository/ElasticsearchMigration.php b/src/Business/Repository/ElasticsearchMigration.php
@@ -2,6 +2,7 @@
 namespace Triadev\EsMigration\Business\Repository;
 
 use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Triadev\EsMigration\Business\Events\MigrationDone;
 use Triadev\EsMigration\Business\Events\MigrationError;
 use Triadev\EsMigration\Business\Events\MigrationRunning;
@@ -42,9 +43,13 @@ public function createOrUpdate(
      */
     public function find(string $migration): ?\Triadev\EsMigration\Models\Entity\ElasticsearchMigration
     {
-        return \Triadev\EsMigration\Models\Entity\ElasticsearchMigration::where('migration', $migration)
-            ->orderBy('created_at', 'desc')
-            ->first();
+        try {
+            return \Triadev\EsMigration\Models\Entity\ElasticsearchMigration::where('migration', $migration)
+                ->orderBy('created_at', 'desc')
+                ->firstOrFail();
+        } catch (ModelNotFoundException $e) {
+            return null;
+        }
     }
 
     /**

diff --git a/src/Business/Repository/ElasticsearchMigrationStep.php b/src/Business/Repository/ElasticsearchMigrationStep.php
@@ -1,6 +1,7 @@
 <?php
 namespace Triadev\EsMigration\Business\Repository;
 
+use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Triadev\EsMigration\Business\Events\MigrationStepDone;
 use Triadev\EsMigration\Business\Events\MigrationStepError;
 use Triadev\EsMigration\Business\Events\MigrationStepRunning;
@@ -74,8 +75,12 @@ public function update(
      */
     public function find(int $migrationStepId): ?\Triadev\EsMigration\Models\Entity\ElasticsearchMigrationStep
     {
-        return \Triadev\EsMigration\Models\Entity\ElasticsearchMigrationStep::where('id', $migrationStepId)
-            ->first();
+        try {
+            return \Triadev\EsMigration\Models\Entity\ElasticsearchMigrationStep::where('id', $migrationStepId)
+                ->firstOrFail();
+        } catch (ModelNotFoundException $e) {
+            return null;
+        }
     }
 
     /**