Add an empty line to the end of the generated code files

jorrit · mghoneimy · commit 87cc4475d10e · 2020-08-16T22:16:57.000-04:00
diff --git a/src/SchemaGenerator/CodeGenerator/CodeFile/ClassFile.php b/src/SchemaGenerator/CodeGenerator/CodeFile/ClassFile.php
@@ -17,7 +17,8 @@ class ClassFile extends TraitFile
     protected const FILE_FORMAT = '<?php
 %1$s%2$s
 class %3$s
-{%4$s%5$s%6$s%7$s}';
+{%4$s%5$s%6$s%7$s}
+';
 
     /**
      * The name of the base class extended by this class
diff --git a/src/SchemaGenerator/CodeGenerator/CodeFile/TraitFile.php b/src/SchemaGenerator/CodeGenerator/CodeFile/TraitFile.php
@@ -19,7 +19,8 @@ class TraitFile extends AbstractCodeFile
     protected const FILE_FORMAT = '<?php
 %1$s%2$s
 trait %3$s
-{%4$s%5$s}';
+{%4$s%5$s}
+';
 
     /**
      * This string stores the name of the namespace which this class belongs to
diff --git a/tests/files_expected/arguments_objects/WithInputObjectArgArgumentsObject.php b/tests/files_expected/arguments_objects/WithInputObjectArgArgumentsObject.php
@@ -14,4 +14,4 @@ public function setObjectProperty(SomeInputObject $someInputObject)
 
         return $this;
     }
-}
+}
diff --git a/tests/files_expected/arguments_objects/WithListArgArgumentsObject.php b/tests/files_expected/arguments_objects/WithListArgArgumentsObject.php
@@ -14,4 +14,4 @@ public function setListProperty(array $listProperty)
 
         return $this;
     }
-}
+}
diff --git a/tests/files_expected/arguments_objects/WithMultipleEnumArgArgumentsObject.php b/tests/files_expected/arguments_objects/WithMultipleEnumArgArgumentsObject.php
@@ -15,4 +15,4 @@ public function setEnumProperty($some)
 
         return $this;
     }
-}
+}
diff --git a/tests/files_expected/arguments_objects/WithMultipleInputObjectArgsArgumentsObject.php b/tests/files_expected/arguments_objects/WithMultipleInputObjectArgsArgumentsObject.php
@@ -22,4 +22,4 @@ public function setAnotherObjectProperty(AnotherInputObject $anotherInputObject)
 
         return $this;
     }
-}
+}
diff --git a/tests/files_expected/arguments_objects/WithMultipleListArgsArgumentsObject.php b/tests/files_expected/arguments_objects/WithMultipleListArgsArgumentsObject.php
@@ -22,4 +22,4 @@ public function setAnotherListProperty(array $anotherListProperty)
 
         return $this;
     }
-}
+}
diff --git a/tests/files_expected/arguments_objects/WithMultipleScalarArgsArgumentsObject.php b/tests/files_expected/arguments_objects/WithMultipleScalarArgsArgumentsObject.php
@@ -22,4 +22,4 @@ public function setAnotherScalarProperty($anotherScalarProperty)
 
         return $this;
     }
-}
+}
diff --git a/tests/files_expected/arguments_objects/WithScalarArgArgumentsObject.php b/tests/files_expected/arguments_objects/WithScalarArgArgumentsObject.php
@@ -14,4 +14,4 @@ public function setScalarProperty($scalarProperty)
 
         return $this;
     }
-}
+}
diff --git a/tests/files_expected/classes/ClassExtendsBase.php b/tests/files_expected/classes/ClassExtendsBase.php
@@ -1,4 +1,4 @@
 <?php
 
 class ClassExtendsBase extends Base
-{}
+{}
diff --git a/tests/files_expected/classes/ClassImplementsInterface.php b/tests/files_expected/classes/ClassImplementsInterface.php
@@ -1,4 +1,4 @@
 <?php
 
 class ClassImplementsInterface implements InterfaceOne
-{}
+{}
diff --git a/tests/files_expected/classes/ClassImplementsMultipleInterfaces.php b/tests/files_expected/classes/ClassImplementsMultipleInterfaces.php
@@ -1,4 +1,4 @@
 <?php
 
 class ClassImplementsMultipleInterfaces implements InterfaceOne, InterfaceTwo
-{}
+{}
diff --git a/tests/files_expected/classes/ClassWithConstant.php b/tests/files_expected/classes/ClassWithConstant.php
@@ -3,4 +3,4 @@
 class ClassWithConstant
 {
     const CONST_ONE = "ONE";
-}
+}
diff --git a/tests/files_expected/classes/ClassWithEverything.php b/tests/files_expected/classes/ClassWithEverything.php
@@ -26,4 +26,4 @@ public function dumpAll() {
     protected function internalStuff($i) {
         return ++$i;
     }
-}
+}
diff --git a/tests/files_expected/classes/ClassWithMultipleConstants.php b/tests/files_expected/classes/ClassWithMultipleConstants.php
@@ -8,4 +8,4 @@ class ClassWithMultipleConstants
     const CONST_FOUR = false;
     const CONST_FIVE = "";
     const CONST_SIX = 6.6;
-}
+}
diff --git a/tests/files_expected/classes/ClassWithMultipleTraits.php b/tests/files_expected/classes/ClassWithMultipleTraits.php
@@ -5,4 +5,4 @@ class ClassWithMultipleTraits
     use TraitOne;
     use TraitTwo;
     use TraitThree;
-}
+}
diff --git a/tests/files_expected/classes/ClassWithTrait.php b/tests/files_expected/classes/ClassWithTrait.php
@@ -3,4 +3,4 @@
 class ClassWithTrait
 {
     use TraitOne;
-}
+}
diff --git a/tests/files_expected/classes/EmptyClass.php b/tests/files_expected/classes/EmptyClass.php
@@ -1,4 +1,4 @@
 <?php
 
 class EmptyClass
-{}
+{}
diff --git a/tests/files_expected/enum_objects/EmptyEnumObject.php b/tests/files_expected/enum_objects/EmptyEnumObject.php
@@ -5,4 +5,4 @@
 use GraphQL\SchemaObject\EnumObject;
 
 class EmptyEnumObject extends EnumObject
-{}
+{}
diff --git a/tests/files_expected/enum_objects/WithConstantEnumObject.php b/tests/files_expected/enum_objects/WithConstantEnumObject.php
@@ -7,4 +7,4 @@
 class WithConstantEnumObject extends EnumObject
 {
     const FIXED_VALUE = "fixed_value";
-}
+}
diff --git a/tests/files_expected/enum_objects/WithMultipleConstantsEnumObject.php b/tests/files_expected/enum_objects/WithMultipleConstantsEnumObject.php
@@ -9,4 +9,4 @@ class WithMultipleConstantsEnumObject extends EnumObject
     const SOME_VALUE = "some_value";
     const ANOTHER_VALUE = "another_value";
     const ONEMOREVALUE = "oneMoreValue";
-}
+}
diff --git a/tests/files_expected/input_objects/WithEnumValueInputObject.php b/tests/files_expected/input_objects/WithEnumValueInputObject.php
@@ -14,4 +14,4 @@ public function setEnumVal($enumVal)
 
         return $this;
     }
-}
+}
diff --git a/tests/files_expected/input_objects/WithInputObjectValueInputObject.php b/tests/files_expected/input_objects/WithInputObjectValueInputObject.php
@@ -14,4 +14,4 @@ public function setInputObject(WithListValueInputObject $withListValueInputObjec
 
         return $this;
     }
-}
+}
diff --git a/tests/files_expected/input_objects/WithListValueInputObject.php b/tests/files_expected/input_objects/WithListValueInputObject.php
@@ -14,4 +14,4 @@ public function setListOne(array $listOne)
 
         return $this;
     }
-}
+}
diff --git a/tests/files_expected/input_objects/WithMultipleInputObjectValuesInputObject.php b/tests/files_expected/input_objects/WithMultipleInputObjectValuesInputObject.php
@@ -22,4 +22,4 @@ public function setInputObjectTwo(_TestFilterInputObject $testFilterInputObject)
 
         return $this;
     }
-}
+}
diff --git a/tests/files_expected/input_objects/WithMultipleListValuesInputObject.php b/tests/files_expected/input_objects/WithMultipleListValuesInputObject.php
@@ -22,4 +22,4 @@ public function setListTwo(array $listTwo)
 
         return $this;
     }
-}
+}
diff --git a/tests/files_expected/input_objects/WithMultipleScalarValuesInputObject.php b/tests/files_expected/input_objects/WithMultipleScalarValuesInputObject.php
@@ -22,4 +22,4 @@ public function setValTwo($valTwo)
 
         return $this;
     }
-}
+}
diff --git a/tests/files_expected/input_objects/WithScalarValueInputObject.php b/tests/files_expected/input_objects/WithScalarValueInputObject.php
@@ -14,4 +14,4 @@ public function setValOne($valOne)
 
         return $this;
     }
-}
+}
diff --git a/tests/files_expected/input_objects/_TestFilterInputObject.php b/tests/files_expected/input_objects/_TestFilterInputObject.php
@@ -38,4 +38,4 @@ public function setTestFilter(_TestFilterInputObject $testFilterInputObject)
 
         return $this;
     }
-}
+}
diff --git a/tests/files_expected/query_objects/EmptyQueryObject.php b/tests/files_expected/query_objects/EmptyQueryObject.php
@@ -7,4 +7,4 @@
 class EmptyQueryObject extends QueryObject
 {
     const OBJECT_NAME = "Empty";
-}
+}
diff --git a/tests/files_expected/query_objects/MultipleObjectSelectorsQueryObject.php b/tests/files_expected/query_objects/MultipleObjectSelectorsQueryObject.php
@@ -32,4 +32,4 @@ public function selectLeftObjects(MultipleObjectSelectorsLeftObjectsArgumentsObj
 
         return $object;
     }
-}
+}
diff --git a/tests/files_expected/query_objects/MultipleSimpleSelectorsQueryObject.php b/tests/files_expected/query_objects/MultipleSimpleSelectorsQueryObject.php
@@ -31,4 +31,4 @@ public function selectGender()
 
         return $this;
     }
-}
+}
diff --git a/tests/files_expected/query_objects/ObjectSelectorQueryObject.php b/tests/files_expected/query_objects/ObjectSelectorQueryObject.php
@@ -18,4 +18,4 @@ public function selectOthers(RootOthersArgumentsObject $argsObject = null)
 
         return $object;
     }
-}
+}
diff --git a/tests/files_expected/query_objects/RootQueryObject.php b/tests/files_expected/query_objects/RootQueryObject.php
@@ -7,4 +7,4 @@
 class RootQueryObject extends QueryObject
 {
     const OBJECT_NAME = "";
-}
+}
diff --git a/tests/files_expected/query_objects/SimpleSelectorQueryObject.php b/tests/files_expected/query_objects/SimpleSelectorQueryObject.php
@@ -14,4 +14,4 @@ public function selectName()
 
         return $this;
     }
-}
+}
diff --git a/tests/files_expected/traits/EmptyTrait.php b/tests/files_expected/traits/EmptyTrait.php
@@ -1,4 +1,4 @@
 <?php
 
 trait EmptyTrait
-{}
+{}
diff --git a/tests/files_expected/traits/TraitWithEverything.php b/tests/files_expected/traits/TraitWithEverything.php
@@ -18,4 +18,4 @@ public function clearProperties() {
         $this->propOne = 1;
         $this->propTwo = 2;
     }
-}
+}
diff --git a/tests/files_expected/traits/TraitWithImports.php b/tests/files_expected/traits/TraitWithImports.php
@@ -4,4 +4,4 @@
 use GraphQL\Client;
 
 trait TraitWithImports
-{}
+{}
diff --git a/tests/files_expected/traits/TraitWithMultipleMethods.php b/tests/files_expected/traits/TraitWithMultipleMethods.php
@@ -14,4 +14,4 @@ private function innerTest() {
         print "test!";
         return 0;
     }
-}
+}
diff --git a/tests/files_expected/traits/TraitWithNamespace.php b/tests/files_expected/traits/TraitWithNamespace.php
@@ -3,4 +3,4 @@
 namespace GraphQL\Test;
 
 trait TraitWithNamespace
-{}
+{}
diff --git a/tests/files_expected/traits/TraitWithNamespaceAndImports.php b/tests/files_expected/traits/TraitWithNamespaceAndImports.php
@@ -6,4 +6,4 @@
 use GraphQL\Client;
 
 trait TraitWithNamespaceAndImports
-{}
+{}
diff --git a/tests/files_expected/traits/TraitWithOneMethod.php b/tests/files_expected/traits/TraitWithOneMethod.php
@@ -6,4 +6,4 @@ public function testTheTrait() {
         print "test!";
         die();
     }
-}
+}
diff --git a/tests/files_expected/traits/TraitWithProperties.php b/tests/files_expected/traits/TraitWithProperties.php
@@ -5,4 +5,4 @@ trait TraitWithProperties
     protected $property1;
     protected $propertyTwo;
     protected $property_three;
-}
+}
diff --git a/tests/files_expected/traits/TraitWithPropertiesAndMethods.php b/tests/files_expected/traits/TraitWithPropertiesAndMethods.php
@@ -13,4 +13,4 @@ public function clearProperties() {
         $this->propOne = 1;
         $this->propTwo = 2;
     }
-}
+}
diff --git a/tests/files_expected/traits/TraitWithPropertiesAndValues.php b/tests/files_expected/traits/TraitWithPropertiesAndValues.php
@@ -9,4 +9,4 @@ trait TraitWithPropertiesAndValues
     protected $propertyFive = true;
     protected $propertySix = "";
     protected $propertySeven = 7.7;
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -14,4 +14,4 @@ public function setObjectProperty(SomeInputObject $someInputObject)`
`14`	`14`
`15`	`15`	`return $this;`
`16`	`16`	`}`
`17`		`-}`
	`17`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -14,4 +14,4 @@ public function setListProperty(array $listProperty)`
`14`	`14`
`15`	`15`	`return $this;`
`16`	`16`	`}`
`17`		`-}`
	`17`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -15,4 +15,4 @@ public function setEnumProperty($some)`
`15`	`15`
`16`	`16`	`return $this;`
`17`	`17`	`}`
`18`		`-}`
	`18`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -22,4 +22,4 @@ public function setAnotherObjectProperty(AnotherInputObject $anotherInputObject)`
`22`	`22`
`23`	`23`	`return $this;`
`24`	`24`	`}`
`25`		`-}`
	`25`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -14,4 +14,4 @@ public function setScalarProperty($scalarProperty)`
`14`	`14`
`15`	`15`	`return $this;`
`16`	`16`	`}`
`17`		`-}`
	`17`	`+}`
-Original file line number
+Diff line change
@@ @@ -1,4 +1,4 @@ @@
 <?php
 class ClassExtendsBase extends Base
 -{}
 +{}