danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-11-27 12:55:26 +01:00
Code Issues Projects Releases Wiki Activity

Revert \Composer\Autoload\ClassLoader in other Cli\*.php

Browse Source
This commit is contained in:
ralila 2021-12-05 00:08:39 +01:00
parent 2d199d1f13
commit 81c94f12c1
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Psalm/Internal/Cli/LanguageServer.php
View File

@ -2,7 +2,6 @@
namespace Psalm\Internal\Cli; namespace Psalm\Internal\Cli;
use Composer\Autoload\ClassLoader;
use Psalm\Config; use Psalm\Config;
use Psalm\Internal\Analyzer\ProjectAnalyzer; use Psalm\Internal\Analyzer\ProjectAnalyzer;
use Psalm\Internal\CliUtils; use Psalm\Internal\CliUtils;
@ -220,7 +219,8 @@ HELP;
$include_collector = new IncludeCollector(); $include_collector = new IncludeCollector();
$first_autoloader = $include_collector->runAndCollect( $first_autoloader = $include_collector->runAndCollect(
function () use ($current_dir, $options, $vendor_dir): ?ClassLoader { // phpcs:ignore SlevomatCodingStandard.Namespaces.ReferenceUsedNamesOnly.ReferenceViaFullyQualifiedName
function () use ($current_dir, $options, $vendor_dir): ?\Composer\Autoload\ClassLoader {
return CliUtils::requireAutoloaders($current_dir, isset($options['r']), $vendor_dir); return CliUtils::requireAutoloaders($current_dir, isset($options['r']), $vendor_dir);
} }
); );

4
src/Psalm/Internal/Cli/Psalter.php
View File

@ -2,7 +2,6 @@
namespace Psalm\Internal\Cli; namespace Psalm\Internal\Cli;
use Composer\Autoload\ClassLoader;
use Composer\XdebugHandler\XdebugHandler; use Composer\XdebugHandler\XdebugHandler;
use Psalm\Config; use Psalm\Config;
use Psalm\Exception\UnsupportedIssueToFixException; use Psalm\Exception\UnsupportedIssueToFixException;
@ -203,7 +202,8 @@ HELP;
$include_collector = new IncludeCollector(); $include_collector = new IncludeCollector();
$first_autoloader = $include_collector->runAndCollect( $first_autoloader = $include_collector->runAndCollect(
function () use ($current_dir, $options, $vendor_dir): ?ClassLoader { // phpcs:ignore SlevomatCodingStandard.Namespaces.ReferenceUsedNamesOnly.ReferenceViaFullyQualifiedName
function () use ($current_dir, $options, $vendor_dir): ?\Composer\Autoload\ClassLoader {
return CliUtils::requireAutoloaders($current_dir, isset($options['r']), $vendor_dir); return CliUtils::requireAutoloaders($current_dir, isset($options['r']), $vendor_dir);
} }
); );

4
src/Psalm/Internal/Cli/Refactor.php
View File

@ -2,7 +2,6 @@
namespace Psalm\Internal\Cli; namespace Psalm\Internal\Cli;
use Composer\Autoload\ClassLoader;
use Composer\XdebugHandler\XdebugHandler; use Composer\XdebugHandler\XdebugHandler;
use Psalm\Internal\Analyzer\ProjectAnalyzer; use Psalm\Internal\Analyzer\ProjectAnalyzer;
use Psalm\Internal\CliUtils; use Psalm\Internal\CliUtils;
@ -178,7 +177,8 @@ HELP;
$include_collector = new IncludeCollector(); $include_collector = new IncludeCollector();
$first_autoloader = $include_collector->runAndCollect( $first_autoloader = $include_collector->runAndCollect(
function () use ($current_dir, $options, $vendor_dir): ?ClassLoader { // phpcs:ignore SlevomatCodingStandard.Namespaces.ReferenceUsedNamesOnly.ReferenceViaFullyQualifiedName
function () use ($current_dir, $options, $vendor_dir): ?\Composer\Autoload\ClassLoader {
return CliUtils::requireAutoloaders($current_dir, isset($options['r']), $vendor_dir); return CliUtils::requireAutoloaders($current_dir, isset($options['r']), $vendor_dir);
} }
); );