Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
30 changes: 15 additions & 15 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ jobs:
strategy:
matrix:
include:
- php-version: '8.0'
symfony-version: '5.4.*'
- php-version: '8.0'
symfony-version: '6.0.*'
- php-version: '8.1'
symfony-version: '6.4.*'
- php-version: '8.3'
symfony-version: '6.4.*'
- php-version: '8.2'
symfony-version: '5.4.*'
- php-version: '8.2'
symfony-version: '6.2.*'
symfony-version: '7.0.*'
- php-version: '8.3'
symfony-version: '7.0.*'
steps:
- name: "Checkout"
uses: actions/checkout@v2
Expand All @@ -41,8 +41,8 @@ jobs:
- name: "Setup env & install dependencies"
uses: ./.github/actions/install
with:
php-version: '8.2'
symfony-version: '6.2.*'
php-version: '8.3'
symfony-version: '7.0.*'
- name: "Run static analyzis with phpstan/phpstan"
run: vendor/bin/phpstan analyze

Expand All @@ -55,8 +55,8 @@ jobs:
- name: "Setup env & install dependencies"
uses: ./.github/actions/install
with:
php-version: '8.2'
symfony-version: '6.2.*'
php-version: '8.3'
symfony-version: '7.0.*'
- name: "Run checkstyle with symplify/easy-coding-standard"
run: vendor/bin/ecs

Expand All @@ -69,8 +69,8 @@ jobs:
- name: "Setup env & install dependencies"
uses: ./.github/actions/install
with:
php-version: '8.2'
symfony-version: '6.2.*'
php-version: '8.3'
symfony-version: '7.0.*'
- name: "Run tests with phpunit/phpunit"
run: vendor/bin/phpunit --testsuite=Convention

Expand All @@ -84,8 +84,8 @@ jobs:
- name: "Setup env & install dependencies"
uses: ./.github/actions/install
with:
php-version: '8.2'
symfony-version: '6.2.*'
php-version: '8.3'
symfony-version: '7.0.*'
coverage-mode: 'xdebug'
- name: "Run tests with phpunit/phpunit"
env:
Expand Down
36 changes: 18 additions & 18 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"minimum-stability": "dev",
"prefer-stable": true,
"require": {
"php": "^8.0",
"php": "^8.1",
"ext-json": "*",
"composer-runtime-api": "^2.0",
"box/spout": "^3.0",
Expand All @@ -23,15 +23,15 @@
"psr/container": "^1.0",
"psr/event-dispatcher": "^1.0",
"psr/log": "^1.0|^2.0|^3.0",
"symfony/config": "^5.0|^6.0",
"symfony/console": "^5.0|^6.0",
"symfony/dependency-injection": "^5.0|^6.0",
"symfony/form": "^5.0|^6.0",
"symfony/http-kernel": "^5.0|^6.0",
"symfony/framework-bundle": "^5.0|^6.0",
"symfony/messenger": "^5.0|^6.0",
"symfony/serializer": "^5.0|^6.0",
"symfony/validator": "^5.0|^6.0"
"symfony/config": "^6.4|^7.0",
"symfony/console": "^6.4|^7.0",
"symfony/dependency-injection": "^6.4|^7.0",
"symfony/form": "^6.4|^7.0",
"symfony/http-kernel": "^6.4|^7.0",
"symfony/framework-bundle": "^6.4|^7.0",
"symfony/messenger": "^6.4|^7.0",
"symfony/serializer": "^6.4|^7.0",
"symfony/validator": "^6.4|^7.0"
},
"require-dev": {
"doctrine/annotations": "^1.14",
Expand All @@ -41,14 +41,14 @@
"phpstan/phpstan": "^1.4",
"phpunit/phpunit": "^9.5",
"sonata-project/admin-bundle": "^4.0",
"symfony/browser-kit": "^5.0|^6.0",
"symfony/css-selector": "^5.0|^6.0",
"symfony/filesystem": "^5.0|^6.0",
"symfony/finder": "^5.0|^6.0",
"symfony/process": "^5.0|^6.0",
"symfony/security-bundle": "^5.0|^6.0",
"symfony/translation": "^5.0|^6.0",
"symfony/twig-bundle": "^5.0|^6.0",
"symfony/browser-kit": "^6.4|^7.0",
"symfony/css-selector": "^6.4|^7.0",
"symfony/filesystem": "^6.4|^7.0",
"symfony/finder": "^6.4|^7.0",
"symfony/process": "^6.4|^7.0",
"symfony/security-bundle": "^6.4|^7.0",
"symfony/translation": "^6.4|^7.0",
"symfony/twig-bundle": "^6.4|^7.0",
"symplify/easy-coding-standard": "^11.3"
},
"replace": {
Expand Down
8 changes: 4 additions & 4 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
services:
php82:
container_name: yokai-batch-php82
php83:
container_name: yokai-batch-php83
environment:
PHP_XDEBUG: 1
extends:
file: ~/.led/docker-base.yaml
service: localuser
hostname: php82
image: ledup/php:8.2
hostname: php83
image: ledup/php:8.3
volumes:
- .:/src
working_dir: /src
Expand Down
4 changes: 2 additions & 2 deletions phpstan.neon
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ parameters:

ignoreErrors:
# The DependencyInjection returns are complex to deal with
- message: '#.*NodeParentInterface\|null.*#'
path: ./src/batch-symfony-framework/src/DependencyInjection
- message: '#^Call to an undefined method Symfony\\Component\\Config\\Definition\\Builder\\NodeParentInterface\:\:#'
path: ./src/batch-symfony-framework/src/DependencyInjection/Configuration.php
16 changes: 8 additions & 8 deletions scripts/tests
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@ install () {
led in -s ${container} -- composer2 --no-interaction update --no-progress --with-all-dependencies
}

install "php82" "6.2.*"
led in -s php82 -- vendor/bin/ecs
led in -s php82 -- vendor/bin/phpstan analyze
led in -s php82 -- vendor/bin/phpunit --testsuite=Convention
install "php83" "7.0.*"
led in -s php83 -- vendor/bin/ecs
led in -s php83 -- vendor/bin/phpstan analyze
led in -s php83 -- vendor/bin/phpunit --testsuite=Convention

matrix=(
"php80/5.4.*"
"php80/6.0.*"
"php82/5.4.*"
"php82/6.2.*"
"php81/6.4.*"
"php83/6.4.*"
"php82/7.0.*"
"php83/7.0.*"
)
for entry in "${matrix[@]}"
do
Expand Down
4 changes: 2 additions & 2 deletions src/batch-box-spout/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
}
],
"require": {
"php": "^8.0",
"php": "^8.1",
"box/spout": "^3.0",
"yokai/batch": "^0.5.0"
},
Expand All @@ -22,7 +22,7 @@
},
"require-dev": {
"phpunit/phpunit": "^9.5",
"symfony/filesystem": "^5.0|^6.0"
"symfony/filesystem": "^6.4|^7.0"
},
"autoload-dev": {
"psr-4": {
Expand Down
2 changes: 1 addition & 1 deletion src/batch-doctrine-dbal/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
}
],
"require": {
"php": "^8.0",
"php": "^8.1",
"ext-json": "*",
"doctrine/dbal": "^2.11|^3.0",
"doctrine/persistence": "^2.0|^3.0",
Expand Down
2 changes: 1 addition & 1 deletion src/batch-doctrine-orm/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
}
],
"require": {
"php": "^8.0",
"php": "^8.1",
"doctrine/orm": "^2.8",
"doctrine/persistence": "^2.0|^3.0",
"yokai/batch": "^0.5.0"
Expand Down
2 changes: 1 addition & 1 deletion src/batch-doctrine-persistence/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
}
],
"require": {
"php": "^8.0",
"php": "^8.1",
"doctrine/persistence": "^2.0|^3.0",
"yokai/batch": "^0.5.0"
},
Expand Down
2 changes: 1 addition & 1 deletion src/batch-league-flysystem/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
}
],
"require": {
"php": "^8.0",
"php": "^8.1",
"league/flysystem": "^3.0",
"yokai/batch": "^0.5.0"
},
Expand Down
4 changes: 2 additions & 2 deletions src/batch-openspout/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
}
],
"require": {
"php": "^8.0",
"php": "^8.1",
"openspout/openspout": "^4.0",
"yokai/batch": "^0.5.0"
},
Expand All @@ -22,7 +22,7 @@
},
"require-dev": {
"phpunit/phpunit": "^9.5",
"symfony/filesystem": "^5.0|^6.0"
"symfony/filesystem": "^6.4|^7.0"
},
"autoload-dev": {
"psr-4": {
Expand Down
6 changes: 3 additions & 3 deletions src/batch-symfony-console/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
}
],
"require": {
"php": "^8.0",
"php": "^8.1",
"ext-json": "*",
"symfony/console": "^5.0|^6.0",
"symfony/console": "^6.4|^7.0",
"yokai/batch": "^0.5.0"
},
"autoload": {
Expand All @@ -24,7 +24,7 @@
"require-dev": {
"phpspec/prophecy-phpunit": "^2.0",
"phpunit/phpunit": "^9.5",
"symfony/process": "^5.0|^6.0"
"symfony/process": "^6.4|^7.0"
},
"autoload-dev": {
"psr-4": {
Expand Down
5 changes: 2 additions & 3 deletions src/batch-symfony-console/src/RunJobCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

namespace Yokai\Batch\Bridge\Symfony\Console;

use Symfony\Component\Console\Attribute\AsCommand;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Exception\InvalidArgumentException;
use Symfony\Component\Console\Input\InputArgument;
Expand All @@ -19,10 +20,9 @@
/**
* Execute any {@see JobInterface} within your CLI.
*/
#[AsCommand(name: 'yokai:batch:run', description: 'Execute any job.')]
final class RunJobCommand extends Command
{
protected static $defaultName = 'yokai:batch:run';

public const EXIT_SUCCESS_CODE = 0;
public const EXIT_ERROR_CODE = 1;
public const EXIT_WARNING_CODE = 2;
Expand All @@ -36,7 +36,6 @@ public function __construct(

protected function configure(): void
{
$this->setDescription('Execute any job.');
$this->addArgument('job', InputArgument::REQUIRED, 'The job name to run');
$this->addArgument('configuration', InputArgument::OPTIONAL, 'The job parameters as a JSON object');
$this->addUsage('import');
Expand Down
22 changes: 11 additions & 11 deletions src/batch-symfony-framework/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
}
],
"require": {
"php": "^8.0",
"php": "^8.1",
"composer-runtime-api": "^2.0",
"symfony/config": "^5.0|^6.0",
"symfony/console": "^5.0|^6.0",
"symfony/dependency-injection": "^5.0|^6.0",
"symfony/http-kernel": "^5.0|^6.0",
"symfony/framework-bundle": "^5.0|^6.0",
"symfony/config": "^6.4|^7.0",
"symfony/console": "^6.4|^7.0",
"symfony/dependency-injection": "^6.4|^7.0",
"symfony/http-kernel": "^6.4|^7.0",
"symfony/framework-bundle": "^6.4|^7.0",
"yokai/batch": "^0.5.0"
},
"autoload": {
Expand All @@ -27,11 +27,11 @@
},
"require-dev": {
"sonata-project/admin-bundle": "^4.0",
"symfony/filesystem": "^5.0|^6.0",
"symfony/form": "^5.0|^6.0",
"symfony/security-bundle": "^5.0|^6.0",
"symfony/translation": "^5.0|^6.0",
"symfony/twig-bundle": "^5.0|^6.0",
"symfony/filesystem": "^6.4|^7.0",
"symfony/form": "^6.4|^7.0",
"symfony/security-bundle": "^6.4|^7.0",
"symfony/translation": "^6.4|^7.0",
"symfony/twig-bundle": "^6.4|^7.0",
"phpunit/phpunit": "^9.5"
},
"suggest": {
Expand Down
4 changes: 2 additions & 2 deletions src/batch-symfony-messenger/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
}
],
"require": {
"php": "^8.0",
"symfony/messenger": "^5.0|^6.0",
"php": "^8.1",
"symfony/messenger": "^6.4|^7.0",
"yokai/batch": "^0.5.0"
},
"autoload": {
Expand Down
3 changes: 1 addition & 2 deletions src/batch-symfony-messenger/src/LaunchJobMessageHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,13 @@

namespace Yokai\Batch\Bridge\Symfony\Messenger;

use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
use Yokai\Batch\Job\JobExecutionAccessor;
use Yokai\Batch\Job\JobExecutor;

/**
* Answer to {@see LaunchJobMessage} and launch requested job.
*/
final class LaunchJobMessageHandler implements MessageHandlerInterface
final class LaunchJobMessageHandler
{
public function __construct(
private JobExecutionAccessor $jobExecutionAccessor,
Expand Down
4 changes: 2 additions & 2 deletions src/batch-symfony-serializer/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
}
],
"require": {
"php": "^8.0",
"symfony/serializer": "^5.0|^6.0",
"php": "^8.1",
"symfony/serializer": "^6.4|^7.0",
"yokai/batch": "^0.5.0"
},
"autoload": {
Expand Down
Loading