fix generic use case request builder

samokiss · samokiss · commit b7056b12735c · 2019-03-04T11:12:29.000+01:00
diff --git a/src/Generator/BusinessRules/Requestors/DTO/Request/GenericUseCaseRequestBuilderGeneratorRequestBuilderImpl.php b/src/Generator/BusinessRules/Requestors/DTO/Request/GenericUseCaseRequestBuilderGeneratorRequestBuilderImpl.php
@@ -22,12 +22,15 @@ public function create(): GenericUseCaseRequestBuilderGeneratorRequestBuilder
         return $this;
     }
 
-    public function withDomainAndUseCaseName(
-        string $domain,
-        string $useCaseName
-    ): GenericUseCaseRequestBuilderGeneratorRequestBuilder
+    public function withDomain(string $domain): GenericUseCaseRequestBuilderGeneratorRequestBuilder
     {
         $this->request->domain = $domain;
+
+        return $this;
+    }
+
+    public function withUseCaseName(string $useCaseName): GenericUseCaseRequestBuilderGeneratorRequestBuilder
+    {
         $this->request->useCaseName = $useCaseName;
 
         return $this;
diff --git a/src/Generator/BusinessRules/Requestors/DTO/Request/GenericUseCaseRequestGeneratorRequestBuilderImpl.php b/src/Generator/BusinessRules/Requestors/DTO/Request/GenericUseCaseRequestGeneratorRequestBuilderImpl.php
@@ -22,12 +22,15 @@ public function create(): GenericUseCaseRequestGeneratorRequestBuilder
         return $this;
     }
 
-    public function withDomainAndUseCaseName(
-        string $domain,
-        string $useCaseName
-    ): GenericUseCaseRequestGeneratorRequestBuilder
+    public function withDomain(string $domain): GenericUseCaseRequestGeneratorRequestBuilder
     {
         $this->request->domain = $domain;
+
+        return $this;
+    }
+
+    public function withUseCaseName(string $useCaseName): GenericUseCaseRequestGeneratorRequestBuilder
+    {
         $this->request->useCaseName = $useCaseName;
 
         return $this;
diff --git a/src/Generator/BusinessRules/Requestors/Request/GenericUseCaseRequestBuilderGeneratorRequestBuilder.php b/src/Generator/BusinessRules/Requestors/Request/GenericUseCaseRequestBuilderGeneratorRequestBuilder.php
@@ -13,8 +13,11 @@ public function build(): GenericUseCaseRequestBuilderGeneratorRequest;
 
     public function create(): GenericUseCaseRequestBuilderGeneratorRequestBuilder;
 
-    public function withDomainAndUseCaseName(
-        string $domain,
+    public function withDomain(
+        string $domain
+    ): GenericUseCaseRequestBuilderGeneratorRequestBuilder;
+
+    public function withUseCaseName(
         string $useCaseName
     ): GenericUseCaseRequestBuilderGeneratorRequestBuilder;
 }
diff --git a/src/Generator/BusinessRules/Requestors/Request/GenericUseCaseRequestGeneratorRequestBuilder.php b/src/Generator/BusinessRules/Requestors/Request/GenericUseCaseRequestGeneratorRequestBuilder.php
@@ -13,8 +13,11 @@ public function build(): GenericUseCaseRequestGeneratorRequest;
 
     public function create(): GenericUseCaseRequestGeneratorRequestBuilder;
 
-    public function withDomainAndUseCaseName(
-        string $domain,
+    public function withDomain(
+        string $domain
+    ): GenericUseCaseRequestGeneratorRequestBuilder;
+
+    public function withUseCaseName(
         string $useCaseName
     ): GenericUseCaseRequestGeneratorRequestBuilder;
 }
diff --git a/src/Generator/BusinessRules/UseCases/DTO/Request/GenericUseCaseGeneratorRequestBuilderImpl.php b/src/Generator/BusinessRules/UseCases/DTO/Request/GenericUseCaseGeneratorRequestBuilderImpl.php
@@ -22,9 +22,15 @@ public function create(): GenericUseCaseGeneratorRequestBuilder
         return $this;
     }
 
-    public function withDomainAndUseCaseName(string $domain, string $useCaseName): GenericUseCaseGeneratorRequestBuilder
+    public function withDomain(string $domain): GenericUseCaseGeneratorRequestBuilder
     {
         $this->request->domain = $domain;
+
+        return $this;
+    }
+
+    public function withUseCaseName(string $useCaseName): GenericUseCaseGeneratorRequestBuilder
+    {
         $this->request->useCaseName = $useCaseName;
 
         return $this;
diff --git a/src/Generator/BusinessRules/UseCases/DTO/Request/GenericUseCaseRequestBuilderImplGeneratorRequestBuilderImpl.php b/src/Generator/BusinessRules/UseCases/DTO/Request/GenericUseCaseRequestBuilderImplGeneratorRequestBuilderImpl.php
@@ -22,12 +22,15 @@ public function create(): GenericUseCaseRequestBuilderImplGeneratorRequestBuilde
         return $this;
     }
 
-    public function withDomainAndUseCaseName(
-        string $domain,
-        string $useCaseName
-    ): GenericUseCaseRequestBuilderImplGeneratorRequestBuilder
+    public function withDomain(string $domain): GenericUseCaseRequestBuilderImplGeneratorRequestBuilder
     {
         $this->request->domain = $domain;
+
+        return $this;
+    }
+
+    public function withUseCaseName(string $useCaseName): GenericUseCaseRequestBuilderImplGeneratorRequestBuilder
+    {
         $this->request->useCaseName = $useCaseName;
 
         return $this;
diff --git a/src/Generator/BusinessRules/UseCases/DTO/Request/GenericUseCaseRequestDTOGeneratorRequestBuilderImpl.php b/src/Generator/BusinessRules/UseCases/DTO/Request/GenericUseCaseRequestDTOGeneratorRequestBuilderImpl.php
@@ -22,12 +22,15 @@ public function create(): GenericUseCaseRequestDTOGeneratorRequestBuilder
         return $this;
     }
 
-    public function withDomainAndUseCaseName(
-        string $domain,
-        string $useCaseName
-    ): GenericUseCaseRequestDTOGeneratorRequestBuilder
+    public function withDomain(string $domain): GenericUseCaseRequestDTOGeneratorRequestBuilder
     {
         $this->request->domain = $domain;
+
+        return $this;
+    }
+
+    public function withUseCaseName(string $useCaseName): GenericUseCaseRequestDTOGeneratorRequestBuilder
+    {
         $this->request->useCaseName = $useCaseName;
 
         return $this;
diff --git a/src/Generator/BusinessRules/UseCases/Request/GenericUseCaseGeneratorRequestBuilder.php b/src/Generator/BusinessRules/UseCases/Request/GenericUseCaseGeneratorRequestBuilder.php
@@ -13,8 +13,11 @@ public function build(): GenericUseCaseGeneratorRequest;
 
     public function create(): GenericUseCaseGeneratorRequestBuilder;
 
-    public function withDomainAndUseCaseName(
-        string $domain,
+    public function withDomain(
+        string $domain
+    ): GenericUseCaseGeneratorRequestBuilder;
+
+    public function withUseCaseName(
         string $useCaseName
     ): GenericUseCaseGeneratorRequestBuilder;
 }
diff --git a/src/Generator/BusinessRules/UseCases/Request/GenericUseCaseRequestBuilderImplGeneratorRequestBuilder.php b/src/Generator/BusinessRules/UseCases/Request/GenericUseCaseRequestBuilderImplGeneratorRequestBuilder.php
@@ -13,8 +13,11 @@ public function build(): GenericUseCaseRequestBuilderImplGeneratorRequest;
 
     public function create(): GenericUseCaseRequestBuilderImplGeneratorRequestBuilder;
 
-    public function withDomainAndUseCaseName(
-        string $domain,
+    public function withDomain(
+        string $domain
+    ): GenericUseCaseRequestBuilderImplGeneratorRequestBuilder;
+
+    public function withUseCaseName(
         string $useCaseName
     ): GenericUseCaseRequestBuilderImplGeneratorRequestBuilder;
 }
diff --git a/src/Generator/BusinessRules/UseCases/Request/GenericUseCaseRequestDTOGeneratorRequestBuilder.php b/src/Generator/BusinessRules/UseCases/Request/GenericUseCaseRequestDTOGeneratorRequestBuilder.php
@@ -13,8 +13,11 @@ public function build(): GenericUseCaseRequestDTOGeneratorRequest;
 
     public function create(): GenericUseCaseRequestDTOGeneratorRequestBuilder;
 
-    public function withDomainAndUseCaseName(
-        string $domain,
+    public function withDomain(
+        string $domain
+    ): GenericUseCaseRequestDTOGeneratorRequestBuilder;
+
+    public function withUseCaseName(
         string $useCaseName
     ): GenericUseCaseRequestDTOGeneratorRequestBuilder;
 }
diff --git a/src/Generator/Tests/BusinessRules/UseCases/DTO/Request/GenericUseCaseTestGeneratorRequestBuilderImpl.php b/src/Generator/Tests/BusinessRules/UseCases/DTO/Request/GenericUseCaseTestGeneratorRequestBuilderImpl.php
@@ -22,12 +22,15 @@ public function create(): GenericUseCaseTestGeneratorRequestBuilder
         return $this;
     }
 
-    public function withDomainAndUseCaseName(
-        string $domain,
-        string $useCaseName
-    ): GenericUseCaseTestGeneratorRequestBuilder
+    public function withDomain(string $domain): GenericUseCaseTestGeneratorRequestBuilder
     {
         $this->request->domain = $domain;
+
+        return $this;
+    }
+
+    public function withUseCaseName(string $useCaseName): GenericUseCaseTestGeneratorRequestBuilder
+    {
         $this->request->useCaseName = $useCaseName;
 
         return $this;
diff --git a/src/Generator/Tests/BusinessRules/UseCases/Request/GenericUseCaseTestGeneratorRequestBuilder.php b/src/Generator/Tests/BusinessRules/UseCases/Request/GenericUseCaseTestGeneratorRequestBuilder.php
@@ -13,5 +13,11 @@ public function build(): GenericUseCaseTestGeneratorRequest;
 
     public function create(): GenericUseCaseTestGeneratorRequestBuilder;
 
-    public function withDomainAndUseCaseName(string $domain, string $useCaseName): GenericUseCaseTestGeneratorRequestBuilder;
+    public function withDomain(
+        string $domain
+    ): GenericUseCaseTestGeneratorRequestBuilder;
+
+    public function withUseCaseName(
+        string $useCaseName
+    ): GenericUseCaseTestGeneratorRequestBuilder;
 }
diff --git a/src/Mediators/BusinessRules/Requestors/Impl/RequestGeneratorsTrait.php b/src/Mediators/BusinessRules/Requestors/Impl/RequestGeneratorsTrait.php
@@ -57,20 +57,18 @@ public function setGenericUseCaseRequestGeneratorRequestBuilder(
     protected function generateGenericUseCaseRequestBuilder(string $domain, string $useCaseName): FileObject
     {
         return $this->genericUseCaseRequestBuilderGenerator->generate(
-            $this->genericUseCaseRequestBuilderGeneratorRequestBuilder->create()->withDomainAndUseCaseName(
-                $domain,
-                $useCaseName
-            )->build()
+            $this->genericUseCaseRequestBuilderGeneratorRequestBuilder->create()->withDomain($domain)
+                ->withUseCaseName($useCaseName)
+                ->build()
         );
     }
 
     protected function generateGenericUseCaseRequest(string $domain, string $useCaseName): FileObject
     {
         return $this->genericUseCaseRequestGenerator->generate(
-            $this->genericUseCaseRequestGeneratorRequestBuilder->create()->withDomainAndUseCaseName(
-                $domain,
-                $useCaseName
-            )->build()
+            $this->genericUseCaseRequestGeneratorRequestBuilder->create()->withDomain($domain)
+                ->withUseCaseName($useCaseName)
+                ->build()
         );
     }
 }
diff --git a/src/Mediators/BusinessRules/UseCases/Impl/GenericUseCaseGeneratorsTrait.php b/src/Mediators/BusinessRules/UseCases/Impl/GenericUseCaseGeneratorsTrait.php
@@ -97,37 +97,36 @@ public function setGenericUseCaseRequestDTOGeneratorRequestBuilder(
     protected function generateGenericUseCaseRequestDTO(string $domain, string $useCase): FileObject
     {
         return $this->genericUseCaseRequestDTOGenerator->generate(
-            $this->genericUseCaseRequestDTOGeneratorRequestBuilder->create()->withDomainAndUseCaseName(
-                $domain,
-                $useCase
-            )->build()
+            $this->genericUseCaseRequestDTOGeneratorRequestBuilder->create()->withDomain($domain)
+                ->withUseCaseName($useCase)
+                ->build()
         );
     }
 
     protected function generateGenericUseCaseRequestBuilderImpl(string $domain, string $useCase): FileObject
     {
         return $this->genericUseCaseRequestBuilderImplGenerator->generate(
-            $this->genericUseCaseRequestBuilderImplGeneratorRequestBuilder->create()->withDomainAndUseCaseName(
-                $domain,
-                $useCase
-            )->build()
+            $this->genericUseCaseRequestBuilderImplGeneratorRequestBuilder->create()->withDomain($domain)
+                ->withUseCaseName($useCase)
+                ->build()
         );
     }
 
     protected function generateGenericUseCase(string $domain, string $useCase): FileObject
     {
         return $this->genericUseCaseGenerator->generate(
-            $this->genericUseCaseGeneratorRequestBuilder->create()->withDomainAndUseCaseName($domain, $useCase)->build()
+            $this->genericUseCaseGeneratorRequestBuilder->create()->withDomain($domain)
+                ->withUseCaseName($useCase)
+                ->build()
         );
     }
 
     protected function generateGenericUseCaseTest(string $domain, string $useCase): FileObject
     {
         return $this->genericUseCaseTestGenerator->generate(
-            $this->genericUseCaseTestGeneratorRequestBuilder->create()->withDomainAndUseCaseName(
-                $domain,
-                $useCase
-            )->build()
+            $this->genericUseCaseTestGeneratorRequestBuilder->create()->withDomain($domain)
+                ->withUseCaseName($useCase)
+                ->build()
         );
     }
 }
diff --git a/tests/Generator/BusinessRules/Requestors/GenericUseCaseRequestBuilderGeneratorTest.php b/tests/Generator/BusinessRules/Requestors/GenericUseCaseRequestBuilderGeneratorTest.php
@@ -51,7 +51,8 @@ protected function setUp()
         );
         $this->request = $genericUseCaseRequestBuilderGeneratorRequestBuilderImpl
             ->create()
-            ->withDomainAndUseCaseName('Domain\SubDomain', 'GenericUseCase')
+            ->withDomain('Domain\SubDomain')
+            ->withUseCaseName('GenericUseCase')
             ->build();
 
         $this->genericUseCaseRequestBuilderGenerator = new GenericUseCaseRequestBuilderGenerator();
diff --git a/tests/Generator/BusinessRules/Requestors/GenericUseCaseRequestGeneratorTest.php b/tests/Generator/BusinessRules/Requestors/GenericUseCaseRequestGeneratorTest.php
@@ -50,7 +50,8 @@ protected function setUp()
         $genericUseCaseRequestGeneratorRequestBuilderImpl = new GenericUseCaseRequestGeneratorRequestBuilderImpl();
         $this->request = $genericUseCaseRequestGeneratorRequestBuilderImpl
             ->create()
-            ->withDomainAndUseCaseName('Domain\SubDomain', 'GenericUseCase')
+            ->withDomain('Domain\SubDomain')
+            ->withUseCaseName('GenericUseCase')
             ->build();
 
         $this->genericUseCaseRequestGenerator = new GenericUseCaseRequestGenerator();
diff --git a/tests/Generator/BusinessRules/UseCases/GenericUseCaseGeneratorTest.php b/tests/Generator/BusinessRules/UseCases/GenericUseCaseGeneratorTest.php
@@ -50,7 +50,8 @@ protected function setUp()
         $genericUseCaseGeneratorRequestBuilderImpl = new GenericUseCaseGeneratorRequestBuilderImpl();
         $this->request = $genericUseCaseGeneratorRequestBuilderImpl
             ->create()
-            ->withDomainAndUseCaseName('Domain\SubDomain', 'GenericUseCase')
+            ->withDomain('Domain\SubDomain')
+            ->withUseCaseName('GenericUseCase')
             ->build();
 
         $this->genericUseCaseGenerator = new GenericUseCaseGenerator();
diff --git a/tests/Generator/BusinessRules/UseCases/GenericUseCaseRequestBuilderImplGeneratorTest.php b/tests/Generator/BusinessRules/UseCases/GenericUseCaseRequestBuilderImplGeneratorTest.php
@@ -51,7 +51,8 @@ protected function setUp()
         );
         $this->request = $genericUseCaseRequestBuilderImplGeneratorRequestBuilderImpl
             ->create()
-            ->withDomainAndUseCaseName('Domain\SubDomain', 'GenericUseCase')
+            ->withDomain('Domain\SubDomain')
+            ->withUseCaseName('GenericUseCase')
             ->build();
 
         $this->genericUseCaseRequestBuilderImplGenerator = new GenericUseCaseRequestBuilderImplGenerator();
diff --git a/tests/Generator/BusinessRules/UseCases/GenericUseCaseRequestDTOGeneratorTest.php b/tests/Generator/BusinessRules/UseCases/GenericUseCaseRequestDTOGeneratorTest.php
@@ -51,7 +51,8 @@ protected function setUp()
         );
         $this->request = $genericUseCaseRequestDTOGeneratorRequestBuilderImpl
             ->create()
-            ->withDomainAndUseCaseName('Domain\SubDomain', 'GenericUseCase')
+            ->withDomain('Domain\SubDomain')
+            ->withUseCaseName('GenericUseCase')
             ->build();
 
         $this->genericUseCaseRequestDTOGenerator = new GenericUseCaseRequestDTOGenerator();
diff --git a/tests/Generator/Tests/BusinessRules/UseCases/GenericUseCaseTestGeneratorTest.php b/tests/Generator/Tests/BusinessRules/UseCases/GenericUseCaseTestGeneratorTest.php
@@ -50,7 +50,8 @@ protected function setUp()
         $genericUseCaseTestGeneratorRequestBuilderImpl = new GenericUseCaseTestGeneratorRequestBuilderImpl();
         $this->request = $genericUseCaseTestGeneratorRequestBuilderImpl
             ->create()
-            ->withDomainAndUseCaseName('Domain\SubDomain', 'GenericUseCase')
+            ->withDomain('Domain\SubDomain')
+            ->withUseCaseName('GenericUseCase')
             ->build();
 
         $this->genericUseCaseTestGenerator = new GenericUseCaseTestGenerator();

Original file line number	Diff line number	Diff line change
`@@ -57,20 +57,18 @@ public function setGenericUseCaseRequestGeneratorRequestBuilder(`
`57`	`57`	`protected function generateGenericUseCaseRequestBuilder(string $domain, string $useCaseName): FileObject`
`58`	`58`	`{`
`59`	`59`	`return $this->genericUseCaseRequestBuilderGenerator->generate(`
`60`		`- $this->genericUseCaseRequestBuilderGeneratorRequestBuilder->create()->withDomainAndUseCaseName(`
`61`		`- $domain,`
`62`		`- $useCaseName`
`63`		`- )->build()`
	`60`	`+ $this->genericUseCaseRequestBuilderGeneratorRequestBuilder->create()->withDomain($domain)`
	`61`	`+ ->withUseCaseName($useCaseName)`
	`62`	`+ ->build()`
`64`	`63`	`);`
`65`	`64`	`}`
`66`	`65`
`67`	`66`	`protected function generateGenericUseCaseRequest(string $domain, string $useCaseName): FileObject`
`68`	`67`	`{`
`69`	`68`	`return $this->genericUseCaseRequestGenerator->generate(`
`70`		`- $this->genericUseCaseRequestGeneratorRequestBuilder->create()->withDomainAndUseCaseName(`
`71`		`- $domain,`
`72`		`- $useCaseName`
`73`		`- )->build()`
	`69`	`+ $this->genericUseCaseRequestGeneratorRequestBuilder->create()->withDomain($domain)`
	`70`	`+ ->withUseCaseName($useCaseName)`
	`71`	`+ ->build()`
`74`	`72`	`);`
`75`	`73`	`}`
`76`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -97,37 +97,36 @@ public function setGenericUseCaseRequestDTOGeneratorRequestBuilder(`
`97`	`97`	`protected function generateGenericUseCaseRequestDTO(string $domain, string $useCase): FileObject`
`98`	`98`	`{`
`99`	`99`	`return $this->genericUseCaseRequestDTOGenerator->generate(`
`100`		`- $this->genericUseCaseRequestDTOGeneratorRequestBuilder->create()->withDomainAndUseCaseName(`
`101`		`- $domain,`
`102`		`- $useCase`
`103`		`- )->build()`
	`100`	`+ $this->genericUseCaseRequestDTOGeneratorRequestBuilder->create()->withDomain($domain)`
	`101`	`+ ->withUseCaseName($useCase)`
	`102`	`+ ->build()`
`104`	`103`	`);`
`105`	`104`	`}`
`106`	`105`
`107`	`106`	`protected function generateGenericUseCaseRequestBuilderImpl(string $domain, string $useCase): FileObject`
`108`	`107`	`{`
`109`	`108`	`return $this->genericUseCaseRequestBuilderImplGenerator->generate(`
`110`		`- $this->genericUseCaseRequestBuilderImplGeneratorRequestBuilder->create()->withDomainAndUseCaseName(`
`111`		`- $domain,`
`112`		`- $useCase`
`113`		`- )->build()`
	`109`	`+ $this->genericUseCaseRequestBuilderImplGeneratorRequestBuilder->create()->withDomain($domain)`
	`110`	`+ ->withUseCaseName($useCase)`
	`111`	`+ ->build()`
`114`	`112`	`);`
`115`	`113`	`}`
`116`	`114`
`117`	`115`	`protected function generateGenericUseCase(string $domain, string $useCase): FileObject`
`118`	`116`	`{`
`119`	`117`	`return $this->genericUseCaseGenerator->generate(`
`120`		`- $this->genericUseCaseGeneratorRequestBuilder->create()->withDomainAndUseCaseName($domain, $useCase)->build()`
	`118`	`+ $this->genericUseCaseGeneratorRequestBuilder->create()->withDomain($domain)`
	`119`	`+ ->withUseCaseName($useCase)`
	`120`	`+ ->build()`
`121`	`121`	`);`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`protected function generateGenericUseCaseTest(string $domain, string $useCase): FileObject`
`125`	`125`	`{`
`126`	`126`	`return $this->genericUseCaseTestGenerator->generate(`
`127`		`- $this->genericUseCaseTestGeneratorRequestBuilder->create()->withDomainAndUseCaseName(`
`128`		`- $domain,`
`129`		`- $useCase`
`130`		`- )->build()`
	`127`	`+ $this->genericUseCaseTestGeneratorRequestBuilder->create()->withDomain($domain)`
	`128`	`+ ->withUseCaseName($useCase)`
	`129`	`+ ->build()`
`131`	`130`	`);`
`132`	`131`	`}`
`133`	`132`	`}`