Skip to content
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

Fix invalid serialization of array with empty object #293

Closed
wants to merge 4 commits into from
Closed

Fix invalid serialization of array with empty object #293

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
f31ffe2
Test array serialization with empty object
cornelles May 26, 2014
4278e73
Update phpunit to 4.2.* version - remove staticCall and replace it with
l3l0 Jul 4, 2014
7251347
Merge remote-tracking branch 'gogume/array-with-empty-object' into fi…
l3l0 Jul 7, 2014
e74ebad
Fixed issue with invalid serialization of array when response contains
l3l0 Jul 7, 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
3 changes: 1 addition & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ matrix:
- php: hhvm

php:
- 5.3
- 5.4
- 5.5
- hhvm
Expand All @@ -14,7 +13,7 @@ before_script:
- composer self-update
- composer install --dev

script: phpunit --coverage-clover clover
script: vendor/bin/phpunit --coverage-clover clover
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these changes are not related to this PR IMO, so they should not be included in it


after_success:
- wget https://scrutinizer-ci.com/ocular.phar
Expand Down
3 changes: 2 additions & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@
"symfony/translation": "~2.0",
"symfony/validator": "~2.0",
"symfony/form": "~2.1",
"symfony/filesystem": "2.*"
"symfony/filesystem": "2.*",
"phpunit/phpunit": "4.1.*"
},
"autoload": {
"psr-0": {
Expand Down
Loading