danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-11-30 04:39:00 +01:00
Code Issues Projects Releases Wiki Activity

Migrate Codebase-namespaced and FileManipulation-namespaced classes to internals

Browse Source
This commit is contained in:
Brown 2018-11-12 10:46:55 -05:00 committed by Matthew Brown
parent a338e76ef6
commit 0254322bed
41 changed files with 69 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/plugins/ClassUnqualifier.php
View File

@ -3,7 +3,7 @@ namespace Psalm\Example\Plugin;
use Psalm\Codebase;
use Psalm\CodeLocation;
use Psalm\FileManipulation\FileManipulation;
use Psalm\FileManipulation;
use Psalm\FileSource;
use Psalm\Plugin\Hook\AfterClassLikeExistenceCheckInterface;
use Psalm\StatementsSource;

2
examples/plugins/StringChecker.php
View File

@ -7,7 +7,7 @@ use Psalm\Checker\StatementsChecker;
use Psalm\Codebase;
use Psalm\CodeLocation;
use Psalm\Context;
use Psalm\FileManipulation\FileManipulation;
use Psalm\FileManipulation;
use Psalm\IssueBuffer;
use Psalm\Issue\TypeCoercion;
use Psalm\Plugin\Hook\AfterExpressionAnalysisInterface;

2
examples/plugins/composer-based/echo-checker/EchoChecker.php
View File

@ -5,7 +5,7 @@ use PhpParser;
use Psalm\Codebase;
use Psalm\CodeLocation;
use Psalm\Context;
use Psalm\FileManipulation\FileManipulation;
use Psalm\FileManipulation;
use Psalm\IssueBuffer;
use Psalm\Issue\TypeCoercion;
use Psalm\Plugin\Hook\AfterStatementAnalysisInterface;

2
psalm.xml.dist
View File

@ -71,7 +71,7 @@
<UnusedProperty>
<errorLevel type="info">
<file name="src/Psalm/FileManipulation/FunctionDocblockManipulator.php" />
<file name="src/Psalm/Internal/FileManipulation/FunctionDocblockManipulator.php" />
</errorLevel>
</UnusedProperty>

32
src/Psalm/Codebase.php
View File

@ -98,42 +98,42 @@ class Codebase
public $find_unused_code = false;
/**
* @var Codebase\Reflection
* @var Internal\Codebase\Reflection
*/
private $reflection;
/**
* @var Codebase\Scanner
* @var Internal\Codebase\Scanner
*/
public $scanner;
/**
* @var Codebase\Analyzer
* @var Internal\Codebase\Analyzer
*/
public $analyzer;
/**
* @var Codebase\Functions
* @var Internal\Codebase\Functions
*/
public $functions;
/**
* @var Codebase\ClassLikes
* @var Internal\Codebase\ClassLikes
*/
public $classlikes;
/**
* @var Codebase\Methods
* @var Internal\Codebase\Methods
*/
public $methods;
/**
* @var Codebase\Properties
* @var Internal\Codebase\Properties
*/
public $properties;
/**
* @var Codebase\Populator
* @var Internal\Codebase\Populator
*/
public $populator;
@ -179,9 +179,9 @@ class Codebase
self::$stubbed_constants = [];
$this->reflection = new Codebase\Reflection($providers->classlike_storage_provider, $this);
$this->reflection = new Internal\Codebase\Reflection($providers->classlike_storage_provider, $this);
$this->scanner = new Codebase\Scanner(
$this->scanner = new Internal\Codebase\Scanner(
$this,
$config,
$providers->file_storage_provider,
@ -193,24 +193,24 @@ class Codebase
$this->loadAnalyzer();
$this->functions = new Codebase\Functions($providers->file_storage_provider, $this->reflection);
$this->methods = new Codebase\Methods(
$this->functions = new Internal\Codebase\Functions($providers->file_storage_provider, $this->reflection);
$this->methods = new Internal\Codebase\Methods(
$config,
$providers->classlike_storage_provider,
$providers->file_reference_provider
);
$this->properties = new Codebase\Properties(
$this->properties = new Internal\Codebase\Properties(
$providers->classlike_storage_provider,
$providers->file_reference_provider
);
$this->classlikes = new Codebase\ClassLikes(
$this->classlikes = new Internal\Codebase\ClassLikes(
$this->config,
$providers->classlike_storage_provider,
$this->scanner,
$this->methods
);
$this->populator = new Codebase\Populator(
$this->populator = new Internal\Codebase\Populator(
$config,
$providers->classlike_storage_provider,
$providers->file_storage_provider,
@ -227,7 +227,7 @@ class Codebase
*/
private function loadAnalyzer()
{
$this->analyzer = new Codebase\Analyzer(
$this->analyzer = new Internal\Codebase\Analyzer(
$this->config,
$this->file_provider,
$this->file_storage_provider,

2
src/Psalm/FileManipulation/FileManipulation.php → src/Psalm/FileManipulation.php
View File

@ -1,5 +1,5 @@
<?php
namespace Psalm\FileManipulation;
namespace Psalm;
class FileManipulation
{

2
src/Psalm/Internal/Analyzer/ClassLikeAnalyzer.php
View File

@ -7,7 +7,7 @@ use Psalm\Codebase;
use Psalm\CodeLocation;
use Psalm\Config;
use Psalm\Context;
use Psalm\FileManipulation\FileManipulationBuffer;
use Psalm\Internal\FileManipulation\FileManipulationBuffer;
use Psalm\Issue\DuplicateClass;
use Psalm\Issue\InaccessibleProperty;
use Psalm\Issue\InvalidClass;

2
src/Psalm/Internal/Analyzer/FileAnalyzer.php
View File

@ -5,7 +5,7 @@ use PhpParser;
use Psalm\Codebase;
use Psalm\Context;
use Psalm\Exception\UnpreparedAnalysisException;
use Psalm\FileManipulation\FileManipulationBuffer;
use Psalm\Internal\FileManipulation\FileManipulationBuffer;
use Psalm\IssueBuffer;
use Psalm\StatementsSource;
use Psalm\Type;

2
src/Psalm/Internal/Analyzer/FunctionAnalyzer.php
View File

@ -3,7 +3,7 @@ namespace Psalm\Internal\Analyzer;
use PhpParser;
use Psalm\Internal\Analyzer\Statements\Expression\AssertionFinder;
use Psalm\Codebase\CallMap;
use Psalm\Internal\Codebase\CallMap;
use Psalm\Context;
use Psalm\CodeLocation;
use Psalm\Issue\InvalidArgument;

2
src/Psalm/Internal/Analyzer/FunctionLike/ReturnTypeAnalyzer.php
View File

@ -16,7 +16,7 @@ use Psalm\Internal\Analyzer\StatementsAnalyzer;
use Psalm\Internal\Analyzer\TypeAnalyzer;
use Psalm\CodeLocation;
use Psalm\Context;
use Psalm\FileManipulation\FunctionDocblockManipulator;
use Psalm\Internal\FileManipulation\FunctionDocblockManipulator;
use Psalm\Issue\InvalidFalsableReturnType;
use Psalm\Issue\InvalidNullableReturnType;
use Psalm\Issue\InvalidReturnType;

4
src/Psalm/Internal/Analyzer/FunctionLikeAnalyzer.php
View File

@ -9,10 +9,10 @@ use Psalm\Codebase;
use Psalm\Internal\Analyzer\FunctionLike\ReturnTypeAnalyzer;
use Psalm\Internal\Analyzer\FunctionLike\ReturnTypeCollector;
use Psalm\Internal\Analyzer\Statements\ExpressionAnalyzer;
use Psalm\Codebase\CallMap;
use Psalm\Internal\Codebase\CallMap;
use Psalm\CodeLocation;
use Psalm\Context;
use Psalm\FileManipulation\FunctionDocblockManipulator;
use Psalm\Internal\FileManipulation\FunctionDocblockManipulator;
use Psalm\Issue\InvalidParamDefault;
use Psalm\Issue\MismatchingDocblockParamType;
use Psalm\Issue\MissingClosureParamType;

4
src/Psalm/Internal/Analyzer/Statements/Expression/Call/FunctionCallAnalyzer.php
View File

@ -7,10 +7,10 @@ use Psalm\Internal\Analyzer\FunctionLikeAnalyzer;
use Psalm\Internal\Analyzer\ProjectAnalyzer;
use Psalm\Internal\Analyzer\Statements\ExpressionAnalyzer;
use Psalm\Internal\Analyzer\StatementsAnalyzer;
use Psalm\Codebase\CallMap;
use Psalm\Internal\Codebase\CallMap;
use Psalm\CodeLocation;
use Psalm\Context;
use Psalm\FileManipulation\FileManipulationBuffer;
use Psalm\Internal\FileManipulation\FileManipulationBuffer;
use Psalm\Issue\ForbiddenCode;
use Psalm\Issue\InvalidFunctionCall;
use Psalm\Issue\NullFunctionCall;

4
src/Psalm/Internal/Analyzer/Statements/Expression/Call/MethodCallAnalyzer.php
View File

@ -8,11 +8,11 @@ use Psalm\Internal\Analyzer\MethodAnalyzer;
use Psalm\Internal\Analyzer\Statements\ExpressionAnalyzer;
use Psalm\Internal\Analyzer\StatementsAnalyzer;
use Psalm\Internal\Analyzer\TypeAnalyzer;
use Psalm\Codebase\CallMap;
use Psalm\Internal\Codebase\CallMap;
use Psalm\CodeLocation;
use Psalm\Config;
use Psalm\Context;
use Psalm\FileManipulation\FileManipulationBuffer;
use Psalm\Internal\FileManipulation\FileManipulationBuffer;
use Psalm\Issue\InvalidMethodCall;
use Psalm\Issue\InvalidPropertyAssignmentValue;
use Psalm\Issue\InvalidScope;

2
src/Psalm/Internal/Analyzer/Statements/Expression/Call/StaticCallAnalyzer.php
View File

@ -10,7 +10,7 @@ use Psalm\Internal\Analyzer\StatementsAnalyzer;
use Psalm\CodeLocation;
use Psalm\Config;
use Psalm\Context;
use Psalm\FileManipulation\FileManipulationBuffer;
use Psalm\Internal\FileManipulation\FileManipulationBuffer;
use Psalm\Issue\DeprecatedClass;
use Psalm\Issue\InvalidStringClass;
use Psalm\Issue\ParentNotFound;

2
src/Psalm/Internal/Analyzer/Statements/Expression/CallAnalyzer.php
View File

@ -8,7 +8,7 @@ use Psalm\Internal\Analyzer\MethodAnalyzer;
use Psalm\Internal\Analyzer\Statements\ExpressionAnalyzer;
use Psalm\Internal\Analyzer\StatementsAnalyzer;
use Psalm\Internal\Analyzer\TypeAnalyzer;
use Psalm\Codebase\CallMap;
use Psalm\Internal\Codebase\CallMap;
use Psalm\CodeLocation;
use Psalm\Context;
use Psalm\Issue\ImplicitToStringCast;

2
src/Psalm/Internal/Analyzer/Statements/ExpressionAnalyzer.php
View File

@ -28,7 +28,7 @@ use Psalm\CodeLocation;
use Psalm\Config;
use Psalm\Context;
use Psalm\Exception\DocblockParseException;
use Psalm\FileManipulation\FileManipulationBuffer;
use Psalm\Internal\FileManipulation\FileManipulationBuffer;
use Psalm\FileSource;
use Psalm\Issue\ForbiddenCode;
use Psalm\Issue\InvalidCast;

4
src/Psalm/Internal/Analyzer/StatementsAnalyzer.php
View File

@ -23,8 +23,8 @@ use Psalm\Config;
use Psalm\Context;
use Psalm\DocComment;
use Psalm\Exception\DocblockParseException;
use Psalm\FileManipulation\FileManipulation;
use Psalm\FileManipulation\FileManipulationBuffer;
use Psalm\FileManipulation;
use Psalm\Internal\FileManipulation\FileManipulationBuffer;
use Psalm\Issue\ContinueOutsideLoop;
use Psalm\Issue\ForbiddenCode;
use Psalm\Issue\ForbiddenEcho;

8
src/Psalm/Codebase/Analyzer.php → src/Psalm/Internal/Codebase/Analyzer.php
View File

@ -1,13 +1,13 @@
<?php
namespace Psalm\Codebase;
namespace Psalm\Internal\Codebase;
use PhpParser;
use Psalm\Internal\Analyzer\FileAnalyzer;
use Psalm\Internal\Analyzer\ProjectAnalyzer;
use Psalm\Config;
use Psalm\FileManipulation\FileManipulation;
use Psalm\FileManipulation\FileManipulationBuffer;
use Psalm\FileManipulation\FunctionDocblockManipulator;
use Psalm\FileManipulation;
use Psalm\Internal\FileManipulation\FileManipulationBuffer;
use Psalm\Internal\FileManipulation\FunctionDocblockManipulator;
use Psalm\IssueBuffer;
use Psalm\Internal\Provider\ClassLikeStorageProvider;
use Psalm\Internal\Provider\FileProvider;

4
src/Psalm/Codebase/CallMap.php → src/Psalm/Internal/Codebase/CallMap.php
View File

@ -1,5 +1,5 @@
<?php
namespace Psalm\Codebase;
namespace Psalm\Internal\Codebase;
use Psalm\Type;
use Psalm\Storage\FunctionLikeParameter;
@ -136,7 +136,7 @@ class CallMap
}
/** @var array<string, array<int|string, string>> */
$call_map = require_once(__DIR__ . '/../Internal/CallMap.php');
$call_map = require_once(__DIR__ . '/../CallMap.php');
self::$call_map = [];

2
src/Psalm/Codebase/ClassLikes.php → src/Psalm/Internal/Codebase/ClassLikes.php
View File

@ -1,5 +1,5 @@
<?php
namespace Psalm\Codebase;
namespace Psalm\Internal\Codebase;
use PhpParser;
use Psalm\Aliases;

2
src/Psalm/Codebase/Functions.php → src/Psalm/Internal/Codebase/Functions.php
View File

@ -1,5 +1,5 @@
<?php
namespace Psalm\Codebase;
namespace Psalm\Internal\Codebase;
use Psalm\Codebase;
use Psalm\Internal\Analyzer\ProjectAnalyzer;

2
src/Psalm/Codebase/Methods.php → src/Psalm/Internal/Codebase/Methods.php
View File

@ -1,5 +1,5 @@
<?php
namespace Psalm\Codebase;
namespace Psalm\Internal\Codebase;
use PhpParser;
use Psalm\Internal\Analyzer\MethodAnalyzer;

2
src/Psalm/Codebase/Populator.php → src/Psalm/Internal/Codebase/Populator.php
View File

@ -1,5 +1,5 @@
<?php
namespace Psalm\Codebase;
namespace Psalm\Internal\Codebase;
use Psalm\Internal\Analyzer\ClassLikeAnalyzer;
use Psalm\Config;

2
src/Psalm/Codebase/Properties.php → src/Psalm/Internal/Codebase/Properties.php
View File

@ -1,5 +1,5 @@
<?php
namespace Psalm\Codebase;
namespace Psalm\Internal\Codebase;
use Psalm\CodeLocation;
use Psalm\Internal\Provider\ClassLikeStorageProvider;

4
src/Psalm/Codebase/PropertyMap.php → src/Psalm/Internal/Codebase/PropertyMap.php
View File

@ -1,5 +1,5 @@
<?php
namespace Psalm\Codebase;
namespace Psalm\Internal\Codebase;
class PropertyMap
{
@ -22,7 +22,7 @@ class PropertyMap
}
/** @var array<string, array<string, string>> */
$property_map = require_once(__DIR__ . '/../Internal/PropertyMap.php');
$property_map = require_once(__DIR__ . '/../PropertyMap.php');
self::$property_map = [];

2
src/Psalm/Codebase/Reflection.php → src/Psalm/Internal/Codebase/Reflection.php
View File

@ -1,5 +1,5 @@
<?php
namespace Psalm\Codebase;
namespace Psalm\Internal\Codebase;
use Psalm\Internal\Analyzer\ClassLikeAnalyzer;
use Psalm\Internal\Analyzer\CommentAnalyzer;

2
src/Psalm/Codebase/Scanner.php → src/Psalm/Internal/Codebase/Scanner.php
View File

@ -1,5 +1,5 @@
<?php
namespace Psalm\Codebase;
namespace Psalm\Internal\Codebase;
use Psalm\Codebase;
use Psalm\Config;

4
src/Psalm/FileManipulation/FileManipulationBuffer.php → src/Psalm/Internal/FileManipulation/FileManipulationBuffer.php
View File

@ -1,5 +1,7 @@
<?php
namespace Psalm\FileManipulation;
namespace Psalm\Internal\FileManipulation;
use Psalm\FileManipulation;
class FileManipulationBuffer
{

4
src/Psalm/FileManipulation/FunctionDocblockManipulator.php → src/Psalm/Internal/FileManipulation/FunctionDocblockManipulator.php
View File

@ -1,5 +1,7 @@
<?php
namespace Psalm\FileManipulation;
namespace Psalm\Internal\FileManipulation;
use Psalm\FileManipulation;
use PhpParser\Node\Expr\Closure;
use PhpParser\Node\FunctionLike;

4
src/Psalm/Internal/Visitor/DependencyFinderVisitor.php
View File

@ -10,8 +10,8 @@ use Psalm\Internal\Analyzer\Statements\Expression\CallAnalyzer;
use Psalm\Internal\Analyzer\Statements\Expression\IncludeAnalyzer;
use Psalm\Internal\Analyzer\StatementsAnalyzer;
use Psalm\Codebase;
use Psalm\Codebase\CallMap;
use Psalm\Codebase\PropertyMap;
use Psalm\Internal\Codebase\CallMap;
use Psalm\Internal\Codebase\PropertyMap;
use Psalm\CodeLocation;
use Psalm\Config;
use Psalm\DocComment;

2
src/Psalm/Plugin/Hook/AfterClassLikeExistenceCheckInterface.php
View File

@ -3,7 +3,7 @@ namespace Psalm\Plugin\Hook;
use Psalm\CodeLocation;
use Psalm\Codebase;
use Psalm\FileManipulation\FileManipulation;
use Psalm\FileManipulation;
use Psalm\StatementsSource;
interface AfterClassLikeExistenceCheckInterface

2
src/Psalm/Plugin/Hook/AfterClassLikeVisitInterface.php
View File

@ -3,7 +3,7 @@ namespace Psalm\Plugin\Hook;
use PhpParser\Node\Stmt\ClassLike;
use Psalm\Codebase;
use Psalm\FileManipulation\FileManipulation;
use Psalm\FileManipulation;
use Psalm\StatementsSource;
use Psalm\Storage\ClassLikeStorage;

2
src/Psalm/Plugin/Hook/AfterExpressionAnalysisInterface.php
View File

@ -4,7 +4,7 @@ namespace Psalm\Plugin\Hook;
use PhpParser\Node\Expr;
use Psalm\Codebase;
use Psalm\Context;
use Psalm\FileManipulation\FileManipulation;
use Psalm\FileManipulation;
use Psalm\StatementsSource;
interface AfterExpressionAnalysisInterface

2
src/Psalm/Plugin/Hook/AfterFunctionCallAnalysisInterface.php
View File

@ -4,7 +4,7 @@ namespace Psalm\Plugin\Hook;
use PhpParser\Node\Expr\FuncCall;
use Psalm\Codebase;
use Psalm\Context;
use Psalm\FileManipulation\FileManipulation;
use Psalm\FileManipulation;
use Psalm\StatementsSource;
use Psalm\Type\Union;

2
src/Psalm/Plugin/Hook/AfterMethodCallAnalysisInterface.php
View File

@ -6,7 +6,7 @@ use PhpParser\Node\Expr\MethodCall;
use PhpParser\Node\Expr\StaticCall;
use Psalm\Codebase;
use Psalm\Context;
use Psalm\FileManipulation\FileManipulation;
use Psalm\FileManipulation;
use Psalm\StatementsSource;
use Psalm\Type\Union;

2
src/Psalm/Plugin/Hook/AfterStatementAnalysisInterface.php
View File

@ -4,7 +4,7 @@ namespace Psalm\Plugin\Hook;
use PhpParser\Node\Stmt;
use Psalm\Codebase;
use Psalm\Context;
use Psalm\FileManipulation\FileManipulation;
use Psalm\FileManipulation;
use Psalm\StatementsSource;
interface AfterStatementAnalysisInterface

1
tests/ConfigTest.php
View File

@ -238,7 +238,6 @@ class ConfigTest extends TestCase
<directory name="src" />
<directory name="examples" />
<ignoreFiles>
<file name="**/**/**/*Analyzer.php" />
<file name="**/**/**/**/*Analyzer.php" />
<file name="**/**/**/**/**/*Analyzer.php" />
</ignoreFiles>

2
tests/DocumentationTest.php
View File

@ -64,7 +64,7 @@ class DocumentationTest extends TestCase
public function setUp()
{
FileAnalyzer::clearCache();
\Psalm\FileManipulation\FunctionDocblockManipulator::clearCache();
\Psalm\Internal\FileManipulation\FunctionDocblockManipulator::clearCache();
$this->file_provider = new Provider\FakeFileProvider();

2
tests/FileManipulationTest.php
View File

@ -15,7 +15,7 @@ class FileManipulationTest extends TestCase
public function setUp()
{
FileAnalyzer::clearCache();
\Psalm\FileManipulation\FunctionDocblockManipulator::clearCache();
\Psalm\Internal\FileManipulation\FunctionDocblockManipulator::clearCache();
$this->file_provider = new Provider\FakeFileProvider();
}

2
tests/FileReferenceTest.php
View File

@ -15,7 +15,7 @@ class FileReferenceTest extends TestCase
public function setUp()
{
FileAnalyzer::clearCache();
\Psalm\FileManipulation\FunctionDocblockManipulator::clearCache();
\Psalm\Internal\FileManipulation\FunctionDocblockManipulator::clearCache();
$this->file_provider = new Provider\FakeFileProvider();

2
tests/TypeParseTest.php
View File

@ -731,6 +731,6 @@ class TypeParseTest extends TestCase
*/
public function providerTestValidCallMapType()
{
return \Psalm\Codebase\CallMap::getCallMap();
return \Psalm\Internal\Codebase\CallMap::getCallMap();
}
}