Skip to content

Commit

Permalink
Prepare library for testing with ramsey/uuid version 4
Browse files Browse the repository at this point in the history
  • Loading branch information
ramsey committed Mar 16, 2020
1 parent 9facc46 commit 52b593a
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 4 deletions.
31 changes: 30 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,44 @@ jobs:
include:
- php: 5.4
dist: trusty
env: COMPOSER_OPTIONS=--prefer-stable
- php: 5.4
dist: trusty
env: COMPOSER_OPTIONS=--prefer-lowest
- php: 5.5
dist: trusty
env: COMPOSER_OPTIONS=--prefer-stable
- php: 5.5
dist: trusty
env: COMPOSER_OPTIONS=--prefer-lowest
- php: 5.6
env: COMPOSER_OPTIONS=--prefer-stable
- php: 5.6
env: COMPOSER_OPTIONS=--prefer-lowest
- php: 7.0
env: COMPOSER_OPTIONS=--prefer-stable
- php: 7.0
env: COMPOSER_OPTIONS=--prefer-lowest
- php: 7.1
env: COMPOSER_OPTIONS=--prefer-stable
- php: 7.1
env: COMPOSER_OPTIONS=--prefer-lowest
- php: 7.2
env: COMPOSER_OPTIONS=--prefer-stable
- php: 7.2
env: COMPOSER_OPTIONS=--prefer-lowest
- php: 7.3
env: COMPOSER_OPTIONS=--prefer-stable
- php: 7.3
env: COMPOSER_OPTIONS=--prefer-lowest
- php: 7.4
env: COMPOSER_OPTIONS=--prefer-stable
- php: 7.4
env: COMPOSER_OPTIONS=--prefer-lowest
- php: nightly
env: COMPOSER_OPTIONS=--prefer-stable --ignore-platform-reqs
- php: nightly
env: COMPOSER_OPTIONS=--prefer-lowest --ignore-platform-reqs
allow_failures:
- php: nightly

Expand All @@ -22,7 +51,7 @@ before_install:

install:
- travis_retry composer require --no-update "php-coveralls/php-coveralls:^1 | ^2"
- travis_retry composer install --no-interaction --prefer-dist --no-progress --no-suggest
- travis_retry composer update --no-interaction --prefer-dist --no-progress --no-suggest $COMPOSER_OPTIONS
- if [ -f vendor/bin/coveralls ]; then ln -s coveralls vendor/bin/php-coveralls; fi

before_script:
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "^1",
"mockery/mockery": "^0.9 | ^1",
"mockery/mockery": "^0.9.11 | ^1",
"phpunit/phpunit": "^4.8.36 | ^5.7 | ^6.5 | ^7",
"squizlabs/php_codesniffer": "^3.5"
},
Expand Down
4 changes: 2 additions & 2 deletions tests/UuidTypeTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public function testUuidConvertsToDatabaseValue()
*/
public function testUuidInterfaceConvertsToDatabaseValue()
{
$uuid = \Mockery::mock('Ramsey\\Uuid\\UuidInterface,Ramsey\\Uuid\\Doctrine\\StringableInterface');
$uuid = \Mockery::mock('Ramsey\\Uuid\\Uuid');

$uuid
->shouldReceive('__toString')
Expand Down Expand Up @@ -96,7 +96,7 @@ public function testNullConversionForDatabaseValue()
*/
public function testUuidInterfaceConvertsToPHPValue()
{
$uuid = \Mockery::mock('Ramsey\\Uuid\\UuidInterface');
$uuid = \Mockery::mock('Ramsey\\Uuid\\Uuid');

$actual = $this->type->convertToPHPValue($uuid, $this->platform);

Expand Down

0 comments on commit 52b593a

Please sign in to comment.