Keep camelCaseVariableNames

rename int to integer

Author: wol-soft

src/Model/Property/Property.php

@@ -209,6 +209,14 @@ public function getExceptionClasses(): array
      */
     protected function processAttributeName(string $name): string
     {
+        $name = preg_replace_callback(
+            '/([a-z])([A-Z])/',
+            function ($matches) {
+                return "{$matches[1]}-{$matches[2]}";
+            },
+            $name
+        );
+
         $elements = array_map(
             function ($element) {
                 return ucfirst(strtolower($element));

src/PropertyProcessor/Property/IntProcessor.php renamed to src/PropertyProcessor/Property/IntegerProcessor.php

@@ -9,7 +9,7 @@
  *
  * @package PHPModelGenerator\PropertyProcessor\Property
  */
-class IntProcessor extends AbstractNumericProcessor
+class IntegerProcessor extends AbstractNumericProcessor
 {
     protected const TYPE = 'int';
 }

tests/Objects/ArrayPropertyTest.php

@@ -223,13 +223,13 @@ public function validTypedArrayDataProvider(): array
             'Empty array' => ['string', []],
             'String array' => ['string', ['a', 'b']],
             'String array with null' => ['string', ['a', 'b', null]],
-            'Int array' => ['int', [1, 2, 3]],
-            'Int array with null' => ['int', [1, 2, 3, null]],
+            'Int array' => ['integer', [1, 2, 3]],
+            'Int array with null' => ['integer', [1, 2, 3, null]],
             // Number array will cast int to float
             'Number array' => ['number', [1, 1.1, 4.5, 6], [1.0, 1.1, 4.5, 6.0]],
             'Boolean array' => ['boolean', [true, false, true]],
             'Null array' => ['null', [null, null]],
-            'Nested array' => ['array","items":{"type":"int"},"injection":"yes we can', [[1, 2], [], [3], null]]
+            'Nested array' => ['array","items":{"type":"integer"},"injection":"yes we can', [[1, 2], [], [3], null]]
         ];
     }
 
@@ -253,14 +253,17 @@ public function invalidTypedArrayDataProvider(): array
     {
         return [
             'String array containing int' => ['string', ['a', 'b', 1]],
-            'Int array containing string' => ['int', [1, 2, 3, '4']],
-            'Int array containing float' => ['int', [1, 2, 3, 2.5]],
+            'Int array containing string' => ['integer', [1, 2, 3, '4']],
+            'Int array containing float' => ['integer', [1, 2, 3, 2.5]],
             'Number array containing array' => ['number', [1, 1.1, 4.5, 6, []]],
             'Boolean array containing int' => ['boolean', [true, false, true, 3]],
             'Null array containing string' => ['null', [null, null, 'null']],
-            'Nested array containing int' => ['array","items":{"type":"int"},"injection":"yes we can', [[1, 2], [], 3]],
+            'Nested array containing int' => [
+                'array","items":{"type":"integer"},"injection":"yes we can',
+                [[1, 2], [], 3]
+            ],
             'Nested array inner array containing string' => [
-                'array","items":{"type":"int"},"injection":"yes we can',
+                'array","items":{"type":"integer"},"injection":"yes we can',
                 [[1, '2'], [], [3]]
             ]
         ];

tests/Objects/IntPropertyTest.php renamed to tests/Objects/IntegerPropertyTest.php

@@ -13,7 +13,7 @@
  *
  * @package PHPModelGenerator\Tests\Objects
  */
-class IntPropertyTest extends AbstractNumericPropertyTest
+class IntegerPropertyTest extends AbstractNumericPropertyTest
 {
     /**
      * @throws FileSystemException
@@ -22,7 +22,7 @@ class IntPropertyTest extends AbstractNumericPropertyTest
      */
     public function testNotProvidedOptionalIntPropertyIsValid(): void
     {
-        $className = $this->generateObjectFromFile('IntProperty.json');
+        $className = $this->generateObjectFromFile('IntegerProperty.json');
 
         $object = new $className([]);
         $this->assertNull($object->getProperty());
@@ -39,7 +39,7 @@ public function testNotProvidedOptionalIntPropertyIsValid(): void
      */
     public function testProvidedIntPropertyIsValid(?int $input): void
     {
-        $className = $this->generateObjectFromFile('IntProperty.json');
+        $className = $this->generateObjectFromFile('IntegerProperty.json');
 
         $object = new $className(['property' => $input]);
         $this->assertSame($input, $object->getProperty());
@@ -69,7 +69,7 @@ public function testInvalidPropertyTypeThrowsAnException($propertyValue): void
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('invalid type for property');
 
-        $className = $this->generateObjectFromFile('IntProperty.json');
+        $className = $this->generateObjectFromFile('IntegerProperty.json');
 
         new $className(['property' => $propertyValue]);
     }
@@ -87,7 +87,7 @@ public function invalidPropertyTypeDataProvider(): array
 
     protected function getMultipleOfFile(): string
     {
-        return 'IntPropertyMultipleOf.json';
+        return 'IntegerPropertyMultipleOf.json';
     }
 
     public function validMultipleOfDataProvider(): iterable
@@ -116,7 +116,7 @@ public function invalidMultipleOfDataProvider(): iterable
 
     protected function getRangeFile(): string
     {
-        return 'IntPropertyRange.json';
+        return 'IntegerPropertyRange.json';
     }
 
     public function validRangeDataProvider(): iterable

tests/PropertyProcessor/PropertyProcessorFactoryTest.php

@@ -7,7 +7,7 @@
 use PHPModelGenerator\Model\Schema;
 use PHPModelGenerator\PropertyProcessor\Property\ArrayProcessor;
 use PHPModelGenerator\PropertyProcessor\Property\BooleanProcessor;
-use PHPModelGenerator\PropertyProcessor\Property\IntProcessor;
+use PHPModelGenerator\PropertyProcessor\Property\IntegerProcessor;
 use PHPModelGenerator\PropertyProcessor\Property\NullProcessor;
 use PHPModelGenerator\PropertyProcessor\Property\NumberProcessor;
 use PHPModelGenerator\PropertyProcessor\Property\ObjectProcessor;
@@ -56,7 +56,7 @@ public function validPropertyProvider(): array
         return [
             'array' => ['array', ArrayProcessor::class],
             'boolean' => ['boolean', BooleanProcessor::class],
-            'int' => ['int', IntProcessor::class],
+            'integer' => ['integer', IntegerProcessor::class],
             'null' => ['null', NullProcessor::class],
             'number' => ['number', NumberProcessor::class],
             'object' => ['object', ObjectProcessor::class],

tests/Schema/AdditionalPropertiesTest/AdditionalProperties.json

@@ -5,7 +5,7 @@
       "type": "string"
     },
     "age": {
-      "type": "int"
+      "type": "integer"
     }
   },
   "additionalProperties": %s

tests/Schema/AdditionalPropertiesTest/AdditionalPropertiesNotDefined.json

@@ -5,7 +5,7 @@
       "type": "string"
     },
     "age": {
-      "type": "int"
+      "type": "integer"
     }
   }
 }

tests/Schema/BasicSchemaGenerationTest/RecursiveTest/SubFolder/SubSchema.json

@@ -3,7 +3,7 @@
   "id": "SubClass",
   "properties": {
     "property": {
-      "type": "int"
+      "type": "integer"
     }
   }
 }

tests/Schema/ComposedNotTest/ReferencedObjectSchema.json

@@ -8,7 +8,7 @@
           "minLength": 2
         },
         "age": {
-          "type": "int"
+          "type": "integer"
         }
       },
       "required": [

tests/Schema/IntPropertyTest/IntProperty.json renamed to tests/Schema/IntegerPropertyTest/IntegerProperty.json

@@ -2,7 +2,7 @@
   "type": "object",
   "properties": {
     "property": {
-      "type": "int"
+      "type": "integer"
     }
   }
 }