Merge 571f093 into 1f04a53

Kdyby · Jan 31, 2021 · a04bdbd · a04bdbd
2 parents 1f04a53 + 571f093
commit a04bdbd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
 	"require": {
 		"php": ">=7.1",
 		"kdyby/strict-objects": "^2.0",
-		"latte/latte": "^2.5.2 || ^3.0",
+		"latte/latte": "^2.5.2 <= 2.8.4",
 		"nette/caching": "^3.0",
 		"nette/di": "^3.0",
 		"nette/finder": "^2.5",

diff --git a/src/DI/TranslationExtension.php b/src/DI/TranslationExtension.php
@@ -29,6 +29,7 @@
 use Kdyby\Translation\Translator as KdybyTranslator;
 use Latte\Engine as LatteEngine;
 use Nette\Application\Application;
+use Nette\Bridges\ApplicationLatte\LatteFactory;
 use Nette\Bridges\ApplicationLatte\ILatteFactory;
 use Nette\Configurator;
 use Nette\DI\Compiler;
@@ -40,7 +41,6 @@
 use Nette\Reflection\ClassType as ReflectionClassType;
 use Nette\Schema\Expect;
 use Nette\Schema\Schema;
-use Nette\Utils\Callback;
 use Nette\Utils\Finder;
 use Nette\Utils\Validators;
 use Symfony\Component\Translation\Extractor\ChainExtractor;
@@ -297,12 +297,16 @@ public function beforeCompile()
 				->addSetup('addFilter', ['translate', [$this->prefix('@helpers'), 'translateFilterAware']]);
 		};
 
-		$latteFactoryService = $builder->getByType(ILatteFactory::class);
+		$latteFactoryService = $builder->getByType(LatteFactory::class)?: $builder->getByType(ILatteFactory::class) ;
 		if (!$latteFactoryService || !self::isOfType($builder->getDefinition($latteFactoryService)->getClass(), LatteEngine::class)) {
 			$latteFactoryService = 'nette.latteFactory';
 		}
 
-		if ($builder->hasDefinition($latteFactoryService) && self::isOfType($builder->getDefinition($latteFactoryService)->getClass(), ILatteFactory::class)) {
+		if ($builder->hasDefinition($latteFactoryService)
+                        && (self::isOfType($builder->getDefinition($latteFactoryService)->getClass(), LatteFactory::class)
+                        || self::isOfType($builder->getDefinition($latteFactoryService)->getClass(), ILatteFactory::class)) 
+                        )
+                        {
 			$registerToLatte($builder->getDefinition($latteFactoryService));
 		}
 
@@ -372,7 +376,7 @@ public function beforeCompile()
 			return str_replace((DIRECTORY_SEPARATOR === '/') ? '\\' : '/', DIRECTORY_SEPARATOR, Helpers::expand($dir, $builder->parameters));
 		}, $config['dirs']);
 
-		$dirs = array_values(array_filter($config['dirs'], Callback::closure('is_dir')));
+		$dirs = array_values(array_filter($config['dirs'], \Closure::fromCallable('is_dir')));
 		if (count($dirs) > 0) {
 			foreach ($dirs as $dir) {
 				$builder->addDependency($dir);