Skip to content

Commit

Permalink
[PHP 8.0] Add DoctrineAnnotationClassToAttributeRector (#78)
Browse files Browse the repository at this point in the history
  • Loading branch information
TomasVotruba committed May 20, 2021
1 parent 0b9c95e commit e539072
Show file tree
Hide file tree
Showing 18 changed files with 401 additions and 7 deletions.
7 changes: 6 additions & 1 deletion packages/PhpAttribute/Printer/PhpAttributeGroupFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,12 @@ final class PhpAttributeGroupFactory
{
public function createFromSimpleTag(AnnotationToAttribute $annotationToAttribute): AttributeGroup
{
$fullyQualified = new FullyQualified($annotationToAttribute->getAttributeClass());
return $this->createFromClass($annotationToAttribute->getAttributeClass());
}

public function createFromClass(string $attributeClass): AttributeGroup
{
$fullyQualified = new FullyQualified($attributeClass);
$attribute = new Attribute($fullyQualified);
return new AttributeGroup([$attribute]);
}
Expand Down
4 changes: 4 additions & 0 deletions phpstan.neon
Original file line number Diff line number Diff line change
Expand Up @@ -479,3 +479,7 @@ parameters:
-
message: '#Do not use chained method calls#'
path: packages/BetterPhpDocParser/Printer/PhpDocInfoPrinter.php

-
message: '#Function "dump_node\(\)" cannot be used/left in the code#'
path: src/functions/node_helper.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?php

declare(strict_types=1);

namespace Rector\Tests\Php80\Rector\Class_\DoctrineAnnotationClassToAttributeRector;

use Iterator;
use Rector\Testing\PHPUnit\AbstractRectorTestCase;
use Symplify\SmartFileSystem\SmartFileInfo;

final class DoctrineAnnotationClassToAttributeRectorTest extends AbstractRectorTestCase
{
/**
* @dataProvider provideData()
*/
public function test(SmartFileInfo $fileInfo): void
{
$this->doTestFileInfo($fileInfo);
}

/**
* @return Iterator<SmartFileInfo>
*/
public function provideData(): Iterator
{
return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
}

public function provideConfigFilePath(): string
{
return __DIR__ . '/config/configured_rule.php';
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?php

namespace Rector\Tests\Php80\Rector\Class_\DoctrineAnnotationClassToAttributeRector\Fixture;

/**
* @Annotation
*/
final class NoneTarget
{
}

?>
-----
<?php

namespace Rector\Tests\Php80\Rector\Class_\DoctrineAnnotationClassToAttributeRector\Fixture;

#[\Attribute]
final class NoneTarget
{
}

?>
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?php

namespace Rector\Tests\Php80\Rector\Class_\DoctrineAnnotationClassToAttributeRector\Fixture;

use Doctrine\Common\Annotations\Annotation\Required;

/**
* @annotation
*/
final class RequiredValue
{
/** @Required */
public $requiredField;
}

?>
-----
<?php

namespace Rector\Tests\Php80\Rector\Class_\DoctrineAnnotationClassToAttributeRector\Fixture;

use Doctrine\Common\Annotations\Annotation\Required;

#[\Attribute]
final class RequiredValue
{
public function __construct(public $requiredField)
{
}
}

?>
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?php

namespace Rector\Tests\Php80\Rector\Class_\DoctrineAnnotationClassToAttributeRector\Fixture;

use Doctrine\Common\Annotations\Annotation\Target;

/**
* @Annotation
* @Target({"METHOD"})
*/
class SomeAnnotation
{
}

?>
-----
<?php

namespace Rector\Tests\Php80\Rector\Class_\DoctrineAnnotationClassToAttributeRector\Fixture;

use Doctrine\Common\Annotations\Annotation\Target;

#[\Attribute(\Attribute::TARGET_METHOD)]
class SomeAnnotation
{
}

?>
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?php

namespace Rector\Tests\Php80\Rector\Class_\DoctrineAnnotationClassToAttributeRector\Fixture;

use Doctrine\Common\Annotations\Annotation\Target;

/**
* @Annotation
* @Target({"METHOD", "PROPERTY", "CLASS"})
*/
final class TargetMethodPropertyClass
{
}

?>
-----
<?php

namespace Rector\Tests\Php80\Rector\Class_\DoctrineAnnotationClassToAttributeRector\Fixture;

use Doctrine\Common\Annotations\Annotation\Target;

#[\Attribute(\Attribute::TARGET_METHOD | \Attribute::TARGET_PROPERTY | \Attribute::TARGET_CLASS)]
final class TargetMethodPropertyClass
{
}

?>
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?php

declare(strict_types=1);

use Rector\Php80\Rector\Class_\DoctrineAnnotationClassToAttributeRector;

use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;

return static function (ContainerConfigurator $containerConfigurator): void {
$services = $containerConfigurator->services();
$services->set(DoctrineAnnotationClassToAttributeRector::class);
};
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
use Rector\Core\Rector\AbstractRector;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample;
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
use Webmozart\Assert\Assert;

/**
* @see \Rector\Tests\Arguments\Rector\MethodCall\ValueObjectWrapArgRector\ValueObjectWrapArgRectorTest
Expand Down Expand Up @@ -111,7 +112,10 @@ public function refactor(Node $node): ?Node
*/
public function configure(array $configuration): void
{
$this->valueObjectWrapArgs = $configuration[self::VALUE_OBJECT_WRAP_ARGS] ?? [];
$valueObjectWrapArgs = $configuration[self::VALUE_OBJECT_WRAP_ARGS] ?? [];
Assert::allIsInstanceOf($valueObjectWrapArgs, ValueObjectWrapArg::class);

$this->valueObjectWrapArgs = $valueObjectWrapArgs;
}

private function wrapInNewWithType(ObjectType $newObjectType, Expr $expr): New_
Expand Down
3 changes: 3 additions & 0 deletions rules/Composer/Rector/AddPackageToRequireComposerRector.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
use Symplify\ComposerJsonManipulator\ValueObject\ComposerJson;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample;
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
use Webmozart\Assert\Assert;

/**
* @see \Rector\Tests\Composer\Rector\AddPackageToRequireComposerRector\AddPackageToRequireComposerRectorTest
Expand Down Expand Up @@ -67,6 +68,8 @@ public function getRuleDefinition(): RuleDefinition
public function configure(array $configuration): void
{
$packagesAndVersions = $configuration[self::PACKAGES_AND_VERSIONS] ?? [];
Assert::allIsInstanceOf($packagesAndVersions, PackageAndVersion::class);

$this->versionGuard->validate($packagesAndVersions);
$this->packagesAndVersions = $packagesAndVersions;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
use Symplify\ComposerJsonManipulator\ValueObject\ComposerJson;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample;
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
use Webmozart\Assert\Assert;

/**
* @see \Rector\Tests\Composer\Rector\AddPackageToRequireDevComposerRector\AddPackageToRequireDevComposerRectorTest
Expand Down Expand Up @@ -70,6 +71,8 @@ public function getRuleDefinition(): RuleDefinition
public function configure(array $configuration): void
{
$packagesAndVersions = $configuration[self::PACKAGES_AND_VERSIONS] ?? [];
Assert::allIsInstanceOf($packagesAndVersions, PackageAndVersion::class);

$this->versionGuard->validate($packagesAndVersions);
$this->packageAndVersions = $packagesAndVersions;
}
Expand Down
3 changes: 3 additions & 0 deletions rules/Composer/Rector/ChangePackageVersionComposerRector.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
use Symplify\ComposerJsonManipulator\ValueObject\ComposerJson;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample;
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
use Webmozart\Assert\Assert;

/**
* @see \Rector\Tests\Composer\Rector\ChangePackageVersionComposerRector\ChangePackageVersionComposerRectorTest
Expand Down Expand Up @@ -73,6 +74,8 @@ public function getRuleDefinition(): RuleDefinition
public function configure(array $configuration): void
{
$packagesAndVersions = $configuration[self::PACKAGES_AND_VERSIONS] ?? [];
Assert::allIsInstanceOf($packagesAndVersions, PackageAndVersion::class);

$this->versionGuard->validate($packagesAndVersions);
$this->packagesAndVersions = $packagesAndVersions;
}
Expand Down
5 changes: 4 additions & 1 deletion rules/Composer/Rector/RenamePackageComposerRector.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
use Symplify\ComposerJsonManipulator\ValueObject\ComposerJson;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample;
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
use Webmozart\Assert\Assert;

/**
* @see \Rector\Tests\Composer\Rector\RenamePackageComposerRector\RenamePackageComposerRectorTest
Expand Down Expand Up @@ -78,6 +79,8 @@ public function getRuleDefinition(): RuleDefinition
*/
public function configure(array $configuration): void
{
$this->renamePackages = $configuration[self::RENAME_PACKAGES] ?? [];
$renamePackages = $configuration[self::RENAME_PACKAGES] ?? [];
Assert::allIsInstanceOf($renamePackages, RenamePackage::class);
$this->renamePackages = $renamePackages;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
use Symplify\ComposerJsonManipulator\ValueObject\ComposerJson;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample;
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
use Webmozart\Assert\Assert;

/**
* @see \Rector\Tests\Composer\Rector\ReplacePackageAndVersionComposerRector\ReplacePackageAndVersionComposerRectorTest
Expand Down Expand Up @@ -78,6 +79,8 @@ public function getRuleDefinition(): RuleDefinition
public function configure(array $configuration): void
{
$replacePackagesAndVersions = $configuration[self::REPLACE_PACKAGES_AND_VERSIONS] ?? [];
Assert::allIsInstanceOf($replacePackagesAndVersions, ReplacePackageAndVersion::class);

$this->versionGuard->validate($replacePackagesAndVersions);
$this->replacePackagesAndVersions = $replacePackagesAndVersions;
}
Expand Down
Loading

0 comments on commit e539072

Please sign in to comment.