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

[7.x] Add PHP8 to travis / PHP8 support #413

Merged
merged 16 commits into from
Jan 7, 2021
Merged

[7.x] Add PHP8 to travis / PHP8 support #413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
a5b3bfc
Add PHP8 to travis
fritz-gerneth Dec 5, 2020
e0f25c1
Update Badges to use correct version branch
fritz-gerneth Dec 5, 2020
06865e1
Update version table, escape characters
fritz-gerneth Dec 5, 2020
d93dda8
Try explicit patch-version pinning in travis
fritz-gerneth Dec 5, 2020
1237dce
Revert "Try explicit patch-version pinning in travis"
fritz-gerneth Dec 5, 2020
85ad300
Add PHP8 to composer.json
fritz-gerneth Dec 5, 2020
c10a689
Open up php-version constraint
fritz-gerneth Dec 8, 2020
4dfbef5
Update to PHPUnit 9
fritz-gerneth Jan 4, 2021
80022f1
Update travis to run test coverage & CS seperately
fritz-gerneth Jan 4, 2021
6c8c1a3
Update docheader
fritz-gerneth Jan 4, 2021
1b05c82
Remove positional assertions in unittests
fritz-gerneth Jan 5, 2021
3ad2ee4
Bump phpunit minimum to 9.3
fritz-gerneth Jan 5, 2021
43ffc37
Forcefully clear php-cs cache in travis
fritz-gerneth Jan 5, 2021
497a9ad
Increase timeout for large tests to reduce chance of accidential failure
fritz-gerneth Jan 5, 2021
2cd90ef
Fix path to .php_cs.cache
fritz-gerneth Jan 5, 2021
3ff1c61
Update readme to reflect php8 support
fritz-gerneth Jan 5, 2021
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@
nbproject
composer.lock
docs/html
.phpunit.result.cache
23 changes: 12 additions & 11 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,15 @@ language: php
matrix:
fast_finish: true
include:
- php: 7.1
- php: 7.3
env:
- DEPENDENCIES=""
- EXECUTE_CS_CHECK=true
- XDEBUG_MODE="coverage"
- TEST_COVERAGE=true
- php: 7.1
env:
- DEPENDENCIES="--prefer-lowest --prefer-stable"
- php: 7.2
- php: 7.3
env:
- DEPENDENCIES=""
- php: 7.2
env:
- DEPENDENCIES="--prefer-lowest --prefer-stable"
- PHP_CS=true
- php: 7.3
env:
- DEPENDENCIES=""
Expand All @@ -29,6 +24,12 @@ matrix:
- php: 7.4
env:
- DEPENDENCIES="--prefer-lowest --prefer-stable"
- php: 8.0
env:
- DEPENDENCIES=""
- php: 8.0
env:
- DEPENDENCIES="--prefer-lowest --prefer-stable"

cache:
directories:
Expand All @@ -41,10 +42,10 @@ before_script:
- phpenv config-rm xdebug.ini
- composer self-update
- composer update --prefer-dist $DEPENDENCIES
- rm -rf $HOME/.php-cs-fixer/.php_cs.cache

script:
- if [[ $TEST_COVERAGE == 'true' ]]; then php -dzend_extension=xdebug.so ./vendor/bin/phpunit --coverage-text --coverage-clover ./build/logs/clover.xml; else ./vendor/bin/phpunit; fi
- if [[ $EXECUTE_CS_CHECK == 'true' ]]; then ./vendor/bin/php-cs-fixer fix -v --diff --dry-run; fi
- if [[ $TEST_COVERAGE == 'true' ]]; then php -dzend_extension=xdebug.so ./vendor/bin/phpunit --coverage-text --coverage-clover ./build/logs/clover.xml; elif [[ $PHP_CS == 'true' ]]; then ./vendor/bin/php-cs-fixer fix -v --diff --dry-run; else ./vendor/bin/phpunit; fi

after_success:
- if [[ $TEST_COVERAGE == 'true' ]]; then php vendor/bin/coveralls -v; fi
Expand Down
15 changes: 8 additions & 7 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

PHP 7.1 EventStore Implementation.

[![Build Status](https://travis-ci.org/prooph/event-store.svg?branch=master)](https://travis-ci.org/prooph/event-store)
[![Coverage Status](https://coveralls.io/repos/prooph/event-store/badge.svg?branch=master&service=github)](https://coveralls.io/github/prooph/event-store?branch=master)
[![Build Status](https://travis-ci.com/prooph/event-store.svg?branch=7.x)](https://travis-ci.com/prooph/event-store)
[![Coverage Status](https://coveralls.io/repos/prooph/event-store/badge.svg?branch=7.x&service=github)](https://coveralls.io/github/prooph/event-store?branch=7.x)
[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/prooph/improoph)

## Overview
Expand Down Expand Up @@ -57,11 +57,12 @@ To establish a consistent code quality, please provide unit tests for all your c

## Version Guidance

| Version | Status | PHP Version | Support Until |
|---------|------------|-------------|---------------|
| 5.x | EOL | >= 5.5 | EOL |
| 6.x | Maintained | >= 5.5 | 3 Dec 2017 |
| 7.x | Latest | >= 7.1 | active |
| Version | Status | PHP Version | Support Until |
|---------|------------|---------------|---------------|
| 5.x | EOL | \>= 5.5 | EOL |
| 6.x | Maintained | \>= 5.5 | 3 Dec 2017 |
| 7.5.x | Latest | \>= 7. | active |
Copy link
Member

@prolic prolic Jan 7, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

still requires 7.1

Copy link
Member

Choose a reason for hiding this comment

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

I took care of this myself.

| 7.6 | Latest | \>= 7.3 \| 8.0 | active |

## License

Expand Down
11 changes: 6 additions & 5 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,17 @@
"minimum-stability": "dev",
"prefer-stable": true,
"require": {
"php": "^7.1",
"php": "^7.1 || ^8.0",
Copy link
Member

Choose a reason for hiding this comment

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

Should we set PHP minimum version to ^7.4 for the new minor version?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

7.3 is still supported until end of next year. PHPUnit 9 supports 7.3 and 8 . Any specific reason to jump to 7.4 right away?

Copy link
Member

Choose a reason for hiding this comment

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

Alright, we can stick to PHP 7.3, because we don‘t want to use new features.

"marc-mabe/php-enum": "^2.3.1 || ^3.0.0 || ^4.0.0",
"prooph/common": "^4.1.0"
"prooph/common": "^4.5.0"
},
"require-dev": {
"phpspec/prophecy": "^1.10.3",
"phpunit/php-invoker": "^2.0",
"phpunit/phpunit": "^7.5.20",
"phpspec/prophecy-phpunit": "^2.0",
"phpunit/php-invoker": "^3.1",
"phpunit/phpunit": "^9.3",
"prooph/bookdown-template": "^0.2.3",
"prooph/php-cs-fixer-config": "v0.3.1",
"prooph/php-cs-fixer-config": "^0.4",
"psr/container": "^1.0",
"sandrokeil/interop-config": "^2.0.1",
"satooshi/php-coveralls": "^1.0"
Expand Down
4 changes: 2 additions & 2 deletions examples/event/QuickStartSucceeded.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

/**
* This file is part of prooph/event-store.
* (c) 2014-2020 prooph software GmbH <[email protected]>
* (c) 2015-2020 Sascha-Oliver Prolic <[email protected]>
* (c) 2014-2021 prooph software GmbH <[email protected]>
* (c) 2015-2021 Sascha-Oliver Prolic <[email protected]>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down
4 changes: 2 additions & 2 deletions examples/quickstart.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

/**
* This file is part of prooph/event-store.
* (c) 2014-2020 prooph software GmbH <[email protected]>
* (c) 2015-2020 Sascha-Oliver Prolic <[email protected]>
* (c) 2014-2021 prooph software GmbH <[email protected]>
* (c) 2015-2021 Sascha-Oliver Prolic <[email protected]>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down
11 changes: 6 additions & 5 deletions phpunit.xml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,15 @@
enforceTimeLimit="true"
failOnWarning="true"
failOnRisky="true"
timeoutForLargeTests="180"
>
<testsuite name="Prooph EventStore Test Suite">
<directory>./tests</directory>
</testsuite>

<filter>
<whitelist>
<directory>./src/</directory>
</whitelist>
</filter>
<coverage>
<include>
<directory suffix=".php">src</directory>
</include>
</coverage>
</phpunit>
4 changes: 2 additions & 2 deletions src/ActionEventEmitterEventStore.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

/**
* This file is part of prooph/event-store.
* (c) 2014-2020 prooph software GmbH <[email protected]>
* (c) 2015-2020 Sascha-Oliver Prolic <[email protected]>
* (c) 2014-2021 prooph software GmbH <[email protected]>
* (c) 2015-2021 Sascha-Oliver Prolic <[email protected]>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down
4 changes: 2 additions & 2 deletions src/Container/InMemoryEventStoreFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

/**
* This file is part of prooph/event-store.
* (c) 2014-2020 prooph software GmbH <[email protected]>
* (c) 2015-2020 Sascha-Oliver Prolic <[email protected]>
* (c) 2014-2021 prooph software GmbH <[email protected]>
* (c) 2015-2021 Sascha-Oliver Prolic <[email protected]>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down
4 changes: 2 additions & 2 deletions src/Container/InMemoryProjectionManagerFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

/**
* This file is part of prooph/event-store.
* (c) 2014-2020 prooph software GmbH <[email protected]>
* (c) 2015-2020 Sascha-Oliver Prolic <[email protected]>
* (c) 2014-2021 prooph software GmbH <[email protected]>
* (c) 2015-2021 Sascha-Oliver Prolic <[email protected]>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down
4 changes: 2 additions & 2 deletions src/EventStore.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

/**
* This file is part of prooph/event-store.
* (c) 2014-2020 prooph software GmbH <[email protected]>
* (c) 2015-2020 Sascha-Oliver Prolic <[email protected]>
* (c) 2014-2021 prooph software GmbH <[email protected]>
* (c) 2015-2021 Sascha-Oliver Prolic <[email protected]>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down
4 changes: 2 additions & 2 deletions src/EventStoreDecorator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

/**
* This file is part of prooph/event-store.
* (c) 2014-2020 prooph software GmbH <[email protected]>
* (c) 2015-2020 Sascha-Oliver Prolic <[email protected]>
* (c) 2014-2021 prooph software GmbH <[email protected]>
* (c) 2015-2021 Sascha-Oliver Prolic <[email protected]>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down
4 changes: 2 additions & 2 deletions src/Exception/ConcurrencyException.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

/**
* This file is part of prooph/event-store.
* (c) 2014-2020 prooph software GmbH <[email protected]>
* (c) 2015-2020 Sascha-Oliver Prolic <[email protected]>
* (c) 2014-2021 prooph software GmbH <[email protected]>
* (c) 2015-2021 Sascha-Oliver Prolic <[email protected]>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down
4 changes: 2 additions & 2 deletions src/Exception/ConfigurationException.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

/**
* This file is part of prooph/event-store.
* (c) 2014-2020 prooph software GmbH <[email protected]>
* (c) 2015-2020 Sascha-Oliver Prolic <[email protected]>
* (c) 2014-2021 prooph software GmbH <[email protected]>
* (c) 2015-2021 Sascha-Oliver Prolic <[email protected]>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down
4 changes: 2 additions & 2 deletions src/Exception/EventStoreException.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

/**
* This file is part of prooph/event-store.
* (c) 2014-2020 prooph software GmbH <[email protected]>
* (c) 2015-2020 Sascha-Oliver Prolic <[email protected]>
* (c) 2014-2021 prooph software GmbH <[email protected]>
* (c) 2015-2021 Sascha-Oliver Prolic <[email protected]>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down
4 changes: 2 additions & 2 deletions src/Exception/ExtensionNotLoadedException.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

/**
* This file is part of prooph/event-store.
* (c) 2014-2020 prooph software GmbH <[email protected]>
* (c) 2015-2020 Sascha-Oliver Prolic <[email protected]>
* (c) 2014-2021 prooph software GmbH <[email protected]>
* (c) 2015-2021 Sascha-Oliver Prolic <[email protected]>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down
4 changes: 2 additions & 2 deletions src/Exception/InvalidArgumentException.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

/**
* This file is part of prooph/event-store.
* (c) 2014-2020 prooph software GmbH <[email protected]>
* (c) 2015-2020 Sascha-Oliver Prolic <[email protected]>
* (c) 2014-2021 prooph software GmbH <[email protected]>
* (c) 2015-2021 Sascha-Oliver Prolic <[email protected]>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down
4 changes: 2 additions & 2 deletions src/Exception/OutOfRangeException.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

/**
* This file is part of prooph/event-store.
* (c) 2014-2020 prooph software GmbH <[email protected]>
* (c) 2015-2020 Sascha-Oliver Prolic <[email protected]>
* (c) 2014-2021 prooph software GmbH <[email protected]>
* (c) 2015-2021 Sascha-Oliver Prolic <[email protected]>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down
4 changes: 2 additions & 2 deletions src/Exception/ProjectionNotFound.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

/**
* This file is part of prooph/event-store.
* (c) 2014-2020 prooph software GmbH <[email protected]>
* (c) 2015-2020 Sascha-Oliver Prolic <[email protected]>
* (c) 2014-2021 prooph software GmbH <[email protected]>
* (c) 2015-2021 Sascha-Oliver Prolic <[email protected]>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down
4 changes: 2 additions & 2 deletions src/Exception/RuntimeException.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

/**
* This file is part of prooph/event-store.
* (c) 2014-2020 prooph software GmbH <[email protected]>
* (c) 2015-2020 Sascha-Oliver Prolic <[email protected]>
* (c) 2014-2021 prooph software GmbH <[email protected]>
* (c) 2015-2021 Sascha-Oliver Prolic <[email protected]>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down
4 changes: 2 additions & 2 deletions src/Exception/StreamExistsAlready.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

/**
* This file is part of prooph/event-store.
* (c) 2014-2020 prooph software GmbH <[email protected]>
* (c) 2015-2020 Sascha-Oliver Prolic <[email protected]>
* (c) 2014-2021 prooph software GmbH <[email protected]>
* (c) 2015-2021 Sascha-Oliver Prolic <[email protected]>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down
4 changes: 2 additions & 2 deletions src/Exception/StreamNotFound.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

/**
* This file is part of prooph/event-store.
* (c) 2014-2020 prooph software GmbH <[email protected]>
* (c) 2015-2020 Sascha-Oliver Prolic <[email protected]>
* (c) 2014-2021 prooph software GmbH <[email protected]>
* (c) 2015-2021 Sascha-Oliver Prolic <[email protected]>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down
4 changes: 2 additions & 2 deletions src/Exception/TransactionAlreadyStarted.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

/**
* This file is part of prooph/event-store.
* (c) 2014-2020 prooph software GmbH <[email protected]>
* (c) 2015-2020 Sascha-Oliver Prolic <[email protected]>
* (c) 2014-2021 prooph software GmbH <[email protected]>
* (c) 2015-2021 Sascha-Oliver Prolic <[email protected]>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down
4 changes: 2 additions & 2 deletions src/Exception/TransactionNotStarted.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

/**
* This file is part of prooph/event-store.
* (c) 2014-2020 prooph software GmbH <[email protected]>
* (c) 2015-2020 Sascha-Oliver Prolic <[email protected]>
* (c) 2014-2021 prooph software GmbH <[email protected]>
* (c) 2015-2021 Sascha-Oliver Prolic <[email protected]>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down
4 changes: 2 additions & 2 deletions src/InMemoryEventStore.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

/**
* This file is part of prooph/event-store.
* (c) 2014-2020 prooph software GmbH <[email protected]>
* (c) 2015-2020 Sascha-Oliver Prolic <[email protected]>
* (c) 2014-2021 prooph software GmbH <[email protected]>
* (c) 2015-2021 Sascha-Oliver Prolic <[email protected]>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down
4 changes: 2 additions & 2 deletions src/Metadata/FieldType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

/**
* This file is part of prooph/event-store.
* (c) 2014-2020 prooph software GmbH <[email protected]>
* (c) 2015-2020 Sascha-Oliver Prolic <[email protected]>
* (c) 2014-2021 prooph software GmbH <[email protected]>
* (c) 2015-2021 Sascha-Oliver Prolic <[email protected]>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down
4 changes: 2 additions & 2 deletions src/Metadata/MetadataEnricher.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

/**
* This file is part of prooph/event-store.
* (c) 2014-2020 prooph software GmbH <[email protected]>
* (c) 2015-2020 Sascha-Oliver Prolic <[email protected]>
* (c) 2014-2021 prooph software GmbH <[email protected]>
* (c) 2015-2021 Sascha-Oliver Prolic <[email protected]>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down
4 changes: 2 additions & 2 deletions src/Metadata/MetadataEnricherAggregate.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

/**
* This file is part of prooph/event-store.
* (c) 2014-2020 prooph software GmbH <[email protected]>
* (c) 2015-2020 Sascha-Oliver Prolic <[email protected]>
* (c) 2014-2021 prooph software GmbH <[email protected]>
* (c) 2015-2021 Sascha-Oliver Prolic <[email protected]>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down
4 changes: 2 additions & 2 deletions src/Metadata/MetadataEnricherPlugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

/**
* This file is part of prooph/event-store.
* (c) 2014-2020 prooph software GmbH <[email protected]>
* (c) 2015-2020 Sascha-Oliver Prolic <[email protected]>
* (c) 2014-2021 prooph software GmbH <[email protected]>
* (c) 2015-2021 Sascha-Oliver Prolic <[email protected]>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down
Loading