From 4e2df5e6ff4588310702a08d2c176b6d225f6031 Mon Sep 17 00:00:00 2001
From: Christopher Lorke <lorke@traum-ferienwohnungen.de>
Date: Sat, 27 Oct 2018 00:29:25 +0200
Subject: [PATCH 1/2] Fix scrutinizer issues.

---
 src/Business/Repository/ElasticsearchMigration.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Business/Repository/ElasticsearchMigration.php b/src/Business/Repository/ElasticsearchMigration.php
index a071598..369c1ec 100644
--- a/src/Business/Repository/ElasticsearchMigration.php
+++ b/src/Business/Repository/ElasticsearchMigration.php
@@ -20,7 +20,7 @@ public function createOrUpdate(
     ): \Triadev\EsMigration\Models\Entity\ElasticsearchMigration {
         $dbMigration = $this->find($migration);
         
-        if (!$dbMigration) {
+        if (!$dbMigration instanceof \Triadev\EsMigration\Models\Entity\ElasticsearchMigration) {
             $dbMigration = new \Triadev\EsMigration\Models\Entity\ElasticsearchMigration();
             $dbMigration->migration = $migration;
         }

From 1e64b9115abf151b5f83cf93427fe82508ceae71 Mon Sep 17 00:00:00 2001
From: Christopher Lorke <lorke@traum-ferienwohnungen.de>
Date: Sat, 27 Oct 2018 00:30:02 +0200
Subject: [PATCH 2/2] Fix scrutinizer issues.

---
 README.md                                           |  1 +
 src/Business/Repository/ElasticsearchMigration.php  | 13 +++++++++----
 .../Repository/ElasticsearchMigrationStep.php       |  9 +++++++--
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index bb7b11f..4c32d77 100644
--- 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
index 369c1ec..8666e91 100644
--- 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;
@@ -20,7 +21,7 @@ public function createOrUpdate(
     ): \Triadev\EsMigration\Models\Entity\ElasticsearchMigration {
         $dbMigration = $this->find($migration);
         
-        if (!$dbMigration instanceof \Triadev\EsMigration\Models\Entity\ElasticsearchMigration) {
+        if (!$dbMigration) {
             $dbMigration = new \Triadev\EsMigration\Models\Entity\ElasticsearchMigration();
             $dbMigration->migration = $migration;
         }
@@ -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
index f919c1d..fb9ef4e 100644
--- 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;
+        }
     }
     
     /**