Merge pull request #2 from Relewise/feature/move-namespace

Moved PHP namespace up a level.

Author: mzanoni

Generator/Constants.cs

@@ -0,0 +1,7 @@
+namespace Generator;
+
+public class Constants
+{
+    public const string Namespace = "Relewise\\Models";
+    public const string GenerationFolderPath = "Models";
+}

Generator/PhpClientWriter.cs

@@ -57,11 +57,11 @@ namespace Relewise;
 
         foreach (var method in clientMethods.DistinctBy(method => method.parameterType))
         {
-            writer.WriteLine($"use Relewise\\Models\\DTO\\{method.parameterType};");
+            writer.WriteLine($"use {Constants.Namespace}\\{method.parameterType};");
         }
         foreach (var method in clientMethods.DistinctBy(method => method.returnType).Where(method => method.returnType != typeof(void)))
         {
-            writer.WriteLine($"use Relewise\\Models\\DTO\\{phpWriter.PhpTypeName(method.returnType)};");
+            writer.WriteLine($"use {Constants.Namespace}\\{phpWriter.PhpTypeName(method.returnType)};");
         }
         writer.WriteLine($"");
 

Generator/PhpTypeWriters/PhpClassWriter.cs

@@ -18,10 +18,10 @@ public PhpClassWriter(PhpWriter phpWriter)
 
     public void Write(IndentedTextWriter writer, Type type, string typeName)
     {
-        writer.WriteLine("""
+        writer.WriteLine($"""
 <?php declare(strict_types=1);
 
-namespace Relewise\Models\DTO;
+namespace {Constants.Namespace};
 
 use DateTime;
 

Generator/PhpTypeWriters/PhpEnumWriter.cs

@@ -15,10 +15,10 @@ public PhpEnumWriter(PhpWriter phpWriter)
 
     public void Write(IndentedTextWriter writer, Type type, string typeName)
     {
-        writer.WriteLine("""
+        writer.WriteLine($"""
 <?php declare(strict_types=1);
 
-namespace Relewise\Models\DTO;
+namespace {Constants.Namespace};
 
 use DateTime;
 

Generator/PhpTypeWriters/PhpInterfaceWriter.cs

@@ -15,10 +15,10 @@ public PhpInterfaceWriter(PhpWriter phpWriter)
 
     public void Write(IndentedTextWriter writer, Type type, string typeName)
     {
-        writer.WriteLine("""
+        writer.WriteLine($"""
 <?php declare(strict_types=1);
 
-namespace Relewise\Models\DTO;
+namespace {Constants.Namespace};
 
 use DateTime;
 

Generator/PhpTypeWriters/PhpKeyValuePairWriter.cs

@@ -15,10 +15,10 @@ public PhpKeyValuePairWriter(PhpWriter phpWriter)
 
     public void Write(IndentedTextWriter writer, Type type, string typeName)
     {
-        writer.WriteLine("""
+        writer.WriteLine($"""
 <?php declare(strict_types=1);
 
-namespace Relewise\Models\DTO;
+namespace {Constants.Namespace};
 
 use DateTime;
 

Generator/PhpWriter.cs

@@ -49,7 +49,7 @@ public void WritePhpTypes(IEnumerable<Type> types)
                 continue;
             }
 
-            using var streamWriter = File.CreateText($"{BasePath}/Models/DTO/{typeName}.php");
+            using var streamWriter = File.CreateText($"{BasePath}/{Constants.GenerationFolderPath}/{typeName}.php");
             using var writer = new IndentedTextWriter(streamWriter);
 
             var phpTypeWriter = phpTypeWriters.FirstOrDefault(writer => writer.CanWrite(type));

src/Factory/DataValueFactory.php

@@ -1,10 +1,10 @@
 <?php declare(strict_types=1);
 namespace Relewise\Factory;
 
-use Relewise\Models\DTO\DataValue;
-use Relewise\Models\DTO\Language;
-use Relewise\Models\DTO\Money;
-use Relewise\Models\DTO\DataValueDataValueTypes;
+use Relewise\Models\DataValue;
+use Relewise\Models\Language;
+use Relewise\Models\Money;
+use Relewise\Models\DataValueDataValueTypes;
 
 class DataValueFactory {
     public static function stringDataValue(string $value) : DataValue {

src/Factory/UserFactory.php

@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 namespace Relewise\Factory;
-use Relewise\Models\DTO\User;
+use Relewise\Models\User;
 
 class UserFactory {
     public static function anonymous() {

src/Models/DTO/AbandonedCartTriggerConfiguration.php renamed to src/Models/AbandonedCartTriggerConfiguration.php

@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace Relewise\Models\DTO;
+namespace Relewise\Models;
 
 use DateTime;