From 2397865923379873bf5e06428c036242e4317ac5 Mon Sep 17 00:00:00 2001
From: imanghafoori <imanghafoori1@gmail.com>
Date: Thu, 7 Sep 2017 21:25:11 +0430
Subject: [PATCH 1/4] negating conditions and exchanging code blocks same logic
 as before

---
 src/Models/Module.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Models/Module.php b/src/Models/Module.php
index 1a63b6ce..18509883 100644
--- a/src/Models/Module.php
+++ b/src/Models/Module.php
@@ -1207,25 +1207,25 @@ public static function processDBRow($module, $request, $row)
     public static function itemCount($module_name)
     {
         $module = Module::get($module_name);
-        if(isset($module)) {
+        if(!isset($module)) {
+            return -1;
+        } else {
             $model_name = ucfirst(str_singular($module_name));
             if($model_name == "User" || $model_name == "Role" || $model_name == "Permission") {
-                if(file_exists(base_path('app/' . $model_name . ".php"))) {
+                if(!file_exists(base_path('app/' . $model_name . ".php"))) {
+                    return -1;
+                } else {
                     $model = "App\\" . $model_name;
                     return $model::count();
-                } else {
-                    return -1;
                 }
             } else {
-                if(file_exists(base_path('app/Models/' . $model_name . ".php"))) {
+                if(!file_exists(base_path('app/Models/' . $model_name . ".php"))) {
+                    return -1;
+                } else {
                     $model = "App\\Models\\" . $model_name;
                     return $model::count();
-                } else {
-                    return -1;
                 }
             }
-        } else {
-            return -1;
         }
     }
     

From 271c113d576c57c27cfa65e85109d839bdd035c9 Mon Sep 17 00:00:00 2001
From: imanghafoori <imanghafoori1@gmail.com>
Date: Thu, 7 Sep 2017 21:28:08 +0430
Subject: [PATCH 2/4] Removing unnecessary else{} (because at the end of the if
 block we have a "return" keyword)

---
 src/Models/Module.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Models/Module.php b/src/Models/Module.php
index 18509883..51e2369e 100644
--- a/src/Models/Module.php
+++ b/src/Models/Module.php
@@ -1209,24 +1209,24 @@ public static function itemCount($module_name)
         $module = Module::get($module_name);
         if(!isset($module)) {
             return -1;
-        } else {
+        }
             $model_name = ucfirst(str_singular($module_name));
             if($model_name == "User" || $model_name == "Role" || $model_name == "Permission") {
                 if(!file_exists(base_path('app/' . $model_name . ".php"))) {
                     return -1;
-                } else {
+                }
                     $model = "App\\" . $model_name;
                     return $model::count();
-                }
-            } else {
+
+            }
                 if(!file_exists(base_path('app/Models/' . $model_name . ".php"))) {
                     return -1;
-                } else {
+                }
                     $model = "App\\Models\\" . $model_name;
                     return $model::count();
-                }
-            }
-        }
+
+
+
     }
     
     /**

From d27891231c5a9079bf184c8995f3eb53fc268fc0 Mon Sep 17 00:00:00 2001
From: imanghafoori <imanghafoori1@gmail.com>
Date: Thu, 7 Sep 2017 21:30:27 +0430
Subject: [PATCH 3/4] reformat / removing white-spaces

---
 src/Models/Module.php | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/Models/Module.php b/src/Models/Module.php
index 51e2369e..aaab5fd0 100644
--- a/src/Models/Module.php
+++ b/src/Models/Module.php
@@ -1210,23 +1210,23 @@ public static function itemCount($module_name)
         if(!isset($module)) {
             return -1;
         }
-            $model_name = ucfirst(str_singular($module_name));
-            if($model_name == "User" || $model_name == "Role" || $model_name == "Permission") {
-                if(!file_exists(base_path('app/' . $model_name . ".php"))) {
-                    return -1;
-                }
-                    $model = "App\\" . $model_name;
-                    return $model::count();
 
+        $model_name = ucfirst(str_singular($module_name));
+        if($model_name == "User" || $model_name == "Role" || $model_name == "Permission") {
+            if(!file_exists(base_path('app/' . $model_name . ".php"))) {
+                return -1;
             }
-                if(!file_exists(base_path('app/Models/' . $model_name . ".php"))) {
-                    return -1;
-                }
-                    $model = "App\\Models\\" . $model_name;
-                    return $model::count();
+            $model = "App\\" . $model_name;
+            return $model::count();
 
+        }
 
+        if(!file_exists(base_path('app/Models/' . $model_name . ".php"))) {
+            return -1;
+        }
 
+        $model = "App\\Models\\" . $model_name;
+        return $model::count();
     }
     
     /**

From 00f33807096bc9b64dc62a693cad16049524046b Mon Sep 17 00:00:00 2001
From: imanghafoori <imanghafoori1@gmail.com>
Date: Thu, 7 Sep 2017 21:32:03 +0430
Subject: [PATCH 4/4] using in_array() to check the same thing

---
 src/Models/Module.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Models/Module.php b/src/Models/Module.php
index aaab5fd0..3fb2334f 100644
--- a/src/Models/Module.php
+++ b/src/Models/Module.php
@@ -1212,7 +1212,7 @@ public static function itemCount($module_name)
         }
 
         $model_name = ucfirst(str_singular($module_name));
-        if($model_name == "User" || $model_name == "Role" || $model_name == "Permission") {
+        if(in_array($model_name, ["User", "Role", "Permission"])) {
             if(!file_exists(base_path('app/' . $model_name . ".php"))) {
                 return -1;
             }