Skip to content

[WIP] #89 Re-enable Psalm #111

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.

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

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
"phpstan/phpstan-deprecation-rules": "^1.0",
"nette/finder": "^2.5",
"tomasvotruba/cognitive-complexity": "^0.1.1",
"vimeo/psalm": "^5",
"webflo/drupal-finder": "^1.3"
},
"autoload": {
Expand All @@ -55,7 +56,7 @@
}
},
"require-dev": {
"phpunit/phpunit": "^8.3"
"phpunit/phpunit": "9.6"
},
"config": {
"allow-plugins": {
Expand Down
4 changes: 2 additions & 2 deletions src/Drupal/DrupalAutoloader.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/Drupal/DrupalAutoloaderBase.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
namespace Wunderio\GrumPHP\Drupal;

use Drupal\Core\DependencyInjection\ContainerNotInitializedException;
use mglaman\PHPStanDrupal\Drupal\Extension;
use Nette\Utils\Finder;
use mglaman\PHPStanDrupal\Drupal\Extension;

/**
* Drupal autoloader base class for allowing Psalm to scan code.
Expand Down
2 changes: 1 addition & 1 deletion tests/AbstractLintTaskTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

use GrumPHP\Collection\FilesCollection;
use GrumPHP\Collection\LintErrorsCollection;
use GrumPHP\Linter\LinterInterface;
use GrumPHP\Linter\LintError;
use GrumPHP\Linter\LinterInterface;
use GrumPHP\Runner\TaskResult;
use GrumPHP\Task\Config\TaskConfigInterface;
use GrumPHP\Task\Context\ContextInterface;
Expand Down