Skip to content

Commit

Permalink
Fix issues for latest GrumPHP version
Browse files Browse the repository at this point in the history
  • Loading branch information
benr77 committed Nov 29, 2023
1 parent e02ab4f commit 4103b0b
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 44 deletions.
2 changes: 1 addition & 1 deletion src/GitlabApiClient.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

final class GitlabApiClient
{
private const API_URL = 'https://%s/api/v4/ci/lint';
private const API_URL = 'https://%s/ci/lint';

private string $gitlabToken;

Expand Down
5 changes: 3 additions & 2 deletions src/GitlabLintTask.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,15 @@
use GrumPHP\Runner\TaskResult;
use GrumPHP\Runner\TaskResultInterface;
use GrumPHP\Task\AbstractExternalTask;
use GrumPHP\Task\Config\ConfigOptionsResolver;
use GrumPHP\Task\Context\ContextInterface;
use GrumPHP\Task\Context\GitPreCommitContext;
use GrumPHP\Task\Context\RunContext;
use Symfony\Component\OptionsResolver\OptionsResolver;

final class GitlabLintTask extends AbstractExternalTask
{
public static function getConfigurableOptions(): OptionsResolver
public static function getConfigurableOptions(): ConfigOptionsResolver
{
$resolver = new OptionsResolver();
$resolver->setDefaults([
Expand All @@ -37,7 +38,7 @@ public static function getConfigurableOptions(): OptionsResolver
->addAllowedTypes('gitlab_url', ['string'])
;

return $resolver;
return ConfigOptionsResolver::fromOptionsResolver($resolver);
}

public function canRunInContext(ContextInterface $context): bool
Expand Down
13 changes: 2 additions & 11 deletions src/Loader.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,11 @@
namespace Headsnet\GrumPHP\GitlabLint;

use GrumPHP\Extension\ExtensionInterface;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Reference;

final class Loader implements ExtensionInterface
{
public const SERVICE_ID = 'task.gitlab_lint';

public function load(ContainerBuilder $container): void
public function imports(): iterable
{
$container->register(self::SERVICE_ID, GitlabLintTask::class)
->addArgument(new Reference('process_builder'))
->addArgument(new Reference('formatter.raw_process'))
->addTag('grumphp.task', [
'task' => 'gitlab_lint',
]);
yield __DIR__ . '/Resources/config/services.yaml';
}
}
9 changes: 9 additions & 0 deletions src/Resources/config/services.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@

services:
task.gitlab_lint:
class: Headsnet\GrumPHP\GitlabLint\GitlabLintTask
arguments:
- '@process_builder'
- '@formatter.raw_process'
tags:
- { name: 'grumphp.task', task: 'gitlab_lint' }
30 changes: 0 additions & 30 deletions tests/GitlabLintLoaderTest.php

This file was deleted.

0 comments on commit 4103b0b

Please sign in to comment.