Skip to content

Fix $this to self:: in case of static method. #224

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
merged 2 commits into from
Jul 22, 2019
Merged

Fix $this to self:: in case of static method. #224

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
03443b2
Fix $this to self:: in case of static method.
janbarasek Jul 18, 2019
047eea4
Presenter: Replace $this and self:: to static:: in static methods
janbarasek Jul 20, 2019
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
16 changes: 8 additions & 8 deletions src/Application/UI/Presenter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,15 +188,15 @@ public function run(Application\Request $request): Application\IResponse
}

$this->initGlobalParameters();
$this->checkRequirements($this->getReflection());
$this->checkRequirements(static::getReflection());
$this->onStartup($this);
$this->startup();
if (!$this->startupCheck) {
$class = $this->getReflection()->getMethod('startup')->getDeclaringClass()->getName();
$class = static::getReflection()->getMethod('startup')->getDeclaringClass()->getName();
throw new Nette\InvalidStateException("Method $class::startup() or its descendant doesn't call parent::startup().");
}
// calls $this->action<Action>()
$this->tryCall($this->formatActionMethod($this->action), $this->params);
$this->tryCall(static::formatActionMethod($this->action), $this->params);

// autoload components
foreach ($this->globalParams as $id => $foo) {
Expand All @@ -218,7 +218,7 @@ public function run(Application\Request $request): Application\IResponse
$this->beforeRender();
$this->onRender($this);
// calls $this->render<View>()
$this->tryCall($this->formatRenderMethod($this->view), $this->params);
$this->tryCall(static::formatRenderMethod($this->view), $this->params);
$this->afterRender();

// save component tree persistent state
Expand Down Expand Up @@ -506,7 +506,7 @@ public function formatLayoutTemplateFiles(): array
}
[$module, $presenter] = Helpers::splitName($this->getName());
$layout = $this->layout ?: 'layout';
$dir = dirname($this->getReflection()->getFileName());
$dir = dirname(static::getReflection()->getFileName());
$dir = is_dir("$dir/templates") ? $dir : dirname($dir);
$list = [
"$dir/templates/$presenter/@$layout.latte",
Expand All @@ -526,7 +526,7 @@ public function formatLayoutTemplateFiles(): array
public function formatTemplateFiles(): array
{
[, $presenter] = Helpers::splitName($this->getName());
$dir = dirname($this->getReflection()->getFileName());
$dir = dirname(static::getReflection()->getFileName());
$dir = is_dir("$dir/templates") ? $dir : dirname($dir);
return [
"$dir/templates/$presenter/$this->view.latte",
Expand Down Expand Up @@ -740,7 +740,7 @@ final protected function createRequest(Component $component, string $destination

$this->lastCreatedRequest = $this->lastCreatedRequestFlag = null;

$parts = $this->parseDestination($destination);
$parts = static::parseDestination($destination);
$path = $parts['path'];
$args = $parts['args'] ?? $args;

Expand Down Expand Up @@ -1151,7 +1151,7 @@ protected function getGlobalState(string $forClass = null): array
*/
public function saveState(array &$params, ComponentReflection $reflection = null): void
{
($reflection ?: $this->getReflection())->saveState($this, $params);
($reflection ?: static::getReflection())->saveState($this, $params);
}


Expand Down