Skip to content

Commit

Permalink
Merge a5fda5a into 4f1b3da
Browse files Browse the repository at this point in the history
  • Loading branch information
prolic committed Jul 8, 2019
2 parents 4f1b3da + a5fda5a commit adf2b1e
Show file tree
Hide file tree
Showing 13 changed files with 1,607 additions and 8 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ before_script:
- if php --ri xdebug >/dev/null; then phpenv config-rm xdebug.ini; fi
- composer self-update
- composer update --prefer-dist $DEPENDENCIES
- if [[ $EXECUTE_CS_CHECK == 'true' ]]; then composer require prooph/php-cs-fixer-config ^0.3; fi

script:
- if [[ $TEST_COVERAGE == 'true' ]]; then php -dzend_extension=xdebug.so ./vendor/bin/phpunit --exclude-group=ignore --coverage-text --coverage-clover ./build/logs/clover.xml; else ./vendor/bin/phpunit --exclude-group=ignore; fi
Expand Down
9 changes: 5 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,17 @@
"amphp/byte-stream": "^1.6",
"amphp/file": "^0.3.5",
"amphp/socket": "^0.10.12",
"prooph/event-store": "^8.0.0-BETA-2",
"prooph/event-store": "dev-master",
"ramsey/uuid": "^3.8"
},
"require-dev": {
"amphp/log": "^1.0",
"phpspec/prophecy": "^1.7",
"phpunit/phpunit": "^7.5",
"phpspec/prophecy": "^1.7.2",
"phpunit/phpunit": "^8.2.2",
"doctrine/instantiator": "^1.1",
"sebastian/object-enumerator": "^3.0.3",
"php-coveralls/php-coveralls": "^2.1"
"php-coveralls/php-coveralls": "^2.1",
"prooph/php-cs-fixer-config": "^0.3"
},
"autoload": {
"psr-4": {
Expand Down
2 changes: 1 addition & 1 deletion phpunit.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
convertWarningsToExceptions="true"
processIsolation="false"
stopOnFailure="false"
bootstrap="vendor/autoload.php"
bootstrap="tests/_bootstrap.php"
failOnWarning="true"
failOnRisky="true"
>
Expand Down
2 changes: 2 additions & 0 deletions src/Internal/EventStoreNodeConnection.php
Original file line number Diff line number Diff line change
Expand Up @@ -494,6 +494,8 @@ public function getRawStreamMetadataAsync(string $stream, ?UserCredentials $user
$readEventPromise->onResolve(function (?Throwable $e, $eventReadResult) use ($stream, $deferred) {
if ($e) {
$deferred->fail($e);

return;
}

\assert($eventReadResult instanceof EventReadResult);
Expand Down

0 comments on commit adf2b1e

Please sign in to comment.