Skip to content

Report enumerated style options available when style unknown. #458

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
merged 3 commits into from
Dec 29, 2014
Merged

Report enumerated style options available when style unknown. #458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
277c2fb
Merge pull request #1 from PHPOffice/develop
h6w Dec 29, 2014
474f8ef
Update AbstractStyle.php
h6w Dec 29, 2014
7d2c0a6
Update CHANGELOG.md
h6w Dec 29, 2014
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ This release added form fields (textinput, checkbox, and dropdown), drawing shap
- MsDOC Reader: Basic MsDOC Reader - @Progi1984 GH-23 GH-287
- "absolute" horizontal and vertical positioning of Frame - @basjan GH-302
- Add new-page function for PDF generation. For multiple PDF-backends - @chc88 GH-426
- Report style options enumerated when style unknown - @h6w

### Bugfixes

Expand Down
2 changes: 1 addition & 1 deletion src/PhpWord/Style/AbstractStyle.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ protected function setFloatVal($value, $default = null)
protected function setEnumVal($value = null, $enum = array(), $default = null)
{
if ($value != null && trim($value) != '' && !empty($enum) && !in_array($value, $enum)) {
throw new \InvalidArgumentException("Invalid style value: {$value}");
throw new \InvalidArgumentException("Invalid style value: {$value} Options:".join(',', $enum));
} elseif ($value === null || trim($value) == '') {
$value = $default;
}
Expand Down