Explorar el Código

Merge remote-tracking branch 'origin/master'

shalvah hace 4 años
padre
commit
6c9c716c95
Se han modificado 3 ficheros con 7 adiciones y 3 borrados
  1. 4 0
      CHANGELOG.md
  2. 1 1
      src/Writing/OpenAPISpecWriter.php
  3. 2 2
      src/Writing/Writer.php

+ 4 - 0
CHANGELOG.md

@@ -12,6 +12,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ### Removed
 
+## 1.4.1 (Monday, 24 August, 2020)
+### Fixed
+- Set proper defaults for Postman overrides, handle empt array examples in OAS (https://github.com/knuckleswtf/scribe/pull/77)
+
 ## 1.4.0 (Sunday, 23 August, 2020)
 ### Added
 - Support for resourceKey in Transformers(https://github.com/knuckleswtf/scribe/pull/73)

+ 1 - 1
src/Writing/OpenAPISpecWriter.php

@@ -360,7 +360,7 @@ class OpenAPISpecWriter
                     if (isset($endpoint['responseFields'][$key]['description'])) {
                         $spec['description'] = $endpoint['responseFields'][$key]['description'];
                     }
-                    if ($spec['type'] === 'array') {
+                    if ($spec['type'] === 'array' && !empty($value)) {
                         $spec['items']['type'] = $this->convertScribeOrPHPTypeToOpenAPIType(gettype($value[0]));
                     }
 

+ 2 - 2
src/Writing/Writer.php

@@ -219,7 +219,7 @@ class Writer
         );
 
         $collection = $writer->generatePostmanCollection();
-        $overrides = $this->config->get('postman.overrides');
+        $overrides = $this->config->get('postman.overrides', []);
         if (count($overrides)) {
             foreach ($overrides as $key => $value) {
                 data_set($collection, $key, $value);
@@ -237,7 +237,7 @@ class Writer
         );
 
         $spec = $writer->generateSpecContent($groupedEndpoints);
-        $overrides = $this->config->get('openapi.overrides');
+        $overrides = $this->config->get('openapi.overrides', []);
         if (count($overrides)) {
             foreach ($overrides as $key => $value) {
                 data_set($spec, $key, $value);