Fix bug in OAS3

mevdschee · mevdschee · commit d9fb0cf6b4c5 · 2019-08-21T16:29:13.000+02:00
diff --git a/api.php b/api.php
@@ -8259,13 +8259,13 @@ private function setPath(string $tableName) /*: void*/
                     $this->openapi->set("paths|$path|$method|parameters|$p|\$ref", "#/components/parameters/$parameter");
                 }
                 if (in_array($operation, ['create', 'update', 'increment'])) {
-                    $this->openapi->set("paths|$path|$method|requestBody|\$ref", "#/components/requestBodies/$operation-" . urlencode($tableName));
+                    $this->openapi->set("paths|$path|$method|requestBody|\$ref", "#/components/requestBodies/$operation-" . rawurlencode($tableName));
                 }
                 $this->openapi->set("paths|$path|$method|tags|0", "$tableName");
                 $this->openapi->set("paths|$path|$method|description", "$operation $tableName");
                 switch ($operation) {
                     case 'list':
-                        $this->openapi->set("paths|$path|$method|responses|200|\$ref", "#/components/responses/$operation-" . urlencode($tableName));
+                        $this->openapi->set("paths|$path|$method|responses|200|\$ref", "#/components/responses/$operation-" . rawurlencode($tableName));
                         break;
                     case 'create':
                         if ($pk->getType() == 'integer') {
@@ -8275,7 +8275,7 @@ private function setPath(string $tableName) /*: void*/
                         }
                         break;
                     case 'read':
-                        $this->openapi->set("paths|$path|$method|responses|200|\$ref", "#/components/responses/$operation-" . urlencode($tableName));
+                        $this->openapi->set("paths|$path|$method|responses|200|\$ref", "#/components/responses/$operation-" . rawurlencode($tableName));
                         break;
                     case 'update':
                     case 'delete':
@@ -8357,7 +8357,7 @@ private function setComponentResponse(string $tableName) /*: void*/
                 } else {
                     $this->openapi->set("components|responses|$operation-$tableName|description", "single $tableName record");
                 }
-                $this->openapi->set("components|responses|$operation-$tableName|content|application/json|schema|\$ref", "#/components/schemas/$operation-" . urlencode($tableName));
+                $this->openapi->set("components|responses|$operation-$tableName|content|application/json|schema|\$ref", "#/components/schemas/$operation-" . rawurlencode($tableName));
             }
         }
 
@@ -8373,7 +8373,7 @@ private function setComponentRequestBody(string $tableName) /*: void*/
                         continue;
                     }
                     $this->openapi->set("components|requestBodies|$operation-$tableName|description", "single $tableName record");
-                    $this->openapi->set("components|requestBodies|$operation-$tableName|content|application/json|schema|\$ref", "#/components/schemas/$operation-" . urlencode($tableName));
+                    $this->openapi->set("components|requestBodies|$operation-$tableName|content|application/json|schema|\$ref", "#/components/schemas/$operation-" . rawurlencode($tableName));
                 }
             }
         }
@@ -10299,6 +10299,7 @@ public static function toString(ResponseInterface $response): string
         'username' => 'php-crud-api',
         'password' => 'php-crud-api',
         'database' => 'php-crud-api',
+        'controllers' => 'openapi,records,columns',
     ]);
     $request = RequestFactory::fromGlobals();
     $api = new Api($config);
diff --git a/src/Tqdev/PhpCrudApi/OpenApi/OpenApiBuilder.php b/src/Tqdev/PhpCrudApi/OpenApi/OpenApiBuilder.php
@@ -155,13 +155,13 @@ private function setPath(string $tableName) /*: void*/
                 $this->openapi->set("paths|$path|$method|parameters|$p|\$ref", "#/components/parameters/$parameter");
             }
             if (in_array($operation, ['create', 'update', 'increment'])) {
-                $this->openapi->set("paths|$path|$method|requestBody|\$ref", "#/components/requestBodies/$operation-" . urlencode($tableName));
+                $this->openapi->set("paths|$path|$method|requestBody|\$ref", "#/components/requestBodies/$operation-" . rawurlencode($tableName));
             }
             $this->openapi->set("paths|$path|$method|tags|0", "$tableName");
             $this->openapi->set("paths|$path|$method|description", "$operation $tableName");
             switch ($operation) {
                 case 'list':
-                    $this->openapi->set("paths|$path|$method|responses|200|\$ref", "#/components/responses/$operation-" . urlencode($tableName));
+                    $this->openapi->set("paths|$path|$method|responses|200|\$ref", "#/components/responses/$operation-" . rawurlencode($tableName));
                     break;
                 case 'create':
                     if ($pk->getType() == 'integer') {
@@ -171,7 +171,7 @@ private function setPath(string $tableName) /*: void*/
                     }
                     break;
                 case 'read':
-                    $this->openapi->set("paths|$path|$method|responses|200|\$ref", "#/components/responses/$operation-" . urlencode($tableName));
+                    $this->openapi->set("paths|$path|$method|responses|200|\$ref", "#/components/responses/$operation-" . rawurlencode($tableName));
                     break;
                 case 'update':
                 case 'delete':
@@ -253,7 +253,7 @@ private function setComponentResponse(string $tableName) /*: void*/
             } else {
                 $this->openapi->set("components|responses|$operation-$tableName|description", "single $tableName record");
             }
-            $this->openapi->set("components|responses|$operation-$tableName|content|application/json|schema|\$ref", "#/components/schemas/$operation-" . urlencode($tableName));
+            $this->openapi->set("components|responses|$operation-$tableName|content|application/json|schema|\$ref", "#/components/schemas/$operation-" . rawurlencode($tableName));
         }
     }
 
@@ -269,7 +269,7 @@ private function setComponentRequestBody(string $tableName) /*: void*/
                     continue;
                 }
                 $this->openapi->set("components|requestBodies|$operation-$tableName|description", "single $tableName record");
-                $this->openapi->set("components|requestBodies|$operation-$tableName|content|application/json|schema|\$ref", "#/components/schemas/$operation-" . urlencode($tableName));
+                $this->openapi->set("components|requestBodies|$operation-$tableName|content|application/json|schema|\$ref", "#/components/schemas/$operation-" . rawurlencode($tableName));
             }
         }
     }
diff --git a/src/index.php b/src/index.php
@@ -13,6 +13,7 @@
     'username' => 'php-crud-api',
     'password' => 'php-crud-api',
     'database' => 'php-crud-api',
+    'controllers' => 'openapi,records,columns',
 ]);
 $request = RequestFactory::fromGlobals();
 $api = new Api($config);

Original file line number	Diff line number	Diff line change
`@@ -8259,13 +8259,13 @@ private function setPath(string $tableName) /: void/`
`8259`	`8259`	`$this->openapi->set("paths\|$path\|$method\|parameters\|$p\|\$ref", "#/components/parameters/$parameter");`
`8260`	`8260`	`}`
`8261`	`8261`	`if (in_array($operation, ['create', 'update', 'increment'])) {`
`8262`		`- $this->openapi->set("paths\|$path\|$method\|requestBody\|\$ref", "#/components/requestBodies/$operation-" . urlencode($tableName));`
	`8262`	`+ $this->openapi->set("paths\|$path\|$method\|requestBody\|\$ref", "#/components/requestBodies/$operation-" . rawurlencode($tableName));`
`8263`	`8263`	`}`
`8264`	`8264`	`$this->openapi->set("paths\|$path\|$method\|tags\|0", "$tableName");`
`8265`	`8265`	`$this->openapi->set("paths\|$path\|$method\|description", "$operation $tableName");`
`8266`	`8266`	`switch ($operation) {`
`8267`	`8267`	`case 'list':`
`8268`		`- $this->openapi->set("paths\|$path\|$method\|responses\|200\|\$ref", "#/components/responses/$operation-" . urlencode($tableName));`
	`8268`	`+ $this->openapi->set("paths\|$path\|$method\|responses\|200\|\$ref", "#/components/responses/$operation-" . rawurlencode($tableName));`
`8269`	`8269`	`break;`
`8270`	`8270`	`case 'create':`
`8271`	`8271`	`if ($pk->getType() == 'integer') {`
`@@ -8275,7 +8275,7 @@ private function setPath(string $tableName) /: void/`
`8275`	`8275`	`}`
`8276`	`8276`	`break;`
`8277`	`8277`	`case 'read':`
`8278`		`- $this->openapi->set("paths\|$path\|$method\|responses\|200\|\$ref", "#/components/responses/$operation-" . urlencode($tableName));`
	`8278`	`+ $this->openapi->set("paths\|$path\|$method\|responses\|200\|\$ref", "#/components/responses/$operation-" . rawurlencode($tableName));`
`8279`	`8279`	`break;`
`8280`	`8280`	`case 'update':`
`8281`	`8281`	`case 'delete':`
`@@ -8357,7 +8357,7 @@ private function setComponentResponse(string $tableName) /: void/`
`8357`	`8357`	`} else {`
`8358`	`8358`	`$this->openapi->set("components\|responses\|$operation-$tableName\|description", "single $tableName record");`
`8359`	`8359`	`}`
`8360`		`- $this->openapi->set("components\|responses\|$operation-$tableName\|content\|application/json\|schema\|\$ref", "#/components/schemas/$operation-" . urlencode($tableName));`
	`8360`	`+ $this->openapi->set("components\|responses\|$operation-$tableName\|content\|application/json\|schema\|\$ref", "#/components/schemas/$operation-" . rawurlencode($tableName));`
`8361`	`8361`	`}`
`8362`	`8362`	`}`
`8363`	`8363`
`@@ -8373,7 +8373,7 @@ private function setComponentRequestBody(string $tableName) /: void/`
`8373`	`8373`	`continue;`
`8374`	`8374`	`}`
`8375`	`8375`	`$this->openapi->set("components\|requestBodies\|$operation-$tableName\|description", "single $tableName record");`
`8376`		`- $this->openapi->set("components\|requestBodies\|$operation-$tableName\|content\|application/json\|schema\|\$ref", "#/components/schemas/$operation-" . urlencode($tableName));`
	`8376`	`+ $this->openapi->set("components\|requestBodies\|$operation-$tableName\|content\|application/json\|schema\|\$ref", "#/components/schemas/$operation-" . rawurlencode($tableName));`
`8377`	`8377`	`}`
`8378`	`8378`	`}`
`8379`	`8379`	`}`
`@@ -10299,6 +10299,7 @@ public static function toString(ResponseInterface $response): string`
`10299`	`10299`	`'username' => 'php-crud-api',`
`10300`	`10300`	`'password' => 'php-crud-api',`
`10301`	`10301`	`'database' => 'php-crud-api',`
	`10302`	`+ 'controllers' => 'openapi,records,columns',`
`10302`	`10303`	`]);`
`10303`	`10304`	`$request = RequestFactory::fromGlobals();`
`10304`	`10305`	`$api = new Api($config);`
Original file line number	Diff line number	Diff line change
`@@ -155,13 +155,13 @@ private function setPath(string $tableName) /: void/`
`155`	`155`	`$this->openapi->set("paths\|$path\|$method\|parameters\|$p\|\$ref", "#/components/parameters/$parameter");`
`156`	`156`	`}`
`157`	`157`	`if (in_array($operation, ['create', 'update', 'increment'])) {`
`158`		`- $this->openapi->set("paths\|$path\|$method\|requestBody\|\$ref", "#/components/requestBodies/$operation-" . urlencode($tableName));`
	`158`	`+ $this->openapi->set("paths\|$path\|$method\|requestBody\|\$ref", "#/components/requestBodies/$operation-" . rawurlencode($tableName));`
`159`	`159`	`}`
`160`	`160`	`$this->openapi->set("paths\|$path\|$method\|tags\|0", "$tableName");`
`161`	`161`	`$this->openapi->set("paths\|$path\|$method\|description", "$operation $tableName");`
`162`	`162`	`switch ($operation) {`
`163`	`163`	`case 'list':`
`164`		`- $this->openapi->set("paths\|$path\|$method\|responses\|200\|\$ref", "#/components/responses/$operation-" . urlencode($tableName));`
	`164`	`+ $this->openapi->set("paths\|$path\|$method\|responses\|200\|\$ref", "#/components/responses/$operation-" . rawurlencode($tableName));`
`165`	`165`	`break;`
`166`	`166`	`case 'create':`
`167`	`167`	`if ($pk->getType() == 'integer') {`
`@@ -171,7 +171,7 @@ private function setPath(string $tableName) /: void/`
`171`	`171`	`}`
`172`	`172`	`break;`
`173`	`173`	`case 'read':`
`174`		`- $this->openapi->set("paths\|$path\|$method\|responses\|200\|\$ref", "#/components/responses/$operation-" . urlencode($tableName));`
	`174`	`+ $this->openapi->set("paths\|$path\|$method\|responses\|200\|\$ref", "#/components/responses/$operation-" . rawurlencode($tableName));`
`175`	`175`	`break;`
`176`	`176`	`case 'update':`
`177`	`177`	`case 'delete':`
`@@ -253,7 +253,7 @@ private function setComponentResponse(string $tableName) /: void/`
`253`	`253`	`} else {`
`254`	`254`	`$this->openapi->set("components\|responses\|$operation-$tableName\|description", "single $tableName record");`
`255`	`255`	`}`
`256`		`- $this->openapi->set("components\|responses\|$operation-$tableName\|content\|application/json\|schema\|\$ref", "#/components/schemas/$operation-" . urlencode($tableName));`
	`256`	`+ $this->openapi->set("components\|responses\|$operation-$tableName\|content\|application/json\|schema\|\$ref", "#/components/schemas/$operation-" . rawurlencode($tableName));`
`257`	`257`	`}`
`258`	`258`	`}`
`259`	`259`
`@@ -269,7 +269,7 @@ private function setComponentRequestBody(string $tableName) /: void/`
`269`	`269`	`continue;`
`270`	`270`	`}`
`271`	`271`	`$this->openapi->set("components\|requestBodies\|$operation-$tableName\|description", "single $tableName record");`
`272`		`- $this->openapi->set("components\|requestBodies\|$operation-$tableName\|content\|application/json\|schema\|\$ref", "#/components/schemas/$operation-" . urlencode($tableName));`
	`272`	`+ $this->openapi->set("components\|requestBodies\|$operation-$tableName\|content\|application/json\|schema\|\$ref", "#/components/schemas/$operation-" . rawurlencode($tableName));`
`273`	`273`	`}`
`274`	`274`	`}`
`275`	`275`	`}`