Out: fix escaping of curl commands

Issue GH-359
SMillerDev · Jun 6, 2022 · 2987fc6 · 2987fc6
1 parent 20f9731
commit 2987fc6
Show file tree

Hide file tree

Showing 8 changed files with 268 additions and 115 deletions.
diff --git a/src/PHPDraft/Out/HTML/default/transition.twig b/src/PHPDraft/Out/HTML/default/transition.twig
@@ -35,7 +35,7 @@
  data-placement="left"
  data-toggle="popover"
  data-html="true"
- data-content="<textarea rows='8' cols='75'>{{ transition.get_curl_command(data.HOST)|raw }}</textarea>">
+ data-content="<textarea rows='8' cols='75'>{{ transition.get_curl_command(data.HOST) }}</textarea>">
  <span class="fas fa-copy"></span>
  </a>
  <h5>Example URI</h5>

diff --git a/src/PHPDraft/Out/HTML/material/transition.twig b/src/PHPDraft/Out/HTML/material/transition.twig
@@ -30,7 +30,7 @@
  <div id="modal-{{ request.get_id }}" class="modal">
  <div class="modal-content">
  <label> Example cURL request:
- <textarea rows='75' cols='75'>{{ transition.get_curl_command(data.HOST)|raw }}</textarea>
+ <textarea rows='75' cols='75'>{{ transition.get_curl_command(data.HOST) }}</textarea>
  </label>
  </div>
  <div class="modal-footer">

diff --git a/tests/statics/drafter/apib/index.apib b/tests/statics/drafter/apib/index.apib
@@ -19,6 +19,8 @@ You must provide the `Authorization: Bearer {access_token}` header in all other
 
 The current client ID and secret are [available here](http://pastebin.com/fX6ejAHd)
 
++ Request (application/json)
+
 + Attributes
  + grant_type: `password` (string) - The type of oAuth grant. Always "password"
  + client_id: `abc` (string) - The oAuth client ID

diff --git a/tests/statics/drafter/html/basic.html b/tests/statics/drafter/html/basic.html
diff --git a/tests/statics/drafter/html/basic_old.html b/tests/statics/drafter/html/basic_old.html
diff --git a/tests/statics/drafter/html/material.html b/tests/statics/drafter/html/material.html
diff --git a/tests/statics/drafter/html/material_old.html b/tests/statics/drafter/html/material_old.html
diff --git a/tests/statics/drafter/json/index.json b/tests/statics/drafter/json/index.json
@@ -286,9 +286,70 @@
  "method": {
  "element": "string",
  "content": "POST"
+ },
+ "headers": {
+ "element": "httpHeaders",
+ "content": [
+ {
+ "element": "member",
+ "content": {
+ "key": {
+ "element": "string",
+ "content": "Content-Type"
+ },
+ "value": {
+ "element": "string",
+ "content": "application/json"
+ }
+ }
+ }
+ ]
  }
  },
- "content": []
+ "content": [
+ {
+ "element": "asset",
+ "meta": {
+ "classes": {
+ "element": "array",
+ "content": [
+ {
+ "element": "string",
+ "content": "messageBody"
+ }
+ ]
+ }
+ },
+ "attributes": {
+ "contentType": {
+ "element": "string",
+ "content": "application/json"
+ }
+ },
+ "content": "{\n \"grant_type\": \"password\",\n \"client_id\": \"abc\",\n \"client_secret\": \"123\",\n \"email\": \"[email protected]\",\n \"password\": \"edisonsux\"\n}"
+ },
+ {
+ "element": "asset",
+ "meta": {
+ "classes": {
+ "element": "array",
+ "content": [
+ {
+ "element": "string",
+ "content": "messageBodySchema"
+ }
+ ]
+ }
+ },
+ "attributes": {
+ "contentType": {
+ "element": "string",
+ "content": "application/schema+json"
+ }
+ },
+ "content": "{\n \"$schema\": \"http://json-schema.org/draft-07/schema#\",\n \"type\": \"object\",\n \"properties\": {\n \"grant_type\": {\n \"type\": \"string\"\n },\n \"client_id\": {\n \"type\": \"string\"\n },\n \"client_secret\": {\n \"type\": \"string\"\n },\n \"email\": {\n \"type\": \"string\"\n },\n \"password\": {\n \"type\": \"string\"\n }\n }\n}"
+ }
+ ]
  },
  {
  "element": "httpResponse",