Merge pull request #90 from JanTvrdik/php56

5.6 with ::class

Author: dg

.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:

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",

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;
 			}

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()
 	{

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.");

src/Application/Routers/Route.php

@@ -477,9 +477,7 @@ private function setMask($mask, array $metadata)
 			// name=<parameter-name [pattern]>
 			$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 {

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;

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) {

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);
 	}
 
 

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;