Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ECS task] Run pre commit argument switch #652

Closed
wants to merge 3 commits into from
Closed

[ECS task] Run pre commit argument switch #652

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3127740
Add $files instead of whitelist_patterns as argument on pre-commit
jmatthiesen81 Jul 5, 2019
ba2635b
Make pre commit argument configurable
jmatthiesen81 Jul 5, 2019
4d75827
Fix wrong condition
jmatthiesen81 Dec 18, 2019
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
43 changes: 40 additions & 3 deletions src/Task/Ecs.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

namespace GrumPHP\Task;

use GrumPHP\Collection\FilesCollection;
use GrumPHP\Collection\ProcessArgumentsCollection;
use GrumPHP\Runner\TaskResult;
use GrumPHP\Runner\TaskResultInterface;
use GrumPHP\Task\Context\ContextInterface;
Expand Down Expand Up @@ -31,6 +33,7 @@ public function getConfigurableOptions(): OptionsResolver
'config' => null,
'level' => null,
'triggered_by' => ['php'],
'files_on_pre_commit' => false,
]);

$resolver->addAllowedTypes('whitelist_patterns', ['array']);
Expand All @@ -39,6 +42,7 @@ public function getConfigurableOptions(): OptionsResolver
$resolver->addAllowedTypes('config', ['null', 'string']);
$resolver->addAllowedTypes('level', ['null', 'string']);
$resolver->addAllowedTypes('triggered_by', ['array']);
$resolver->addAllowedTypes('files_on_pre_commit', ['bool']);

return $resolver;
}
Expand All @@ -52,17 +56,27 @@ public function run(ContextInterface $context): TaskResultInterface
{
$config = $this->getConfiguration();

/** @var array $whitelistPatterns */
$whitelistPatterns = $config['whitelist_patterns'];

$files = $context->getFiles()->extensions($config['triggered_by']);
if (0 < \count($whitelistPatterns)) {
$files = $files->paths($whitelistPatterns);
}

if (0 === \count($files)) {
return TaskResult::createSkipped($this, $context);
}

$arguments = $this->processBuilder->createArgumentsForCommand('ecs');
$arguments->add('check');

foreach ($config['whitelist_patterns'] as $whitelistPattern) {
$arguments->add($whitelistPattern);
}
$this->handleContextArguments(
$arguments,
$files,
$whitelistPatterns,
$config['files_on_pre_commit'] && $context instanceof GitPreCommitContext
);

$arguments->addOptionalArgument('--config=%s', $config['config']);
$arguments->addOptionalArgument('--level=%s', $config['level']);
Expand All @@ -80,4 +94,27 @@ public function run(ContextInterface $context): TaskResultInterface

return TaskResult::createPassed($this, $context);
}

/**
* @param ProcessArgumentsCollection $arguments
* @param FilesCollection $files
* @param array $whitelistPatterns
* @param bool $addAsFilesToArguments
*/
private function handleContextArguments(
ProcessArgumentsCollection $arguments,
FilesCollection $files,
array $whitelistPatterns,
bool $addAsFilesToArguments
): void {
if ($addAsFilesToArguments) {
$arguments->addFiles($files);

return;
}

foreach ($whitelistPatterns as $whitelistPattern) {
$arguments->add($whitelistPattern);
}
}
}