Skip to content

Commit

Permalink
Merge c946a04 into 4f1b3da
Browse files Browse the repository at this point in the history
  • Loading branch information
prolic committed Jul 19, 2019
2 parents 4f1b3da + c946a04 commit 468b913
Show file tree
Hide file tree
Showing 27 changed files with 2,959 additions and 23 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@
nbproject
composer.lock
docs/html
.phpunit.result.cache
13 changes: 6 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ matrix:
- php: 7.3
env:
- DEPENDENCIES=""
- TEST_COVERAGE=true
- php: 7.3
env:
- DEPENDENCIES="--prefer-lowest --prefer-stable"
Expand All @@ -28,11 +27,11 @@ cache:
- $HOME/.local

before_script:
- echo downloading event-store 4.1.1-hotfix1
- wget https://eventstore.org/downloads/EventStore-OSS-Ubuntu-14.04-v4.1.1-hotfix1.tar.gz
- echo downloading EventStore 5.0.1
- wget https://eventstore.org/downloads/ubuntu/EventStore-OSS-Linux-Ubuntu-16.04-v5.0.1.tar.gz
- echo extracting event-store
- tar xf EventStore-OSS-Ubuntu-14.04-v4.1.1-hotfix1.tar.gz
- cd EventStore-OSS-Ubuntu-14.04-v4.1.1-hotfix1
- tar xf EventStore-OSS-Linux-Ubuntu-16.04-v5.0.1.tar.gz
- cd EventStore-OSS-Linux-Ubuntu-16.04-v5.0.1
- echo starting event-store
- ./run-node.sh --run-projections=all --mem-db --ext-tcp-heartbeat-interval 5000 --ext-tcp-heartbeat-timeout 1500 > /dev/null &
- cd ..
Expand All @@ -48,12 +47,12 @@ before_script:
- echo "extension = protobuf.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
- mkdir -p "$HOME/.php-cs-fixer"
- if php --ri xdebug >/dev/null; then phpenv config-rm xdebug.ini; fi
- if [[ $TEST_COVERAGE == 'true' ]]; then pecl install pcov; 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
- if [[ $TEST_COVERAGE == 'true' ]]; then php ./vendor/bin/phpunit --exclude-group=ignore --coverage-text --coverage-clover ./build/logs/clover.xml; else ./vendor/bin/phpunit --exclude-group=ignore; fi
- if [[ $EXECUTE_CS_CHECK == 'true' ]]; then ./vendor/bin/php-cs-fixer fix -v --diff --dry-run; fi

after_script:
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 docker/local-1-node/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ services:
command: tail -f /dev/null

eventstore:
image: eventstore/eventstore:release-4.1.0
image: eventstore/eventstore:release-5.0.1
ports:
- 2113:2113
- 1113:1113
Expand Down
6 changes: 3 additions & 3 deletions docker/local-3-node-cluster/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: "3"
services:

eventstore1:
image: eventstore/eventstore:release-4.1.0
image: eventstore/eventstore:release-5.0.1
env_file:
- common-variables.env
environment:
Expand All @@ -28,7 +28,7 @@ services:
ipv4_address: 172.16.0.11

eventstore2:
image: eventstore/eventstore:release-4.1.0
image: eventstore/eventstore:release-5.0.1
env_file:
- common-variables.env
environment:
Expand All @@ -53,7 +53,7 @@ services:
ipv4_address: 172.16.0.12

eventstore3:
image: eventstore/eventstore:release-4.1.0
image: eventstore/eventstore:release-5.0.1
env_file:
- common-variables.env
environment:
Expand Down
6 changes: 3 additions & 3 deletions docker/local-3-node-dns-cluster/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: "3"
services:

eventstore1:
image: eventstore/eventstore:release-4.1.0
image: eventstore/eventstore:release-5.0.1
env_file:
- common-variables.env
environment:
Expand All @@ -27,7 +27,7 @@ services:
- escluster.net

eventstore2:
image: eventstore/eventstore:release-4.1.0
image: eventstore/eventstore:release-5.0.1
env_file:
- common-variables.env
environment:
Expand All @@ -51,7 +51,7 @@ services:
- escluster.net

eventstore3:
image: eventstore/eventstore:release-4.1.0
image: eventstore/eventstore:release-5.0.1
env_file:
- common-variables.env
environment:
Expand Down
2 changes: 1 addition & 1 deletion docker/unittest/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Run the following commands from repo root:

## Start eventstore container
## Start EventStore container

The eventstore container takes a few seconds to be ready. So start it upfront.

Expand Down
2 changes: 1 addition & 1 deletion docker/unittest/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ services:
- eventstore

eventstore:
image: eventstore/eventstore:release-4.1.0
image: eventstore/eventstore:release-5.0.1
ports:
- 2113:2113
- 1113:1113
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 468b913

Please sign in to comment.