Skip to content

raml2html: Upgrade to PHP 7.4 #1898

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adriendupuis merged 4 commits into from
Feb 16, 2023
+3 −4
Merged

raml2html: Upgrade to PHP 7.4 #1898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c748feb
raml2html: Upgrade to PHP 7.4
adriendupuis Feb 16, 2023
9b726c0
php_7.4.patch: Ends with a new line
adriendupuis Feb 16, 2023
98e7de2
Remove php_7.4.patch and fix the problem on our side
adriendupuis Feb 16, 2023
fea8cbd
RenderExtension.php: Fix "empty string as example" case
adriendupuis Feb 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tools/raml2html/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
}
],
"require": {
"php": "^7.2",
"php": "^7.4",
"symfony/console": "^4.2",
"raml-org/raml-php-parser": "dev-master",
"twig/twig": "^2.0",
Expand Down
5 changes: 2 additions & 3 deletions tools/raml2html/src/Twig/Extension/RenderExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,7 @@ public function getExamplesTabs(array $responseBodies): array

/** @var \Raml\Body $body */
foreach ($responseBodies as $body) {

if (!empty($body->getExample())) {
if (!empty($body->getExamples()) && !empty($body->getExample())) {
$tabs[] = $this->getSchemaFormat($body->getMediaType());
}
}
Expand All @@ -85,7 +84,7 @@ public function getExamplesBody(array $responseBodies): array
foreach ($responseBodies as $body) {
$schemaFormat = $this->getSchemaFormat($body->getMediaType());

if (!empty($body->getExample())) {
if (!empty($body->getExamples()) && !empty($body->getExample())) {
$examples[$schemaFormat][] = $body->getExample();
}
}
Expand Down