Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
GenieTim committed Jun 30, 2022
2 parents 047c60f + 196ef04 commit f328052
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 11 deletions.
25 changes: 15 additions & 10 deletions ecs.php
Original file line number Diff line number Diff line change
@@ -1,19 +1,24 @@
<?php

use Symplify\EasyCodingStandard\Config\ECSConfig;
use Symplify\EasyCodingStandard\ValueObject\Option;
use PhpCsFixer\Fixer\ArrayNotation\ArraySyntaxFixer;
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
use Symplify\EasyCodingStandard\ValueObject\Set\SetList;
use Symplify\EasyCodingStandard\ValueObject\Option;
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;

return static function (ContainerConfigurator $containerConfigurator): void {
$parameters = $containerConfigurator->parameters();
$parameters->set(Option::PATHS, [__DIR__ . '/src', __DIR__ . '/tests']);
return static function (ECSConfig $configurator): void {
$configurator->paths([__DIR__ . '/src', __DIR__ . '/tests']);

// A. full sets
$containerConfigurator->import(SetList::PSR_12);
$configurator->sets([
SetList::CLEAN_CODE,
SetList::PSR_12
]);

// B. standalone rule
$services = $containerConfigurator->services();
$services->set(ArraySyntaxFixer::class)
->call('configure', [[ 'syntax' => 'short', ]]);
};
$configurator->ruleWithConfiguration(ArraySyntaxFixer::class, [
'syntax' => 'short',
]);

$configurator->skip(['Unused variable $deleted.' => ['src/GitElephant/Objects/Diff/DiffChunk.php'], 'Unused variable $new.' => ['src/GitElephant/Objects/Diff/DiffChunk.php']]);
};
2 changes: 1 addition & 1 deletion src/GitElephant/Objects/Log.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
* @author Matteo Giachino <[email protected]>
* @author Dhaval Patel <[email protected]>
*/
class Log implements \ArrayAccess, \Countable, \Iterator
class Log implements \ArrayAccess, \Countable, \Iterator: void
{
/**
* @var \GitElephant\Repository
Expand Down

0 comments on commit f328052

Please sign in to comment.