refactor

Author: Jeremiah VALERIE

src/Generator/AbstractTypeGenerator.php

@@ -151,14 +151,17 @@ protected function varExport($var, $default = null, array $compilerNames = [])
                 // handle multi-line strings
                 $lines = explode("\n", $string);
                 if (count($lines) > 1) {
-                    $firstLine = array_shift($lines) . "'" . ' . "\n"';
-                    $lastLine = "'" . array_pop($lines);
-                    $lines = array_map(function ($s) {
-                        return "'" . $s . "'" . ' . "\n"';
-                    }, $lines);
+                    $firstLine = sprintf('%s\' . "\n"', array_shift($lines));
+                    $lastLine = sprintf("'%s", array_pop($lines));
+                    $lines = array_map(
+                        function ($line) {
+                            return sprintf('\'%s\' . "\n"', $line);
+                        },
+                        $lines
+                    );
                     array_unshift($lines, $firstLine);
                     array_push($lines, $lastLine);
-                    $string = implode(" . ", $lines);
+                    $string = implode(' . ', $lines);
                 }
 
                 return $string;

src/Generator/TypeGenerator.php

@@ -55,12 +55,12 @@ protected function generateDeprecationReason(array $value)
 
     protected function generateDefaultValue(array $value)
     {
-        if (!array_key_exists('defaultValue', $value)) {
+        $key = 'defaultValue';
+        if (!array_key_exists($key, $value)) {
             return '';
         }
-        $defaultValue = $this->varExportFromArrayValue($value, 'defaultValue');
 
-        return "\n".'<spaces>\'defaultValue\' => '.$defaultValue.',';
+        return sprintf("\n<spaces>'%s' => %s,", $key, $this->varExportFromArrayValue($value, $key));
     }
 
     protected function generateType(array $value)