diff --git a/.php_cs.php b/.php_cs.php
index 5e73e4d..589c022 100644
--- a/.php_cs.php
+++ b/.php_cs.php
@@ -14,6 +14,7 @@
     'no_multiline_whitespace_before_semicolons' => true,
     'no_short_echo_tag'                         => true,
     'no_unused_imports'                         => true,
+    'blank_line_after_opening_tag'              => true,
     'not_operator_with_successor_space'         => true,
     'no_useless_else'                           => true,
     'ordered_imports'                           => [
diff --git a/CHANGELOG.md b/CHANGELOG.md
index db367d1..66e2fe8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [7.1.1] - 2021-09-09
+### Fixed
+- Changed default php-cs-fixer configuration to add blank line after opening tag, according to PSR12
+
 ## [7.1.0] - 2021-08-30
 ### Added
 - Support for free-form object in response
diff --git a/example/gen/src/Request/AddPetRequest.php b/example/gen/src/Request/AddPetRequest.php
index 7b3ccad..4da10df 100644
--- a/example/gen/src/Request/AddPetRequest.php
+++ b/example/gen/src/Request/AddPetRequest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/example/gen/src/Request/CreateUserRequest.php b/example/gen/src/Request/CreateUserRequest.php
index 9f10deb..c99d1a8 100644
--- a/example/gen/src/Request/CreateUserRequest.php
+++ b/example/gen/src/Request/CreateUserRequest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/example/gen/src/Request/CreateUsersWithListInputRequest.php b/example/gen/src/Request/CreateUsersWithListInputRequest.php
index 441dd1e..4b8ec38 100644
--- a/example/gen/src/Request/CreateUsersWithListInputRequest.php
+++ b/example/gen/src/Request/CreateUsersWithListInputRequest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/example/gen/src/Request/DeleteOrderRequest.php b/example/gen/src/Request/DeleteOrderRequest.php
index 6d7cae3..95e7030 100644
--- a/example/gen/src/Request/DeleteOrderRequest.php
+++ b/example/gen/src/Request/DeleteOrderRequest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/example/gen/src/Request/DeletePetRequest.php b/example/gen/src/Request/DeletePetRequest.php
index 86618a5..df96468 100644
--- a/example/gen/src/Request/DeletePetRequest.php
+++ b/example/gen/src/Request/DeletePetRequest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/example/gen/src/Request/DeleteUserRequest.php b/example/gen/src/Request/DeleteUserRequest.php
index 329061a..e5b3706 100644
--- a/example/gen/src/Request/DeleteUserRequest.php
+++ b/example/gen/src/Request/DeleteUserRequest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/example/gen/src/Request/FindPetsByStatusRequest.php b/example/gen/src/Request/FindPetsByStatusRequest.php
index 3853085..444e8cb 100644
--- a/example/gen/src/Request/FindPetsByStatusRequest.php
+++ b/example/gen/src/Request/FindPetsByStatusRequest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/example/gen/src/Request/FindPetsByTagsRequest.php b/example/gen/src/Request/FindPetsByTagsRequest.php
index 803acaa..8a6ebc1 100644
--- a/example/gen/src/Request/FindPetsByTagsRequest.php
+++ b/example/gen/src/Request/FindPetsByTagsRequest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/example/gen/src/Request/GetInventoryRequest.php b/example/gen/src/Request/GetInventoryRequest.php
index eaa9493..1a76a8c 100644
--- a/example/gen/src/Request/GetInventoryRequest.php
+++ b/example/gen/src/Request/GetInventoryRequest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/example/gen/src/Request/GetOrderByIdRequest.php b/example/gen/src/Request/GetOrderByIdRequest.php
index c079c67..8cac13e 100644
--- a/example/gen/src/Request/GetOrderByIdRequest.php
+++ b/example/gen/src/Request/GetOrderByIdRequest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/example/gen/src/Request/GetPetByIdRequest.php b/example/gen/src/Request/GetPetByIdRequest.php
index b1e0525..939e9dd 100644
--- a/example/gen/src/Request/GetPetByIdRequest.php
+++ b/example/gen/src/Request/GetPetByIdRequest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/example/gen/src/Request/GetUserByNameRequest.php b/example/gen/src/Request/GetUserByNameRequest.php
index 367cf42..49e6036 100644
--- a/example/gen/src/Request/GetUserByNameRequest.php
+++ b/example/gen/src/Request/GetUserByNameRequest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/example/gen/src/Request/LoginUserRequest.php b/example/gen/src/Request/LoginUserRequest.php
index 6feda81..1ac3ac4 100644
--- a/example/gen/src/Request/LoginUserRequest.php
+++ b/example/gen/src/Request/LoginUserRequest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/example/gen/src/Request/LogoutUserRequest.php b/example/gen/src/Request/LogoutUserRequest.php
index 0aaad70..5a1d6f3 100644
--- a/example/gen/src/Request/LogoutUserRequest.php
+++ b/example/gen/src/Request/LogoutUserRequest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/example/gen/src/Request/Mapper/GuzzleRequestMapper.php b/example/gen/src/Request/Mapper/GuzzleRequestMapper.php
index ca225c0..9248910 100644
--- a/example/gen/src/Request/Mapper/GuzzleRequestMapper.php
+++ b/example/gen/src/Request/Mapper/GuzzleRequestMapper.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/example/gen/src/Request/PlaceOrderRequest.php b/example/gen/src/Request/PlaceOrderRequest.php
index 1c07fa5..515b0c1 100644
--- a/example/gen/src/Request/PlaceOrderRequest.php
+++ b/example/gen/src/Request/PlaceOrderRequest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/example/gen/src/Request/UpdatePetRequest.php b/example/gen/src/Request/UpdatePetRequest.php
index b8b6d12..68921f0 100644
--- a/example/gen/src/Request/UpdatePetRequest.php
+++ b/example/gen/src/Request/UpdatePetRequest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/example/gen/src/Request/UpdatePetWithFormRequest.php b/example/gen/src/Request/UpdatePetWithFormRequest.php
index 82c5c54..d9392b4 100644
--- a/example/gen/src/Request/UpdatePetWithFormRequest.php
+++ b/example/gen/src/Request/UpdatePetWithFormRequest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/example/gen/src/Request/UpdateUserRequest.php b/example/gen/src/Request/UpdateUserRequest.php
index 06271b3..ef4cc52 100644
--- a/example/gen/src/Request/UpdateUserRequest.php
+++ b/example/gen/src/Request/UpdateUserRequest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/example/gen/src/Schema/Category.php b/example/gen/src/Schema/Category.php
index 982cc4a..3443aa4 100644
--- a/example/gen/src/Schema/Category.php
+++ b/example/gen/src/Schema/Category.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/example/gen/src/Schema/GetInventoryResponseBody.php b/example/gen/src/Schema/GetInventoryResponseBody.php
index 872ed80..c363f31 100644
--- a/example/gen/src/Schema/GetInventoryResponseBody.php
+++ b/example/gen/src/Schema/GetInventoryResponseBody.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/example/gen/src/Schema/Mapper/CategoryMapper.php b/example/gen/src/Schema/Mapper/CategoryMapper.php
index 6d440f0..f8813a3 100644
--- a/example/gen/src/Schema/Mapper/CategoryMapper.php
+++ b/example/gen/src/Schema/Mapper/CategoryMapper.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/example/gen/src/Schema/Mapper/GetInventoryResponseBodyMapper.php b/example/gen/src/Schema/Mapper/GetInventoryResponseBodyMapper.php
index 3de2ea7..5fe9e5c 100644
--- a/example/gen/src/Schema/Mapper/GetInventoryResponseBodyMapper.php
+++ b/example/gen/src/Schema/Mapper/GetInventoryResponseBodyMapper.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/example/gen/src/Schema/Mapper/OrderMapper.php b/example/gen/src/Schema/Mapper/OrderMapper.php
index 86ef1ec..68153b5 100644
--- a/example/gen/src/Schema/Mapper/OrderMapper.php
+++ b/example/gen/src/Schema/Mapper/OrderMapper.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/example/gen/src/Schema/Mapper/PetCollectionMapper.php b/example/gen/src/Schema/Mapper/PetCollectionMapper.php
index 02f1a0c..2704067 100644
--- a/example/gen/src/Schema/Mapper/PetCollectionMapper.php
+++ b/example/gen/src/Schema/Mapper/PetCollectionMapper.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/example/gen/src/Schema/Mapper/PetMapper.php b/example/gen/src/Schema/Mapper/PetMapper.php
index 2dcfb19..46e049f 100644
--- a/example/gen/src/Schema/Mapper/PetMapper.php
+++ b/example/gen/src/Schema/Mapper/PetMapper.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/example/gen/src/Schema/Mapper/TagCollectionMapper.php b/example/gen/src/Schema/Mapper/TagCollectionMapper.php
index 87fd789..c9fa971 100644
--- a/example/gen/src/Schema/Mapper/TagCollectionMapper.php
+++ b/example/gen/src/Schema/Mapper/TagCollectionMapper.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/example/gen/src/Schema/Mapper/TagMapper.php b/example/gen/src/Schema/Mapper/TagMapper.php
index cb56440..bc80298 100644
--- a/example/gen/src/Schema/Mapper/TagMapper.php
+++ b/example/gen/src/Schema/Mapper/TagMapper.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/example/gen/src/Schema/Mapper/UserMapper.php b/example/gen/src/Schema/Mapper/UserMapper.php
index ef4b157..de21a7c 100644
--- a/example/gen/src/Schema/Mapper/UserMapper.php
+++ b/example/gen/src/Schema/Mapper/UserMapper.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/example/gen/src/Schema/Order.php b/example/gen/src/Schema/Order.php
index 9d4d0fc..c530019 100644
--- a/example/gen/src/Schema/Order.php
+++ b/example/gen/src/Schema/Order.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/example/gen/src/Schema/Pet.php b/example/gen/src/Schema/Pet.php
index 01acff0..b330cf6 100644
--- a/example/gen/src/Schema/Pet.php
+++ b/example/gen/src/Schema/Pet.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/example/gen/src/Schema/PetCollection.php b/example/gen/src/Schema/PetCollection.php
index 32f70b5..8c62e8f 100644
--- a/example/gen/src/Schema/PetCollection.php
+++ b/example/gen/src/Schema/PetCollection.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/example/gen/src/Schema/Tag.php b/example/gen/src/Schema/Tag.php
index 853cb68..3252d2c 100644
--- a/example/gen/src/Schema/Tag.php
+++ b/example/gen/src/Schema/Tag.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/example/gen/src/Schema/TagCollection.php b/example/gen/src/Schema/TagCollection.php
index ef9f2e4..7e950ef 100644
--- a/example/gen/src/Schema/TagCollection.php
+++ b/example/gen/src/Schema/TagCollection.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/example/gen/src/Schema/User.php b/example/gen/src/Schema/User.php
index d0dc746..001bb79 100644
--- a/example/gen/src/Schema/User.php
+++ b/example/gen/src/Schema/User.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/example/gen/src/Schema/UserCollection.php b/example/gen/src/Schema/UserCollection.php
index 43aa06c..ac0115e 100644
--- a/example/gen/src/Schema/UserCollection.php
+++ b/example/gen/src/Schema/UserCollection.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/example/gen/src/ServiceProvider.php b/example/gen/src/ServiceProvider.php
index c845561..fd3a442 100644
--- a/example/gen/src/ServiceProvider.php
+++ b/example/gen/src/ServiceProvider.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/example/gen/src/SwaggerPetstoreOpenAPI3Client.php b/example/gen/src/SwaggerPetstoreOpenAPI3Client.php
index be3bbae..b394423 100644
--- a/example/gen/src/SwaggerPetstoreOpenAPI3Client.php
+++ b/example/gen/src/SwaggerPetstoreOpenAPI3Client.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/example/gen/src/SwaggerPetstoreOpenAPI3ClientFactory.php b/example/gen/src/SwaggerPetstoreOpenAPI3ClientFactory.php
index 1df5d10..20553ab 100644
--- a/example/gen/src/SwaggerPetstoreOpenAPI3ClientFactory.php
+++ b/example/gen/src/SwaggerPetstoreOpenAPI3ClientFactory.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/src/Application.php b/src/Application.php
index 8d0be0d..9a236ff 100644
--- a/src/Application.php
+++ b/src/Application.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator;
 
diff --git a/src/Ast/Builder/ClassBuilder.php b/src/Ast/Builder/ClassBuilder.php
index f07720c..89f546c 100644
--- a/src/Ast/Builder/ClassBuilder.php
+++ b/src/Ast/Builder/ClassBuilder.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Ast\Builder;
 
diff --git a/src/Ast/Builder/CodeBuilder.php b/src/Ast/Builder/CodeBuilder.php
index 62946eb..049d427 100644
--- a/src/Ast/Builder/CodeBuilder.php
+++ b/src/Ast/Builder/CodeBuilder.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Ast\Builder;
 
diff --git a/src/Ast/Builder/MethodBuilder.php b/src/Ast/Builder/MethodBuilder.php
index cdd883f..4f7f658 100644
--- a/src/Ast/Builder/MethodBuilder.php
+++ b/src/Ast/Builder/MethodBuilder.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Ast\Builder;
 
diff --git a/src/Ast/Builder/ParameterBuilder.php b/src/Ast/Builder/ParameterBuilder.php
index 5755e9d..a8f0556 100644
--- a/src/Ast/Builder/ParameterBuilder.php
+++ b/src/Ast/Builder/ParameterBuilder.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Ast\Builder;
 
diff --git a/src/Ast/ParameterNode.php b/src/Ast/ParameterNode.php
index fc257d4..e14e5b5 100644
--- a/src/Ast/ParameterNode.php
+++ b/src/Ast/ParameterNode.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Ast;
 
diff --git a/src/Ast/PhpVersion.php b/src/Ast/PhpVersion.php
index 8188aaf..4f2021b 100644
--- a/src/Ast/PhpVersion.php
+++ b/src/Ast/PhpVersion.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Ast;
 
diff --git a/src/Ast/Visitor/NamespaceSubstituteVisitor.php b/src/Ast/Visitor/NamespaceSubstituteVisitor.php
index ff21c80..6029fe8 100644
--- a/src/Ast/Visitor/NamespaceSubstituteVisitor.php
+++ b/src/Ast/Visitor/NamespaceSubstituteVisitor.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Ast\Visitor;
 
diff --git a/src/CodeGeneratorFacade.php b/src/CodeGeneratorFacade.php
index abee67b..b63a64e 100644
--- a/src/CodeGeneratorFacade.php
+++ b/src/CodeGeneratorFacade.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator;
 
diff --git a/src/Entity/FieldCollection.php b/src/Entity/FieldCollection.php
index ea3a52a..700814f 100644
--- a/src/Entity/FieldCollection.php
+++ b/src/Entity/FieldCollection.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Entity;
 
diff --git a/src/Entity/FieldType.php b/src/Entity/FieldType.php
index 3e63b9e..a5f7e8c 100644
--- a/src/Entity/FieldType.php
+++ b/src/Entity/FieldType.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Entity;
 
diff --git a/src/Entity/ImportCollection.php b/src/Entity/ImportCollection.php
index ff35985..e35596d 100644
--- a/src/Entity/ImportCollection.php
+++ b/src/Entity/ImportCollection.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Entity;
 
diff --git a/src/Entity/Operation.php b/src/Entity/Operation.php
index 7ec2119..8626c97 100644
--- a/src/Entity/Operation.php
+++ b/src/Entity/Operation.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Entity;
 
diff --git a/src/Entity/OperationCollection.php b/src/Entity/OperationCollection.php
index d820dc4..f080819 100644
--- a/src/Entity/OperationCollection.php
+++ b/src/Entity/OperationCollection.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Entity;
 
diff --git a/src/Entity/RequestFieldRegistry.php b/src/Entity/RequestFieldRegistry.php
index 35898f2..8c1aa91 100644
--- a/src/Entity/RequestFieldRegistry.php
+++ b/src/Entity/RequestFieldRegistry.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Entity;
 
diff --git a/src/Entity/Response.php b/src/Entity/Response.php
index 3e3bb92..3cb4278 100644
--- a/src/Entity/Response.php
+++ b/src/Entity/Response.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Entity;
 
diff --git a/src/Generator/ClientFactoryGenerator.php b/src/Generator/ClientFactoryGenerator.php
index 4c6a874..aecfa66 100644
--- a/src/Generator/ClientFactoryGenerator.php
+++ b/src/Generator/ClientFactoryGenerator.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Generator;
 
diff --git a/src/Generator/GeneratorAbstract.php b/src/Generator/GeneratorAbstract.php
index 7740700..5c58b8c 100644
--- a/src/Generator/GeneratorAbstract.php
+++ b/src/Generator/GeneratorAbstract.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Generator;
 
diff --git a/src/Generator/GeneratorInterface.php b/src/Generator/GeneratorInterface.php
index 281c117..ab33b15 100644
--- a/src/Generator/GeneratorInterface.php
+++ b/src/Generator/GeneratorInterface.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Generator;
 
diff --git a/src/Generator/Implementation/Container/PimpleContainer.php b/src/Generator/Implementation/Container/PimpleContainer.php
index 060422c..180f3a7 100644
--- a/src/Generator/Implementation/Container/PimpleContainer.php
+++ b/src/Generator/Implementation/Container/PimpleContainer.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Generator\Implementation\Container;
 
diff --git a/src/Generator/Implementation/ContainerImplementationInterface.php b/src/Generator/Implementation/ContainerImplementationInterface.php
index 39d84c9..e5d8e87 100644
--- a/src/Generator/Implementation/ContainerImplementationInterface.php
+++ b/src/Generator/Implementation/ContainerImplementationInterface.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Generator\Implementation;
 
diff --git a/src/Generator/Implementation/ContainerImplementationStrategy.php b/src/Generator/Implementation/ContainerImplementationStrategy.php
index 637a682..525f2d1 100644
--- a/src/Generator/Implementation/ContainerImplementationStrategy.php
+++ b/src/Generator/Implementation/ContainerImplementationStrategy.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Generator\Implementation;
 
diff --git a/src/Generator/Implementation/HttpMessage/GuzzleHttpMessage.php b/src/Generator/Implementation/HttpMessage/GuzzleHttpMessage.php
index 58c2540..c94b8e5 100644
--- a/src/Generator/Implementation/HttpMessage/GuzzleHttpMessage.php
+++ b/src/Generator/Implementation/HttpMessage/GuzzleHttpMessage.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Generator\Implementation\HttpMessage;
 
diff --git a/src/Generator/Implementation/HttpMessage/HttpMessageAbstract.php b/src/Generator/Implementation/HttpMessage/HttpMessageAbstract.php
index 6333181..fd51228 100644
--- a/src/Generator/Implementation/HttpMessage/HttpMessageAbstract.php
+++ b/src/Generator/Implementation/HttpMessage/HttpMessageAbstract.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Generator\Implementation\HttpMessage;
 
diff --git a/src/Generator/Implementation/HttpMessage/NyholmHttpMessage.php b/src/Generator/Implementation/HttpMessage/NyholmHttpMessage.php
index e4174c4..2b09af0 100644
--- a/src/Generator/Implementation/HttpMessage/NyholmHttpMessage.php
+++ b/src/Generator/Implementation/HttpMessage/NyholmHttpMessage.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Generator\Implementation\HttpMessage;
 
diff --git a/src/Generator/Implementation/HttpMessageImplementationInterface.php b/src/Generator/Implementation/HttpMessageImplementationInterface.php
index ba7ff1b..e160112 100644
--- a/src/Generator/Implementation/HttpMessageImplementationInterface.php
+++ b/src/Generator/Implementation/HttpMessageImplementationInterface.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Generator\Implementation;
 
diff --git a/src/Generator/Implementation/HttpMessageImplementationStrategy.php b/src/Generator/Implementation/HttpMessageImplementationStrategy.php
index f4ba6b4..c2bb348 100644
--- a/src/Generator/Implementation/HttpMessageImplementationStrategy.php
+++ b/src/Generator/Implementation/HttpMessageImplementationStrategy.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Generator\Implementation;
 
diff --git a/src/Generator/RequestMapperGenerator.php b/src/Generator/RequestMapperGenerator.php
index 55006e7..fb630af 100644
--- a/src/Generator/RequestMapperGenerator.php
+++ b/src/Generator/RequestMapperGenerator.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Generator;
 
diff --git a/src/Generator/SchemaCollectionGenerator.php b/src/Generator/SchemaCollectionGenerator.php
index f540202..61f3631 100644
--- a/src/Generator/SchemaCollectionGenerator.php
+++ b/src/Generator/SchemaCollectionGenerator.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Generator;
 
diff --git a/src/Generator/SchemaMapperGenerator.php b/src/Generator/SchemaMapperGenerator.php
index 12cdd81..83fd085 100644
--- a/src/Generator/SchemaMapperGenerator.php
+++ b/src/Generator/SchemaMapperGenerator.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Generator;
 
diff --git a/src/Generator/ServiceProviderGenerator.php b/src/Generator/ServiceProviderGenerator.php
index 7a9f65b..c1859a5 100644
--- a/src/Generator/ServiceProviderGenerator.php
+++ b/src/Generator/ServiceProviderGenerator.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Generator;
 
diff --git a/src/Input/Configuration.php b/src/Input/Configuration.php
index b9306dc..165d2e9 100644
--- a/src/Input/Configuration.php
+++ b/src/Input/Configuration.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Input;
 
diff --git a/src/Input/Factory/OperationFactory.php b/src/Input/Factory/OperationFactory.php
index e5d2fd6..ae9a48b 100644
--- a/src/Input/Factory/OperationFactory.php
+++ b/src/Input/Factory/OperationFactory.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Input\Factory;
 
diff --git a/src/Input/Factory/ResponseFactory.php b/src/Input/Factory/ResponseFactory.php
index 93dd63e..4f9353f 100644
--- a/src/Input/Factory/ResponseFactory.php
+++ b/src/Input/Factory/ResponseFactory.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Input\Factory;
 
diff --git a/src/Input/FileReader.php b/src/Input/FileReader.php
index 65bff5c..0a6b473 100644
--- a/src/Input/FileReader.php
+++ b/src/Input/FileReader.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Input;
 
diff --git a/src/Input/InvalidSpecificationException.php b/src/Input/InvalidSpecificationException.php
index 347b434..3ea3c3b 100644
--- a/src/Input/InvalidSpecificationException.php
+++ b/src/Input/InvalidSpecificationException.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Input;
 
diff --git a/src/Input/Parser.php b/src/Input/Parser.php
index 184244e..76fad68 100644
--- a/src/Input/Parser.php
+++ b/src/Input/Parser.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Input;
 
diff --git a/src/Input/PhpNameValidator.php b/src/Input/PhpNameValidator.php
index 7f44081..d967670 100644
--- a/src/Input/PhpNameValidator.php
+++ b/src/Input/PhpNameValidator.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Input;
 
diff --git a/src/Input/Specification.php b/src/Input/Specification.php
index 9b70260..51eb1ef 100644
--- a/src/Input/Specification.php
+++ b/src/Input/Specification.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Input;
 
diff --git a/src/Meta/ComposerJsonTemplate.php b/src/Meta/ComposerJsonTemplate.php
index 406d7b6..67b88e4 100644
--- a/src/Meta/ComposerJsonTemplate.php
+++ b/src/Meta/ComposerJsonTemplate.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Meta;
 
diff --git a/src/Meta/ReadmeMdTemplate.php b/src/Meta/ReadmeMdTemplate.php
index 43cc925..3d1df43 100644
--- a/src/Meta/ReadmeMdTemplate.php
+++ b/src/Meta/ReadmeMdTemplate.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Meta;
 
diff --git a/src/Meta/Template/TwigExtension.php b/src/Meta/Template/TwigExtension.php
index 6f62b20..232646a 100644
--- a/src/Meta/Template/TwigExtension.php
+++ b/src/Meta/Template/TwigExtension.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Meta\Template;
 
diff --git a/src/Meta/TemplateInterface.php b/src/Meta/TemplateInterface.php
index d3e39dd..7ed148d 100644
--- a/src/Meta/TemplateInterface.php
+++ b/src/Meta/TemplateInterface.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Meta;
 
diff --git a/src/MetaTemplateFacade.php b/src/MetaTemplateFacade.php
index a17b388..772fc68 100644
--- a/src/MetaTemplateFacade.php
+++ b/src/MetaTemplateFacade.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator;
 
diff --git a/src/Naming/CaseCaster.php b/src/Naming/CaseCaster.php
index e9dc497..1b4cef6 100644
--- a/src/Naming/CaseCaster.php
+++ b/src/Naming/CaseCaster.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Naming;
 
diff --git a/src/Naming/ClientNaming.php b/src/Naming/ClientNaming.php
index 5f14843..9b1825f 100644
--- a/src/Naming/ClientNaming.php
+++ b/src/Naming/ClientNaming.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Naming;
 
diff --git a/src/Naming/CopiedNamespace.php b/src/Naming/CopiedNamespace.php
index 6d05034..e9b4f70 100644
--- a/src/Naming/CopiedNamespace.php
+++ b/src/Naming/CopiedNamespace.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Naming;
 
diff --git a/src/Naming/RequestNaming.php b/src/Naming/RequestNaming.php
index e4c4b9a..c14e2bc 100644
--- a/src/Naming/RequestNaming.php
+++ b/src/Naming/RequestNaming.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Naming;
 
diff --git a/src/Naming/SchemaCollectionNaming.php b/src/Naming/SchemaCollectionNaming.php
index 256b530..0279d97 100644
--- a/src/Naming/SchemaCollectionNaming.php
+++ b/src/Naming/SchemaCollectionNaming.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Naming;
 
diff --git a/src/Naming/SchemaMapperNaming.php b/src/Naming/SchemaMapperNaming.php
index ea77efc..b01b4f8 100644
--- a/src/Naming/SchemaMapperNaming.php
+++ b/src/Naming/SchemaMapperNaming.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Naming;
 
diff --git a/src/Output/Copy/Request/Mapper/RequestMapperInterface.php b/src/Output/Copy/Request/Mapper/RequestMapperInterface.php
index 3b07fbd..d47ec63 100644
--- a/src/Output/Copy/Request/Mapper/RequestMapperInterface.php
+++ b/src/Output/Copy/Request/Mapper/RequestMapperInterface.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Output\Copy\Request\Mapper;
 
diff --git a/src/Output/Copy/Request/RequestInterface.php b/src/Output/Copy/Request/RequestInterface.php
index 420e935..ec44966 100644
--- a/src/Output/Copy/Request/RequestInterface.php
+++ b/src/Output/Copy/Request/RequestInterface.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Output\Copy\Request;
 
diff --git a/src/Output/Copy/Response/ResponseHandler.php b/src/Output/Copy/Response/ResponseHandler.php
index 464f5ae..b41626e 100644
--- a/src/Output/Copy/Response/ResponseHandler.php
+++ b/src/Output/Copy/Response/ResponseHandler.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Output\Copy\Response;
 
diff --git a/src/Output/Copy/Schema/Mapper/SchemaMapperInterface.php b/src/Output/Copy/Schema/Mapper/SchemaMapperInterface.php
index 0dc97ca..5ef040e 100644
--- a/src/Output/Copy/Schema/Mapper/SchemaMapperInterface.php
+++ b/src/Output/Copy/Schema/Mapper/SchemaMapperInterface.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Output\Copy\Schema\Mapper;
 
diff --git a/src/Output/Copy/Schema/SerializableInterface.php b/src/Output/Copy/Schema/SerializableInterface.php
index c1136b8..7514be0 100644
--- a/src/Output/Copy/Schema/SerializableInterface.php
+++ b/src/Output/Copy/Schema/SerializableInterface.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Output\Copy\Schema;
 
diff --git a/src/Output/Copy/Serializer/BodySerializer.php b/src/Output/Copy/Serializer/BodySerializer.php
index 28b0c8b..9e72a8c 100644
--- a/src/Output/Copy/Serializer/BodySerializer.php
+++ b/src/Output/Copy/Serializer/BodySerializer.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Output\Copy\Serializer;
 
diff --git a/src/Output/Copy/Serializer/ContentType/AbstractJsonContentTypeSerializer.php b/src/Output/Copy/Serializer/ContentType/AbstractJsonContentTypeSerializer.php
index b7dc660..3d4d7c3 100644
--- a/src/Output/Copy/Serializer/ContentType/AbstractJsonContentTypeSerializer.php
+++ b/src/Output/Copy/Serializer/ContentType/AbstractJsonContentTypeSerializer.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Output\Copy\Serializer\ContentType;
 
diff --git a/src/Output/Copy/Serializer/ContentType/ContentTypeSerializerInterface.php b/src/Output/Copy/Serializer/ContentType/ContentTypeSerializerInterface.php
index 0f9e3d1..79f4d14 100644
--- a/src/Output/Copy/Serializer/ContentType/ContentTypeSerializerInterface.php
+++ b/src/Output/Copy/Serializer/ContentType/ContentTypeSerializerInterface.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Output\Copy\Serializer\ContentType;
 
diff --git a/src/Output/Copy/Serializer/ContentType/FormUrlencodedContentTypeSerializer.php b/src/Output/Copy/Serializer/ContentType/FormUrlencodedContentTypeSerializer.php
index f0f4885..a783093 100644
--- a/src/Output/Copy/Serializer/ContentType/FormUrlencodedContentTypeSerializer.php
+++ b/src/Output/Copy/Serializer/ContentType/FormUrlencodedContentTypeSerializer.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Output\Copy\Serializer\ContentType;
 
diff --git a/src/Output/Copy/Serializer/ContentType/JsonContentTypeSerializer.php b/src/Output/Copy/Serializer/ContentType/JsonContentTypeSerializer.php
index f561144..ed9c6f8 100644
--- a/src/Output/Copy/Serializer/ContentType/JsonContentTypeSerializer.php
+++ b/src/Output/Copy/Serializer/ContentType/JsonContentTypeSerializer.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Output\Copy\Serializer\ContentType;
 
diff --git a/src/Output/Copy/Serializer/ContentType/SerializeException.php b/src/Output/Copy/Serializer/ContentType/SerializeException.php
index 912ba84..3113966 100644
--- a/src/Output/Copy/Serializer/ContentType/SerializeException.php
+++ b/src/Output/Copy/Serializer/ContentType/SerializeException.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Output\Copy\Serializer\ContentType;
 
diff --git a/src/Output/Copy/Serializer/ContentType/VdnApiJsonContentTypeSerializer.php b/src/Output/Copy/Serializer/ContentType/VdnApiJsonContentTypeSerializer.php
index 6e3e52b..e271bc5 100644
--- a/src/Output/Copy/Serializer/ContentType/VdnApiJsonContentTypeSerializer.php
+++ b/src/Output/Copy/Serializer/ContentType/VdnApiJsonContentTypeSerializer.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Output\Copy\Serializer\ContentType;
 
diff --git a/src/Output/DirectoryPrinter.php b/src/Output/DirectoryPrinter.php
index b8a8e34..ba55826 100644
--- a/src/Output/DirectoryPrinter.php
+++ b/src/Output/DirectoryPrinter.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Output;
 
diff --git a/src/Output/Meta/MetaFile.php b/src/Output/Meta/MetaFile.php
index 58eb141..6bb6d3b 100644
--- a/src/Output/Meta/MetaFile.php
+++ b/src/Output/Meta/MetaFile.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Output\Meta;
 
diff --git a/src/Output/Meta/MetaFileCollection.php b/src/Output/Meta/MetaFileCollection.php
index 3528d36..8a33908 100644
--- a/src/Output/Meta/MetaFileCollection.php
+++ b/src/Output/Meta/MetaFileCollection.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Output\Meta;
 
diff --git a/src/Output/MetaFilePrinter.php b/src/Output/MetaFilePrinter.php
index d3dfdb1..6091292 100644
--- a/src/Output/MetaFilePrinter.php
+++ b/src/Output/MetaFilePrinter.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Output;
 
diff --git a/src/Output/Php/PhpCodeStyleFixer.php b/src/Output/Php/PhpCodeStyleFixer.php
index 284e568..9ed3c62 100644
--- a/src/Output/Php/PhpCodeStyleFixer.php
+++ b/src/Output/Php/PhpCodeStyleFixer.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Output\Php;
 
diff --git a/src/Output/Php/PhpFile.php b/src/Output/Php/PhpFile.php
index d14eefe..42c1c57 100644
--- a/src/Output/Php/PhpFile.php
+++ b/src/Output/Php/PhpFile.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Output\Php;
 
diff --git a/src/Output/Php/PhpFileCollection.php b/src/Output/Php/PhpFileCollection.php
index 86721ea..60406ec 100644
--- a/src/Output/Php/PhpFileCollection.php
+++ b/src/Output/Php/PhpFileCollection.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Output\Php;
 
diff --git a/src/Output/PhpFilePrinter.php b/src/Output/PhpFilePrinter.php
index 462a957..66e9c30 100644
--- a/src/Output/PhpFilePrinter.php
+++ b/src/Output/PhpFilePrinter.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Output;
 
diff --git a/src/Output/StaticPhpFileCopier.php b/src/Output/StaticPhpFileCopier.php
index 8760486..2d1fd10 100644
--- a/src/Output/StaticPhpFileCopier.php
+++ b/src/Output/StaticPhpFileCopier.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Output;
 
diff --git a/src/Output/TextFilePrinter.php b/src/Output/TextFilePrinter.php
index 1806c0f..395f0cb 100644
--- a/src/Output/TextFilePrinter.php
+++ b/src/Output/TextFilePrinter.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Output;
 
diff --git a/src/Output/WarningFormatter.php b/src/Output/WarningFormatter.php
index 028b033..8e6c795 100644
--- a/src/Output/WarningFormatter.php
+++ b/src/Output/WarningFormatter.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Output;
 
diff --git a/test/suite/functional/ConfigurationBuilder.php b/test/suite/functional/ConfigurationBuilder.php
index 2fc8904..2108c80 100644
--- a/test/suite/functional/ConfigurationBuilder.php
+++ b/test/suite/functional/ConfigurationBuilder.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Test\Functional;
 
diff --git a/test/suite/functional/Generator/Client/SwaggerPetstoreClient.php b/test/suite/functional/Generator/Client/SwaggerPetstoreClient.php
index 5e6618e..f850e89 100644
--- a/test/suite/functional/Generator/Client/SwaggerPetstoreClient.php
+++ b/test/suite/functional/Generator/Client/SwaggerPetstoreClient.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/test/suite/functional/Generator/ClientFactory/ClientFactoryDefault.php b/test/suite/functional/Generator/ClientFactory/ClientFactoryDefault.php
index cf0ef9b..373cb63 100644
--- a/test/suite/functional/Generator/ClientFactory/ClientFactoryDefault.php
+++ b/test/suite/functional/Generator/ClientFactory/ClientFactoryDefault.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/test/suite/functional/Generator/ClientFactoryGeneratorTest.php b/test/suite/functional/Generator/ClientFactoryGeneratorTest.php
index 9250980..03f835b 100644
--- a/test/suite/functional/Generator/ClientFactoryGeneratorTest.php
+++ b/test/suite/functional/Generator/ClientFactoryGeneratorTest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Test\Functional\Generator;
 
diff --git a/test/suite/functional/Generator/ClientGeneratorTest.php b/test/suite/functional/Generator/ClientGeneratorTest.php
index 7941ae4..be4b58d 100644
--- a/test/suite/functional/Generator/ClientGeneratorTest.php
+++ b/test/suite/functional/Generator/ClientGeneratorTest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Test\Functional\Generator;
 
diff --git a/test/suite/functional/Generator/FreeFormSchema/ItemPhp70.php b/test/suite/functional/Generator/FreeFormSchema/ItemPhp70.php
index e496559..99dbbf2 100644
--- a/test/suite/functional/Generator/FreeFormSchema/ItemPhp70.php
+++ b/test/suite/functional/Generator/FreeFormSchema/ItemPhp70.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/test/suite/functional/Generator/FreeFormSchema/ItemPhp72.php b/test/suite/functional/Generator/FreeFormSchema/ItemPhp72.php
index e496559..99dbbf2 100644
--- a/test/suite/functional/Generator/FreeFormSchema/ItemPhp72.php
+++ b/test/suite/functional/Generator/FreeFormSchema/ItemPhp72.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/test/suite/functional/Generator/FreeFormSchema/ItemPhp74.php b/test/suite/functional/Generator/FreeFormSchema/ItemPhp74.php
index 7f3245c..6fa7d44 100644
--- a/test/suite/functional/Generator/FreeFormSchema/ItemPhp74.php
+++ b/test/suite/functional/Generator/FreeFormSchema/ItemPhp74.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/test/suite/functional/Generator/FreeFormSchemaGeneratorTest.php b/test/suite/functional/Generator/FreeFormSchemaGeneratorTest.php
index 294401b..43b67fa 100644
--- a/test/suite/functional/Generator/FreeFormSchemaGeneratorTest.php
+++ b/test/suite/functional/Generator/FreeFormSchemaGeneratorTest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Test\Functional\Generator;
 
diff --git a/test/suite/functional/Generator/Request/GetResourcesRequest.php b/test/suite/functional/Generator/Request/GetResourcesRequest.php
index bf07e61..61abdb0 100644
--- a/test/suite/functional/Generator/Request/GetResourcesRequest.php
+++ b/test/suite/functional/Generator/Request/GetResourcesRequest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/test/suite/functional/Generator/Request/PatchResourceRequest.php b/test/suite/functional/Generator/Request/PatchResourceRequest.php
index 90f6568..f8a454b 100644
--- a/test/suite/functional/Generator/Request/PatchResourceRequest.php
+++ b/test/suite/functional/Generator/Request/PatchResourceRequest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/test/suite/functional/Generator/Request/PutResourceByIdRequest.php b/test/suite/functional/Generator/Request/PutResourceByIdRequest.php
index 3a8f8fb..ed5042f 100644
--- a/test/suite/functional/Generator/Request/PutResourceByIdRequest.php
+++ b/test/suite/functional/Generator/Request/PutResourceByIdRequest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/test/suite/functional/Generator/RequestGeneratorTest.php b/test/suite/functional/Generator/RequestGeneratorTest.php
index 0962b0c..0d1f185 100644
--- a/test/suite/functional/Generator/RequestGeneratorTest.php
+++ b/test/suite/functional/Generator/RequestGeneratorTest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Test\Functional\Generator;
 
diff --git a/test/suite/functional/Generator/RequestMapper/GuzzleRequestMapper.php b/test/suite/functional/Generator/RequestMapper/GuzzleRequestMapper.php
index b157ba8..cf0723a 100644
--- a/test/suite/functional/Generator/RequestMapper/GuzzleRequestMapper.php
+++ b/test/suite/functional/Generator/RequestMapper/GuzzleRequestMapper.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/test/suite/functional/Generator/RequestMapper/NyholmRequestMapper.php b/test/suite/functional/Generator/RequestMapper/NyholmRequestMapper.php
index 28fa46d..a830c73 100644
--- a/test/suite/functional/Generator/RequestMapper/NyholmRequestMapper.php
+++ b/test/suite/functional/Generator/RequestMapper/NyholmRequestMapper.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/test/suite/functional/Generator/RequestMapperGeneratorTest.php b/test/suite/functional/Generator/RequestMapperGeneratorTest.php
index 38eae6b..0d67037 100644
--- a/test/suite/functional/Generator/RequestMapperGeneratorTest.php
+++ b/test/suite/functional/Generator/RequestMapperGeneratorTest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Test\Functional\Generator;
 
diff --git a/test/suite/functional/Generator/Schema/AllOfItem.php b/test/suite/functional/Generator/Schema/AllOfItem.php
index e4cb70c..17943d0 100644
--- a/test/suite/functional/Generator/Schema/AllOfItem.php
+++ b/test/suite/functional/Generator/Schema/AllOfItem.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/test/suite/functional/Generator/Schema/ItemMandatoryObject.php b/test/suite/functional/Generator/Schema/ItemMandatoryObject.php
index 5ac1cba..f1d5cfc 100644
--- a/test/suite/functional/Generator/Schema/ItemMandatoryObject.php
+++ b/test/suite/functional/Generator/Schema/ItemMandatoryObject.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/test/suite/functional/Generator/Schema/ItemPhp70.php b/test/suite/functional/Generator/Schema/ItemPhp70.php
index a4bb5a1..dd2279a 100644
--- a/test/suite/functional/Generator/Schema/ItemPhp70.php
+++ b/test/suite/functional/Generator/Schema/ItemPhp70.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/test/suite/functional/Generator/Schema/ItemPhp72.php b/test/suite/functional/Generator/Schema/ItemPhp72.php
index cd6fb2e..d7842c1 100644
--- a/test/suite/functional/Generator/Schema/ItemPhp72.php
+++ b/test/suite/functional/Generator/Schema/ItemPhp72.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/test/suite/functional/Generator/Schema/ItemPhp74.php b/test/suite/functional/Generator/Schema/ItemPhp74.php
index 7004635..c771b5e 100644
--- a/test/suite/functional/Generator/Schema/ItemPhp74.php
+++ b/test/suite/functional/Generator/Schema/ItemPhp74.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/test/suite/functional/Generator/SchemaCollection/ItemCollectionPhp70.php b/test/suite/functional/Generator/SchemaCollection/ItemCollectionPhp70.php
index 772f6ff..0428c22 100644
--- a/test/suite/functional/Generator/SchemaCollection/ItemCollectionPhp70.php
+++ b/test/suite/functional/Generator/SchemaCollection/ItemCollectionPhp70.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/test/suite/functional/Generator/SchemaCollection/ItemCollectionPhp72.php b/test/suite/functional/Generator/SchemaCollection/ItemCollectionPhp72.php
index 35bd600..e538767 100644
--- a/test/suite/functional/Generator/SchemaCollection/ItemCollectionPhp72.php
+++ b/test/suite/functional/Generator/SchemaCollection/ItemCollectionPhp72.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/test/suite/functional/Generator/SchemaCollection/ItemCollectionPhp74.php b/test/suite/functional/Generator/SchemaCollection/ItemCollectionPhp74.php
index a2f38d2..d8413db 100644
--- a/test/suite/functional/Generator/SchemaCollection/ItemCollectionPhp74.php
+++ b/test/suite/functional/Generator/SchemaCollection/ItemCollectionPhp74.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/test/suite/functional/Generator/SchemaCollectionGeneratorTest.php b/test/suite/functional/Generator/SchemaCollectionGeneratorTest.php
index 124d3f3..7602634 100644
--- a/test/suite/functional/Generator/SchemaCollectionGeneratorTest.php
+++ b/test/suite/functional/Generator/SchemaCollectionGeneratorTest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Test\Functional\Generator;
 
diff --git a/test/suite/functional/Generator/SchemaGeneratorTest.php b/test/suite/functional/Generator/SchemaGeneratorTest.php
index 67c01b1..fbffb08 100644
--- a/test/suite/functional/Generator/SchemaGeneratorTest.php
+++ b/test/suite/functional/Generator/SchemaGeneratorTest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Test\Functional\Generator;
 
diff --git a/test/suite/functional/Generator/SchemaMapper/FreeFormItemMapper.php b/test/suite/functional/Generator/SchemaMapper/FreeFormItemMapper.php
index 5f9fb8a..263296e 100644
--- a/test/suite/functional/Generator/SchemaMapper/FreeFormItemMapper.php
+++ b/test/suite/functional/Generator/SchemaMapper/FreeFormItemMapper.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/test/suite/functional/Generator/SchemaMapper/ItemCollectionMapper.php b/test/suite/functional/Generator/SchemaMapper/ItemCollectionMapper.php
index e7df8e0..0333201 100644
--- a/test/suite/functional/Generator/SchemaMapper/ItemCollectionMapper.php
+++ b/test/suite/functional/Generator/SchemaMapper/ItemCollectionMapper.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/test/suite/functional/Generator/SchemaMapper/ItemMapper.php b/test/suite/functional/Generator/SchemaMapper/ItemMapper.php
index 7b5ca8c..4932924 100644
--- a/test/suite/functional/Generator/SchemaMapper/ItemMapper.php
+++ b/test/suite/functional/Generator/SchemaMapper/ItemMapper.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/test/suite/functional/Generator/SchemaMapper/ResourceMapper.php b/test/suite/functional/Generator/SchemaMapper/ResourceMapper.php
index 7c0461a..d247ce4 100644
--- a/test/suite/functional/Generator/SchemaMapper/ResourceMapper.php
+++ b/test/suite/functional/Generator/SchemaMapper/ResourceMapper.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/test/suite/functional/Generator/SchemaMapperGeneratorTest.php b/test/suite/functional/Generator/SchemaMapperGeneratorTest.php
index bc8bd00..c302dbb 100644
--- a/test/suite/functional/Generator/SchemaMapperGeneratorTest.php
+++ b/test/suite/functional/Generator/SchemaMapperGeneratorTest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Test\Functional\Generator;
 
diff --git a/test/suite/functional/Generator/ServiceProvider/ServiceProviderPhp70.php b/test/suite/functional/Generator/ServiceProvider/ServiceProviderPhp70.php
index 7c5e105..7d9a912 100644
--- a/test/suite/functional/Generator/ServiceProvider/ServiceProviderPhp70.php
+++ b/test/suite/functional/Generator/ServiceProvider/ServiceProviderPhp70.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/test/suite/functional/Generator/ServiceProvider/ServiceProviderPhp72.php b/test/suite/functional/Generator/ServiceProvider/ServiceProviderPhp72.php
index 7c5e105..7d9a912 100644
--- a/test/suite/functional/Generator/ServiceProvider/ServiceProviderPhp72.php
+++ b/test/suite/functional/Generator/ServiceProvider/ServiceProviderPhp72.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file was generated by docler-labs/api-client-generator.
diff --git a/test/suite/functional/Generator/ServiceProviderGeneratorTest.php b/test/suite/functional/Generator/ServiceProviderGeneratorTest.php
index 93c23de..4bbf8ce 100644
--- a/test/suite/functional/Generator/ServiceProviderGeneratorTest.php
+++ b/test/suite/functional/Generator/ServiceProviderGeneratorTest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Test\Functional\Generator;
 
diff --git a/test/suite/functional/Input/FileReaderTest.php b/test/suite/functional/Input/FileReaderTest.php
index 3421c8d..26e192d 100644
--- a/test/suite/functional/Input/FileReaderTest.php
+++ b/test/suite/functional/Input/FileReaderTest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Test\Functional\Input;
 
diff --git a/test/suite/functional/Input/ParserTest.php b/test/suite/functional/Input/ParserTest.php
index e7f69b1..1e239a9 100644
--- a/test/suite/functional/Input/ParserTest.php
+++ b/test/suite/functional/Input/ParserTest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Test\Functional\Input;
 
diff --git a/test/suite/functional/Meta/AbstractTemplateTest.php b/test/suite/functional/Meta/AbstractTemplateTest.php
index 2213827..7d37f5a 100644
--- a/test/suite/functional/Meta/AbstractTemplateTest.php
+++ b/test/suite/functional/Meta/AbstractTemplateTest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Test\Functional\Meta;
 
diff --git a/test/suite/functional/Meta/ComposerJsonTemplateTest.php b/test/suite/functional/Meta/ComposerJsonTemplateTest.php
index 7843bb0..2fda07a 100644
--- a/test/suite/functional/Meta/ComposerJsonTemplateTest.php
+++ b/test/suite/functional/Meta/ComposerJsonTemplateTest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Test\Functional\Meta;
 
diff --git a/test/suite/functional/Meta/ReadmeMdTemplateTest.php b/test/suite/functional/Meta/ReadmeMdTemplateTest.php
index ea64f1f..a5c4e4e 100644
--- a/test/suite/functional/Meta/ReadmeMdTemplateTest.php
+++ b/test/suite/functional/Meta/ReadmeMdTemplateTest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Test\Functional\Meta;
 
diff --git a/test/suite/functional/Naming/SchemaNamingTest.php b/test/suite/functional/Naming/SchemaNamingTest.php
index b7cf7b7..e2673cd 100644
--- a/test/suite/functional/Naming/SchemaNamingTest.php
+++ b/test/suite/functional/Naming/SchemaNamingTest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Test\Functional\Naming;
 
diff --git a/test/suite/unit/Ast/Builder/CodeBuilderTest.php b/test/suite/unit/Ast/Builder/CodeBuilderTest.php
index f0505c1..310bff3 100644
--- a/test/suite/unit/Ast/Builder/CodeBuilderTest.php
+++ b/test/suite/unit/Ast/Builder/CodeBuilderTest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Test\Unit\Ast\Builder;
 
diff --git a/test/suite/unit/Ast/Visitor/NamespaceSubstituteVisitorTest.php b/test/suite/unit/Ast/Visitor/NamespaceSubstituteVisitorTest.php
index 6286db5..237784c 100644
--- a/test/suite/unit/Ast/Visitor/NamespaceSubstituteVisitorTest.php
+++ b/test/suite/unit/Ast/Visitor/NamespaceSubstituteVisitorTest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Test\Unit\Ast\Visitor;
 
diff --git a/test/suite/unit/CodeGeneratorFacadeTest.php b/test/suite/unit/CodeGeneratorFacadeTest.php
index 788750a..29c3fe9 100644
--- a/test/suite/unit/CodeGeneratorFacadeTest.php
+++ b/test/suite/unit/CodeGeneratorFacadeTest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Test\Unit;
 
diff --git a/test/suite/unit/Entity/FieldTypeTest.php b/test/suite/unit/Entity/FieldTypeTest.php
index 0d91a5c..998c042 100644
--- a/test/suite/unit/Entity/FieldTypeTest.php
+++ b/test/suite/unit/Entity/FieldTypeTest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Test\Unit\Entity;
 
diff --git a/test/suite/unit/Entity/OperationTest.php b/test/suite/unit/Entity/OperationTest.php
index 37043b3..b446e33 100644
--- a/test/suite/unit/Entity/OperationTest.php
+++ b/test/suite/unit/Entity/OperationTest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Test\Unit\Entity;
 
diff --git a/test/suite/unit/Input/ConfigurationTest.php b/test/suite/unit/Input/ConfigurationTest.php
index dcf66c9..17425ed 100644
--- a/test/suite/unit/Input/ConfigurationTest.php
+++ b/test/suite/unit/Input/ConfigurationTest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Test\Unit\Input;
 
diff --git a/test/suite/unit/Input/PhpNameValidatorTest.php b/test/suite/unit/Input/PhpNameValidatorTest.php
index daccf70..c63130a 100644
--- a/test/suite/unit/Input/PhpNameValidatorTest.php
+++ b/test/suite/unit/Input/PhpNameValidatorTest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Test\Unit\Input;
 
diff --git a/test/suite/unit/MetaTemplateFacadeTest.php b/test/suite/unit/MetaTemplateFacadeTest.php
index 306e74f..d6ad0d4 100644
--- a/test/suite/unit/MetaTemplateFacadeTest.php
+++ b/test/suite/unit/MetaTemplateFacadeTest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Test\Unit;
 
diff --git a/test/suite/unit/Naming/CaseCasterTest.php b/test/suite/unit/Naming/CaseCasterTest.php
index b472012..cde82b5 100644
--- a/test/suite/unit/Naming/CaseCasterTest.php
+++ b/test/suite/unit/Naming/CaseCasterTest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Test\Unit\Naming;
 
diff --git a/test/suite/unit/Output/Copy/Request/CookieJarTest.php b/test/suite/unit/Output/Copy/Request/CookieJarTest.php
index 59de1e3..ca8c299 100644
--- a/test/suite/unit/Output/Copy/Request/CookieJarTest.php
+++ b/test/suite/unit/Output/Copy/Request/CookieJarTest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Test\Unit\Output\Copy\Request;
 
diff --git a/test/suite/unit/Output/Copy/Serializer/ContentType/VdnApiJsonContentTypeSerializerTest.php b/test/suite/unit/Output/Copy/Serializer/ContentType/VdnApiJsonContentTypeSerializerTest.php
index 96ffc31..544a936 100644
--- a/test/suite/unit/Output/Copy/Serializer/ContentType/VdnApiJsonContentTypeSerializerTest.php
+++ b/test/suite/unit/Output/Copy/Serializer/ContentType/VdnApiJsonContentTypeSerializerTest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Test\Unit\Output\Copy\Serializer\ContentType;
 
diff --git a/test/suite/unit/Output/Meta/MetaFileCollectionTest.php b/test/suite/unit/Output/Meta/MetaFileCollectionTest.php
index fda6a10..ea3b369 100644
--- a/test/suite/unit/Output/Meta/MetaFileCollectionTest.php
+++ b/test/suite/unit/Output/Meta/MetaFileCollectionTest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Test\Unit\Output\Meta;
 
diff --git a/test/suite/unit/Output/Meta/MetaFilePrinterTest.php b/test/suite/unit/Output/Meta/MetaFilePrinterTest.php
index 60f063a..d42d5d3 100644
--- a/test/suite/unit/Output/Meta/MetaFilePrinterTest.php
+++ b/test/suite/unit/Output/Meta/MetaFilePrinterTest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Test\Unit\Output\Meta;
 
diff --git a/test/suite/unit/Output/Php/PhpFileCollectionTest.php b/test/suite/unit/Output/Php/PhpFileCollectionTest.php
index d417ae6..85d173c 100644
--- a/test/suite/unit/Output/Php/PhpFileCollectionTest.php
+++ b/test/suite/unit/Output/Php/PhpFileCollectionTest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Test\Unit\Output\Php;
 
diff --git a/test/suite/unit/Output/Php/PhpFileTest.php b/test/suite/unit/Output/Php/PhpFileTest.php
index acc84b2..cf5c8d4 100644
--- a/test/suite/unit/Output/Php/PhpFileTest.php
+++ b/test/suite/unit/Output/Php/PhpFileTest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Test\Unit\Output\Php;
 
diff --git a/test/suite/unit/Output/Php/PhpPrinterTest.php b/test/suite/unit/Output/Php/PhpPrinterTest.php
index 3801650..0577d18 100644
--- a/test/suite/unit/Output/Php/PhpPrinterTest.php
+++ b/test/suite/unit/Output/Php/PhpPrinterTest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Test\Unit\Output\Php;
 
diff --git a/test/suite/unit/Output/Php/PhpVersionTest.php b/test/suite/unit/Output/Php/PhpVersionTest.php
index fc666c0..a836e48 100644
--- a/test/suite/unit/Output/Php/PhpVersionTest.php
+++ b/test/suite/unit/Output/Php/PhpVersionTest.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DoclerLabs\ApiClientGenerator\Test\Unit\Output\Php;