Improve the parsing of values coming from headers (#1483)

* Replace usage of FILTER_VALIDATE_INT with a cast

* Enable the fixer turning isset ternaries into null coalescing

Author: stof

src/Generator/ClientGenerator.php

@@ -98,8 +98,8 @@ public function getVersion() {
                 return false;
             }
 
-            $configRegion = isset($config['signRegion']) ? $config['signRegion'] : $region;
-            $defaultConfigRegion = isset($defaultConfig['signRegion']) ? $defaultConfig['signRegion'] : $region;
+            $configRegion = $config['signRegion'] ?? $region;
+            $defaultConfigRegion = $defaultConfig['signRegion'] ?? $region;
             if ($configRegion !== $defaultConfigRegion) {
                 return false;
             }

src/Generator/CodeGenerator/PopulatorGenerator.php

@@ -182,26 +182,40 @@ private function generatePopulator(Operation $operation, StructureShape $shape,
             $locationName = strtolower($member->getLocationName() ?? $member->getName());
             $propertyName = GeneratorHelper::normalizeName($member->getName());
             $memberShape = $member->getShape();
-            if ('timestamp' === $memberShape->getType()) {
-                $body .= strtr('$this->PROPERTY_NAME = isset($headers["LOCATION_NAME"][0]) ? new \DateTimeImmutable($headers["LOCATION_NAME"][0]) : null;' . "\n", [
-                    'PROPERTY_NAME' => $propertyName,
-                    'LOCATION_NAME' => $locationName,
-                ]);
-            } else {
-                if (null !== $constant = $this->typeGenerator->getFilterConstant($memberShape)) {
+            switch ($memberShape->getType()) {
+                case 'timestamp':
+                    $body .= strtr('$this->PROPERTY_NAME = isset($headers["LOCATION_NAME"][0]) ? new \DateTimeImmutable($headers["LOCATION_NAME"][0]) : null;' . "\n", [
+                        'PROPERTY_NAME' => $propertyName,
+                        'LOCATION_NAME' => $locationName,
+                    ]);
+
+                    break;
+                case 'integer':
+                case 'long':
+                    $body .= strtr('$this->PROPERTY_NAME = isset($headers["LOCATION_NAME"][0]) ? (int) $headers["LOCATION_NAME"][0] : null;' . "\n", [
+                        'PROPERTY_NAME' => $propertyName,
+                        'LOCATION_NAME' => $locationName,
+                    ]);
+
+                    break;
+                case 'boolean':
                     $this->requirementsRegistry->addRequirement('ext-filter');
 
-                    $body .= strtr('$this->PROPERTY_NAME = isset($headers["LOCATION_NAME"][0]) ? filter_var($headers["LOCATION_NAME"][0], FILTER) : null;' . "\n", [
+                    $body .= strtr('$this->PROPERTY_NAME = isset($headers["LOCATION_NAME"][0]) ? filter_var($headers["LOCATION_NAME"][0], FILTER_VALIDATE_BOOLEAN) : null;' . "\n", [
                         'PROPERTY_NAME' => $propertyName,
                         'LOCATION_NAME' => $locationName,
-                        'FILTER' => $constant,
                     ]);
-                } else {
+
+                    break;
+                case 'string':
                     $body .= strtr('$this->PROPERTY_NAME = $headers["LOCATION_NAME"][0] ?? null;' . "\n", [
                         'PROPERTY_NAME' => $propertyName,
                         'LOCATION_NAME' => $locationName,
                     ]);
-                }
+
+                    break;
+                default:
+                    throw new \RuntimeException(sprintf('Type %s is not yet implemented', $memberShape->getType()));
             }
         }
 

src/Generator/CodeGenerator/TypeGenerator.php

@@ -169,20 +169,6 @@ public function getPhpType(Shape $shape): array
         return [$type, $doc, $memberClassNames];
     }
 
-    public function getFilterConstant(Shape $shape): ?string
-    {
-        switch ($shape->getType()) {
-            case 'integer':
-            case 'long':
-                return 'FILTER_VALIDATE_INT';
-            case 'boolean':
-                return 'FILTER_VALIDATE_BOOLEAN';
-            case 'string':
-            default:
-                return null;
-        }
-    }
-
     private function getNativePhpType(string $parameterType): string
     {
         switch ($parameterType) {