Merge pull request #40 from lucasmichot/feature/master/useless-return

Avoid useless return
nuwave · Apr 23, 2017 · 6f1b00f · 6f1b00f
2 parents 918b0e8 + 42f6031
commit 6f1b00f
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 33 deletions.
diff --git a/src/GraphQL.php b/src/GraphQL.php
@@ -107,14 +107,12 @@ protected function generateSchemaType(Collection $fields, $name)
             return $field;
         });
 
-        if (! $typeFields->count()) {
-            return;
+        if ($typeFields->count()) {
+            return new ObjectType([
+                'name' => $name,
+                'fields' => $typeFields->toArray(),
+            ]);
         }
-
-        return new ObjectType([
-            'name' => $name,
-            'fields' => $typeFields->toArray(),
-        ]);
     }
 
     /**

diff --git a/src/Schema/Registrars/EdgeRegistrar.php b/src/Schema/Registrars/EdgeRegistrar.php
@@ -66,8 +66,6 @@ public function instance($name, $fresh = false, ObjectType $type = null)
 
             return $instance;
         }
-
-        return;
     }
 
     /**

diff --git a/src/Support/Cache/FileStore.php b/src/Support/Cache/FileStore.php
@@ -33,8 +33,6 @@ public function get($name)
         if (file_exists($this->getPath($name))) {
             return unserialize(file_get_contents($this->getPath($name)));
         }
-
-        return;
     }
 
     /**

diff --git a/src/Support/DataLoader/GraphQLDataFetcher.php b/src/Support/DataLoader/GraphQLDataFetcher.php
@@ -41,8 +41,6 @@ public function load($key, $root)
         if ($dataFetcher = $this->getChildFetcher($key)) {
             return $dataFetcher->loadDataByKey($this->getName(), $this->getKey($root));
         }
-
-        return;
     }
 
     /**
@@ -194,11 +192,9 @@ protected function hasChildFetcher($key)
      */
     protected function getChildFetcher($key)
     {
-        if (! $this->hasChildFetcher($key)) {
-            return;
+        if ($this->hasChildFetcher($key)) {
+            return app($this->children[$key]);
         }
-
-        return app($this->children[$key]);
     }
 
     /**

diff --git a/src/Support/Definition/EloquentType.php b/src/Support/Definition/EloquentType.php
@@ -322,8 +322,6 @@ protected function getModelResolve($key)
         if (method_exists($this->model, $method)) {
             return [$this->model, $method];
         }
-
-        return;
     }
 
     /**

diff --git a/src/Support/Definition/GraphQLField.php b/src/Support/Definition/GraphQLField.php
@@ -38,7 +38,7 @@ public function attributes()
      */
     public function type()
     {
-        return;
+        //
     }
 
     /**

diff --git a/src/Support/Definition/GraphQLType.php b/src/Support/Definition/GraphQLType.php
@@ -90,8 +90,6 @@ protected function getFieldResolver($name, $field)
                 return call_user_func_array($resolver, func_get_args());
             };
         }
-
-        return;
     }
 
     /**

diff --git a/src/Support/Definition/PageInfoType.php b/src/Support/Definition/PageInfoType.php
@@ -71,8 +71,6 @@ public function fields()
                             $collection->lastItem() * $collection->currentPage()
                         );
                     }
-
-                    return;
                 },
             ],
             'total' => [
@@ -82,8 +80,6 @@ public function fields()
                     if ($collection instanceof LengthAwarePaginator) {
                         return $collection->total();
                     }
-
-                    return;
                 },
             ],
             'count' => [
@@ -93,8 +89,6 @@ public function fields()
                     if ($collection instanceof LengthAwarePaginator) {
                         return $collection->count();
                     }
-
-                    return;
                 },
             ],
             'currentPage' => [
@@ -104,8 +98,6 @@ public function fields()
                     if ($collection instanceof LengthAwarePaginator) {
                         return $collection->currentPage();
                     }
-
-                    return;
                 },
             ],
             'lastPage' => [
@@ -115,8 +107,6 @@ public function fields()
                     if ($collection instanceof LengthAwarePaginator) {
                         return $collection->lastPage();
                     }
-
-                    return;
                 },
             ],
         ];

diff --git a/src/Support/Definition/RelayConnectionType.php b/src/Support/Definition/RelayConnectionType.php
@@ -266,6 +266,6 @@ public function __isset($key)
      */
     public function type()
     {
-        return;
+        //
     }
 }
-Original file line number
+Diff line change
@@ Expand Up @@
                 return $instance;
             }
-            return;
         }
         /**
@@ Expand Down @@