formatting

Author: taylorotwell

src/Illuminate/Database/Eloquent/Concerns/PreventsCircularRecursion.php

@@ -4,6 +4,7 @@
 
 use Illuminate\Support\Arr;
 use Illuminate\Support\Onceable;
+use WeakMap;
 
 trait PreventsCircularRecursion
 {
@@ -14,29 +15,6 @@ trait PreventsCircularRecursion
      */
     protected static $recursionCache;
 
-    /**
-     * Get the current recursion cache being used by the model.
-     *
-     * @return \WeakMap
-     */
-    protected static function getRecursionCache()
-    {
-        return static::$recursionCache ??= new \WeakMap();
-    }
-
-    /**
-     * Get the current stack of methods being called recursively.
-     *
-     * @param  object  $object
-     * @return array
-     */
-    protected static function getRecursiveCallStack($object): array
-    {
-        return static::getRecursionCache()->offsetExists($object)
-            ? static::getRecursionCache()->offsetGet($object)
-            : [];
-    }
-
     /**
      * Prevent a method from being called multiple times on the same object within the same call stack.
      *
@@ -51,6 +29,7 @@ protected function withoutRecursion($callback, $default = null)
         $onceable = Onceable::tryFromTrace($trace, $callback);
 
         $object = $onceable->object ?? $this;
+
         $stack = static::getRecursiveCallStack($object);
 
         if (array_key_exists($onceable->hash, $stack)) {
@@ -59,6 +38,7 @@ protected function withoutRecursion($callback, $default = null)
 
         try {
             $stack[$onceable->hash] = is_callable($default) ? call_user_func($default) : $default;
+
             static::getRecursionCache()->offsetSet($object, $stack);
 
             return call_user_func($onceable->callable);
@@ -70,4 +50,27 @@ protected function withoutRecursion($callback, $default = null)
             }
         }
     }
+
+    /**
+     * Get the current stack of methods being called recursively.
+     *
+     * @param  object  $object
+     * @return array
+     */
+    protected static function getRecursiveCallStack($object): array
+    {
+        return static::getRecursionCache()->offsetExists($object)
+            ? static::getRecursionCache()->offsetGet($object)
+            : [];
+    }
+
+    /**
+     * Get the current recursion cache being used by the model.
+     *
+     * @return \WeakMap
+     */
+    protected static function getRecursionCache()
+    {
+        return static::$recursionCache ??= new WeakMap();
+    }
 }