Skip to content

Internal class clean #1205

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

Jump to bottom
Merged
merged 14 commits into from
Apr 1, 2015
Merged

Internal class clean #1205

merged 14 commits into from
Apr 1, 2015

Conversation

dstogov
Copy link
Member

@dstogov dstogov commented Mar 30, 2015

No description provided.

Danack and others added 13 commits March 1, 2015 02:37
@Danack
Fixed PDORow behaviour and message.
b00cd68
@Danack
Fixed ReflectionFunction, ReflectionMethod and ReflectionParameter.
043a026
@Danack
Fixed ReflectionExtension and ReflectionProperty.
a519838
@Danack
Fixed SplFixedArray and tests.
c57bde7
@Danack
Converted intl extension to use IntlException in constructors.
99dae96
@Danack
Made Phar throw exception on bad constructor.
0922eca
@Danack
Fixed fileinfo behaviour.
78ebf83
@Danack
Fixed PDO constructor to not return null.
d3267d0
@Danack
Made UConverter throw an exception if the constructor fails.
9803fcc
@Danack
Reverted change to function name and added note of why it is differen…
6b23264 
…t from the class it is actually changing.
@Danack
Fixed indentation. Fixed comment style. Fixed commented out code.
910a324
@dstogov
Merge branch 'InternalClassClean' of github.com:Danack/php-src into I…
9155a26 
…nternalClassClean

* '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.
@dstogov
Patch improvement:
1018f46 
Removed the corresponding core code.
Fixed ext/com_dotnet and ext/date.
Refactored ext/intl changes.
Improved ext/fileinfo and ext/pdo changes.
Fixed tests.
@nikic
Copy link
Member

nikic commented Mar 30, 2015

The ext/intl/tests/dateformat_calendars.phpt test is failing on travis.

========DIFF========
005+ Fatal error: Uncaught exception 'IntlException' with message 'IntlDateFormatter::__construct(): datefmt_create: invalid value for calendar type; it must be one of IntlDateFormatter::TRADITIONAL (locale's default calendar) or IntlDateFormatter::GREGORIAN. Alternatively, it can be an IntlCalendar object' in /home/travis/build/php/php-src/ext/intl/tests/dateformat_calendars.php:27
006+ Stack trace:
005- Warning: IntlDateFormatter::__construct(): datefmt_create: invalid value for calendar type; it must be one of IntlDateFormatter::TRADITIONAL (locale's default calendar) or IntlDateFormatter::GREGORIAN. Alternatively, it can be an IntlCalendar object in %s on line %d
006- ==DONE==
007+ #0 /home/travis/build/php/php-src/ext/intl/tests/dateformat_calendars.php(27): IntlDateFormatter->__construct('en_US@calendar=...', 0, 0, 'GMT+05:12', -1)
008+ #1 {main}
009+ thrown in /home/travis/build/php/php-src/ext/intl/tests/dateformat_calendars.php on line 27
========DONE========

@dstogov
Copy link
Member Author

dstogov commented Mar 30, 2015

I hope I fixed it. I can't test because of different ICU version.

On Mon, Mar 30, 2015 at 8:18 PM, Nikita Popov notifications@github.com
wrote:

The ext/intl/tests/dateformat_calendars.phpt test is failing on travis.

========DIFF========
005+ Fatal error: Uncaught exception 'IntlException' with message 'IntlDateFormatter::__construct(): datefmt_create: invalid value for calendar type; it must be one of IntlDateFormatter::TRADITIONAL (locale's default calendar) or IntlDateFormatter::GREGORIAN. Alternatively, it can be an IntlCalendar object' in /home/travis/build/php/php-src/ext/intl/tests/dateformat_calendars.php:27
006+ Stack trace:
005- Warning: IntlDateFormatter::__construct(): datefmt_create: invalid value for calendar type; it must be one of IntlDateFormatter::TRADITIONAL (locale's default calendar) or IntlDateFormatter::GREGORIAN. Alternatively, it can be an IntlCalendar object in %s on line %d
006- ==DONE==
007+ #0 /home/travis/build/php/php-src/ext/intl/tests/dateformat_calendars.php(27): IntlDateFormatter->__construct('en_US@calendar=...', 0, 0, 'GMT+05:12', -1)
008+ #1 {main}
009+ thrown in /home/travis/build/php/php-src/ext/intl/tests/dateformat_calendars.php on line 27
========DONE========

—
Reply to this email directly or view it on GitHub
#1205 (comment).

@nikic nikic mentioned this pull request Apr 1, 2015
Closed
@php-pulls php-pulls merged commit 2afca9f into php:master Apr 1, 2015
@dstogov dstogov deleted the InternalClassClean branch October 14, 2019 20:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@dstogov @nikic @php-pulls @Danack