Skip to content

Correct handling of arrays on recipeYields property #725

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
christianlupus merged 4 commits into from
May 23, 2021
Merged

Correct handling of arrays on recipeYields property #725

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
75f6394
Correct handling of arrays on recipeYields property
christianlupus May 23, 2021
b0b900f
Update Changelog
christianlupus May 23, 2021
535922e
Corrected HP file styling
christianlupus May 23, 2021
d51c0ef
Make code requirements of NC happy
christianlupus May 23, 2021
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
4 changes: 3 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@
[#720](https://github.com/nextcloud/cookbook/pull/720) @christianlupus
- Update compression-webpack-plugin
[#721](https://github.com/nextcloud/cookbook/pull/721) @christianlupus

- Fix array in recipeYields field according to #722
[#725](https://github.com/nextcloud/cookbook/pull/725) @christianlupus

## 0.8.4 - 2021-03-08

### Added
Expand Down
11 changes: 11 additions & 0 deletions lib/Service/RecipeService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,17 @@ public function checkRecipe(array $json): array {

// Make sure that "recipeYield" is an integer which is at least 1
if (isset($json['recipeYield']) && $json['recipeYield']) {

// Check if "recipeYield is an array
if (is_array($json['recipeYield'])) {
if (count($json['recipeYield']) === 1) {
$json['recipeYield'] = $json['recipeYield'][0];
} else {
// XXX How to parse an array correctly?
$json['recipeYield'] = join(' ', $json['recipeYield']);
}
}

$regex_matches = [];
preg_match('/(\d*)/', $json['recipeYield'], $regex_matches);
if (count($regex_matches) >= 1) {
Expand Down