Skip to content

Commit

Permalink
supported versions (#94)
Browse files Browse the repository at this point in the history
* supported versions
    - drop support for unmaintained versions
    - add support for php8.2/8.3 and symfony 7.0
* update copyrights
* run static analysis on latest stable version
  • Loading branch information
unixslayer authored May 21, 2024
1 parent 393b76d commit 0e75bdc
Show file tree
Hide file tree
Showing 70 changed files with 159 additions and 161 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/static-analyse.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
strategy:
matrix:
php-version:
- "8.0"
- "8.3"
operating-system:
- "ubuntu-latest"
runs-on: ${{ matrix.operating-system }}
Expand Down
17 changes: 5 additions & 12 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,13 @@ jobs:
strategy:
matrix:
symfony-version:
- "5.2.*"
- "6.0.*"
- "5.4.*"
- "6.4.*"
- "7.0.*"
php-version:
- "7.4"
- "8.0"
- "8.1"
- "8.2"
- "8.3"
operating-system:
- "ubuntu-latest"

Expand Down Expand Up @@ -47,14 +48,6 @@ jobs:
restore-keys: |
php-${{ matrix.php-version }}-${{ matrix.dependencies }}-composer-
- name: "Require symfony/messenger polyfill for symfony 3.4.*"
if: ${{ matrix.symfony-version == '3.4.*' && matrix.php-version != '8.0' }}
run: "composer require --dev lendable/symfony-messenger-polyfill --no-update"

- name: "Require symfony/messenger"
if: ${{ matrix.symfony-version != '3.4.*' }}
run: "composer require --dev symfony/messenger --no-update"

- name: "Require php-coveralls/php-coveralls"
run: "composer global require php-coveralls/php-coveralls"

Expand Down
16 changes: 8 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,17 +54,17 @@
"php": "^7.4|^8.0",
"ext-pdo": "*",
"ext-json": "*",
"symfony/config": "^3.4 || ^4.4 || ^5.2 || ^6.0",
"symfony/dependency-injection": "^3.4 || ^4.4 || ^5.2 || ^6.0",
"symfony/http-kernel": "^3.4 || ^4.4 || ^5.2 || ^6.0",
"symfony/framework-bundle": "^3.4 || ^4.4 || ^5.2 || ^6.0",
"symfony/messenger": "^4.2 || ^4.4 || ^5.2 || ^6.0",
"prooph/event-store": "^7.0"
"symfony/config": "^5.4 || ^6.4 || ^7.0",
"symfony/dependency-injection": "^5.4 || ^6.4 || ^7.0",
"symfony/http-kernel": "^5.4.39 || ^6.4 || ^7.0",
"symfony/framework-bundle": "^5.4 || ^6.4 || ^7.0",
"symfony/messenger": "^5.4 || ^6.4 || ^7.0",
"prooph/event-store": "^7.9.0"
},
"require-dev": {
"prooph/pdo-event-store": "^1.12",
"phpunit/phpunit": "^8 || ^9",
"symfony/yaml" : "^3.4 || ^4.4 || ^5.2 || ^6.0",
"phpunit/phpunit": "^9",
"symfony/yaml" : "^5.4 || ^6.4 || ^7.0",
"bookdown/bookdown": "^1.1",
"prooph/bookdown-template": "^0.3",
"friendsofphp/php-cs-fixer": "^3.5",
Expand Down
4 changes: 2 additions & 2 deletions src/Command/AbstractProjectionCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

/**
* This file is part of prooph/event-store-symfony-bundle.
* (c) 2014-2022 Alexander Miertsch <[email protected]>
* (c) 2015-2022 Sascha-Oliver Prolic <[email protected]>
* (c) 2014-2024 Alexander Miertsch <[email protected]>
* (c) 2015-2024 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/Command/FormatsOutput.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

/**
* This file is part of prooph/event-store-symfony-bundle.
* (c) 2014-2022 Alexander Miertsch <[email protected]>
* (c) 2015-2022 Sascha-Oliver Prolic <[email protected]>
* (c) 2014-2024 Alexander Miertsch <[email protected]>
* (c) 2015-2024 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/Command/ProjectionDeleteCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

/**
* This file is part of prooph/event-store-symfony-bundle.
* (c) 2014-2022 Alexander Miertsch <[email protected]>
* (c) 2015-2022 Sascha-Oliver Prolic <[email protected]>
* (c) 2014-2024 Alexander Miertsch <[email protected]>
* (c) 2015-2024 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
6 changes: 3 additions & 3 deletions src/Command/ProjectionNamesCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

/**
* This file is part of prooph/event-store-symfony-bundle.
* (c) 2014-2022 Alexander Miertsch <[email protected]>
* (c) 2015-2022 Sascha-Oliver Prolic <[email protected]>
* (c) 2014-2024 Alexander Miertsch <[email protected]>
* (c) 2015-2024 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 Expand Up @@ -73,7 +73,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int

/** @var string|null $filter */
$filter = $input->getArgument(self::ARGUMENT_FILTER);
$regex = $input->getOption(static::OPTION_REGEX);
$regex = $input->getOption(self::OPTION_REGEX);

$output->write(\sprintf('<action>Projection names'));
if ($filter) {
Expand Down
4 changes: 2 additions & 2 deletions src/Command/ProjectionResetCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

/**
* This file is part of prooph/event-store-symfony-bundle.
* (c) 2014-2022 Alexander Miertsch <[email protected]>
* (c) 2015-2022 Sascha-Oliver Prolic <[email protected]>
* (c) 2014-2024 Alexander Miertsch <[email protected]>
* (c) 2015-2024 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
8 changes: 4 additions & 4 deletions src/Command/ProjectionRunCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

/**
* This file is part of prooph/event-store-symfony-bundle.
* (c) 2014-2022 Alexander Miertsch <[email protected]>
* (c) 2015-2022 Sascha-Oliver Prolic <[email protected]>
* (c) 2014-2024 Alexander Miertsch <[email protected]>
* (c) 2015-2024 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 All @@ -27,12 +27,12 @@ protected function configure(): void
$this
->setName('event-store:projection:run')
->setDescription('Runs a projection')
->addOption(static::OPTION_RUN_ONCE, 'o', InputOption::VALUE_NONE, 'Loop the projection only once, then exit');
->addOption(self::OPTION_RUN_ONCE, 'o', InputOption::VALUE_NONE, 'Loop the projection only once, then exit');
}

protected function execute(InputInterface $input, OutputInterface $output): int
{
$keepRunning = ! $input->getOption(static::OPTION_RUN_ONCE);
$keepRunning = ! $input->getOption(self::OPTION_RUN_ONCE);
$output->writeln(
\sprintf(
'<action>Starting projection <highlight>%s</highlight>. Keep running: <highlight>%s</highlight></action>',
Expand Down
4 changes: 2 additions & 2 deletions src/Command/ProjectionStateCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

/**
* This file is part of prooph/event-store-symfony-bundle.
* (c) 2014-2022 Alexander Miertsch <[email protected]>
* (c) 2015-2022 Sascha-Oliver Prolic <[email protected]>
* (c) 2014-2024 Alexander Miertsch <[email protected]>
* (c) 2015-2024 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/Command/ProjectionStopCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

/**
* This file is part of prooph/event-store-symfony-bundle.
* (c) 2014-2022 Alexander Miertsch <[email protected]>
* (c) 2015-2022 Sascha-Oliver Prolic <[email protected]>
* (c) 2014-2024 Alexander Miertsch <[email protected]>
* (c) 2015-2024 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/Command/ProjectionStreamPositionsCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

/**
* This file is part of prooph/event-store-symfony-bundle.
* (c) 2014-2022 Alexander Miertsch <[email protected]>
* (c) 2015-2022 Sascha-Oliver Prolic <[email protected]>
* (c) 2014-2024 Alexander Miertsch <[email protected]>
* (c) 2015-2024 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
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

/**
* This file is part of prooph/event-store-symfony-bundle.
* (c) 2014-2022 Alexander Miertsch <[email protected]>
* (c) 2015-2022 Sascha-Oliver Prolic <[email protected]>
* (c) 2014-2024 Alexander Miertsch <[email protected]>
* (c) 2015-2024 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/DependencyInjection/Compiler/MetadataEnricherPass.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

/**
* This file is part of prooph/event-store-symfony-bundle.
* (c) 2014-2022 Alexander Miertsch <[email protected]>
* (c) 2015-2022 Sascha-Oliver Prolic <[email protected]>
* (c) 2014-2024 Alexander Miertsch <[email protected]>
* (c) 2015-2024 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/DependencyInjection/Compiler/PluginLocatorPass.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

/**
* This file is part of prooph/event-store-symfony-bundle.
* (c) 2014-2022 Alexander Miertsch <[email protected]>
* (c) 2015-2022 Sascha-Oliver Prolic <[email protected]>
* (c) 2014-2024 Alexander Miertsch <[email protected]>
* (c) 2015-2024 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/DependencyInjection/Compiler/PluginsPass.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

/**
* This file is part of prooph/event-store-symfony-bundle.
* (c) 2014-2022 Alexander Miertsch <[email protected]>
* (c) 2015-2022 Sascha-Oliver Prolic <[email protected]>
* (c) 2014-2024 Alexander Miertsch <[email protected]>
* (c) 2015-2024 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/DependencyInjection/Compiler/ProjectionOptionsPass.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

/**
* This file is part of prooph/event-store-symfony-bundle.
* (c) 2014-2022 Alexander Miertsch <[email protected]>
* (c) 2015-2022 Sascha-Oliver Prolic <[email protected]>
* (c) 2014-2024 Alexander Miertsch <[email protected]>
* (c) 2015-2024 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/DependencyInjection/Compiler/RegisterProjectionsPass.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

/**
* This file is part of prooph/event-store-symfony-bundle.
* (c) 2014-2022 Alexander Miertsch <[email protected]>
* (c) 2015-2022 Sascha-Oliver Prolic <[email protected]>
* (c) 2014-2024 Alexander Miertsch <[email protected]>
* (c) 2015-2024 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/DependencyInjection/Configuration.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

/**
* This file is part of prooph/event-store-symfony-bundle.
* (c) 2014-2022 Alexander Miertsch <[email protected]>
* (c) 2015-2022 Sascha-Oliver Prolic <[email protected]>
* (c) 2014-2024 Alexander Miertsch <[email protected]>
* (c) 2015-2024 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/DependencyInjection/ProophEventStoreExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

/**
* This file is part of prooph/event-store-symfony-bundle.
* (c) 2014-2022 Alexander Miertsch <[email protected]>
* (c) 2015-2022 Sascha-Oliver Prolic <[email protected]>
* (c) 2014-2024 Alexander Miertsch <[email protected]>
* (c) 2015-2024 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
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

/**
* This file is part of prooph/event-store-symfony-bundle.
* (c) 2014-2022 Alexander Miertsch <[email protected]>
* (c) 2015-2022 Sascha-Oliver Prolic <[email protected]>
* (c) 2014-2024 Alexander Miertsch <[email protected]>
* (c) 2015-2024 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
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

/**
* This file is part of prooph/event-store-symfony-bundle.
* (c) 2014-2022 Alexander Miertsch <[email protected]>
* (c) 2015-2022 Sascha-Oliver Prolic <[email protected]>
* (c) 2014-2024 Alexander Miertsch <[email protected]>
* (c) 2015-2024 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/Factory/ActionEventEmitterFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

/**
* This file is part of prooph/event-store-symfony-bundle.
* (c) 2014-2022 Alexander Miertsch <[email protected]>
* (c) 2015-2022 Sascha-Oliver Prolic <[email protected]>
* (c) 2014-2024 Alexander Miertsch <[email protected]>
* (c) 2015-2024 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/Factory/DefaultActionEventEmitterFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

/**
* This file is part of prooph/event-store-symfony-bundle.
* (c) 2014-2022 Alexander Miertsch <[email protected]>
* (c) 2015-2022 Sascha-Oliver Prolic <[email protected]>
* (c) 2014-2024 Alexander Miertsch <[email protected]>
* (c) 2015-2024 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/Factory/DefaultEventStoreFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

/**
* This file is part of prooph/event-store-symfony-bundle.
* (c) 2014-2022 Alexander Miertsch <[email protected]>
* (c) 2015-2022 Sascha-Oliver Prolic <[email protected]>
* (c) 2014-2024 Alexander Miertsch <[email protected]>
* (c) 2015-2024 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/Factory/EventStoreFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

/**
* This file is part of prooph/event-store-symfony-bundle.
* (c) 2014-2022 Alexander Miertsch <[email protected]>
* (c) 2015-2022 Sascha-Oliver Prolic <[email protected]>
* (c) 2014-2024 Alexander Miertsch <[email protected]>
* (c) 2015-2024 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/Factory/ProjectionManagerFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

/**
* This file is part of prooph/event-store-symfony-bundle.
* (c) 2014-2022 Alexander Miertsch <[email protected]>
* (c) 2015-2022 Sascha-Oliver Prolic <[email protected]>
* (c) 2014-2024 Alexander Miertsch <[email protected]>
* (c) 2015-2024 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: 8 additions & 3 deletions src/Messenger/EventStoreTransactionMiddleware.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

/**
* This file is part of prooph/event-store-symfony-bundle.
* (c) 2014-2022 Alexander Miertsch <[email protected]>
* (c) 2015-2022 Sascha-Oliver Prolic <[email protected]>
* (c) 2014-2024 Alexander Miertsch <[email protected]>
* (c) 2015-2024 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 Expand Up @@ -42,11 +42,16 @@ public function handle(Envelope $envelope, StackInterface $stack): Envelope
$this->eventStore->rollback();

if ($e instanceof HandlerFailedException) {
$method = 'getWrappedExceptions';
if (! \method_exists($e, $method)) {
$method = 'getNestedExceptions';
}

// Remove all HandledStamp from the envelope so the retry will execute all handlers again.
// When a handler fails, the queries of allegedly successful previous handlers just got rolled back.
throw new HandlerFailedException(
$e->getEnvelope()->withoutAll(HandledStamp::class),
$e->getNestedExceptions()
$e->$method()
);
}

Expand Down
4 changes: 2 additions & 2 deletions src/Projection/Options/ProjectionOptions.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

/**
* This file is part of prooph/event-store-symfony-bundle.
* (c) 2014-2022 Alexander Miertsch <[email protected]>
* (c) 2015-2022 Sascha-Oliver Prolic <[email protected]>
* (c) 2014-2024 Alexander Miertsch <[email protected]>
* (c) 2015-2024 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

0 comments on commit 0e75bdc

Please sign in to comment.