Skip to content

[Nette Kdyby] Skip control events" #3445

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.

Sign up for GitHub

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 1 commit into from
May 29, 2020
Merged

[Nette Kdyby] Skip control events" #3445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions rules/nette-kdyby/src/Rector/MethodCall/ReplaceMagicPropertyEventWithEventClassRector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

namespace Rector\NetteKdyby\Rector\MethodCall;

use Nette\Application\UI\Control;
use PhpParser\Node;
use PhpParser\Node\Arg;
use PhpParser\Node\Expr\Assign;
Expand Down Expand Up @@ -168,6 +169,11 @@ private function isLocalOnPropertyCall(MethodCall $methodCall): bool
return false;
}

// control event, inner only
if (is_a($className, Control::class, true)) {
return false;
}

if (method_exists($className, $methodName)) {
return false;
}
Expand Down
0 ...hEventClassRector/Fixture/fixture.php.inc → ...tClassRector/Fixture/simple_event.php.inc
View file
Open in desktop
File renamed without changes.
20 changes: 20 additions & 0 deletions .../ReplaceMagicPropertyEventWithEventClassRector/Fixture/skip_on_success_in_control.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?php

namespace Rector\NetteKdyby\Tests\Rector\MethodCall\ReplaceMagicPropertyEventWithEventClassRector\Fixture;

use Nette\Application\UI\Control;
use Rector\NetteKdyby\Tests\Rector\MethodCall\ReplaceMagicPropertyEventWithEventClassRector\Source\SomeUser;

final class SkipOnSuccessInControl extends Control
{
public $onSuccess = [];

public $onBeforeSuccess = [];

public function run(SomeUser $user)
{
$this->onSuccess($user, 'run');

$this->onBeforeSuccess($user, 'run');
}
}
9 changes: 7 additions & 2 deletions ...icPropertyEventWithEventClassRector/ReplaceMagicPropertyEventWithEventClassRectorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,14 @@

final class ReplaceMagicPropertyEventWithEventClassRectorTest extends AbstractRectorTestCase
{
public function test(): void
public function testSkip(): void
{
$this->doTestFile(__DIR__ . '/Fixture/fixture.php.inc');
$this->doTestFile(__DIR__ . '/Fixture/skip_on_success_in_control.php.inc');
}

public function testSimpleEvent(): void
{
$this->doTestFile(__DIR__ . '/Fixture/simple_event.php.inc');

$expectedEventFilePath = dirname($this->originalTempFile) . '/Event/FileManagerUploadEvent.php';
$this->assertFileExists($expectedEventFilePath);
Expand Down