Merge pull request #327 from nextras/nette_3_0

Add support for Nette 3.0 [closes #261]

.travis.yml

@@ -38,7 +38,7 @@ before_script:
 
 script:
     - ./tests/run.sh -s $NTESTER_FLAGS ./tests/cases
-    - if [ "$TRAVIS_PHP_VERSION" == "7.2" ]; then vendor/bin/phpstan.phar analyse -l 7 -c .phpstan.neon src; fi
+    - if [ "$TRAVIS_PHP_VERSION" == "7.2" ] && [ "$dependencies" = "highest" ]; then vendor/bin/phpstan.phar analyse -l 7 -c .phpstan.neon src; fi
 
 after_script:
     - if [ "$TRAVIS_PHP_VERSION" == "7.2" ]; then

composer.json

@@ -20,15 +20,16 @@
 	},
 	"require": {
 		"php": ">=7.1",
-		"nette/caching": "~2.5",
-		"nette/utils": "~2.5",
-		"nette/tokenizer": "~2.3",
+		"nette/caching": "~2.5 || ~3.0@rc",
+		"nette/utils": "~2.5 || ~3.0@rc",
+		"nette/tokenizer": "~2.3 || ~3.0@rc",
 		"nextras/dbal": "~3.0"
 	},
 	"require-dev": {
-		"nette/bootstrap": "~2.4",
-		"nette/di": "~2.4 >=2.4.7",
-		"nette/finder": "~2.4",
+		"nette/bootstrap": "~2.4 || ~3.0@rc",
+		"nette/di": "~2.4 >=2.4.10 || ~3.0@beta",
+		"nette/finder": "~2.4 || ~3.0@rc",
+		"nette/neon": "~2.4 || ~3.0@rc",
 		"nette/tester": "~2.1",
 		"marc-mabe/php-enum": "~3.0",
 		"mockery/mockery": "~1.2",

src/Bridges/NetteDI/DIRepositoryFinder.php

@@ -9,7 +9,7 @@
 namespace Nextras\Orm\Bridges\NetteDI;
 
 use Nette\DI\ContainerBuilder;
-use Nette\DI\ServiceDefinition;
+use Nextras\Orm\InvalidStateException;
 use Nextras\Orm\Repository\IRepository;
 
 
@@ -41,10 +41,27 @@ public function beforeCompile(): ?array
 		$repositories = [];
 		$repositoriesMap = [];
 		foreach ($types as $serviceName => $serviceDefinition) {
-			$serviceDefinition->addSetup('setModel', [$this->extension->prefix('@model')]);
-			$class = $serviceDefinition->getClass();
+			if ($serviceDefinition instanceof \Nette\DI\Definitions\FactoryDefinition) {
+				$serviceDefinition
+					->getResultDefinition()
+					->addSetup('setModel', [$this->extension->prefix('@model')]);
+				$name = $this->getRepositoryName($serviceName, $serviceDefinition);
+
+			} elseif ($serviceDefinition instanceof \Nette\DI\Definitions\ServiceDefinition || $serviceDefinition instanceof \Nette\DI\ServiceDefinition) {
+				$serviceDefinition
+					->addSetup('setModel', [$this->extension->prefix('@model')]);
+				$name = $this->getRepositoryName($serviceName, $serviceDefinition);
+
+			} else {
+				$type = $serviceDefinition->getType();
+				throw new InvalidStateException(
+					"It seems DI defined repository of type '$type' is not defined as one of supported DI services.
+					Orm can only work with ServiceDefinition or FactoryDefinition services."
+				);
+			}
+
+			$class = $serviceDefinition->getType();
 			assert($class !== null);
-			$name = $this->getRepositoryName($serviceName, $serviceDefinition);
 			$repositories[$name] = $class;
 			$repositoriesMap[$class] = $serviceName;
 		}
@@ -54,7 +71,10 @@ public function beforeCompile(): ?array
 	}
 
 
-	protected function getRepositoryName(string $serviceName, ServiceDefinition $serviceDefinition): string
+	/**
+	 * @param \Nette\DI\Definitions\FactoryDefinition|\Nette\DI\Definitions\ServiceDefinition|\Nette\DI\ServiceDefinition $serviceDefinition
+	 */
+	protected function getRepositoryName(string $serviceName, $serviceDefinition): string
 	{
 		return $serviceName;
 	}

src/Bridges/NetteDI/OrmExtension.php

@@ -101,7 +101,7 @@ protected function setupDependencyProvider()
 		}
 
 		$this->builder->addDefinition($providerName)
-			->setClass(DependencyProvider::class);
+			->setType(DependencyProvider::class);
 	}
 
 
@@ -114,7 +114,7 @@ protected function setupDbalMapperDependencies()
 		$name = $this->prefix('mapperCoordinator');
 		if (!$this->builder->hasDefinition($name)) {
 			$this->builder->addDefinition($name)
-				->setClass(DbalMapperCoordinator::class);
+				->setType(DbalMapperCoordinator::class);
 		}
 	}
 
@@ -127,7 +127,7 @@ protected function setupMetadataParserFactory()
 		}
 
 		$this->builder->addDefinition($factoryName)
-			->setClass(MetadataParserFactory::class);
+			->setType(MetadataParserFactory::class);
 	}
 
 
@@ -139,7 +139,7 @@ protected function setupMetadataStorage(array $entityClassMap)
 		}
 
 		$this->builder->addDefinition($metadataName)
-			->setClass(MetadataStorage::class)
+			->setType(MetadataStorage::class)
 			->setArguments([
 				'entityClassesMap' => $entityClassMap,
 				'cache' => $this->prefix('@cache'),
@@ -157,7 +157,7 @@ protected function setupModel(string $modelClass, array $repositoriesConfig)
 		}
 
 		$this->builder->addDefinition($modelName)
-			->setClass($modelClass)
+			->setType($modelClass)
 			->setArguments([
 				'configuration' => $repositoriesConfig,
 				'repositoryLoader' => $this->prefix('@repositoryLoader'),

src/Bridges/NetteDI/PhpDocRepositoryFinder.php

@@ -63,7 +63,9 @@ protected function findRepositories(string $modelClass): array
 		}
 
 		$modelReflection = new \ReflectionClass($modelClass);
-		$this->builder->addDependency($modelReflection->getFileName());
+		$classFileName = $modelReflection->getFileName();
+		assert($classFileName !== false);
+		$this->builder->addDependency($classFileName);
 
 		$repositories = [];
 		preg_match_all(

src/Entity/Reflection/ModifierParser.php

@@ -14,6 +14,7 @@
 use Nette\Tokenizer\Tokenizer;
 use Nette\Utils\Reflection;
 use Nextras\Orm\InvalidModifierDefinitionException;
+use Nextras\Orm\InvalidStateException;
 use ReflectionClass;
 
 
@@ -65,15 +66,15 @@ public function matchModifiers(string $input): array
 	 */
 	public function parse(string $string, ReflectionClass $reflectionClass): array
 	{
-		$iterator = $this->lex($string, $reflectionClass);
+		$iterator = $this->lex($string);
 		return [
 			$name = $this->processName($iterator),
-			$this->processArgs($iterator, $name, false),
+			$this->processArgs($iterator, $reflectionClass, $name, false),
 		];
 	}
 
 
-	private function lex(string $input, ReflectionClass $reflectionClass): Stream
+	private function lex(string $input): Stream
 	{
 		try {
 			$tokens = $this->tokenizer->tokenize($input)->tokens;
@@ -85,33 +86,7 @@ private function lex(string $input, ReflectionClass $reflectionClass): Stream
 			return $token->type !== self::TOKEN_WHITESPACE;
 		});
 		$tokens = array_values($tokens);
-
-		$expanded = [];
-		foreach ($tokens as $token) {
-			if ($token->type === self::TOKEN_STRING) {
-				$token->value = stripslashes(substr($token->value, 1, -1));
-				$expanded[] = $token;
-
-			} elseif ($token->type === self::TOKEN_KEYWORD) {
-				$values = $this->processKeyword($token->value, $reflectionClass);
-				if (is_array($values)) {
-					$count = count($values) - 1;
-					foreach ($values as $i => $value) {
-						$expanded[] = new Token($value, $token->type, $token->offset);
-						if ($i !== $count) {
-							$expanded[] = new Token(',', self::TOKEN_SEPARATOR, -1);
-						}
-					}
-				} else {
-					$expanded[] = new Token($values, $token->type, $token->offset);
-				}
-
-			} else {
-				$expanded[] = $token;
-			}
-		}
-
-		return new Stream($expanded);
+		return new Stream($tokens);
 	}
 
 
@@ -135,13 +110,12 @@ private function processName(Stream $iterator): string
 	}
 
 
-	private function processArgs(Stream $iterator, string $modifierName, bool $inArray)
+	private function processArgs(Stream $iterator, \ReflectionClass $reflectionClass, string $modifierName, bool $inArray)
 	{
 		$result = [];
 		while (($currentToken = $iterator->nextToken()) !== null) {
 			assert($currentToken !== null);
 			$type = $currentToken->type;
-			$value = $currentToken->value;
 
 			if ($type === self::TOKEN_RBRACKET) {
 				if ($inArray) {
@@ -160,25 +134,37 @@ private function processArgs(Stream $iterator, string $modifierName, bool $inArr
 					$nextTokenType = $nextToken ? $nextToken->type : null;
 
 					if ($nextTokenType === self::TOKEN_LBRACKET) {
-						$result[$value] = $this->processArgs($iterator, $modifierName, true);
+						$value = $this->processValue($currentToken, $reflectionClass);
+						assert(!is_array($value));
+						$result[$value] = $this->processArgs($iterator, $reflectionClass, $modifierName, true);
 					} elseif ($nextTokenType === self::TOKEN_STRING || $nextTokenType === self::TOKEN_KEYWORD) {
-						$result[$value] = $iterator->currentValue();
+						$value = $this->processValue($currentToken, $reflectionClass);
+						assert(!is_array($value));
+						assert($nextToken !== null);
+						$result[$value] = $this->processValue($nextToken, $reflectionClass);
 					} elseif ($nextTokenType !== null) {
 						throw new InvalidModifierDefinitionException("Modifier {{$modifierName}} has invalid token after =.");
 					}
 				} else {
 					$iterator->position--;
-					$result[] = $value;
+					$value = $this->processValue($currentToken, $reflectionClass);
+					if (is_array($value)) {
+						foreach ($value as $subValue) {
+							$result[] = $subValue;
+						}
+					} else {
+						$result[] = $value;
+					}
 				}
 			} elseif ($type === self::TOKEN_LBRACKET) {
-				$result[] = $this->processArgs($iterator, $modifierName, true);
+				$result[] = $this->processArgs($iterator, $reflectionClass, $modifierName, true);
 			} else {
 				throw new InvalidModifierDefinitionException("Modifier {{$modifierName}} has invalid token, expected string, keyword, or array.");
 			}
 
 			$iterator->position++;
-			$currentToken = $iterator->currentToken();
-			$type = $currentToken ? $currentToken->type : null;
+			$currentToken2 = $iterator->currentToken();
+			$type = $currentToken2 ? $currentToken2->type : null;
 			if ($type === self::TOKEN_RBRACKET && $inArray) {
 				return $result;
 			} elseif ($type !== null && $type !== self::TOKEN_SEPARATOR) {
@@ -194,6 +180,23 @@ private function processArgs(Stream $iterator, string $modifierName, bool $inArr
 	}
 
 
+	/**
+	 * @return mixed
+	 */
+	private function processValue(Token $token, \ReflectionClass $reflectionClass)
+	{
+		if ($token->type === self::TOKEN_STRING) {
+			return stripslashes(substr($token->value, 1, -1));
+
+		} elseif ($token->type === self::TOKEN_KEYWORD) {
+			return $this->processKeyword($token->value, $reflectionClass);
+
+		} else {
+			throw new InvalidStateException();
+		}
+	}
+
+
 	private function processKeyword(string $value, ReflectionClass $reflectionClass)
 	{
 		if (strcasecmp($value, 'true') === 0) {

src/Mapper/BaseMapper.php

@@ -17,7 +17,9 @@
 
 abstract class BaseMapper implements IMapper
 {
-	use SmartObject;
+	use SmartObject {
+		__call as __smartCall;
+	}
 
 
 	/** @var string */
@@ -75,5 +77,12 @@ public function getStorageReflection(): IStorageReflection
 	}
 
 
+	// Workaround for "Declaration should be compatible" in PHP 7.1 and Nette 2.4 & 3.0
+	public function __call(string $name, array $args)
+	{
+		$this->__smartCall($name, $args);
+	}
+
+
 	abstract protected function createStorageReflection();
 }

src/TestHelper/TestMapper.php

@@ -26,7 +26,7 @@ public function addMethod(string $name, callable $callback)
 	}
 
 
-	public function __call($name, $args)
+	public function __call(string $name, array $args)
 	{
 		if (isset($this->methods[strtolower($name)])) {
 			return call_user_func_array($this->methods[strtolower($name)], $args);