diff --git a/.travis.yml b/.travis.yml index cb6f55cd0..eec6b29d9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,5 @@ language: php php: - - 5.4 - - 5.5 - 5.6 - 7.0 - hhvm @@ -20,7 +18,7 @@ matrix: env: PHP_BIN=php-cgi include: - - php: 5.5 + - php: 5.6 env: dependencies="--prefer-lowest --prefer-stable" PHP_BIN=php script: diff --git a/composer.json b/composer.json index 19adbe76c..427c11f40 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": ">=5.4.4", + "php": ">=5.6.0", "nette/component-model": "~2.2", "nette/http": "~2.2", "nette/reflection": "~2.2", diff --git a/src/Application/LinkGenerator.php b/src/Application/LinkGenerator.php index 3b7663389..7148fbb2f 100644 --- a/src/Application/LinkGenerator.php +++ b/src/Application/LinkGenerator.php @@ -37,7 +37,7 @@ public function __construct(IRouter $router, Nette\Http\Url $refUrl, IPresenterF * Generates URL to presenter. * @param string destination in format "[[[module:]presenter:]action] [#fragment]" * @return string - * @throws InvalidLinkException + * @throws UI\InvalidLinkException */ public function link($dest, array $params = []) { @@ -52,7 +52,7 @@ public function link($dest, array $params = []) throw new UI\InvalidLinkException($e->getMessage(), NULL, $e); } - if (is_subclass_of($class, 'Nette\Application\UI\Presenter')) { + if (is_subclass_of($class, UI\Presenter::class)) { if ($action === '') { $action = UI\Presenter::DEFAULT_ACTION; } diff --git a/src/Application/MicroPresenter.php b/src/Application/MicroPresenter.php index 7aa083f71..a9c378e0e 100644 --- a/src/Application/MicroPresenter.php +++ b/src/Application/MicroPresenter.php @@ -17,7 +17,7 @@ /** * Micro presenter. * - * @property-read Nette\Application\IRequest $request + * @property-read Nette\Application\Request $request */ class MicroPresenter extends Nette\Object implements Application\IPresenter { @@ -115,7 +115,7 @@ public function run(Application\Request $request) */ public function createTemplate($class = NULL, callable $latteFactory = NULL) { - $latte = $latteFactory ? $latteFactory() : $this->getContext()->getByType('Nette\Bridges\ApplicationLatte\ILatteFactory')->create(); + $latte = $latteFactory ? $latteFactory() : $this->getContext()->getByType(Nette\Bridges\ApplicationLatte\ILatteFactory::class)->create(); $template = $class ? new $class : new Nette\Bridges\ApplicationLatte\Template($latte); $template->setParameters($this->request->getParameters()); @@ -156,7 +156,7 @@ public function error($message = NULL, $code = Http\IResponse::S404_NOT_FOUND) /** - * @return Nette\Application\IRequest + * @return Nette\Application\Request */ public function getRequest() { diff --git a/src/Application/PresenterFactory.php b/src/Application/PresenterFactory.php index 834e63b7b..23bab6f7e 100644 --- a/src/Application/PresenterFactory.php +++ b/src/Application/PresenterFactory.php @@ -72,7 +72,7 @@ public function getPresenterClass(& $name) $reflection = new \ReflectionClass($class); $class = $reflection->getName(); - if (!$reflection->implementsInterface('Nette\Application\IPresenter')) { + if (!$reflection->implementsInterface(IPresenter::class)) { throw new InvalidPresenterException("Cannot load presenter '$name', class '$class' is not Nette\\Application\\IPresenter implementor."); } elseif ($reflection->isAbstract()) { throw new InvalidPresenterException("Cannot load presenter '$name', class '$class' is abstract."); diff --git a/src/Application/Routers/Route.php b/src/Application/Routers/Route.php index b5db44c42..2b7cd5a7e 100644 --- a/src/Application/Routers/Route.php +++ b/src/Application/Routers/Route.php @@ -477,9 +477,7 @@ private function setMask($mask, array $metadata) // name= $matches = Strings::matchAll($parts[$i - 1], '/(?:([a-zA-Z0-9_.-]+)=)?<([^> ]+) *([^>]*)>/'); - foreach ($matches as $match) { - list(, $param, $name, $pattern) = $match; // $pattern is not used - + foreach ($matches as list(, $param, $name, $pattern)) { // $pattern is not used if (isset(static::$styles['?' . $name])) { $meta = static::$styles['?' . $name]; } else { diff --git a/src/Application/UI/Form.php b/src/Application/UI/Form.php index b1d79f74b..df0b6fc45 100644 --- a/src/Application/UI/Form.php +++ b/src/Application/UI/Form.php @@ -36,7 +36,7 @@ public function __construct(Nette\ComponentModel\IContainer $parent = NULL, $nam protected function validateParent(Nette\ComponentModel\IContainer $parent) { parent::validateParent($parent); - $this->monitor('Nette\Application\UI\Presenter'); + $this->monitor(Presenter::class); } @@ -47,7 +47,7 @@ protected function validateParent(Nette\ComponentModel\IContainer $parent) */ public function getPresenter($need = TRUE) { - return $this->lookup('Nette\Application\UI\Presenter', $need); + return $this->lookup(Presenter::class, $need); } @@ -60,7 +60,7 @@ public function getPresenter($need = TRUE) protected function attached($presenter) { if ($presenter instanceof Presenter) { - $name = $this->lookupPath('Nette\Application\UI\Presenter'); + $name = $this->lookupPath(Presenter::class); if (!isset($this->getElementPrototype()->id)) { $this->getElementPrototype()->id = 'frm-' . $name; diff --git a/src/Application/UI/Presenter.php b/src/Application/UI/Presenter.php index ec301ceb3..ca42ba43c 100644 --- a/src/Application/UI/Presenter.php +++ b/src/Application/UI/Presenter.php @@ -748,7 +748,7 @@ public function canonicalize() /** * Attempts to cache the sent entity by its last modification date. - * @param string|int|DateTime last modified time + * @param string|int|\DateTimeInterface last modified time * @param string strong entity tag validator * @param mixed optional expiration time * @return void @@ -1156,7 +1156,7 @@ protected function getGlobalState($forClass = NULL) } $components = $this->getReflection()->getPersistentComponents(); - $iterator = $this->getComponents(TRUE, 'Nette\Application\UI\IStatePersistent'); + $iterator = $this->getComponents(TRUE, IStatePersistent::class); foreach ($iterator as $name => $component) { if ($iterator->getDepth() === 0) { diff --git a/src/Application/UI/PresenterComponent.php b/src/Application/UI/PresenterComponent.php index f38c9a06b..b8abd84ad 100644 --- a/src/Application/UI/PresenterComponent.php +++ b/src/Application/UI/PresenterComponent.php @@ -33,7 +33,7 @@ abstract class PresenterComponent extends Nette\ComponentModel\Container impleme */ public function getPresenter($need = TRUE) { - return $this->lookup('Nette\Application\UI\Presenter', $need); + return $this->lookup(Presenter::class, $need); } @@ -44,7 +44,7 @@ public function getPresenter($need = TRUE) */ public function getUniqueId() { - return $this->lookupPath('Nette\Application\UI\Presenter', TRUE); + return $this->lookupPath(Presenter::class, TRUE); } @@ -68,7 +68,7 @@ protected function attached($presenter) protected function validateParent(Nette\ComponentModel\IContainer $parent) { parent::validateParent($parent); - $this->monitor('Nette\Application\UI\Presenter'); + $this->monitor(Presenter::class); } diff --git a/src/Application/UI/PresenterComponentReflection.php b/src/Application/UI/PresenterComponentReflection.php index f6339dfd1..2499c0890 100644 --- a/src/Application/UI/PresenterComponentReflection.php +++ b/src/Application/UI/PresenterComponentReflection.php @@ -39,7 +39,7 @@ public function getPersistentParams($class = NULL) return $params; } $params = []; - if (is_subclass_of($class, 'Nette\Application\UI\PresenterComponent')) { + if (is_subclass_of($class, PresenterComponent::class)) { $defaults = get_class_vars($class); foreach ($class::getPersistentParams() as $name => $default) { if (is_int($name)) { @@ -76,7 +76,7 @@ public function getPersistentComponents($class = NULL) return $components; } $components = []; - if (is_subclass_of($class, 'Nette\Application\UI\Presenter')) { + if (is_subclass_of($class, Presenter::class)) { foreach ($class::getPersistentComponents() as $name => $meta) { if (is_string($meta)) { $name = $meta; diff --git a/src/Bridges/ApplicationDI/ApplicationExtension.php b/src/Bridges/ApplicationDI/ApplicationExtension.php index d00a3cc36..d464370d8 100644 --- a/src/Bridges/ApplicationDI/ApplicationExtension.php +++ b/src/Bridges/ApplicationDI/ApplicationExtension.php @@ -51,14 +51,14 @@ public function loadConfiguration() { $config = $this->validateConfig($this->defaults); $container = $this->getContainerBuilder(); - $container->addExcludedClasses(['Nette\Application\UI\Control']); + $container->addExcludedClasses([UI\Control::class]); $this->invalidLinkMode = $this->debugMode ? UI\Presenter::INVALID_LINK_TEXTUAL | ($config['silentLinks'] ? 0 : UI\Presenter::INVALID_LINK_WARNING) : UI\Presenter::INVALID_LINK_WARNING; $application = $container->addDefinition($this->prefix('application')) - ->setClass('Nette\Application\Application') + ->setClass(Nette\Application\Application::class) ->addSetup('$catchExceptions', [$config['catchExceptions']]) ->addSetup('$errorPresenter', [$config['errorPresenter']]); @@ -68,9 +68,9 @@ public function loadConfiguration() $touch = $this->debugMode && $config['scanDirs'] ? $this->tempFile : NULL; $presenterFactory = $container->addDefinition($this->prefix('presenterFactory')) - ->setClass('Nette\Application\IPresenterFactory') - ->setFactory('Nette\Application\PresenterFactory', [new Nette\DI\Statement( - 'Nette\Bridges\ApplicationDI\PresenterFactoryCallback', [1 => $this->invalidLinkMode, $touch] + ->setClass(Nette\Application\IPresenterFactory::class) + ->setFactory(Nette\Application\PresenterFactory::class, [new Nette\DI\Statement( + Nette\Bridges\ApplicationDI\PresenterFactoryCallback::class, [1 => $this->invalidLinkMode, $touch] )]); if ($config['mapping']) { @@ -78,7 +78,7 @@ public function loadConfiguration() } $container->addDefinition($this->prefix('linkGenerator')) - ->setFactory('Nette\Application\LinkGenerator', [ + ->setFactory(Nette\Application\LinkGenerator::class, [ 1 => new Nette\DI\Statement('@Nette\Http\IRequest::getUrl'), ]); @@ -94,7 +94,7 @@ public function beforeCompile() $container = $this->getContainerBuilder(); $all = []; - foreach ($container->findByType('Nette\Application\IPresenter') as $def) { + foreach ($container->findByType(Nette\Application\IPresenter::class) as $def) { $all[$def->getClass()] = $def; } @@ -107,7 +107,7 @@ public function beforeCompile() foreach ($all as $def) { $def->setInject(TRUE)->setAutowired(FALSE)->addTag('nette.presenter', $def->getClass()); - if (is_subclass_of($def->getClass(), 'Nette\Application\UI\Presenter')) { + if (is_subclass_of($def->getClass(), UI\Presenter::class)) { $def->addSetup('$invalidLinkMode', [$this->invalidLinkMode]); } } @@ -121,7 +121,7 @@ private function findPresenters() $classes = []; if ($config['scanDirs']) { - if (!class_exists('Nette\Loaders\RobotLoader')) { + if (!class_exists(Nette\Loaders\RobotLoader::class)) { throw new Nette\NotSupportedException("RobotLoader is required to find presenters, install package `nette/robot-loader` or disable option {$this->prefix('scanDirs')}: false"); } $robot = new Nette\Loaders\RobotLoader; @@ -147,7 +147,7 @@ private function findPresenters() $presenters = []; foreach (array_unique($classes) as $class) { if (strpos($class, $config['scanFilter']) !== FALSE && class_exists($class) - && ($rc = new \ReflectionClass($class)) && $rc->implementsInterface('Nette\Application\IPresenter') + && ($rc = new \ReflectionClass($class)) && $rc->implementsInterface(Nette\Application\IPresenter::class) && !$rc->isAbstract() ) { $presenters[] = $rc->getName(); diff --git a/src/Bridges/ApplicationDI/LatteExtension.php b/src/Bridges/ApplicationDI/LatteExtension.php index 31a4c8456..8c8a6700b 100644 --- a/src/Bridges/ApplicationDI/LatteExtension.php +++ b/src/Bridges/ApplicationDI/LatteExtension.php @@ -37,7 +37,7 @@ public function __construct($tempDir, $debugMode = FALSE) public function loadConfiguration() { - if (!class_exists('Latte\Engine')) { + if (!class_exists(Latte\Engine::class)) { return; } @@ -45,16 +45,16 @@ public function loadConfiguration() $container = $this->getContainerBuilder(); $container->addDefinition($this->prefix('latteFactory')) - ->setClass('Latte\Engine') + ->setClass(Latte\Engine::class) ->addSetup('setTempDirectory', [$this->tempDir]) ->addSetup('setAutoRefresh', [$this->debugMode]) ->addSetup('setContentType', [$config['xhtml'] ? Latte\Compiler::CONTENT_XHTML : Latte\Compiler::CONTENT_HTML]) ->addSetup('Nette\Utils\Html::$xhtml = ?', [(bool) $config['xhtml']]) - ->setImplement('Nette\Bridges\ApplicationLatte\ILatteFactory'); + ->setImplement(Nette\Bridges\ApplicationLatte\ILatteFactory::class); $container->addDefinition($this->prefix('templateFactory')) - ->setClass('Nette\Application\UI\ITemplateFactory') - ->setFactory('Nette\Bridges\ApplicationLatte\TemplateFactory'); + ->setClass(Nette\Application\UI\ITemplateFactory::class) + ->setFactory(Nette\Bridges\ApplicationLatte\TemplateFactory::class); foreach ($config['macros'] as $macro) { if (strpos($macro, '::') === FALSE && class_exists($macro)) { diff --git a/src/Bridges/ApplicationDI/RoutingExtension.php b/src/Bridges/ApplicationDI/RoutingExtension.php index 5e6052529..59a52fb1b 100644 --- a/src/Bridges/ApplicationDI/RoutingExtension.php +++ b/src/Bridges/ApplicationDI/RoutingExtension.php @@ -37,8 +37,8 @@ public function loadConfiguration() $container = $this->getContainerBuilder(); $router = $container->addDefinition($this->prefix('router')) - ->setClass('Nette\Application\IRouter') - ->setFactory('Nette\Application\Routers\RouteList'); + ->setClass(Nette\Application\IRouter::class) + ->setFactory(Nette\Application\Routers\RouteList::class); foreach ($config['routes'] as $mask => $action) { $router->addSetup('$service[] = new Nette\Application\Routers\Route(?, ?);', [$mask, $action]); @@ -54,9 +54,9 @@ public function beforeCompile() { $container = $this->getContainerBuilder(); - if ($this->debugMode && $this->config['debugger'] && $application = $container->getByType('Nette\Application\Application')) { + if ($this->debugMode && $this->config['debugger'] && $application = $container->getByType(Nette\Application\Application::class)) { $container->getDefinition($application)->addSetup('@Tracy\Bar::addPanel', [ - new Nette\DI\Statement('Nette\Bridges\ApplicationTracy\RoutingPanel'), + new Nette\DI\Statement(Nette\Bridges\ApplicationTracy\RoutingPanel::class), ]); } } diff --git a/src/Bridges/ApplicationLatte/TemplateFactory.php b/src/Bridges/ApplicationLatte/TemplateFactory.php index e2ab17a4b..33d50610e 100644 --- a/src/Bridges/ApplicationLatte/TemplateFactory.php +++ b/src/Bridges/ApplicationLatte/TemplateFactory.php @@ -68,7 +68,7 @@ public function createTemplate(UI\Control $control = NULL) $latte->getParser()->shortNoEscape = TRUE; $latte->getCompiler()->addMacro('cache', new Nette\Bridges\CacheLatte\CacheMacro($latte->getCompiler())); UIMacros::install($latte->getCompiler()); - if (class_exists('Nette\Bridges\FormsLatte\FormMacros')) { + if (class_exists(Nette\Bridges\FormsLatte\FormMacros::class)) { Nette\Bridges\FormsLatte\FormMacros::install($latte->getCompiler()); } if ($control) { diff --git a/src/Bridges/ApplicationTracy/RoutingPanel.php b/src/Bridges/ApplicationTracy/RoutingPanel.php index 68e9d57d0..0d2629059 100644 --- a/src/Bridges/ApplicationTracy/RoutingPanel.php +++ b/src/Bridges/ApplicationTracy/RoutingPanel.php @@ -136,7 +136,7 @@ private function findSource() } $rc = new \ReflectionClass($class); - if ($rc->isSubclassOf('Nette\Application\UI\Presenter')) { + if ($rc->isSubclassOf(Nette\Application\UI\Presenter::class)) { if (isset($request->parameters[Presenter::SIGNAL_KEY])) { $method = $class::formatSignalMethod($request->parameters[Presenter::SIGNAL_KEY]); diff --git a/tests/Application.DI/ApplicationExtension.basic.phpt b/tests/Application.DI/ApplicationExtension.basic.phpt index b967f4424..730ca853b 100644 --- a/tests/Application.DI/ApplicationExtension.basic.phpt +++ b/tests/Application.DI/ApplicationExtension.basic.phpt @@ -17,9 +17,9 @@ test(function () { $compiler->addExtension('application', new ApplicationExtension(FALSE)); $builder = $compiler->getContainerBuilder(); - $builder->addDefinition('myRouter')->setClass('Nette\Application\Routers\SimpleRouter'); - $builder->addDefinition('myHttpRequest')->setFactory('Nette\Http\Request', [new DI\Statement('Nette\Http\UrlScript')]); - $builder->addDefinition('myHttpResponse')->setClass('Nette\Http\Response'); + $builder->addDefinition('myRouter')->setClass(Nette\Application\Routers\SimpleRouter::class); + $builder->addDefinition('myHttpRequest')->setFactory(Nette\Http\Request::class, [new DI\Statement(Nette\Http\UrlScript::class)]); + $builder->addDefinition('myHttpResponse')->setClass(Nette\Http\Response::class); $code = $compiler->compile([ 'application' => ['debugger' => FALSE], @@ -27,7 +27,7 @@ test(function () { eval($code); $container = new Container1; - Assert::type('Nette\Application\Application', $container->getService('application')); - Assert::type('Nette\Application\PresenterFactory', $container->getService('nette.presenterFactory')); - Assert::type('Nette\Application\LinkGenerator', $container->getService('application.linkGenerator')); + Assert::type(Nette\Application\Application::class, $container->getService('application')); + Assert::type(Nette\Application\PresenterFactory::class, $container->getService('nette.presenterFactory')); + Assert::type(Nette\Application\LinkGenerator::class, $container->getService('application.linkGenerator')); }); diff --git a/tests/Application.DI/ApplicationExtension.invalidLink.phpt b/tests/Application.DI/ApplicationExtension.invalidLink.phpt index 0c7fd9e45..e4184464e 100644 --- a/tests/Application.DI/ApplicationExtension.invalidLink.phpt +++ b/tests/Application.DI/ApplicationExtension.invalidLink.phpt @@ -19,9 +19,9 @@ function createCompiler($config) $compiler = new DI\Compiler; $compiler->loadConfig(Tester\FileMock::create($config, 'neon')); $builder = $compiler->getContainerBuilder(); - $builder->addDefinition('myRouter')->setClass('Nette\Application\Routers\SimpleRouter'); - $builder->addDefinition('myHttpRequest')->setFactory('Nette\Http\Request', [new DI\Statement('Nette\Http\UrlScript')]); - $builder->addDefinition('myHttpResponse')->setClass('Nette\Http\Response'); + $builder->addDefinition('myRouter')->setClass(Nette\Application\Routers\SimpleRouter::class); + $builder->addDefinition('myHttpRequest')->setFactory(Nette\Http\Request::class, [new DI\Statement(Nette\Http\UrlScript::class)]); + $builder->addDefinition('myHttpResponse')->setClass(Nette\Http\Response::class); return $compiler; } diff --git a/tests/Application.DI/ApplicationExtension.scan.phpt b/tests/Application.DI/ApplicationExtension.scan.phpt index bf58d64e7..4d50f04c9 100644 --- a/tests/Application.DI/ApplicationExtension.scan.phpt +++ b/tests/Application.DI/ApplicationExtension.scan.phpt @@ -18,9 +18,9 @@ test(function () { $compiler->addExtension('application', new ApplicationExtension); $builder = $compiler->getContainerBuilder(); - $builder->addDefinition('myRouter')->setClass('Nette\Application\Routers\SimpleRouter'); - $builder->addDefinition('myHttpRequest')->setFactory('Nette\Http\Request', [new DI\Statement('Nette\Http\UrlScript')]); - $builder->addDefinition('myHttpResponse')->setClass('Nette\Http\Response'); + $builder->addDefinition('myRouter')->setClass(Nette\Application\Routers\SimpleRouter::class); + $builder->addDefinition('myHttpRequest')->setFactory(Nette\Http\Request::class, [new DI\Statement(Nette\Http\UrlScript::class)]); + $builder->addDefinition('myHttpResponse')->setClass(Nette\Http\Response::class); $code = $compiler->compile([ 'application' => ['debugger' => FALSE], ], 'Container1'); @@ -30,7 +30,7 @@ test(function () { $tags = $container->findByTag('nette.presenter'); Assert::count(1, array_keys($tags, 'NetteModule\ErrorPresenter')); Assert::count(1, array_keys($tags, 'NetteModule\MicroPresenter')); - Assert::count(0, array_keys($tags, 'Nette\Application\UI\Presenter')); + Assert::count(0, array_keys($tags, Nette\Application\UI\Presenter::class)); }); @@ -39,9 +39,9 @@ test(function () { $compiler->addExtension('application', new ApplicationExtension); $builder = $compiler->getContainerBuilder(); - $builder->addDefinition('myRouter')->setClass('Nette\Application\Routers\SimpleRouter'); - $builder->addDefinition('myHttpRequest')->setFactory('Nette\Http\Request', [new DI\Statement('Nette\Http\UrlScript')]); - $builder->addDefinition('myHttpResponse')->setClass('Nette\Http\Response'); + $builder->addDefinition('myRouter')->setClass(Nette\Application\Routers\SimpleRouter::class); + $builder->addDefinition('myHttpRequest')->setFactory(Nette\Http\Request::class, [new DI\Statement(Nette\Http\UrlScript::class)]); + $builder->addDefinition('myHttpResponse')->setClass(Nette\Http\Response::class); $code = $compiler->compile([ 'application' => [ 'scanDirs' => [__DIR__ . '/files'], @@ -63,9 +63,9 @@ test(function () { $compiler->addExtension('application', new ApplicationExtension(FALSE, [__DIR__ . '/files'])); $builder = $compiler->getContainerBuilder(); - $builder->addDefinition('myRouter')->setClass('Nette\Application\Routers\SimpleRouter'); - $builder->addDefinition('myHttpRequest')->setFactory('Nette\Http\Request', [new DI\Statement('Nette\Http\UrlScript')]); - $builder->addDefinition('myHttpResponse')->setClass('Nette\Http\Response'); + $builder->addDefinition('myRouter')->setClass(Nette\Application\Routers\SimpleRouter::class); + $builder->addDefinition('myHttpRequest')->setFactory(Nette\Http\Request::class, [new DI\Statement(Nette\Http\UrlScript::class)]); + $builder->addDefinition('myHttpResponse')->setClass(Nette\Http\Response::class); $loader = new DI\Config\Loader; $config = $loader->load(Tester\FileMock::create(' application: diff --git a/tests/Application.DI/LatteExtension.basic.phpt b/tests/Application.DI/LatteExtension.basic.phpt index 59931dc2f..af0c6d796 100644 --- a/tests/Application.DI/LatteExtension.basic.phpt +++ b/tests/Application.DI/LatteExtension.basic.phpt @@ -55,7 +55,7 @@ class AnotherExtension extends Nette\DI\CompilerExtension public function beforeCompile() { - foreach ($this->compiler->getExtensions('Nette\Bridges\ApplicationDI\LatteExtension') as $extension) { + foreach ($this->compiler->getExtensions(Nette\Bridges\ApplicationDI\LatteExtension::class) as $extension) { $extension->addMacro('FooMacros::install'); } } @@ -80,7 +80,7 @@ eval($code); $container = new Container; -Assert::type('Nette\Bridges\ApplicationLatte\ILatteFactory', $container->getService('nette.latteFactory')); +Assert::type(Nette\Bridges\ApplicationLatte\ILatteFactory::class, $container->getService('nette.latteFactory')); $container->getService('nette.latteFactory')->create()->setLoader(new Latte\Loaders\StringLoader)->compile(''); Assert::same([ diff --git a/tests/Application.DI/RoutingExtension.basic.phpt b/tests/Application.DI/RoutingExtension.basic.phpt index b8d8f90c4..eecb6baba 100644 --- a/tests/Application.DI/RoutingExtension.basic.phpt +++ b/tests/Application.DI/RoutingExtension.basic.phpt @@ -28,7 +28,7 @@ test(function () { $container = new Container1; $router = $container->getService('router'); - Assert::type('Nette\Application\Routers\RouteList', $router); + Assert::type(Nette\Application\Routers\RouteList::class, $router); Assert::count(2, $router); Assert::same('index.php', $router[0]->getMask()); Assert::same('item/', $router[1]->getMask()); diff --git a/tests/Application.DI/RoutingExtension.cache.phpt b/tests/Application.DI/RoutingExtension.cache.phpt index 9f1aad7fc..e22604dc3 100644 --- a/tests/Application.DI/RoutingExtension.cache.phpt +++ b/tests/Application.DI/RoutingExtension.cache.phpt @@ -89,4 +89,4 @@ Assert::exception(function () { $compiler = new DI\Compiler; $compiler->addExtension('routing', new RoutingExtension(FALSE)); $compiler->compile($config, 'Container3'); -}, 'Nette\DI\ServiceCreationException', 'Unable to cache router due to error: %a%'); +}, Nette\DI\ServiceCreationException::class, 'Unable to cache router due to error: %a%'); diff --git a/tests/Application.Routers/LinkGenerator.phpt b/tests/Application.Routers/LinkGenerator.phpt index e089cb0a4..3b9a24ef8 100644 --- a/tests/Application.Routers/LinkGenerator.phpt +++ b/tests/Application.Routers/LinkGenerator.phpt @@ -60,13 +60,13 @@ namespace { Assert::exception(function () use ($pf) { $generator = new LinkGenerator(new Routers\SimpleRouter, new Http\Url('http://nette.org/en/'), $pf); $generator->link('default'); - }, 'Nette\Application\UI\InvalidLinkException', "Invalid link destination 'default'."); + }, Nette\Application\UI\InvalidLinkException::class, "Invalid link destination 'default'."); Assert::exception(function () use ($pf) { $generator = new LinkGenerator(new Routers\Route('/', 'Product:'), new Http\Url('http://nette.org/en/'), $pf); $generator->link('Homepage:default', ['id' => 10]); - }, 'Nette\Application\UI\InvalidLinkException', 'No route for Homepage:default(id=10)'); + }, Nette\Application\UI\InvalidLinkException::class, 'No route for Homepage:default(id=10)'); test(function () { diff --git a/tests/Application/MicroPresenter.response.phpt b/tests/Application/MicroPresenter.response.phpt index 044bd1aa4..61a61265e 100644 --- a/tests/Application/MicroPresenter.response.phpt +++ b/tests/Application/MicroPresenter.response.phpt @@ -33,7 +33,7 @@ class MicroContainer extends Nette\DI\Container protected $meta = [ 'types' => [ - 'Nette\\Bridges\\ApplicationLatte\\ILatteFactory' => [1 => ['latte.latteFactory']], + Nette\Bridges\ApplicationLatte\ILatteFactory::class => [1 => ['latte.latteFactory']], ], ]; @@ -65,7 +65,7 @@ test(function () { }, ])); - Assert::type('Nette\Application\Responses\TextResponse', $response); + Assert::type(\Nette\Application\Responses\TextResponse::class, $response); Assert::same('test', Responder::render($response)); }); @@ -79,7 +79,7 @@ test(function () { 'param' => 'test', ])); - Assert::type('Nette\Application\Responses\TextResponse', $response); + Assert::type(Nette\Application\Responses\TextResponse::class, $response); Assert::same('test', Responder::render($response)); }); @@ -92,7 +92,7 @@ test(function () { }, ])); - Assert::type('Nette\Application\Responses\TextResponse', $response); + Assert::type(Nette\Application\Responses\TextResponse::class, $response); Assert::same(date('Y'), Responder::render($response)); }); @@ -106,7 +106,7 @@ test(function () { 'param' => 'test', ])); - Assert::type('Nette\Application\Responses\TextResponse', $response); + Assert::type(Nette\Application\Responses\TextResponse::class, $response); Assert::same('test', Responder::render($response)); }); @@ -127,7 +127,7 @@ test(function () { }, ])); - Assert::type('Nette\Application\Responses\TextResponse', $response); + Assert::type(Nette\Application\Responses\TextResponse::class, $response); Assert::same('test', Responder::render($response)); }); @@ -149,7 +149,7 @@ test(function () { }, ])); - Assert::type('Nette\Application\Responses\TextResponse', $response); + Assert::type(Nette\Application\Responses\TextResponse::class, $response); Assert::same('test', Responder::render($response)); }); diff --git a/tests/Application/Presenter.link().phpt b/tests/Application/Presenter.link().phpt index 7769f9db3..f50d762d0 100644 --- a/tests/Application/Presenter.link().phpt +++ b/tests/Application/Presenter.link().phpt @@ -153,7 +153,7 @@ class TestPresenter extends Application\UI\Presenter $this->invalidLinkMode = self::INVALID_LINK_EXCEPTION; Assert::exception(function () use ($me) { $me->link('product', ['var1' => NULL, 'ok' => 'a']); - }, 'Nette\Application\UI\InvalidLinkException', "Invalid value for persistent parameter 'ok' in 'Test', expected boolean."); + }, Nette\Application\UI\InvalidLinkException::class, "Invalid value for persistent parameter 'ok' in 'Test', expected boolean."); } diff --git a/tests/Application/Presenter.paramChecking.phpt b/tests/Application/Presenter.paramChecking.phpt index 0c2f588f4..67b509144 100644 --- a/tests/Application/Presenter.paramChecking.phpt +++ b/tests/Application/Presenter.paramChecking.phpt @@ -36,63 +36,63 @@ $presenter->injectPrimary( Assert::exception(function () use ($presenter) { $request = new Application\Request('Test', Http\Request::GET, ['action' => []]); $presenter->run($request); -}, 'Nette\Application\BadRequestException', 'Action name is not alphanumeric string.'); +}, Nette\Application\BadRequestException::class, 'Action name is not alphanumeric string.'); Assert::exception(function () use ($presenter) { $request = new Application\Request('Test', Http\Request::GET, ['do' => []]); $presenter->run($request); -}, 'Nette\Application\BadRequestException', 'Signal name is not string.'); +}, Nette\Application\BadRequestException::class, 'Signal name is not string.'); Assert::exception(function () use ($presenter) { $request = new Application\Request('Test', Http\Request::GET, ['a' => []]); $presenter->run($request); -}, 'Nette\Application\BadRequestException', "Invalid value for parameter 'a' in method TestPresenter::actionDefault(), expected scalar."); +}, Nette\Application\BadRequestException::class, "Invalid value for parameter 'a' in method TestPresenter::actionDefault(), expected scalar."); Assert::exception(function () use ($presenter) { $request = new Application\Request('Test', Http\Request::GET, ['b' => []]); $presenter->run($request); -}, 'Nette\Application\BadRequestException', "Invalid value for parameter 'b' in method TestPresenter::actionDefault(), expected scalar."); +}, Nette\Application\BadRequestException::class, "Invalid value for parameter 'b' in method TestPresenter::actionDefault(), expected scalar."); Assert::exception(function () use ($presenter) { $request = new Application\Request('Test', Http\Request::GET, ['c' => 1]); $presenter->run($request); -}, 'Nette\Application\BadRequestException', "Invalid value for parameter 'c' in method TestPresenter::actionDefault(), expected array."); +}, Nette\Application\BadRequestException::class, "Invalid value for parameter 'c' in method TestPresenter::actionDefault(), expected array."); Assert::exception(function () use ($presenter) { $request = new Application\Request('Test', Http\Request::GET, ['d' => 1]); $presenter->run($request); -}, 'Nette\Application\BadRequestException', "Invalid value for parameter 'd' in method TestPresenter::actionDefault(), expected array."); +}, Nette\Application\BadRequestException::class, "Invalid value for parameter 'd' in method TestPresenter::actionDefault(), expected array."); Assert::exception(function () use ($presenter) { $request = new Application\Request('Test', Http\Request::GET, ['e' => 1.1]); $presenter->run($request); -}, 'Nette\Application\BadRequestException', "Invalid value for parameter 'e' in method TestPresenter::actionDefault(), expected integer."); +}, Nette\Application\BadRequestException::class, "Invalid value for parameter 'e' in method TestPresenter::actionDefault(), expected integer."); Assert::exception(function () use ($presenter) { $request = new Application\Request('Test', Http\Request::GET, ['e' => '1 ']); $presenter->run($request); -}, 'Nette\Application\BadRequestException', "Invalid value for parameter 'e' in method TestPresenter::actionDefault(), expected integer."); +}, Nette\Application\BadRequestException::class, "Invalid value for parameter 'e' in method TestPresenter::actionDefault(), expected integer."); Assert::exception(function () use ($presenter) { $request = new Application\Request('Test', Http\Request::GET, ['f' => '1 ']); $presenter->run($request); -}, 'Nette\Application\BadRequestException', "Invalid value for parameter 'f' in method TestPresenter::actionDefault(), expected double."); +}, Nette\Application\BadRequestException::class, "Invalid value for parameter 'f' in method TestPresenter::actionDefault(), expected double."); Assert::exception(function () use ($presenter) { $request = new Application\Request('Test', Http\Request::GET, ['g' => '']); $presenter->run($request); -}, 'Nette\Application\BadRequestException', "Invalid value for parameter 'g' in method TestPresenter::actionDefault(), expected boolean."); +}, Nette\Application\BadRequestException::class, "Invalid value for parameter 'g' in method TestPresenter::actionDefault(), expected boolean."); Assert::exception(function () use ($presenter) { $request = new Application\Request('Test', Http\Request::GET, ['bool' => []]); $presenter->run($request); -}, 'Nette\Application\BadRequestException', "Invalid value for persistent parameter 'bool' in 'Test', expected boolean."); +}, Nette\Application\BadRequestException::class, "Invalid value for persistent parameter 'bool' in 'Test', expected boolean."); diff --git a/tests/Application/Presenter.storeRequest().phpt b/tests/Application/Presenter.storeRequest().phpt index f4e19783d..8ed0f95ef 100644 --- a/tests/Application/Presenter.storeRequest().phpt +++ b/tests/Application/Presenter.storeRequest().phpt @@ -25,7 +25,7 @@ class MockSession extends Http\Session public function __construct() {} - public function getSection($section, $class = 'Nette\Http\SessionSection') + public function getSection($section, $class = Nette\Http\SessionSection::class) { return $this->testSection; } diff --git a/tests/Application/PresenterComponent.redirect().phpt b/tests/Application/PresenterComponent.redirect().phpt index dfb40b2d6..b3c5f69bc 100644 --- a/tests/Application/PresenterComponent.redirect().phpt +++ b/tests/Application/PresenterComponent.redirect().phpt @@ -40,7 +40,7 @@ $presenter->injectPrimary( test(function () use ($presenter) { $presenter->redirect('foo'); - Assert::type('Nette\Application\Responses\RedirectResponse', $presenter->response); + Assert::type(Nette\Application\Responses\RedirectResponse::class, $presenter->response); Assert::same(302, $presenter->response->getCode()); Assert::same('http://localhost/?action=foo&presenter=test', $presenter->response->getUrl()); }); @@ -48,7 +48,7 @@ test(function () use ($presenter) { test(function () use ($presenter) { $presenter->redirect('foo', ['arg' => 1]); - Assert::type('Nette\Application\Responses\RedirectResponse', $presenter->response); + Assert::type(Nette\Application\Responses\RedirectResponse::class, $presenter->response); Assert::same(302, $presenter->response->getCode()); Assert::same('http://localhost/?arg=1&action=foo&presenter=test', $presenter->response->getUrl()); }); @@ -56,7 +56,7 @@ test(function () use ($presenter) { test(function () use ($presenter) { $presenter->redirect('foo', 2); - Assert::type('Nette\Application\Responses\RedirectResponse', $presenter->response); + Assert::type(Nette\Application\Responses\RedirectResponse::class, $presenter->response); Assert::same(302, $presenter->response->getCode()); Assert::same('http://localhost/?val=2&action=foo&presenter=test', $presenter->response->getUrl()); }); @@ -64,7 +64,7 @@ test(function () use ($presenter) { test(function () use ($presenter) { $presenter->redirect(301, 'foo', ['arg' => 1]); - Assert::type('Nette\Application\Responses\RedirectResponse', $presenter->response); + Assert::type(Nette\Application\Responses\RedirectResponse::class, $presenter->response); Assert::same(301, $presenter->response->getCode()); Assert::same('http://localhost/?arg=1&action=foo&presenter=test', $presenter->response->getUrl()); }); @@ -72,7 +72,7 @@ test(function () use ($presenter) { test(function () use ($presenter) { $presenter->redirect(301, 'foo', 2); - Assert::type('Nette\Application\Responses\RedirectResponse', $presenter->response); + Assert::type(Nette\Application\Responses\RedirectResponse::class, $presenter->response); Assert::same(301, $presenter->response->getCode()); Assert::same('http://localhost/?val=2&action=foo&presenter=test', $presenter->response->getUrl()); });