Merge e1d8be3 into 1f04a53

Kdyby · Nov 26, 2020 · 859ce18 · 859ce18
2 parents 1f04a53 + e1d8be3
commit 859ce18
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/DI/TranslationExtension.php b/src/DI/TranslationExtension.php
@@ -40,7 +40,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;
@@ -372,7 +371,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);

diff --git a/src/Latte/TranslateMacros.php b/src/Latte/TranslateMacros.php
@@ -25,6 +25,7 @@ public static function install(Compiler $compiler)
 		$me = new static($compiler);
 		/** @var \Kdyby\Translation\Latte\TranslateMacros $me */
 
+
 		$me->addMacro('_', [$me, 'macroTranslate'], [$me, 'macroTranslate']);
 		$me->addMacro('translator', [$me, 'macroDomain'], [$me, 'macroDomain']);
 
@@ -48,7 +49,7 @@ public function macroTranslate(MacroNode $node, PhpWriter $writer)
 				$value = 'ob_get_clean()';
 			}
 
-			return $writer->write('$_fi = new LR\FilterInfo(%var); echo %modifyContent($this->filters->filterContent("translate", $_fi, %raw))', $node->context[0], $value);
+			return $writer->write('$__fi = new LR\FilterInfo(%var); echo %modifyContent($this->filters->filterContent("translate", $__fi, %raw))', $node->context[0], $value);
 
 		} elseif ($node->args !== '') {
 			$node->empty = TRUE;