-
-
Notifications
You must be signed in to change notification settings - Fork 739
Add an option to skip importing root namespace classes (like \DateTime) #2077
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
Merged
TomasVotruba
merged 7 commits into
rectorphp:master
from
gnutix:optional-root-namespace-import
Oct 4, 2019
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
23fe195
Trying to implement this feature. Not there yet.
gnutix 4c5b534
Adding a test.
gnutix dae17c9
Check for root namespace class differently.
gnutix d0a29c5
Merge remote-tracking branch 'origin/master' into optional-root-names…
gnutix 239ad3b
Fix implementation. DocBlock still not handled.
gnutix 2057540
Implement DocBlock support, simplify some code, make the fixture more…
gnutix 8ffce14
Add a comment.
gnutix File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
100 changes: 100 additions & 0 deletions
100
...e_/ImportFullyQualifiedNamesRector/Fixture/import_root_namespace_classes_disabled.php.inc
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,100 @@ | ||
| <?php | ||
|
|
||
| namespace Rector\CodingStyle\Tests\Rector\Namespace_\ImportFullyQualifiedNamesRector\Fixture; | ||
|
|
||
| final class ImportRootNamespaceClassesDisabled | ||
| { | ||
| /** | ||
| * @var \DateTime | ||
| */ | ||
| private $date; | ||
|
|
||
| /** | ||
| * @var \Rector\CodingStyle\Tests\Rector\Namespace_\ImportFullyQualifiedNamesRector\Source\Response | ||
| */ | ||
| private $response; | ||
|
|
||
| public function __construct() | ||
| { | ||
| /** @var \DateTime $currentDate */ | ||
| $currentDate = new \DateTime(); | ||
|
|
||
| /** @var \Rector\CodingStyle\Tests\Rector\Namespace_\ImportFullyQualifiedNamesRector\Source\Response $response */ | ||
| $response = new \Rector\CodingStyle\Tests\Rector\Namespace_\ImportFullyQualifiedNamesRector\Source\Response(); | ||
|
|
||
| $this->date = $currentDate; | ||
| $this->response = $response; | ||
| } | ||
|
|
||
| public function setDate(?\DateTime $date): void | ||
| { | ||
| $this->date = $date; | ||
| } | ||
|
|
||
| public function getDate(): ?\DateTime | ||
| { | ||
| return $this->date; | ||
| } | ||
|
|
||
| public function setResponse(?\Rector\CodingStyle\Tests\Rector\Namespace_\ImportFullyQualifiedNamesRector\Source\Response $response): void | ||
| { | ||
| $this->response = $response; | ||
| } | ||
|
|
||
| public function getResponse(): ?\Rector\CodingStyle\Tests\Rector\Namespace_\ImportFullyQualifiedNamesRector\Source\Response | ||
| { | ||
| return $this->response; | ||
| } | ||
| } | ||
| ?> | ||
| ----- | ||
| <?php | ||
|
|
||
| namespace Rector\CodingStyle\Tests\Rector\Namespace_\ImportFullyQualifiedNamesRector\Fixture; | ||
|
|
||
| use Rector\CodingStyle\Tests\Rector\Namespace_\ImportFullyQualifiedNamesRector\Source\Response; | ||
| final class ImportRootNamespaceClassesDisabled | ||
| { | ||
| /** | ||
| * @var \DateTime | ||
| */ | ||
| private $date; | ||
|
|
||
| /** | ||
| * @var Response | ||
| */ | ||
| private $response; | ||
|
|
||
| public function __construct() | ||
| { | ||
| /** @var \DateTime $currentDate */ | ||
| $currentDate = new \DateTime(); | ||
|
|
||
| /** @var Response $response */ | ||
| $response = new Response(); | ||
|
|
||
| $this->date = $currentDate; | ||
| $this->response = $response; | ||
| } | ||
|
|
||
| public function setDate(?\DateTime $date): void | ||
| { | ||
| $this->date = $date; | ||
| } | ||
|
|
||
| public function getDate(): ?\DateTime | ||
| { | ||
| return $this->date; | ||
| } | ||
|
|
||
| public function setResponse(?Response $response): void | ||
| { | ||
| $this->response = $response; | ||
| } | ||
|
|
||
| public function getResponse(): ?Response | ||
| { | ||
| return $this->response; | ||
| } | ||
| } | ||
| ?> |
62 changes: 62 additions & 0 deletions
62
...ce_/ImportFullyQualifiedNamesRector/Fixture/import_root_namespace_classes_enabled.php.inc
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| <?php | ||
|
|
||
| namespace Rector\CodingStyle\Tests\Rector\Namespace_\ImportFullyQualifiedNamesRector\Fixture; | ||
|
|
||
| final class ImportRootNamespaceClassesEnabled | ||
| { | ||
| /** | ||
| * @var \DateTime | ||
| */ | ||
| private $date; | ||
|
|
||
| public function __construct() | ||
| { | ||
| /** @var \DateTime $currentDate */ | ||
| $currentDate = new \DateTime(); | ||
|
|
||
| $this->date = $currentDate; | ||
| } | ||
|
|
||
| public function setDate(?\DateTime $date): void | ||
| { | ||
| $this->date = $date; | ||
| } | ||
|
|
||
| public function getDate(): ?\DateTime | ||
| { | ||
| return $this->date; | ||
| } | ||
| } | ||
| ?> | ||
| ----- | ||
| <?php | ||
|
|
||
| namespace Rector\CodingStyle\Tests\Rector\Namespace_\ImportFullyQualifiedNamesRector\Fixture; | ||
|
|
||
| use DateTime; | ||
| final class ImportRootNamespaceClassesEnabled | ||
| { | ||
| /** | ||
| * @var DateTime | ||
| */ | ||
| private $date; | ||
|
|
||
| public function __construct() | ||
| { | ||
| /** @var DateTime $currentDate */ | ||
| $currentDate = new DateTime(); | ||
|
|
||
| $this->date = $currentDate; | ||
| } | ||
|
|
||
| public function setDate(?DateTime $date): void | ||
| { | ||
| $this->date = $date; | ||
| } | ||
|
|
||
| public function getDate(): ?DateTime | ||
| { | ||
| return $this->date; | ||
| } | ||
| } | ||
| ?> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
33 changes: 33 additions & 0 deletions
33
...tor/Namespace_/ImportFullyQualifiedNamesRector/ImportRootNamespaceClassesDisabledTest.php
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| namespace Rector\CodingStyle\Tests\Rector\Namespace_\ImportFullyQualifiedNamesRector; | ||
|
|
||
| use Rector\CodingStyle\Rector\Namespace_\ImportFullyQualifiedNamesRector; | ||
| use Rector\Testing\PHPUnit\AbstractRectorTestCase; | ||
|
|
||
| final class ImportRootNamespaceClassesDisabledTest extends AbstractRectorTestCase | ||
| { | ||
| /** | ||
| * @dataProvider provideDataForTest() | ||
| */ | ||
| public function test(string $file): void | ||
| { | ||
| $this->doTestFile($file); | ||
| } | ||
|
|
||
| public function provideDataForTest(): iterable | ||
| { | ||
| yield [__DIR__ . '/Fixture/import_root_namespace_classes_disabled.php.inc']; | ||
| } | ||
|
|
||
| protected function getRectorsWithConfiguration(): array | ||
| { | ||
| return [ | ||
| ImportFullyQualifiedNamesRector::class => [ | ||
| '$shouldImportRootNamespaceClasses' => false, | ||
| ], | ||
| ]; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.