Early return and type fix

Author: jeffreyzant

README.md

@@ -170,8 +170,8 @@ The fillUsing method allows you to alter the data or store the data on a differe
 
 ```php
 Flexible::make('Content', 'content')
-    ->fillUsing(function ($request, $model, $attribute, $requestAttribte) {
-        $value = $request->{$requestAttribte};
+    ->fillUsing(function ($request, $model, $attribute, $requestAttribute) {
+        $value = $request->{$requestAttribute};
 
         $model->{$attribute} = $value;
     })

src/Flexible.php

@@ -241,15 +241,17 @@ public function resolve($resource, $attribute = null)
     {
         $attribute = $attribute ?? $this->attribute;
 
-        if (! $this->resolveCallback) {
-            $this->registerOriginModel($resource);
-
-            $this->buildGroups($resource, $attribute);
-
-            $this->value = $this->resolveGroups($this->groups);
-        } elseif (is_callable($this->resolveCallback)) {
+        if ($this->resolveCallback && is_callable($this->resolveCallback)) {
             $this->value = call_user_func($this->resolveCallback, $this, $resource, $attribute);
+
+            return;
         }
+
+        $this->registerOriginModel($resource);
+
+        $this->buildGroups($resource, $attribute);
+
+        $this->value = $this->resolveGroups($this->groups);
     }
 
     /**
@@ -263,11 +265,13 @@ public function resolveForDisplay($resource, $attribute = null)
     {
         $attribute = $attribute ?? $this->attribute;
 
-        if (! $this->displayCallback) {
-            $this->resolve($resource, $attribute);
-        } elseif (is_callable($this->displayCallback)) {
+        if ($this->displayCallback && is_callable($this->displayCallback)) {
             $this->value = call_user_func($this->displayCallback, $this, $resource, $attribute);
+
+            return;
         }
+
+        $this->resolve($resource, $attribute);
     }
 
     /**