mirror_php/rector
1
0
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2025-04-20 23:41:57 +02:00
Code Issues Projects Releases Wiki Activity

phpstan fixes

Browse Source
This commit is contained in:
TomasVotruba 2017-07-16 14:01:45 +02:00
parent 57f291a389
commit 7a97ad00af
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
composer.json
View File

@ -17,7 +17,7 @@
"phpunit/phpunit": "^6.2",
"tracy/tracy": "^2.4",
"symplify/easy-coding-standard": "^2.1",
"phpstan/phpstan": "^0.7.0"
"phpstan/phpstan": "^0.7"
},
"autoload": {
"psr-4": {
@ -33,6 +33,6 @@
"all": ["phpunit", "@cs", "@ps"],
"cs": "ecs check src tests",
"fs": "ecs check src tests --fix",
"ps": "phpstan analyse src tests --level 7"
"ps": "phpstan analyse src tests --level 7 -c phpstan.neon"
}
}

5
phpstan.neon Normal file
View File

@ -0,0 +1,5 @@
parameters:
ignoreErrors:
- '#should return PhpParser\\Node\[\] but returns PhpParser\\Node\[\]\|null#'
# annotated => bug
- '#Access to an undefined property PhpParser\\Node\\Expr::\$value#'

27
src/Reconstructor/DependencyInjection/InjectAnnotationToConstructorReconstructor.php
View File

@ -2,7 +2,6 @@
namespace Rector\Reconstructor\DependencyInjection;
use PhpCsFixer\DocBlock\Annotation;
use PhpCsFixer\DocBlock\DocBlock;
use PhpParser\Comment\Doc;
use PhpParser\Node;
@ -29,7 +28,7 @@ final class InjectAnnotationToConstructorReconstructor implements ReconstructorI
}
/**
* @param Class_|Node $classNode
* @param Class_ $classNode
*/
public function reconstruct(Node $classNode): void
{
@ -39,40 +38,36 @@ final class InjectAnnotationToConstructorReconstructor implements ReconstructorI
}
$propertyNode = $classElementStatement;
$propertyDocBlock = $this->createDocBlock($propertyNode);
$propertyDocBlock = $this->createDocBlockFromProperty($propertyNode);
$injectAnnotations = $propertyDocBlock->getAnnotationsOfType('inject');
if (! $injectAnnotations) {
continue;
}
$this->removeInjectAnnotation($injectAnnotations, $propertyNode, $propertyDocBlock);
$this->removeInjectAnnotationFromProperty($propertyNode, $propertyDocBlock);
$this->makePropertyPrivate($propertyNode);
$propertyType = $propertyDocBlock->getAnnotationsOfType('var')[0]->getTypes()[0];
$propertyType = $propertyDocBlock->getAnnotationsOfType('var')[0]
->getTypes()[0];
$propertyName = $propertyNode->props[0]->name;
$this->constructorMethodBuilder->addPropertyAssignToClass($classNode, $propertyType, $propertyName);
}
}
private function createDocBlock(Property $propertyNode): DocBlock
private function createDocBlockFromProperty(Property $propertyNode): DocBlock
{
return new DocBlock($propertyNode->getDocComment());
}
/**
* @param $propertyNode
* @return int
*/
private function makePropertyPrivate($propertyNode): int
private function makePropertyPrivate(Property $propertyNode): void
{
return $propertyNode->flags = Class_::MODIFIER_PRIVATE;
$propertyNode->flags = Class_::MODIFIER_PRIVATE;
}
/**
* @param Annotation[] $injectAnnotations
*/
private function removeInjectAnnotation(array $injectAnnotations, Property $propertyNode, DocBlock $propertyDocBlock): void
private function removeInjectAnnotationFromProperty(Property $propertyNode, DocBlock $propertyDocBlock): void
{
$injectAnnotations = $propertyDocBlock->getAnnotationsOfType('inject');
foreach ($injectAnnotations as $injectAnnotation) {
$injectAnnotation->remove();
}