Performance improvements (#12)

Don't use call_user_func_array. Instead call functions directly

Author: wol-soft

composer.json

@@ -12,8 +12,8 @@
     ],
     "require": {
         "symplify/easy-coding-standard": "^7.2.3",
-        "wol-soft/php-json-schema-model-generator-production": "^0.12.0",
-        "wol-soft/php-micro-template": "^1.3.1",
+        "wol-soft/php-json-schema-model-generator-production": "^0.12.1",
+        "wol-soft/php-micro-template": "^1.3.2",
 
         "php": ">=7.2",
         "ext-json": "*",

docs/source/gettingStarted.rst

@@ -6,7 +6,7 @@ Installation
 
 The recommended way to install php-json-model-generator is through `Composer <http://getcomposer.org>`_:
 
-.. code-block:: rconsole
+.. code-block:: console
 
     composer require --dev wol-soft/php-json-schema-model-generator
     composer require wol-soft/php-json-schema-model-generator-production

src/PropertyProcessor/ComposedValue/AbstractComposedValueProcessor.php

@@ -43,16 +43,16 @@ protected function generateValidators(PropertyInterface $property, array $proper
             // @codeCoverageIgnoreEnd
         }
 
-        $properties = $this->getCompositionProperties($property, $propertyData);
-        $availableAmount = count($properties);
+        $compositionProperties = $this->getCompositionProperties($property, $propertyData);
+        $availableAmount = count($compositionProperties);
 
         $property->addValidator(
             new ComposedPropertyValidator(
                 $property,
-                $properties,
+                $compositionProperties,
                 static::class,
                 [
-                    'properties' => $properties,
+                    'properties' => $compositionProperties,
                     'generatorConfiguration' => $this->schemaProcessor->getGeneratorConfiguration(),
                     'viewHelper' => new RenderHelper($this->schemaProcessor->getGeneratorConfiguration()),
                     'availableAmount' => $availableAmount,
@@ -63,7 +63,7 @@ protected function generateValidators(PropertyInterface $property, array $proper
                     'postPropose' => $this instanceof ComposedPropertiesInterface,
                     'mergedProperty' =>
                         $this instanceof MergedComposedPropertiesInterface
-                            ? $this->createMergedProperty($property, $properties, $propertyData)
+                            ? $this->createMergedProperty($property, $compositionProperties, $propertyData)
                             : null,
                     'onlyForDefinedValues' =>
                         $propertyData['onlyForDefinedValues'] && $this instanceof ComposedPropertiesInterface,
@@ -86,7 +86,7 @@ protected function generateValidators(PropertyInterface $property, array $proper
     protected function getCompositionProperties(PropertyInterface $property, array $propertyData): array
     {
         $propertyFactory = new PropertyFactory(new PropertyProcessorFactory());
-        $properties = [];
+        $compositionProperties = [];
 
         foreach ($propertyData['propertyData'][$propertyData['type']] as $compositionElement) {
             $compositionProperty = new CompositionPropertyDecorator(
@@ -113,36 +113,39 @@ protected function getCompositionProperties(PropertyInterface $property, array $
                 $property->addTypeHintDecorator(new CompositionTypeHintDecorator($compositionProperty));
             }
 
-            $properties[] = $compositionProperty;
+            $compositionProperties[] = $compositionProperty;
         }
 
-        return $properties;
+        return $compositionProperties;
     }
 
     /**
      * TODO: no nested properties --> cancel, only one --> use original model
      *
      * Gather all nested object properties and merge them together into a single merged property
      *
-     * @param PropertyInterface              $compositionProperty
+     * @param PropertyInterface              $property
      * @param CompositionPropertyDecorator[] $properties
      * @param array                          $propertyData
      *
-     * @return PropertyInterface
+     * @return PropertyInterface|null
      *
      * @throws SchemaException
      */
     private function createMergedProperty(
-        PropertyInterface $compositionProperty,
+        PropertyInterface $property,
         array $properties,
         array $propertyData
-    ): PropertyInterface {
-        $mergedClassName = $this->schemaProcessor->getGeneratorConfiguration()->getClassNameGenerator()->getClassName(
-            $compositionProperty->getName(),
-            $propertyData['propertyData'],
-            true,
-            $this->schemaProcessor->getCurrentClassName()
-        );
+    ): ?PropertyInterface {
+        $mergedClassName = $this->schemaProcessor
+            ->getGeneratorConfiguration()
+            ->getClassNameGenerator()
+            ->getClassName(
+                $property->getName(),
+                $propertyData['propertyData'],
+                true,
+                $this->schemaProcessor->getCurrentClassName()
+            );
 
         // check if the merged property already has been generated
         if (isset(self::$generatedMergedProperties[$mergedClassName])) {
@@ -161,7 +164,7 @@ private function createMergedProperty(
             $mergedPropertySchema
         );
 
-        $compositionProperty->addTypeHintDecorator(new CompositionTypeHintDecorator($mergedProperty));
+        $property->addTypeHintDecorator(new CompositionTypeHintDecorator($mergedProperty));
 
         return $mergedProperty
             ->addDecorator(

src/Templates/Serializer/TransformingFilterSerializer.phptpl

@@ -3,8 +3,5 @@
  */
 protected function serialize{{ viewHelper.ucfirst(property) }}()
 {
-    return call_user_func_array(
-        [\{{ serializerClass }}::class, "{{ serializerMethod }}"],
-        [$this->{{ property }}, {{ serializerOptions }}]
-    );
+    return \{{ serializerClass }}::{{ serializerMethod }}($this->{{ property }}, {{ serializerOptions }});
 }

src/Templates/Validator/Filter.phptpl

@@ -4,7 +4,7 @@
     (function (&$value) use (&$transformationFailed): bool {
         // make sure exceptions from the filter are caught and added to the error handling
         try {
-            $value = call_user_func_array([\{{ filterClass }}::class, "{{ filterMethod }}"], [$value, {{ filterOptions }}]);
+            $value = \{{ filterClass }}::{{ filterMethod }}($value, {{ filterOptions }});
         } catch (\Exception $filterException) {
             {% if isTransformingFilter %}
                 $transformationFailed = true;