Merge branch '6.x' into 7.x

src/GeneratesCode.php

@@ -131,8 +131,10 @@ protected function buildClass(string $name): string
     {
         $stub = $this->files->get($this->getListenerStubFile());
 
-        return $this->replaceClass(
-            $this->replaceNamespace($stub, $name), $name
+        return $this->listener->generatingCode(
+            $this->replaceClass(
+                $this->replaceNamespace($stub, $name), $name
+            ), $name
         );
     }
 
@@ -181,15 +183,7 @@ protected function replaceNamespace(string $stub, string $name): string
             );
         }
 
-        return $this->listener->generatingCode($stub, $name);
-    }
-
-    /**
-     * Get the full namespace for a given class, without the class name.
-     */
-    protected function getNamespace(string $name): string
-    {
-        return trim(implode('\\', \array_slice(explode('\\', $name), 0, -1)), '\\');
+        return $stub;
     }
 
     /**
@@ -210,6 +204,14 @@ class_basename($this->userProviderModel()),
         );
     }
 
+    /**
+     * Get the full namespace for a given class, without the class name.
+     */
+    protected function getNamespace(string $name): string
+    {
+        return trim(implode('\\', \array_slice(explode('\\', $name), 0, -1)), '\\');
+    }
+
     /**
      * Alphabetically sorts the imports for the given stub.
      */