Merge pull request #53 from php-api-clients/ensure-webhooks-have-names-not-numbers

Ensure webhooks haves names not numbers

Author: WyriHaximus

composer.lock

@@ -86,22 +86,22 @@ public function __construct(array $data)
                         } else {
                             // array
                             $this->_properties[$property] = [];
-                            foreach ($data[$property] as $item) {
+                            foreach ($data[$property] as $key => $item) {
                                 if ($type[0] === Type::STRING) {
                                     if (!is_string($item)) {
                                         $this->_errors[] = "property '$property' must be array of strings, but array has " . gettype($item) . " element.";
                                     }
-                                    $this->_properties[$property][] = $item;
+                                    $this->_properties[$property][$key] = $item;
                                 } elseif (Type::isScalar($type[0])) {
-                                    $this->_properties[$property][] = $item;
+                                    $this->_properties[$property][$key] = $item;
                                 } elseif ($type[0] === Type::ANY) {
                                     if (is_array($item) && isset($item['$ref'])) {
-                                        $this->_properties[$property][] = new Reference($item, null);
+                                        $this->_properties[$property][$key] = new Reference($item, null);
                                     } else {
-                                        $this->_properties[$property][] = $item;
+                                        $this->_properties[$property][$key] = $item;
                                     }
                                 } else {
-                                    $this->_properties[$property][] = $this->instantiate($type[0], $item);
+                                    $this->_properties[$property][$key] = $this->instantiate($type[0], $item);
                                 }
                             }
                         }
@@ -190,15 +190,23 @@ public function getSerializableData()
             if ($v instanceof SpecObjectInterface) {
                 $data[$k] = $v->getSerializableData();
             } elseif (is_array($v)) {
+                // test if php arrays should be represented as object in YAML/JSON
                 $toObject = false;
-                $j = 0;
-                foreach ($v as $i => $d) {
-                    if ($j++ !== $i) {
-                        $toObject = true;
-                    }
-                    if ($d instanceof SpecObjectInterface) {
-                        $data[$k][$i] = $d->getSerializableData();
+                if (!empty($v)) {
+                    // case 1: non-empty array should be an object if it does not contain
+                    // consecutive numeric keys
+                    $j = 0;
+                    foreach ($v as $i => $d) {
+                        if ($j++ !== $i) {
+                            $toObject = true;
+                        }
+                        if ($d instanceof SpecObjectInterface) {
+                            $data[$k][$i] = $d->getSerializableData();
+                        }
                     }
+                } elseif (isset($this->attributes()[$k]) && is_array($this->attributes()[$k]) && 2 === count($this->attributes()[$k])) {
+                    // case 2: Attribute type is an object (specified in attributes() by an array which specifies two items (key and value type)
+                    $toObject = true;
                 }
                 if ($toObject) {
                     $data[$k] = (object) $data[$k];
@@ -297,11 +305,25 @@ protected function addError(string $error, $class = '')
         $this->_errors[] = end($shortName).$error;
     }
 
+    /**
+     * @param string $name property name.
+     * @return bool true when this object has a property with a non-null value or the property is defined in the OpenAPI spec.
+     * @deprecated since 1.6.0, will be removed in 2.0.0
+     */
     protected function hasProperty(string $name): bool
     {
         return isset($this->_properties[$name]) || isset($this->attributes()[$name]);
     }
 
+    /**
+     * @param string $name property name.
+     * @return bool true, when a property has a non-null value (does not check for default values)
+     */
+    protected function hasPropertyValue(string $name): bool
+    {
+        return isset($this->_properties[$name]);
+    }
+
     protected function requireProperties(array $names, array $atLeastOne = [])
     {
         foreach ($names as $name) {

external_files/cebe/SpecBaseObject.php

@@ -117,7 +117,7 @@ private function all(string $namespace): iterable
         if (count($this->spec->webhooks ?? []) > 0) {
             $pathClassNameMapping = [];
             foreach ($this->spec->webhooks as $path => $pathItem) {
-                $webHookClassName = 'WebHook_' . $this->className($path);
+                $webHookClassName = $this->className($path);
                 $pathClassNameMapping[$path] = $this->fqcn($namespace . 'WebHook/' . $webHookClassName);
                 if (strlen($webHookClassName) === 0) {
                     continue;