Add fail on notices and fix a notice generation

marcelthole · Aug 6, 2024 · eb83a42 · eb83a42
1 parent 029e754
commit eb83a42
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 4 deletions.
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,5 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd" bootstrap="./tests/bootstrap.php" colors="true" defaultTimeLimit="5" executionOrder="random" enforceTimeLimit="true" cacheDirectory=".phpunit.cache" requireCoverageMetadata="true" beStrictAboutCoverageMetadata="true">
+<phpunit
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+    bootstrap="./tests/bootstrap.php"
+    colors="true"
+    defaultTimeLimit="5"
+    executionOrder="random"
+    enforceTimeLimit="true"
+    cacheDirectory=".phpunit.cache"
+    requireCoverageMetadata="true"
+    beStrictAboutCoverageMetadata="true"
+    failOnNotice="true"
+    displayDetailsOnTestsThatTriggerNotices="true"
+    failOnDeprecation="true"
+    displayDetailsOnTestsThatTriggerDeprecations="true"
+    failOnWarning="true"
+    displayDetailsOnTestsThatTriggerWarnings="true"
+    beStrictAboutOutputDuringTests="true"
+    displayDetailsOnTestsThatTriggerErrors="true"
+>
   <php>
     <ini name="assert.exception" value="1"/>
   </php>

diff --git a/src/Merge/ReferenceNormalizer.php b/src/Merge/ReferenceNormalizer.php
@@ -149,16 +149,18 @@ public function normalizeInlineReferences(
 
                 /** @var array<string, Response> $allSchemas */
                 $allSchemas = $openApiDefinition->components->responses;
+                $allContents = $allSchemas[$key]->content;
                 foreach ($response->content as $contentKey => $content) {
                     if (! $content->schema instanceof Schema) {
                         continue;
                     }
 
-                    $allSchemas[$key]->content[$contentKey]->schema = $this->normalizeProperties(
+                    $allContents[$contentKey]->schema = $this->normalizeProperties(
                         $content->schema,
                         $refFileCollection,
                     );
                 }
+                $allSchemas[$key]->content = $allContents;
 
                 $openApiDefinition->components->responses = $allSchemas;
             }

diff --git a/tests/Merge/Fixtures/expected/openapi-normalized.json b/tests/Merge/Fixtures/expected/openapi-normalized.json
@@ -158,7 +158,27 @@
     "components": {
         "responses": {
             "reference-101": {
-                "description": "OK"
+                "description": "OK",
+                "content": {
+                    "text\/json": {
+                        "schema": {
+                            "properties": {
+                                "dummyJSON": {
+                                    "$ref": "#\/components\/schemas\/requestBody"
+                                }
+                            }
+                        }
+                    },
+                    "application\/json": {
+                        "schema": {
+                            "properties": {
+                                "dummyApplicationJSON": {
+                                    "$ref": "#\/components\/schemas\/requestBody"
+                                }
+                            }
+                        }
+                    }
+                }
             }
         }
     }

diff --git a/tests/Merge/Fixtures/openapi-with-reference.json b/tests/Merge/Fixtures/openapi-with-reference.json
@@ -161,7 +161,28 @@
     "components": {
         "responses": {
             "reference-101": {
-                "description": "OK"
+                "description": "OK",
+                "content": {
+                    "text/json": {
+                        "schema": {
+                            "properties": {
+                                "dummyJSON": {
+                                    "$ref": "./requestBody.json#/components/schemas/requestBody"
+                                }
+                            }
+                        }
+                    },
+                    "application/json": {
+                        "schema": {
+                            "properties": {
+
+                                "dummyApplicationJSON": {
+                                    "$ref": "./requestBody.json#/components/schemas/requestBody"
+                                }
+                            }
+                        }
+                    }
+                }
             }
         }
     }