Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions tests/Functional/RuleSet/RuleSetTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

use PHPUnit\Framework\TestCase;
use Sabberworm\CSS\OutputFormat;
use Sabberworm\CSS\Rule\Rule;
use Sabberworm\CSS\Property\Declaration;
use Sabberworm\CSS\RuleSet\RuleSet;

/**
Expand Down Expand Up @@ -59,9 +59,9 @@ public static function providePropertyNamesAndValuesAndExpectedCss(): array
*
* @dataProvider providePropertyNamesAndValuesAndExpectedCss
*/
public function renderReturnsCssForRulesSet(array $propertyNamesAndValuesToSet, string $expectedCss): void
public function renderReturnsCssForDeclarationsSet(array $propertyNamesAndValuesToSet, string $expectedCss): void
{
$this->setRulesFromPropertyNamesAndValues($propertyNamesAndValuesToSet);
$this->setDeclarationsFromPropertyNamesAndValues($propertyNamesAndValuesToSet);

$result = $this->subject->render(OutputFormat::create());

Expand All @@ -73,7 +73,7 @@ public function renderReturnsCssForRulesSet(array $propertyNamesAndValuesToSet,
*/
public function renderWithCompactOutputFormatReturnsCssWithoutWhitespaceOrTrailingSemicolon(): void
{
$this->setRulesFromPropertyNamesAndValues([
$this->setDeclarationsFromPropertyNamesAndValues([
['name' => 'color', 'value' => 'green'],
['name' => 'display', 'value' => 'block'],
]);
Expand All @@ -88,7 +88,7 @@ public function renderWithCompactOutputFormatReturnsCssWithoutWhitespaceOrTraili
*/
public function renderWithPrettyOutputFormatReturnsCssWithNewlinesAroundIndentedDeclarations(): void
{
$this->setRulesFromPropertyNamesAndValues([
$this->setDeclarationsFromPropertyNamesAndValues([
['name' => 'color', 'value' => 'green'],
['name' => 'display', 'value' => 'block'],
]);
Expand All @@ -101,19 +101,19 @@ public function renderWithPrettyOutputFormatReturnsCssWithNewlinesAroundIndented
/**
* @param list<array{name: string, value: string}> $propertyNamesAndValues
*/
private function setRulesFromPropertyNamesAndValues(array $propertyNamesAndValues): void
private function setDeclarationsFromPropertyNamesAndValues(array $propertyNamesAndValues): void
{
$rulesToSet = \array_map(
$declarationsToSet = \array_map(
/**
* @param array{name: string, value: string} $nameAndValue
*/
static function (array $nameAndValue): Rule {
$rule = new Rule($nameAndValue['name']);
$rule->setValue($nameAndValue['value']);
return $rule;
static function (array $nameAndValue): Declaration {
$declaration = new Declaration($nameAndValue['name']);
$declaration->setValue($nameAndValue['value']);
return $declaration;
},
$propertyNamesAndValues
);
$this->subject->setRules($rulesToSet);
$this->subject->setRules($declarationsToSet);
}
}