better array keys type detection

juliangut · Nov 9, 2018 · 308854e · 308854e
1 parent de57d5e
commit 308854e
Showing 1 changed file with 8 additions and 18 deletions.
diff --git a/src/Mapping/Driver/MappingTrait.php b/src/Mapping/Driver/MappingTrait.php
@@ -97,7 +97,7 @@ protected function getGroupMetadata(array $mapping, GroupMetadata $parentGroup =
      *
      * @return RouteMetadata
      */
-    protected function getRouteMetadata($mapping, GroupMetadata $group = null): RouteMetadata
+    protected function getRouteMetadata(array $mapping, GroupMetadata $group = null): RouteMetadata
     {
         $route = (new RouteMetadata())
             ->setMethods($this->getMethods($mapping))
@@ -232,7 +232,7 @@ protected function isXmlHttpRequest(array $mapping): bool
      */
     protected function getPriority(array $mapping): int
     {
-        return \array_key_exists('priority', $mapping) ? (int) $mapping['priority'] : 0;
+        return (int) ($mapping['priority'] ?? 0);
     }
 
     /**
@@ -266,14 +266,9 @@ protected function getParameters(array $mapping): array
 
         $parameters = $mapping['parameters'];
 
-        \array_map(
-            function ($key) {
-                if (!\is_string($key)) {
-                    throw new DriverException('Parameters keys must be all strings');
-                }
-            },
-            \array_keys($parameters)
-        );
+        if ($parameters !== [] && \array_keys($parameters) === \range(0, \count($parameters) - 1)) {
+            throw new DriverException('Parameters keys must be all strings');
+        }
 
         return $parameters;
     }
@@ -295,14 +290,9 @@ protected function getPlaceholders(array $mapping): array
 
         $placeholders = $mapping['placeholders'];
 
-        \array_map(
-            function ($key) {
-                if (!\is_string($key)) {
-                    throw new DriverException('Placeholder keys must be all strings');
-                }
-            },
-            \array_keys($placeholders)
-        );
+        if ($placeholders !== [] && \array_keys($placeholders) === \range(0, \count($placeholders) - 1)) {
+            throw new DriverException('Placeholder keys must be all strings');
+        }
 
         return $placeholders;
     }