Skip to content

Commit 910356a

Browse files
committed
✨ add compat for grumphp 2
1 parent 5c16664 commit 910356a

4 files changed

Lines changed: 17 additions & 17 deletions

File tree

Services.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
services:
2+
PLUS\GrumPHPBomTask\BomFixerTask:
3+
class: PLUS\GrumPHPBomTask\BomFixerTask
4+
arguments:
5+
- '@process_builder'
6+
- '@formatter.raw_process'
7+
tags:
8+
- {name: grumphp.task, task: plus_bom_fixer}

composer.json

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,6 @@
1010
"homepage": "http://pluswerk.ag"
1111
}
1212
],
13-
"config": {
14-
"platform": {
15-
"php": "7.3"
16-
}
17-
},
1813
"support": {
1914
"issues": "https://github.com/pluswerk/grumphp-bom-task/issues"
2015
},
@@ -25,8 +20,8 @@
2520
}
2621
},
2722
"require": {
28-
"php": ">=7.3",
29-
"phpro/grumphp": "^1.3.3",
23+
"php": "~8.1.0 || ~8.2.0",
24+
"phpro/grumphp": "^2",
3025
"opis/closure": "^3.6.2"
3126
},
3227
"require-dev": {

src/BomFixerTask.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
use GrumPHP\Runner\TaskResult;
66
use GrumPHP\Runner\TaskResultInterface;
7+
use GrumPHP\Task\Config\ConfigOptionsResolver;
78
use GrumPHP\Task\Config\EmptyTaskConfig;
89
use GrumPHP\Task\Config\TaskConfigInterface;
910
use GrumPHP\Task\Context\ContextInterface;
@@ -22,7 +23,7 @@ public function __construct()
2223
$this->config = new EmptyTaskConfig();
2324
}
2425

25-
public static function getConfigurableOptions(): OptionsResolver
26+
public static function getConfigurableOptions(): ConfigOptionsResolver
2627
{
2728
$resolver = new OptionsResolver();
2829
$resolver->setDefaults(
@@ -32,8 +33,7 @@ public static function getConfigurableOptions(): OptionsResolver
3233
);
3334

3435
$resolver->addAllowedTypes('triggered_by', ['array']);
35-
36-
return $resolver;
36+
return ConfigOptionsResolver::fromOptionsResolver($resolver);
3737
}
3838

3939
public function getConfig(): TaskConfigInterface

src/ExtensionLoader.php

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace PLUS\GrumPHPBomTask;
46

57
use GrumPHP\Extension\ExtensionInterface;
6-
use Symfony\Component\DependencyInjection\ContainerBuilder;
7-
use Symfony\Component\DependencyInjection\Reference;
88

99
class ExtensionLoader implements ExtensionInterface
1010
{
11-
public function load(ContainerBuilder $container): void
11+
public function imports(): iterable
1212
{
13-
$container->register('task.plus_bom_fixer', BomFixerTask::class)
14-
->addArgument(new Reference('process_builder'))
15-
->addArgument(new Reference('formatter.raw_process'))
16-
->addTag('grumphp.task', ['task' => 'plus_bom_fixer']);
13+
yield __DIR__ . '/../Services.yaml';
1714
}
1815
}

0 commit comments

Comments
 (0)