Fixes for PHP 7.3, also some code style fixes (#69)

Author: bbatsche

composer.json

@@ -9,7 +9,7 @@
         "ralouphie/mimey": "^2.0",
         "symfony/yaml": "^2.3||^3.3",
         "zendframework/zend-http": "^2.6",
-        "zendframework/zend-stdlib": "^2.7"
+        "zendframework/zend-stdlib": "^2.7 || ^3.2"
     },
     "require-dev": {
         "bebat/verify": "^2.0",

src/AbstractKeyValueStore.php

@@ -50,7 +50,7 @@ public function get($lookup)
         $value = $this->data;
 
         foreach (explode('.', (string) $lookup) as $segment) {
-            if (\is_array($value) && array_key_exists($segment, $value)) {
+            if (\is_array($value) && \array_key_exists($segment, $value)) {
                 $value = $value[$segment];
             } else {
                 return;
@@ -71,7 +71,7 @@ public function getExistingParentLookup(string $lookup): string
 
         foreach (explode('.', $lookup) as $segment) {
             if (\is_array($subArray)) {
-                if (array_key_exists($segment, $subArray)) {
+                if (\array_key_exists($segment, $subArray)) {
                     $subArray         = $subArray[$segment];
                     $parentSegments[] = $segment;
                 } else {
@@ -103,7 +103,7 @@ public function has($lookup): bool
         $subArray = $this->data;
 
         foreach (explode('.', (string) $lookup) as $segment) {
-            if (\is_array($subArray) && array_key_exists($segment, $subArray)) {
+            if (\is_array($subArray) && \array_key_exists($segment, $subArray)) {
                 $subArray = $subArray[$segment];
             } else {
                 return false;
@@ -183,7 +183,7 @@ public function set(string $lookup, $value): void
         }
 
         $key = array_shift($segments);
-        if (array_key_exists($key, $data)) {
+        if (\array_key_exists($key, $data)) {
             // $value should be appended w/o modifying any of the existing values in $data
             if (\is_array($data[$key]) && \is_array($value)) {
                 $data[$key] = $data[$key] + $value;

src/ResolverFactory.php

@@ -72,8 +72,8 @@ public static function get($definition): ?Resolver\ResolverInterface
      */
     private static function build(string $resolverType): Resolver\ResolverInterface
     {
-        if (!array_key_exists($resolverType, self::$resolvers)) {
-            if (!array_key_exists($resolverType, self::$resolverClasses)) {
+        if (!\array_key_exists($resolverType, self::$resolvers)) {
+            if (!\array_key_exists($resolverType, self::$resolverClasses)) {
                 throw new \RuntimeException('No resolver class defined for resolver ' . $resolverType);
             }
 

src/Template/TemplateFactory.php

@@ -30,7 +30,7 @@ public static function get(string $basePath, ?string $engine): TemplateInterface
     {
         // default to mustache if null passed
         $engine = $engine ?? self::TEMPLATE_MUSTACHE;
-        if (array_key_exists($engine, self::$templateClasses)) {
+        if (\array_key_exists($engine, self::$templateClasses)) {
             $engine = new self::$templateClasses[$engine]($basePath);
             if ($engine instanceof TemplateInterface) {
                 return $engine;

test/Resolver/DirectoryTest.php

@@ -108,7 +108,7 @@ public function testResolve(): void
      */
     public function testResolve404(string $directory, string $filename): void
     {
-        $definition = new Definition(compact($directory));
+        $definition = new Definition(compact('directory'));
 
         $this->mockIterator->shouldReceive('get')
             ->with('request.url.pathname')