diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-03-30 12:14:43 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2015-03-30 12:14:43 +0300 |
| commit | 9155a267adeeb6f442f97892de441e4b6666ce73 (patch) | |
| tree | 7d525ab7379401c38b4416886655b4753ec5701a /ext/intl/breakiterator/breakiterator_methods.cpp | |
| parent | c71c97e101f239d487c7a9797bdf193098d469ca (diff) | |
| parent | 910a3243063f0490a60e5c3c0e1467a6171f4e39 (diff) | |
| download | php-git-9155a267adeeb6f442f97892de441e4b6666ce73.tar.gz | |
Merge branch 'InternalClassClean' of github.com:Danack/php-src into InternalClassClean
* 'InternalClassClean' of github.com:Danack/php-src:
Fixed indentation. Fixed comment style. Fixed commented out code.
Reverted change to function name and added note of why it is different from the class it is actually changing.
Made UConverter throw an exception if the constructor fails.
Fixed PDO constructor to not return null.
Fixed fileinfo behaviour.
Made Phar throw exception on bad constructor.
Converted intl extension to use IntlException in constructors.
Fixed SplFixedArray and tests.
Fixed ReflectionExtension and ReflectionProperty.
Fixed ReflectionFunction, ReflectionMethod and ReflectionParameter.
Fixed PDORow behaviour and message.
Diffstat (limited to 'ext/intl/breakiterator/breakiterator_methods.cpp')
| -rw-r--r-- | ext/intl/breakiterator/breakiterator_methods.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/intl/breakiterator/breakiterator_methods.cpp b/ext/intl/breakiterator/breakiterator_methods.cpp index baab5a682d..02d228653a 100644 --- a/ext/intl/breakiterator/breakiterator_methods.cpp +++ b/ext/intl/breakiterator/breakiterator_methods.cpp @@ -162,12 +162,12 @@ U_CFUNC PHP_FUNCTION(breakiter_set_text) BREAKITER_METHOD_FETCH_OBJECT; ut = utext_openUTF8(ut, text->val, text->len, BREAKITER_ERROR_CODE_P(bio)); - INTL_CTOR_CHECK_STATUS(bio, "breakiter_set_text: error opening UText"); + INTL_CTOR_CHECK_STATUS(bio, "breakiter_set_text: error opening UText", 0); bio->biter->setText(ut, BREAKITER_ERROR_CODE(bio)); utext_close(ut); /* ICU shallow clones the UText */ INTL_CTOR_CHECK_STATUS(bio, "breakiter_set_text: error calling " - "BreakIterator::setText()"); + "BreakIterator::setText()", 0); /* When ICU clones the UText, it does not copy the buffer, so we have to * keep the string buffer around by holding a reference to its zval. This |