Revert "[5.5] Make Optional@__call really macroable (laravel#20898)"

This reverts commit 979d693.
Ellrion · Sep 1, 2017 · 6004cc1 · 6004cc1
1 parent 9e96e46
commit 6004cc1
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/Illuminate/Support/Optional.php b/src/Illuminate/Support/Optional.php
@@ -48,12 +48,12 @@ public function __get($key)
      */
     public function __call($method, $parameters)
     {
-        if (static::hasMacro($method)) {
-            return $this->macroCall($method, $parameters);
-        }
-
         if (is_object($this->value)) {
             return $this->value->{$method}(...$parameters);
         }
+
+        if (static::hasMacro($method)) {
+            return $this->macroCall($method, $parameters);
+        }
     }
 }