PresenterComponentReflection ⇒ ComponentReflection

composer.json

@@ -40,7 +40,8 @@
 		"nette/latte": "<2.4"
 	},
 	"autoload": {
-		"classmap": ["src/"]
+		"classmap": ["src/"],
+		"files": ["src/compatibility.php"]
 	},
 	"minimum-stability": "dev",
 	"extra": {

src/Application/MicroPresenter.php

@@ -74,7 +74,7 @@ public function run(Application\Request $request)
 		$params['presenter'] = $this;
 		$callback = $params['callback'];
 		$reflection = Nette\Utils\Callback::toReflection(Nette\Utils\Callback::check($callback));
-		$params = Application\UI\PresenterComponentReflection::combineArgs($reflection, $params);
+		$params = Application\UI\ComponentReflection::combineArgs($reflection, $params);
 
 		if ($this->context) {
 			foreach ($reflection->getParameters() as $param) {

src/Application/UI/PresenterComponentReflection.php → src/Application/UI/ComponentReflection.php

@@ -18,7 +18,7 @@
  * @property-read string $fileName
  * @internal
  */
-class PresenterComponentReflection extends \ReflectionClass
+class ComponentReflection extends \ReflectionClass
 {
 	use Nette\SmartObject;
 

src/Application/UI/MethodReflection.php

@@ -25,7 +25,7 @@ class MethodReflection extends \ReflectionMethod
 	 */
 	public function hasAnnotation($name)
 	{
-		return (bool) PresenterComponentReflection::parseAnnotation($this, $name);
+		return (bool) ComponentReflection::parseAnnotation($this, $name);
 	}
 
 
@@ -36,7 +36,7 @@ public function hasAnnotation($name)
 	 */
 	public function getAnnotation($name)
 	{
-		$res = PresenterComponentReflection::parseAnnotation($this, $name);
+		$res = ComponentReflection::parseAnnotation($this, $name);
 		return $res ? end($res) : NULL;
 	}
 

src/Application/UI/Presenter.php

@@ -291,7 +291,7 @@ protected function shutdown($response)
 	 */
 	public function checkRequirements($element)
 	{
-		$user = (array) PresenterComponentReflection::parseAnnotation($element, 'User');
+		$user = (array) ComponentReflection::parseAnnotation($element, 'User');
 		if (in_array('loggedIn', $user, TRUE) && !$this->getUser()->isLoggedIn()) {
 			throw new Application\ForbiddenRequestException;
 		}
@@ -855,7 +855,7 @@ protected function createRequest($component, $destination, array $args, $mode)
 
 		// PROCESS SIGNAL ARGUMENTS
 		if (isset($signal)) { // $component must be IStatePersistent
-			$reflection = new PresenterComponentReflection(get_class($component));
+			$reflection = new ComponentReflection(get_class($component));
 			if ($signal === 'this') { // means "no signal"
 				$signal = '';
 				if (array_key_exists(0, $args)) {
@@ -894,7 +894,7 @@ protected function createRequest($component, $destination, array $args, $mode)
 
 			$current = ($action === '*' || strcasecmp($action, $this->action) === 0) && $presenterClass === get_class($this);
 
-			$reflection = new PresenterComponentReflection($presenterClass);
+			$reflection = new ComponentReflection($presenterClass);
 
 			// counterpart of run() & tryCall()
 			$method = $presenterClass::formatActionMethod($action);
@@ -1005,7 +1005,7 @@ public static function argsToParams($class, $method, & $args, $supplemental = []
 		$i = 0;
 		$rm = new \ReflectionMethod($class, $method);
 		foreach ($rm->getParameters() as $param) {
-			list($type, $isClass) = PresenterComponentReflection::getParameterType($param);
+			list($type, $isClass) = ComponentReflection::getParameterType($param);
 			$name = $param->getName();
 
 			if (array_key_exists($i, $args)) {
@@ -1027,7 +1027,7 @@ public static function argsToParams($class, $method, & $args, $supplemental = []
 				throw new InvalidLinkException("Missing parameter \$$name required by $class::{$rm->getName()}()");
 			}
 
-			if (!PresenterComponentReflection::convertType($args[$name], $type, $isClass)) {
+			if (!ComponentReflection::convertType($args[$name], $type, $isClass)) {
 				throw new InvalidLinkException(sprintf(
 					'Argument $%s passed to %s() must be %s, %s given.',
 					$name,
@@ -1119,7 +1119,7 @@ public function restoreRequest($key)
 	 */
 	public static function getPersistentComponents()
 	{
-		return (array) PresenterComponentReflection::parseAnnotation(new \ReflectionClass(get_called_class()), 'persistent');
+		return (array) ComponentReflection::parseAnnotation(new \ReflectionClass(get_called_class()), 'persistent');
 	}
 
 
@@ -1139,7 +1139,7 @@ protected function getGlobalState($forClass = NULL)
 					$state[$prefix . $key] = $val;
 				}
 			}
-			$this->saveState($state, $forClass ? new PresenterComponentReflection($forClass) : NULL);
+			$this->saveState($state, $forClass ? new ComponentReflection($forClass) : NULL);
 
 			if ($sinces === NULL) {
 				$sinces = [];

src/Application/UI/PresenterComponent.php

@@ -108,11 +108,11 @@ public function checkRequirements($element)
 
 	/**
 	 * Access to reflection.
-	 * @return PresenterComponentReflection
+	 * @return ComponentReflection
 	 */
 	public static function getReflection()
 	{
-		return new PresenterComponentReflection(get_called_class());
+		return new ComponentReflection(get_called_class());
 	}
 
 
@@ -151,7 +151,7 @@ public function loadState(array $params)
 	/**
 	 * Saves state informations for next request.
 	 * @param  array
-	 * @param  PresenterComponentReflection (internal, used by Presenter)
+	 * @param  ComponentReflection (internal, used by Presenter)
 	 * @return void
 	 */
 	public function saveState(array & $params, $reflection = NULL)
@@ -173,7 +173,7 @@ public function saveState(array & $params, $reflection = NULL)
 			}
 
 			$type = gettype($meta['def']);
-			if (!PresenterComponentReflection::convertType($params[$name], $type)) {
+			if (!ComponentReflection::convertType($params[$name], $type)) {
 				throw new InvalidLinkException(sprintf(
 					"Value passed to persistent parameter '%s' in %s must be %s, %s given.",
 					$name,
@@ -247,7 +247,7 @@ public static function getPersistentParams()
 		$rc = new \ReflectionClass(get_called_class());
 		$params = [];
 		foreach ($rc->getProperties(\ReflectionProperty::IS_PUBLIC) as $rp) {
-			if (!$rp->isStatic() && PresenterComponentReflection::parseAnnotation($rp, 'persistent')) {
+			if (!$rp->isStatic() && ComponentReflection::parseAnnotation($rp, 'persistent')) {
 				$params[] = $rp->getName();
 			}
 		}

src/compatibility.php

@@ -0,0 +1,8 @@
+<?php
+
+/**
+ * This file is part of the Nette Framework (https://nette.org)
+ * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
+ */
+
+class_alias('Nette\Application\UI\ComponentReflection', 'Nette\Application\UI\PresenterComponentReflection');

tests/UI/PresenterComponentReflection.combineArgs.php7.phpt → tests/UI/ComponentReflection.combineArgs.php7.phpt

@@ -1,11 +1,11 @@
 <?php
 
 /**
- * Test: PresenterComponentReflection::combineArgs()
+ * Test: ComponentReflection::combineArgs()
  * @phpVersion 7
  */
 
-use Nette\Application\UI\PresenterComponentReflection as Reflection;
+use Nette\Application\UI\ComponentReflection as Reflection;
 use Nette\Application\BadRequestException;
 use Tester\Assert;
 

tests/UI/PresenterComponentReflection.combineArgs.phpt → tests/UI/ComponentReflection.combineArgs.phpt

@@ -1,10 +1,10 @@
 <?php
 
 /**
- * Test: PresenterComponentReflection::combineArgs()
+ * Test: ComponentReflection::combineArgs()
  */
 
-use Nette\Application\UI\PresenterComponentReflection as Reflection;
+use Nette\Application\UI\ComponentReflection as Reflection;
 use Nette\Application\BadRequestException;
 use Tester\Assert;
 

tests/UI/PresenterComponentReflection.convertType.phpt → tests/UI/ComponentReflection.convertType.phpt

@@ -1,10 +1,10 @@
 <?php
 
 /**
- * Test: PresenterComponentReflection::convertType()
+ * Test: ComponentReflection::convertType()
  */
 
-use Nette\Application\UI\PresenterComponentReflection;
+use Nette\Application\UI\ComponentReflection;
 use Tester\Assert;
 
 
@@ -23,10 +23,10 @@ function testIt($type, $val, $res = NULL)
 {
 	$isClass = class_exists($type);
 	if (func_num_args() === 3) {
-		Assert::true(PresenterComponentReflection::convertType($val, $type, $isClass));
+		Assert::true(ComponentReflection::convertType($val, $type, $isClass));
 	} else {
 		$res = $val;
-		Assert::false(PresenterComponentReflection::convertType($val, $type, $isClass));
+		Assert::false(ComponentReflection::convertType($val, $type, $isClass));
 	}
 	Assert::same($res, $val);
 }

tests/UI/PresenterComponentReflection.parseAnnotation.phpt → tests/UI/ComponentReflection.parseAnnotation.phpt

@@ -1,10 +1,10 @@
 <?php
 
 /**
- * Test: PresenterComponentReflection annotation parser.
+ * Test: ComponentReflection annotation parser.
  */
 
-use Nette\Application\UI\PresenterComponentReflection as Reflection;
+use Nette\Application\UI\ComponentReflection as Reflection;
 use Tester\Assert;