mirror_php/rector
1
0
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2025-02-24 19:53:14 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3551 from rectorphp/inter-form

Browse Source 
skip Form factories too
This commit is contained in:
Tomas Votruba 2020-06-18 17:00:02 +02:00 committed by GitHub
commit cf663c4fe7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 43 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
rules/autodiscovery/src/Rector/FileSystem/MoveInterfacesToContractNamespaceDirectoryRector.php
View File

@ -82,7 +82,7 @@ PHP
throw new ShouldNotHappenException();
}
if ($this->isNetteControlFactory($oldInterfaceName)) {
if ($this->isNetteMagicGeneratedFactory($oldInterfaceName)) {
return;
}
@ -118,7 +118,10 @@ PHP
return $classLikeName;
}
private function isNetteControlFactory(string $interfaceName): bool
/**
* @see https://doc.nette.org/en/3.0/components#toc-components-with-dependencies
*/
private function isNetteMagicGeneratedFactory(string $interfaceName): bool
{
$reflectionClass = new ReflectionClass($interfaceName);
foreach ($reflectionClass->getMethods() as $methodReflection) {
@ -126,11 +129,15 @@ PHP
continue;
}
if (! is_a((string) $methodReflection->getReturnType(), 'Nette\Application\UI\Control', true)) {
continue;
$returnType = (string) $methodReflection->getReturnType();
if (is_a($returnType, 'Nette\Application\UI\Control', true)) {
return true;
}
return true;
if (is_a($returnType, 'Nette\Application\UI\Form', true)) {
return true;
}
}
return false;

9
rules/autodiscovery/tests/Rector/FileSystem/MoveInterfacesToContractNamespaceDirectoryRector/MoveInterfacesToContractNamespaceDirectoryRectorTest.php
View File

@ -29,12 +29,19 @@ final class MoveInterfacesToContractNamespaceDirectoryRectorTest extends Abstrac
__DIR__ . '/Expected/ExpectedRandomInterface.php',
];
// test skipped control factory
// skip nette control factory
yield [
__DIR__ . '/Source/Control/ControlFactory.php',
$this->getFixtureTempDirectory() . '/Source/Control/ControlFactory.php',
__DIR__ . '/Source/Control/ControlFactory.php',
];
// skip form control factory
yield [
__DIR__ . '/Source/Control/FormFactory.php',
$this->getFixtureTempDirectory() . '/Source/Control/FormFactory.php',
__DIR__ . '/Source/Control/FormFactory.php',
];
}
protected function getRectorClass(): string

2
rules/autodiscovery/tests/Rector/FileSystem/MoveInterfacesToContractNamespaceDirectoryRector/Source/Control/ControlFactory.php
View File

@ -4,8 +4,6 @@ declare(strict_types=1);
namespace Rector\Autodiscovery\Tests\Rector\FileSystem\MoveInterfacesToContractNamespaceDirectoryRector\Source\Control;
use Rector\Autodiscovery\Tests\Rector\FileSystem\MoveInterfacesToContractNamespaceDirectoryRector\Source\Control\SomeControl;
interface ControlFactory
{
public function create(): SomeControl;

10
rules/autodiscovery/tests/Rector/FileSystem/MoveInterfacesToContractNamespaceDirectoryRector/Source/Control/FormFactory.php Normal file
View File

@ -0,0 +1,10 @@
<?php
declare(strict_types=1);
namespace Rector\Autodiscovery\Tests\Rector\FileSystem\MoveInterfacesToContractNamespaceDirectoryRector\Source\Control;
interface FormFactory
{
public function create(): SomeForm;
}

12
rules/autodiscovery/tests/Rector/FileSystem/MoveInterfacesToContractNamespaceDirectoryRector/Source/Control/SomeForm.php Normal file
View File

@ -0,0 +1,12 @@
<?php
declare(strict_types=1);
namespace Rector\Autodiscovery\Tests\Rector\FileSystem\MoveInterfacesToContractNamespaceDirectoryRector\Source\Control;
use Nette\Application\UI\Form;
final class SomeForm extends Form
{
}

2
stubs/Nette/Application/UI/Form.php
View File

@ -4,7 +4,7 @@ declare(strict_types=1);
namespace Nette\Application\UI;
if (class_exists('Nette\Forms\Form')) {
if (class_exists('Nette\Application\UI')) {
return;
}