Merge branch 'main' of github.com:wunderio/code-quality into feature/72-Re-add-code-complexity

Author: hkirsman

.github/pull_request_template.md

@@ -0,0 +1,11 @@
+## Overview
+
+
+
+## Screenshots
+
+
+
+## Testing
+
+

README.md

@@ -17,7 +17,7 @@ This repository currently has the following checks:
 
 * Shell script exec bits - [check_file_permissions](src/Task/CheckFilePermissions/README.md)
 * PHP Drupal CS and PHP Code security  - [phpcs](src/Task/Phpcs/README.md)
-* PHP 8.0 Compatibility - [php_compatibility](src/Task/PhpCompatibility/README.md)
+* PHP 8.1 Compatibility - [php_compatibility](src/Task/PhpCompatibility/README.md)
 * PHP syntax - [php_check_syntax](src/Task/PhpCheckSyntax/README.md)
 * Cognitive complexity and other ecs sniffs - [ecs](src/Task/Ecs/README.md)
 * Yaml syntax - [yaml_lint](src/Task/YamlLint/README.md)
@@ -27,7 +27,7 @@ This repository currently has the following checks:
 ## Pre-requisites
 
 * Composer
-* PHP >= 7.3
+* PHP >= 8.1
 
 ## Installation
 

composer.json

@@ -36,7 +36,7 @@
     "bin": ["bin/check_perms"],
     "require": {
         "symfony/polyfill-iconv": "^1",
-        "phpro/grumphp": "^1",
+        "phpro/grumphp": "^2.5",
         "drupal/coder": "^8",
         "phpcompatibility/php-compatibility": "^9.3",
         "pheromone/phpcs-security-audit": "^2.0",
@@ -45,9 +45,7 @@
         "mglaman/phpstan-drupal": "^1.1",
         "phpstan/extension-installer": "^1.1",
         "phpstan/phpstan-deprecation-rules": "^1.0",
-        "vimeo/psalm": "^4",
         "nette/finder": "^2.5",
-        "symfony/finder": "^4.4 || ^5.3 || ^6",
         "tomasvotruba/cognitive-complexity": "^0.1.1",
         "webflo/drupal-finder": "^1.3"
     },

grumphp.yml

@@ -15,7 +15,7 @@ grumphp:
     json_lint: ~
     phpunit: ~
     php_check_syntax: ~
-    psalm: ~
+    #psalm: ~
   extensions:
     - Wunderio\GrumPHP\Task\PhpCompatibility\PhpCompatibilityExtensionLoader
     - Wunderio\GrumPHP\Task\PhpCheckSyntax\PhpCheckSyntaxExtensionLoader
@@ -25,4 +25,4 @@ grumphp:
     - Wunderio\GrumPHP\Task\PhpStan\PhpStanExtensionLoader
     - Wunderio\GrumPHP\Task\YamlLint\YamlLintExtensionLoader
     - Wunderio\GrumPHP\Task\JsonLint\JsonLintExtensionLoader
-    - Wunderio\GrumPHP\Task\Psalm\PsalmExtensionLoader
+    #- Wunderio\GrumPHP\Task\Psalm\PsalmExtensionLoader

src/Drupal/DrupalAutoloader.php

@@ -6,11 +6,11 @@
 
 use DrupalFinder\DrupalFinderComposerRuntime;
 use Drush\Drush;
+use mglaman\PHPStanDrupal\Drupal\Extension;
+use mglaman\PHPStanDrupal\Drupal\ExtensionDiscovery;
 use Nette\Utils\Finder;
 use PHPUnit\Framework\Test;
 use Symfony\Component\Yaml\Yaml;
-use mglaman\PHPStanDrupal\Drupal\Extension;
-use mglaman\PHPStanDrupal\Drupal\ExtensionDiscovery;
 
 /**
  * Drupal autoloader for allowing Psalm to scan code.

src/Drupal/DrupalAutoloaderBase.php

@@ -5,8 +5,8 @@
 namespace Wunderio\GrumPHP\Drupal;
 
 use Drupal\Core\DependencyInjection\ContainerNotInitializedException;
-use Nette\Utils\Finder;
 use mglaman\PHPStanDrupal\Drupal\Extension;
+use Nette\Utils\Finder;
 
 /**
  * Drupal autoloader base class for allowing Psalm to scan code.

src/Task/AbstractExternalExtensionLoader.php

@@ -1,13 +1,10 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Wunderio\GrumPHP\Task;
 
 use GrumPHP\Extension\ExtensionInterface;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\Yaml\Yaml;
 
 /**
  * Class AbstractExternalExtensionLoader.
@@ -18,54 +15,13 @@
  */
 abstract class AbstractExternalExtensionLoader implements ExtensionInterface {
 
-  /**
-   * Name.
-   *
-   * @var string
-   */
-  public $name;
-
-  /**
-   * Construction arguments.
-   *
-   * @var array
-   */
-  public $arguments;
-
-  /**
-   * Task class.
-   *
-   * @var string
-   */
-  public $class;
-
-  /**
-   * AbstractExternalExtensionLoader constructor.
-   */
-  public function __construct() {
-    $tasks = Yaml::parseFile(__DIR__ . '/tasks.yml');
-    $class_name = str_replace('ExtensionLoader', '', static::class);
-    $this->class = $class_name . 'Task';
-    $default_configuration = $tasks['default'];
-    unset($default_configuration['name']);
-    $configurations = $tasks[$this->class] ?? $default_configuration;
-    $class_name = explode('\\', $class_name);
-    $default_name = strtolower(preg_replace('/\B([A-Z])/', '_$1', end($class_name)));
-    $this->name = $configurations['name'] ?? $default_name;
-    $this->arguments = $configurations['arguments'] ?? $default_configuration['arguments'];
-  }
-
   /**
    * {@inheritdoc}
    */
-  public function load(ContainerBuilder $container): void {
-    $task = $container->register('task.' . $this->name, $this->class);
-    if (!empty($this->arguments)) {
-      foreach ($this->arguments as $argument) {
-        $task->addArgument(new Reference($argument));
-      }
-    }
-    $task->addTag('grumphp.task', ['task' => $this->name]);
+  public function imports(): iterable {
+    $class_name = str_replace('ExtensionLoader', '', static::class);
+    $class_exploded = explode('\\', $class_name);
+    yield dirname(__DIR__) . '/Task/' . end($class_exploded) . '/services.yaml';
   }
 
 }

src/Task/AbstractLintTask.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Wunderio\GrumPHP\Task;
 

src/Task/AbstractMultiPathProcessingTask.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Wunderio\GrumPHP\Task;
 

src/Task/AbstractProcessingTask.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Wunderio\GrumPHP\Task;