Skip to content

Commit d4c6651

Browse files
committed
Merge branch '1.0.x'
* 1.0.x: Remove composer.lock Added phpunit to composer Removed dead code Fix querying for empty simple ref many Fix parameter checking in BsonFilter
2 parents c121837 + 55bff8b commit d4c6651

File tree

14 files changed

+32
-678
lines changed

14 files changed

+32
-678
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ tools/sandbox/Hydrators/*
33
tests/Proxies/*
44
tests/Hydrators/*
55
phpunit.xml
6+
composer.lock
67
vendor/

.travis.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@ services: mongodb
1313

1414
before_script:
1515
- yes '' | pecl -q install -f mongo-${MONGO_VERSION} && echo "extension=mongo.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`
16+
- composer self-update
1617
- composer install --dev
1718

1819
script:
19-
- phpunit --coverage-clover=coverage.clover
20+
- ./vendor/bin/phpunit --coverage-clover=coverage.clover
2021

2122
after_script:
2223
- wget https://scrutinizer-ci.com/ocular.phar

composer.json

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
"doctrine/mongodb": "~1.2"
2727
},
2828
"require-dev": {
29+
"phpunit/phpunit": "~4.8|~5.0",
2930
"symfony/yaml": "~2.3|~3.0"
3031
},
3132
"suggest": {

0 commit comments

Comments
 (0)