Skip to content

Commit 0680620

Browse files
committed
[TASK] Avoid the deprecated __toString() in tests
Moving some tests to functional tests and splitting them up will come in later changes for #1057.
1 parent 4312c56 commit 0680620

File tree

2 files changed

+16
-4
lines changed

2 files changed

+16
-4
lines changed

tests/Unit/Value/ColorTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
namespace Sabberworm\CSS\Tests\Unit\Value;
66

77
use PHPUnit\Framework\TestCase;
8+
use Sabberworm\CSS\OutputFormat;
89
use Sabberworm\CSS\Parsing\ParserState;
910
use Sabberworm\CSS\Parsing\SourceException;
1011
use Sabberworm\CSS\Settings;
@@ -346,7 +347,7 @@ public function parsesAndRendersValidColor(string $color, string $expectedRender
346347
{
347348
$subject = Color::parse(new ParserState($color, Settings::create()));
348349

349-
$renderedResult = (string) $subject;
350+
$renderedResult = $subject->render(OutputFormat::create());
350351

351352
self::assertSame($expectedRendering, $renderedResult);
352353
}

tests/Unit/Value/ValueTest.php

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@
55
namespace Sabberworm\CSS\Tests\Unit\Value;
66

77
use PHPUnit\Framework\TestCase;
8+
use Sabberworm\CSS\OutputFormat;
89
use Sabberworm\CSS\Parsing\ParserState;
910
use Sabberworm\CSS\Settings;
11+
use Sabberworm\CSS\Value\CSSFunction;
1012
use Sabberworm\CSS\Value\Value;
1113

1214
/**
@@ -48,7 +50,8 @@ public function parsesArithmeticInFunctions(string $operator): void
4850
self::DEFAULT_DELIMITERS
4951
);
5052

51-
self::assertSame('max(300px,50vh ' . $operator . ' 10px)', (string) $subject);
53+
self::assertInstanceOf(CSSFunction::class, $subject);
54+
self::assertSame('max(300px,50vh ' . $operator . ' 10px)', $subject->render(OutputFormat::createCompact()));
5255
}
5356

5457
/**
@@ -90,7 +93,11 @@ public function parsesArithmeticWithMultipleOperatorsInFunctions(
9093
self::DEFAULT_DELIMITERS
9194
);
9295

93-
self::assertSame(\sprintf($expectedResultTemplate, $expression), (string) $subject);
96+
self::assertInstanceOf(CSSFunction::class, $subject);
97+
self::assertSame(
98+
\sprintf($expectedResultTemplate, $expression),
99+
$subject->render(OutputFormat::createCompact())
100+
);
94101
}
95102

96103
/**
@@ -118,6 +125,10 @@ public function parsesArithmeticWithMalformedOperandsInFunctions(string $leftOpe
118125
self::DEFAULT_DELIMITERS
119126
);
120127

121-
self::assertSame('max(300px,' . $leftOperand . ' + ' . $rightOperand . ')', (string) $subject);
128+
self::assertInstanceOf(CSSFunction::class, $subject);
129+
self::assertSame(
130+
'max(300px,' . $leftOperand . ' + ' . $rightOperand . ')',
131+
$subject->render(OutputFormat::createCompact())
132+
);
122133
}
123134
}

0 commit comments

Comments
 (0)