Reintroduce method variable to reduce PR clutter

Author: pindab0ter

src/Console/ModelsCommand.php

@@ -589,22 +589,23 @@ public function getPropertiesFromMethods($model)
             foreach ($methodReflections as $methodReflection) {
                 $type = $this->getReturnTypeFromReflection($methodReflection);
                 $isAttribute = is_a($type, '\Illuminate\Database\Eloquent\Casts\Attribute', true);
+                $method = $methodReflection->getName();
                 if (
-                    Str::startsWith($methodReflection->getName(), 'get') && Str::endsWith(
-                        $methodReflection->getName(),
+                    Str::startsWith($method, 'get') && Str::endsWith(
+                        $method,
                         'Attribute'
-                    ) && $methodReflection->getName() !== 'getAttribute'
+                    ) && $method !== 'getAttribute'
                 ) {
                     //Magic get<name>Attribute
-                    $name = Str::snake(substr($methodReflection->getName(), 3, -9));
+                    $name = Str::snake(substr($method, 3, -9));
                     if (!empty($name)) {
                         $type = $this->getReturnType($methodReflection);
                         $type = $this->getTypeInModel($model, $type);
                         $comment = $this->getCommentFromDocBlock($methodReflection);
                         $this->setProperty($name, $type, true, null, $comment);
                     }
                 } elseif ($isAttribute) {
-                    $name = Str::snake($methodReflection->getName());
+                    $name = Str::snake($method);
                     $types = $this->getAttributeReturnType($model, $methodReflection);
                     $comment = $this->getCommentFromDocBlock($methodReflection);
 
@@ -617,20 +618,20 @@ public function getPropertiesFromMethods($model)
                         $this->setProperty($name, null, null, true, $comment);
                     }
                 } elseif (
-                    Str::startsWith($methodReflection->getName(), 'set') && Str::endsWith(
-                        $methodReflection->getName(),
+                    Str::startsWith($method, 'set') && Str::endsWith(
+                        $method,
                         'Attribute'
-                    ) && $methodReflection->getName() !== 'setAttribute'
+                    ) && $method !== 'setAttribute'
                 ) {
                     //Magic set<name>Attribute
-                    $name = Str::snake(substr($methodReflection->getName(), 3, -9));
+                    $name = Str::snake(substr($method, 3, -9));
                     if (!empty($name)) {
                         $comment = $this->getCommentFromDocBlock($methodReflection);
                         $this->setProperty($name, null, null, true, $comment);
                     }
-                } elseif (Str::startsWith($methodReflection->getName(), 'scope') && $methodReflection->getName() !== 'scopeQuery') {
+                } elseif (Str::startsWith($method, 'scope') && $method !== 'scopeQuery') {
                     //Magic set<name>Attribute
-                    $name = Str::camel(substr($methodReflection->getName(), 5));
+                    $name = Str::camel(substr($method, 5));
                     if (!empty($name)) {
                         $comment = $this->getCommentFromDocBlock($methodReflection);
                         $args = $this->getParameters($methodReflection);
@@ -646,20 +647,20 @@ public function getPropertiesFromMethods($model)
                         );
                         $this->setMethod($name, $builder . '|' . $modelName, $args, $comment);
                     }
-                } elseif (in_array($methodReflection->getName(), ['query', 'newQuery', 'newModelQuery'])) {
+                } elseif (in_array($method, ['query', 'newQuery', 'newModelQuery'])) {
                     $builder = $this->getClassNameInDestinationFile($model, get_class($model->newModelQuery()));
 
                     $this->setMethod(
-                        $methodReflection->getName(),
+                        $method,
                         $builder . '|' . $this->getClassNameInDestinationFile($model, get_class($model))
                     );
 
                     if ($this->write_model_external_builder_methods) {
                         $this->writeModelExternalBuilderMethods($model);
                     }
                 } elseif (
-                    !method_exists('Illuminate\Database\Eloquent\Model', $methodReflection->getName())
-                    && !Str::startsWith($methodReflection->getName(), 'get')
+                    !method_exists('Illuminate\Database\Eloquent\Model', $method)
+                    && !Str::startsWith($method, 'get')
                 ) {
                     //Use reflection to inspect the code, based on Illuminate/Support/SerializableClosure.php
                     if ($returnType = $methodReflection->getReturnType()) {
@@ -727,15 +728,15 @@ public function getPropertiesFromMethods($model)
                                     );
                                     $collectionTypeHint = $this->getCollectionTypeHint($collectionClassNameInModel, $relatedModel);
                                     $this->setProperty(
-                                        $methodReflection->getName(),
+                                        $method,
                                         $collectionTypeHint,
                                         true,
                                         null,
                                         $comment
                                     );
                                     if ($this->write_model_relation_count_properties) {
                                         $this->setProperty(
-                                            Str::snake($methodReflection->getName()) . '_count',
+                                            Str::snake($method) . '_count',
                                             'int|null',
                                             true,
                                             false
@@ -748,7 +749,7 @@ public function getPropertiesFromMethods($model)
                                 ) {
                                     // Model isn't specified because relation is polymorphic
                                     $this->setProperty(
-                                        $methodReflection->getName(),
+                                        $method,
                                         $this->getClassNameInDestinationFile($model, Model::class) . '|\Eloquent',
                                         true,
                                         null,
@@ -757,7 +758,7 @@ public function getPropertiesFromMethods($model)
                                 } else {
                                     //Single model is returned
                                     $this->setProperty(
-                                        $methodReflection->getName(),
+                                        $method,
                                         $relatedModel,
                                         true,
                                         null,