Merge remote-tracking branch 'origin/3'

src/Scaffolding/Scaffolders/CRUD/Create.php

@@ -41,7 +41,7 @@ public function getName()
             return $name;
         }
 
-        return 'create' . ucfirst($this->getTypeName());
+        return 'create' . ucfirst($this->getResolvedTypeName());
     }
 
     /**
@@ -107,7 +107,7 @@ protected function generateInputType(Manager $manager)
      */
     protected function inputTypeName()
     {
-        return $this->getTypeName() . 'CreateInputType';
+        return $this->getResolvedTypeName() . 'CreateInputType';
     }
 
     public function resolve($object, array $args, $context, ResolveInfo $info)

src/Scaffolding/Scaffolders/CRUD/Delete.php

@@ -39,7 +39,7 @@ public function getName()
             return $name;
         }
 
-        return 'delete' . ucfirst($this->getTypeName());
+        return 'delete' . ucfirst($this->getResolvedTypeName());
     }
 
     /**

src/Scaffolding/Scaffolders/CRUD/Read.php

@@ -45,7 +45,7 @@ public function getName()
             return $name;
         }
 
-        $typePlural = $this->pluralise($this->getTypeName());
+        $typePlural = $this->pluralise($this->getResolvedTypeName());
         return 'read' . ucfirst($typePlural);
     }
 

src/Scaffolding/Scaffolders/CRUD/ReadOne.php

@@ -34,7 +34,7 @@ public function getName()
             return $name;
         }
 
-        return 'readOne' . ucfirst($this->getTypeName());
+        return 'readOne' . ucfirst($this->getResolvedTypeName());
     }
 
     /**

src/Scaffolding/Scaffolders/CRUD/Update.php

@@ -42,7 +42,7 @@ public function getName()
             return $name;
         }
 
-        return 'update' . ucfirst($this->getTypeName());
+        return 'update' . ucfirst($this->getResolvedTypeName());
     }
 
     /**
@@ -114,7 +114,7 @@ protected function generateInputType(Manager $manager)
      */
     protected function inputTypeName()
     {
-        return $this->getTypeName() . 'UpdateInputType';
+        return $this->getResolvedTypeName() . 'UpdateInputType';
     }
 
     /**

src/Scaffolding/Scaffolders/DataObjectScaffolder.php

@@ -82,7 +82,7 @@ public function __construct($dataObjectClass)
      */
     public function getTypeName()
     {
-        return $this->typeName();
+        return $this->getDataObjectTypeName();
     }
 
     /**

src/Scaffolding/Scaffolders/ListQueryScaffolder.php

@@ -130,7 +130,7 @@ public function applyConfig(array $config)
             } else {
                 throw new InvalidArgumentException(sprintf(
                     'sortableFields must be an array (see %s)',
-                    $this->getTypeName()
+                    $this->getResolvedTypeName()
                 ));
             }
         }

src/Scaffolding/Scaffolders/MutationScaffolder.php

@@ -61,9 +61,15 @@ public function scaffold(Manager $manager)
         ];
     }
 
-    public function getTypeName()
+    /**
+     * If a type name has not been assigned, fallback to the typename that gets generated
+     * off the dataobject
+     *
+     * @return string
+     */
+    protected function getResolvedTypeName()
     {
-        return parent::getTypeName() ?: $this->typeName();
+        return $this->getTypeName() ?: $this->getDataObjectTypeName();
     }
 
     /**

src/Scaffolding/Scaffolders/QueryScaffolder.php

@@ -71,9 +71,15 @@ public function setNested($bool)
         return $this;
     }
 
-    public function getTypeName()
+    /**
+     * If a type name has not been assigned, fallback to the typename that gets generated
+     * off the dataobject
+     *
+     * @return string
+     */
+    protected function getResolvedTypeName()
     {
-        return parent::getTypeName() ?: $this->typeName();
+        return $this->getTypeName() ?: $this->getDataObjectTypeName();
     }
 
     /**

src/Scaffolding/Traits/DataObjectTypeTrait.php

@@ -33,11 +33,10 @@ public function getDataObjectClass()
 
     /**
      * Type name inferred from the dataobject.
-     * This should not be called directly, but only by getTypeName()
      *
      * @return string
      */
-    protected function typeName()
+    public function getDataObjectTypeName()
     {
         $dataObjectClass = $this->getDataObjectClass();
         if (!$dataObjectClass) {