99use Sabberworm \CSS \CSSList \AtRuleBlockList ;
1010use Sabberworm \CSS \CSSList \CSSList ;
1111use Sabberworm \CSS \Property \Charset ;
12+ use Sabberworm \CSS \Property \Declaration ;
1213use Sabberworm \CSS \Property \Import ;
1314use Sabberworm \CSS \Renderable ;
14- use Sabberworm \CSS \Rule \Rule ;
1515use Sabberworm \CSS \RuleSet \AtRuleSet ;
1616use Sabberworm \CSS \RuleSet \DeclarationBlock ;
1717use Sabberworm \CSS \Tests \Unit \CSSList \Fixtures \ConcreteCSSBlockList ;
@@ -300,9 +300,9 @@ public function getAllValuesReturnsOneValueDirectlySetAsContent(): void
300300 $ value = new CSSString ('Superfont ' );
301301
302302 $ declarationBlock = new DeclarationBlock ();
303- $ rule = new Rule ('font-family ' );
304- $ rule ->setValue ($ value );
305- $ declarationBlock ->addRule ($ rule );
303+ $ declaration = new Declaration ('font-family ' );
304+ $ declaration ->setValue ($ value );
305+ $ declarationBlock ->addRule ($ declaration );
306306 $ subject ->setContents ([$ declarationBlock ]);
307307
308308 $ result = $ subject ->getAllValues ();
@@ -321,12 +321,12 @@ public function getAllValuesReturnsMultipleValuesDirectlySetAsContentInOneDeclar
321321 $ value2 = new CSSString ('aquamarine ' );
322322
323323 $ declarationBlock = new DeclarationBlock ();
324- $ rule1 = new Rule ('font-family ' );
325- $ rule1 ->setValue ($ value1 );
326- $ declarationBlock ->addRule ($ rule1 );
327- $ rule2 = new Rule ('color ' );
328- $ rule2 ->setValue ($ value2 );
329- $ declarationBlock ->addRule ($ rule2 );
324+ $ declaration1 = new Declaration ('font-family ' );
325+ $ declaration1 ->setValue ($ value1 );
326+ $ declarationBlock ->addRule ($ declaration1 );
327+ $ declaration2 = new Declaration ('color ' );
328+ $ declaration2 ->setValue ($ value2 );
329+ $ declarationBlock ->addRule ($ declaration2 );
330330 $ subject ->setContents ([$ declarationBlock ]);
331331
332332 $ result = $ subject ->getAllValues ();
@@ -345,13 +345,13 @@ public function getAllValuesReturnsMultipleValuesDirectlySetAsContentInMultipleD
345345 $ value2 = new CSSString ('aquamarine ' );
346346
347347 $ declarationBlock1 = new DeclarationBlock ();
348- $ rule1 = new Rule ('font-family ' );
349- $ rule1 ->setValue ($ value1 );
350- $ declarationBlock1 ->addRule ($ rule1 );
348+ $ declaration1 = new Declaration ('font-family ' );
349+ $ declaration1 ->setValue ($ value1 );
350+ $ declarationBlock1 ->addRule ($ declaration1 );
351351 $ declarationBlock2 = new DeclarationBlock ();
352- $ rule2 = new Rule ('color ' );
353- $ rule2 ->setValue ($ value2 );
354- $ declarationBlock2 ->addRule ($ rule2 );
352+ $ declaration2 = new Declaration ('color ' );
353+ $ declaration2 ->setValue ($ value2 );
354+ $ declarationBlock2 ->addRule ($ declaration2 );
355355 $ subject ->setContents ([$ declarationBlock1 , $ declarationBlock2 ]);
356356
357357 $ result = $ subject ->getAllValues ();
@@ -369,9 +369,9 @@ public function getAllValuesReturnsValuesWithinAtRuleBlockList(): void
369369 $ value = new CSSString ('Superfont ' );
370370
371371 $ declarationBlock = new DeclarationBlock ();
372- $ rule = new Rule ('font-family ' );
373- $ rule ->setValue ($ value );
374- $ declarationBlock ->addRule ($ rule );
372+ $ declaration = new Declaration ('font-family ' );
373+ $ declaration ->setValue ($ value );
374+ $ declarationBlock ->addRule ($ declaration );
375375 $ atRuleBlockList = new AtRuleBlockList ('media ' );
376376 $ atRuleBlockList ->setContents ([$ declarationBlock ]);
377377 $ subject ->setContents ([$ atRuleBlockList ]);
@@ -392,13 +392,13 @@ public function getAllValuesWithElementProvidedReturnsOnlyValuesWithinThatElemen
392392 $ value2 = new CSSString ('aquamarine ' );
393393
394394 $ declarationBlock1 = new DeclarationBlock ();
395- $ rule1 = new Rule ('font-family ' );
396- $ rule1 ->setValue ($ value1 );
397- $ declarationBlock1 ->addRule ($ rule1 );
395+ $ declaration1 = new Declaration ('font-family ' );
396+ $ declaration1 ->setValue ($ value1 );
397+ $ declarationBlock1 ->addRule ($ declaration1 );
398398 $ declarationBlock2 = new DeclarationBlock ();
399- $ rule2 = new Rule ('color ' );
400- $ rule2 ->setValue ($ value2 );
401- $ declarationBlock2 ->addRule ($ rule2 );
399+ $ declaration2 = new Declaration ('color ' );
400+ $ declaration2 ->setValue ($ value2 );
401+ $ declarationBlock2 ->addRule ($ declaration2 );
402402 $ subject ->setContents ([$ declarationBlock1 , $ declarationBlock2 ]);
403403
404404 $ result = $ subject ->getAllValues ($ declarationBlock1 );
@@ -409,20 +409,20 @@ public function getAllValuesWithElementProvidedReturnsOnlyValuesWithinThatElemen
409409 /**
410410 * @test
411411 */
412- public function getAllValuesWithSearchStringProvidedReturnsOnlyValuesFromMatchingRules (): void
412+ public function getAllValuesWithSearchStringProvidedReturnsOnlyValuesFromMatchingDeclarations (): void
413413 {
414414 $ subject = new ConcreteCSSBlockList ();
415415
416416 $ value1 = new CSSString ('Superfont ' );
417417 $ value2 = new CSSString ('aquamarine ' );
418418
419419 $ declarationBlock = new DeclarationBlock ();
420- $ rule1 = new Rule ('font-family ' );
421- $ rule1 ->setValue ($ value1 );
422- $ declarationBlock ->addRule ($ rule1 );
423- $ rule2 = new Rule ('color ' );
424- $ rule2 ->setValue ($ value2 );
425- $ declarationBlock ->addRule ($ rule2 );
420+ $ declaration1 = new Declaration ('font-family ' );
421+ $ declaration1 ->setValue ($ value1 );
422+ $ declarationBlock ->addRule ($ declaration1 );
423+ $ declaration2 = new Declaration ('color ' );
424+ $ declaration2 ->setValue ($ value2 );
425+ $ declarationBlock ->addRule ($ declaration2 );
426426 $ subject ->setContents ([$ declarationBlock ]);
427427
428428 $ result = $ subject ->getAllValues (null , 'font- ' );
@@ -441,9 +441,9 @@ public function getAllValuesByDefaultDoesNotReturnValuesInFunctionArguments(): v
441441 $ value2 = new Size (2 , '% ' );
442442
443443 $ declarationBlock = new DeclarationBlock ();
444- $ rule = new Rule ('margin ' );
445- $ rule ->setValue (new CSSFunction ('max ' , [$ value1 , $ value2 ]));
446- $ declarationBlock ->addRule ($ rule );
444+ $ declaration = new Declaration ('margin ' );
445+ $ declaration ->setValue (new CSSFunction ('max ' , [$ value1 , $ value2 ]));
446+ $ declarationBlock ->addRule ($ declaration );
447447 $ subject ->setContents ([$ declarationBlock ]);
448448
449449 $ result = $ subject ->getAllValues ();
@@ -462,9 +462,9 @@ public function getAllValuesWithSearchInFunctionArgumentsReturnsValuesInFunction
462462 $ value2 = new Size (2 , '% ' );
463463
464464 $ declarationBlock = new DeclarationBlock ();
465- $ rule = new Rule ('margin ' );
466- $ rule ->setValue (new CSSFunction ('max ' , [$ value1 , $ value2 ]));
467- $ declarationBlock ->addRule ($ rule );
465+ $ declaration = new Declaration ('margin ' );
466+ $ declaration ->setValue (new CSSFunction ('max ' , [$ value1 , $ value2 ]));
467+ $ declarationBlock ->addRule ($ declaration );
468468 $ subject ->setContents ([$ declarationBlock ]);
469469
470470 $ result = $ subject ->getAllValues (null , null , true );
0 commit comments