diff --git a/.multi-tester.yml b/.multi-tester.yml index a35826a0..d17331c1 100644 --- a/.multi-tester.yml +++ b/.multi-tester.yml @@ -1,4 +1,7 @@ -pug-php/pug: default +pug-php/pug: + install: + - composer config --no-plugins allow-plugins.nodejs-php-fallback/nodejs-php-fallback true + - composer install --no-interaction pug/bemto: autoload: @@ -8,11 +11,20 @@ pug/bemto: - composer dump-autoload --optimize --no-interaction --quiet - composer self-update --2 -pug-php/pug-assets: default +pug-php/pug-assets: + install: + - composer config --no-plugins allow-plugins.nodejs-php-fallback/nodejs-php-fallback true + - composer install --no-interaction -pug-php/pug-minify: default +pug-php/pug-minify: + install: + - composer config --no-plugins allow-plugins.nodejs-php-fallback/nodejs-php-fallback true + - composer install --no-interaction -pug/slim: default +pug/slim: + install: + - composer config --no-plugins allow-plugins.nodejs-php-fallback/nodejs-php-fallback true + - composer install --no-interaction pug/twig: autoload: @@ -21,8 +33,19 @@ pug/twig: - composer dump-autoload --optimize --no-interaction --quiet - composer self-update --2 -ci-pug/ci-pug: default - -bkwld/laravel-pug: default - -pug/yii2: default +ci-pug/ci-pug: + install: + - composer config --no-plugins allow-plugins.nodejs-php-fallback/nodejs-php-fallback true + - composer install --no-interaction + +bkwld/laravel-pug: + install: + - composer config --no-plugins allow-plugins.pug/installer true + - composer config --no-plugins allow-plugins.nodejs-php-fallback/nodejs-php-fallback true + - composer install --no-interaction + +pug/yii2: + install: + - composer config --no-plugins allow-plugins.yiisoft/yii2-composer true + - composer config --no-plugins allow-plugins.nodejs-php-fallback/nodejs-php-fallback true + - composer install --no-interaction diff --git a/tests/Phug/Lexer/Scanner/AssignmentScannerTest.php b/tests/Phug/Lexer/Scanner/AssignmentScannerTest.php index 7ba75009..d9029677 100644 --- a/tests/Phug/Lexer/Scanner/AssignmentScannerTest.php +++ b/tests/Phug/Lexer/Scanner/AssignmentScannerTest.php @@ -59,7 +59,7 @@ public function testObjectInTernary() self::assertSame( 'isNestedFile ? {\'href\': \'../account-orders.html\'} : {\'href\': \'accountorders.html\'}', - $tok->getName() + $tok->getValue() ); } } diff --git a/tests/Phug/Lexer/Scanner/AttributeScannerTest.php b/tests/Phug/Lexer/Scanner/AttributeScannerTest.php index 7729349f..33186456 100644 --- a/tests/Phug/Lexer/Scanner/AttributeScannerTest.php +++ b/tests/Phug/Lexer/Scanner/AttributeScannerTest.php @@ -603,21 +603,21 @@ public function testJsAttributeStyle() self::assertSame('"a"', $class->getValue()); } + /** + * @covers \Phug\Lexer\Scanner\AssignmentScanner::scan + */ public function testTernaryRendering() { - list( - $tag, - $assignment, - $start, - $attribute, - $end, - ) = $this->assertTokens('div&attributes(val === "42" ? {"answer": "42"} : {"ko": "failed"})', [ - TagToken::class, - AssignmentToken::class, - AttributeStartToken::class, - AttributeToken::class, - AttributeEndToken::class, - ]); + list($tag, $assignment, $start, $attribute, $end) = $this->assertTokens( + 'div&attributes(val === "42" ? {"answer": "42"} : {"ko": "failed"})', + [ + TagToken::class, + AssignmentToken::class, + AttributeStartToken::class, + AttributeToken::class, + AttributeEndToken::class, + ] + ); self::assertSame('div', $tag->getName()); self::assertSame('attributes', $assignment->getName());