Fix Latte 2.5 compatibility (#164)

jankonas · enumag · commit 0619a642a340 · 2019-05-31T11:02:23.000+02:00
* Remove Kdyby\StrictObjects\Scream trait from Kdyby\Translation\Latte\TranslateMacros since it's ancestor uses Tracy\Strict

* Fix Kdyby\Monolog compatibility issue

* Drop support for PHP &lt; 7.1, add PHP 7.3 to tests

* Move tests to the end of testing pipeline

* Remove shortNoEscape (deprecated in Latte 2.4.0 and removed in Latte 2.5.0)
diff --git a/.travis.yml b/.travis.yml
@@ -7,10 +7,9 @@ cache:
         - $HOME/.composer/cache
 
 php:
-  - 5.6
-  - 7.0
   - 7.1
   - 7.2
+  - 7.3
 
 env:
   - # dev
@@ -20,14 +19,14 @@ env:
 matrix:
   fast_finish: true
   include:
-    - php: 7.2
+    - php: 7.3
       env: COMPOSER_EXTRA_ARGS="--prefer-stable" COVERAGE="--coverage ./coverage.xml --coverage-src ./src" TESTER_RUNTIME="phpdbg"
-    - php: 7.2
+    - php: 7.3
       env: COMPOSER_EXTRA_ARGS="--prefer-stable" PHPSTAN=1
-    - php: 7.2
+    - php: 7.3
       env: COMPOSER_EXTRA_ARGS="--prefer-stable" CODING_STANDARD=1
   exclude:
-    - php: 7.2
+    - php: 7.3
       env: COMPOSER_EXTRA_ARGS="--prefer-stable"
   allow_failures:
     - env:
@@ -40,10 +39,10 @@ install:
   - if [ "$COVERAGE" != "" ]; then travis_retry wget -O /tmp/coveralls.phar https://github.com/satooshi/php-coveralls/releases/download/v1.0.1/coveralls.phar; fi
 
 script:
-  - vendor/bin/tester $COVERAGE -s -p ${TESTER_RUNTIME:-php} -c ./tests/php.ini-unix ./tests/KdybyTests/
   - php /tmp/php-parallel-lint/parallel-lint.php -e php,phpt --exclude vendor .
   - if [ "$PHPSTAN" = "1" ]; then php vendor/phpstan/phpstan-shim/phpstan.phar analyse --ansi --no-progress -l7 -c phpstan.neon src tests/KdybyTests; fi
   - if [ "$CODING_STANDARD" = "1" ]; then php vendor/bin/phpcs --standard=ruleset.xml --encoding=utf-8 -sp src tests; fi
+  - vendor/bin/tester $COVERAGE -s -p ${TESTER_RUNTIME:-php} -c ./tests/php.ini-unix ./tests/KdybyTests/
 
 after_script:
   - if [ "$COVERAGE" != "" ]; then php /tmp/coveralls.phar --verbose --config tests/.coveralls.yml || true; fi
diff --git a/composer.json b/composer.json
@@ -17,7 +17,7 @@
 		"issues": "https://github.com/kdyby/translation/issues"
 	},
 	"require": {
-		"php": "^5.6 || ^7.0",
+		"php": "^7.1",
 		"kdyby/strict-objects": "^1.0",
 		"latte/latte": "^2.4.6@dev",
 		"nette/caching": "^2.5@dev",
@@ -45,7 +45,7 @@
 		"nette/forms": "^2.4.6@dev",
 		"tracy/tracy": "^2.4.9@dev",
 		"kdyby/console": "^2.7.1@dev",
-		"kdyby/monolog": "^1.3.2@dev",
+		"kdyby/monolog": "^1.4.0@dev",
 		"symfony/yaml": "^3.4 || ^4.0",
 		"symfony/console": "^3.4 || ^4.0",
 		"nette/tester": "^2.0",
diff --git a/src/Extractors/LatteExtractor.php b/src/Extractors/LatteExtractor.php
@@ -46,7 +46,6 @@ public function extractFile($file, MessageCatalogue $catalogue)
 	{
 		$buffer = NULL;
 		$parser = new Parser();
-		$parser->shortNoEscape = TRUE;
 
 		foreach ($tokens = $parser->parse(file_get_contents($file)) as $token) {
 			if ($token->type !== $token::MACRO_TAG || !in_array($token->name, ['_', '/_'], TRUE)) {
diff --git a/src/Latte/TranslateMacros.php b/src/Latte/TranslateMacros.php
@@ -18,8 +18,6 @@
 class TranslateMacros extends \Latte\Macros\MacroSet
 {
 
-	use \Kdyby\StrictObjects\Scream;
-
 	public static function install(Compiler $compiler)
 	{
 		$me = new static($compiler);

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,6 @@ public function extractFile($file, MessageCatalogue $catalogue)`
`46`	`46`	`{`
`47`	`47`	`$buffer = NULL;`
`48`	`48`	`$parser = new Parser();`
`49`		`- $parser->shortNoEscape = TRUE;`
`50`	`49`
`51`	`50`	`foreach ($tokens = $parser->parse(file_get_contents($file)) as $token) {`
`52`	`51`	`if ($token->type !== $token::MACRO_TAG \|\| !in_array($token->name, ['_', '/_'], TRUE)) {`
Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,6 @@`
`18`	`18`	`class TranslateMacros extends \Latte\Macros\MacroSet`
`19`	`19`	`{`
`20`	`20`
`21`		`- use \Kdyby\StrictObjects\Scream;`
`22`		`-`
`23`	`21`	`public static function install(Compiler $compiler)`
`24`	`22`	`{`
`25`	`23`	`$me = new static($compiler);`