Skip to content

Commit 4103b0b

Browse files
committed
Fix issues for latest GrumPHP version
1 parent e02ab4f commit 4103b0b

File tree

5 files changed

+15
-44
lines changed

5 files changed

+15
-44
lines changed

src/GitlabApiClient.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
final class GitlabApiClient
2525
{
26-
private const API_URL = 'https://%s/api/v4/ci/lint';
26+
private const API_URL = 'https://%s/ci/lint';
2727

2828
private string $gitlabToken;
2929

src/GitlabLintTask.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,15 @@
1515
use GrumPHP\Runner\TaskResult;
1616
use GrumPHP\Runner\TaskResultInterface;
1717
use GrumPHP\Task\AbstractExternalTask;
18+
use GrumPHP\Task\Config\ConfigOptionsResolver;
1819
use GrumPHP\Task\Context\ContextInterface;
1920
use GrumPHP\Task\Context\GitPreCommitContext;
2021
use GrumPHP\Task\Context\RunContext;
2122
use Symfony\Component\OptionsResolver\OptionsResolver;
2223

2324
final class GitlabLintTask extends AbstractExternalTask
2425
{
25-
public static function getConfigurableOptions(): OptionsResolver
26+
public static function getConfigurableOptions(): ConfigOptionsResolver
2627
{
2728
$resolver = new OptionsResolver();
2829
$resolver->setDefaults([
@@ -37,7 +38,7 @@ public static function getConfigurableOptions(): OptionsResolver
3738
->addAllowedTypes('gitlab_url', ['string'])
3839
;
3940

40-
return $resolver;
41+
return ConfigOptionsResolver::fromOptionsResolver($resolver);
4142
}
4243

4344
public function canRunInContext(ContextInterface $context): bool

src/Loader.php

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,11 @@
1313
namespace Headsnet\GrumPHP\GitlabLint;
1414

1515
use GrumPHP\Extension\ExtensionInterface;
16-
use Symfony\Component\DependencyInjection\ContainerBuilder;
17-
use Symfony\Component\DependencyInjection\Reference;
1816

1917
final class Loader implements ExtensionInterface
2018
{
21-
public const SERVICE_ID = 'task.gitlab_lint';
22-
23-
public function load(ContainerBuilder $container): void
19+
public function imports(): iterable
2420
{
25-
$container->register(self::SERVICE_ID, GitlabLintTask::class)
26-
->addArgument(new Reference('process_builder'))
27-
->addArgument(new Reference('formatter.raw_process'))
28-
->addTag('grumphp.task', [
29-
'task' => 'gitlab_lint',
30-
]);
21+
yield __DIR__ . '/Resources/config/services.yaml';
3122
}
3223
}

src/Resources/config/services.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
2+
services:
3+
task.gitlab_lint:
4+
class: Headsnet\GrumPHP\GitlabLint\GitlabLintTask
5+
arguments:
6+
- '@process_builder'
7+
- '@formatter.raw_process'
8+
tags:
9+
- { name: 'grumphp.task', task: 'gitlab_lint' }

tests/GitlabLintLoaderTest.php

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)