Skip to content

[TASK] Add and implement CSSElement interface #1231

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 9, 2025
Merged
Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ Please also have a look at our

### Added

- Add Interface `CSSElement` (#1231)
- Methods `getLineNumber` and `getColumnNumber` which return a nullable `int`
for the following classes:
`Comment`, `CSSList`, `SourceException`, `Charset`, `CSSNamespace`, `Import`,
Expand Down
10 changes: 8 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -624,6 +624,9 @@ classDiagram

%% Start of the part originally generated from the PHP code using tasuku43/mermaid-class-diagram

class CSSElement {
<<interface>>
}
class Renderable {
<<interface>>
}
Expand Down Expand Up @@ -721,9 +724,11 @@ classDiagram
}

RuleSet <|-- DeclarationBlock: inheritance
Renderable <|-- CSSElement: inheritance
Renderable <|-- CSSListItem: inheritance
Commentable <|-- CSSListItem: inheritance
Positionable <|.. RuleSet: realization
CSSElement <|.. RuleSet: realization
CSSListItem <|.. RuleSet: realization
RuleSet <|-- AtRuleSet: inheritance
AtRule <|.. AtRuleSet: realization
Expand All @@ -736,7 +741,7 @@ classDiagram
AtRule <|.. Import: realization
Positionable <|.. CSSNamespace: realization
AtRule <|.. CSSNamespace: realization
Renderable <|.. Rule: realization
CSSElement <|.. Rule: realization
Positionable <|.. Rule: realization
Commentable <|.. Rule: realization
SourceException <|-- OutputException: inheritance
Expand All @@ -746,6 +751,7 @@ classDiagram
SourceException <|-- UnexpectedTokenException: inheritance
CSSList <|-- CSSBlockList: inheritance
CSSBlockList <|-- Document: inheritance
CSSElement <|.. CSSList: realization
Positionable <|.. CSSList: realization
CSSListItem <|.. CSSList: realization
CSSList <|-- KeyFrame: inheritance
Expand All @@ -758,7 +764,7 @@ classDiagram
Value <|-- ValueList: inheritance
CSSFunction <|-- CalcFunction: inheritance
ValueList <|-- LineName: inheritance
Renderable <|.. Value: realization
CSSElement <|.. Value: realization
Positionable <|.. Value: realization
PrimitiveValue <|-- Size: inheritance
PrimitiveValue <|-- CSSString: inheritance
Expand Down
17 changes: 17 additions & 0 deletions src/CSSElement.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?php

declare(strict_types=1);

namespace Sabberworm\CSS;

/**
* Represents any entity in the CSS that is encapsulated by a class.
*
* Its primary purpose is to provide a type for use with `Document::getAllValues()`
* when a subset of values from a particular part of the document is required.
*
* Thus, elements which don't contain `Value`s (such as statement at-rules) don't need to implement this.
*
* It extends `Renderable` because every element is renderable.
*/
interface CSSElement extends Renderable {}
3 changes: 2 additions & 1 deletion src/CSSList/CSSBlockList.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

namespace Sabberworm\CSS\CSSList;

use Sabberworm\CSS\CSSElement;
use Sabberworm\CSS\Property\Selector;
use Sabberworm\CSS\Rule\Rule;
use Sabberworm\CSS\RuleSet\DeclarationBlock;
Expand Down Expand Up @@ -75,7 +76,7 @@ public function getAllRuleSets(): array
}

/**
* @param CSSList|Rule|RuleSet|Value $element
* @param CSSElement|string $element
* @param list<Value> $result
*/
protected function allValues(
Expand Down
3 changes: 2 additions & 1 deletion src/CSSList/CSSList.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
namespace Sabberworm\CSS\CSSList;

use Sabberworm\CSS\Comment\CommentContainer;
use Sabberworm\CSS\CSSElement;
use Sabberworm\CSS\OutputFormat;
use Sabberworm\CSS\Parsing\ParserState;
use Sabberworm\CSS\Parsing\SourceException;
Expand Down Expand Up @@ -34,7 +35,7 @@
* Note that `CSSListItem` extends both `Commentable` and `Renderable`,
* so those interfaces must also be implemented by concrete subclasses.
*/
abstract class CSSList implements CSSListItem, Positionable
abstract class CSSList implements CSSElement, CSSListItem, Positionable
{
use CommentContainer;
use Position;
Expand Down
3 changes: 2 additions & 1 deletion src/CSSList/Document.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

namespace Sabberworm\CSS\CSSList;

use Sabberworm\CSS\CSSElement;
use Sabberworm\CSS\OutputFormat;
use Sabberworm\CSS\Parsing\ParserState;
use Sabberworm\CSS\Parsing\SourceException;
Expand Down Expand Up @@ -33,7 +34,7 @@ public static function parse(ParserState $parserState): Document
/**
* Returns all `Value` objects found recursively in `Rule`s in the tree.
*
* @param CSSList|RuleSet|string $element
* @param CSSElement|string $element
* the `CSSList` or `RuleSet` to start the search from (defaults to the whole document).
* If a string is given, it is used as rule name filter.
* @param bool $searchInFunctionArguments whether to also return Value objects used as Function arguments.
Expand Down
4 changes: 2 additions & 2 deletions src/Rule/Rule.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
use Sabberworm\CSS\Comment\Comment;
use Sabberworm\CSS\Comment\Commentable;
use Sabberworm\CSS\Comment\CommentContainer;
use Sabberworm\CSS\CSSElement;
use Sabberworm\CSS\OutputFormat;
use Sabberworm\CSS\Parsing\ParserState;
use Sabberworm\CSS\Parsing\UnexpectedEOFException;
use Sabberworm\CSS\Parsing\UnexpectedTokenException;
use Sabberworm\CSS\Position\Position;
use Sabberworm\CSS\Position\Positionable;
use Sabberworm\CSS\Renderable;
use Sabberworm\CSS\Value\RuleValueList;
use Sabberworm\CSS\Value\Value;

Expand All @@ -22,7 +22,7 @@
*
* In CSS, `Rule`s are expressed as follows: “key: value[0][0] value[0][1], value[1][0] value[1][1];”
*/
class Rule implements Commentable, Positionable, Renderable
class Rule implements Commentable, CSSElement, Positionable
{
use CommentContainer;
use Position;
Expand Down
3 changes: 2 additions & 1 deletion src/RuleSet/RuleSet.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
namespace Sabberworm\CSS\RuleSet;

use Sabberworm\CSS\Comment\CommentContainer;
use Sabberworm\CSS\CSSElement;
use Sabberworm\CSS\CSSList\CSSListItem;
use Sabberworm\CSS\OutputFormat;
use Sabberworm\CSS\Parsing\ParserState;
Expand All @@ -26,7 +27,7 @@
* Note that `CSSListItem` extends both `Commentable` and `Renderable`,
* so those interfaces must also be implemented by concrete subclasses.
*/
abstract class RuleSet implements CSSListItem, Positionable
abstract class RuleSet implements CSSElement, CSSListItem, Positionable
{
use CommentContainer;
use Position;
Expand Down
4 changes: 2 additions & 2 deletions src/Value/Value.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@

namespace Sabberworm\CSS\Value;

use Sabberworm\CSS\CSSElement;
use Sabberworm\CSS\Parsing\ParserState;
use Sabberworm\CSS\Parsing\SourceException;
use Sabberworm\CSS\Parsing\UnexpectedEOFException;
use Sabberworm\CSS\Parsing\UnexpectedTokenException;
use Sabberworm\CSS\Position\Position;
use Sabberworm\CSS\Position\Positionable;
use Sabberworm\CSS\Renderable;

/**
* Abstract base class for specific classes of CSS values: `Size`, `Color`, `CSSString` and `URL`, and another
* abstract subclass `ValueList`.
*/
abstract class Value implements Positionable, Renderable
abstract class Value implements CSSElement, Positionable
{
use Position;

Expand Down
11 changes: 11 additions & 0 deletions tests/Unit/CSSList/CSSListTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

use PHPUnit\Framework\TestCase;
use Sabberworm\CSS\Comment\Commentable;
use Sabberworm\CSS\CSSElement;
use Sabberworm\CSS\Renderable;
use Sabberworm\CSS\RuleSet\DeclarationBlock;
use Sabberworm\CSS\Tests\Unit\CSSList\Fixtures\ConcreteCSSList;
Expand All @@ -15,6 +16,16 @@
*/
final class CSSListTest extends TestCase
{
/**
* @test
*/
public function implementsCSSElement(): void
{
$subject = new ConcreteCSSList();

self::assertInstanceOf(CSSElement::class, $subject);
}

/**
* @test
*/
Expand Down
11 changes: 11 additions & 0 deletions tests/Unit/Rule/RuleTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
namespace Sabberworm\CSS\Tests\Unit\Rule;

use PHPUnit\Framework\TestCase;
use Sabberworm\CSS\CSSElement;
use Sabberworm\CSS\Parsing\ParserState;
use Sabberworm\CSS\Rule\Rule;
use Sabberworm\CSS\Settings;
Expand All @@ -17,6 +18,16 @@
*/
final class RuleTest extends TestCase
{
/**
* @test
*/
public function implementsCSSElement(): void
{
$subject = new Rule('beverage-container');

self::assertInstanceOf(CSSElement::class, $subject);
}

/**
* @return array<string, array{0: string, 1: list<class-string>}>
*/
Expand Down
19 changes: 19 additions & 0 deletions tests/Unit/RuleSet/Fixtures/ConcreteRuleSet.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?php

declare(strict_types=1);

namespace Sabberworm\CSS\Tests\Unit\RuleSet\Fixtures;

use Sabberworm\CSS\OutputFormat;
use Sabberworm\CSS\RuleSet\RuleSet;

final class ConcreteRuleSet extends RuleSet
{
/**
* @return never
*/
public function render(OutputFormat $outputFormat): string
{
throw new \BadMethodCallException('Nothing to see here :/', 1744067015);
}
}
25 changes: 25 additions & 0 deletions tests/Unit/RuleSet/RuleSetTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?php

declare(strict_types=1);

namespace Sabberworm\CSS\Tests\Unit\RuleSet;

use PHPUnit\Framework\TestCase;
use Sabberworm\CSS\CSSElement;
use Sabberworm\CSS\Tests\Unit\RuleSet\Fixtures\ConcreteRuleSet;

/**
* @covers \Sabberworm\CSS\RuleSet\RuleSet
*/
final class RuleSetTest extends TestCase
{
/**
* @test
*/
public function implementsCSSElement(): void
{
$subject = new ConcreteRuleSet();

self::assertInstanceOf(CSSElement::class, $subject);
}
}
19 changes: 19 additions & 0 deletions tests/Unit/Value/Fixtures/ConcreteValue.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?php

declare(strict_types=1);

namespace Sabberworm\CSS\Tests\Unit\Value\Fixtures;

use Sabberworm\CSS\OutputFormat;
use Sabberworm\CSS\Value\Value;

final class ConcreteValue extends Value
{
/**
* @return never
*/
public function render(OutputFormat $outputFormat): string
{
throw new \BadMethodCallException('Nothing to see here :/', 1744067951);
}
}
12 changes: 12 additions & 0 deletions tests/Unit/Value/ValueTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@
namespace Sabberworm\CSS\Tests\Unit\Value;

use PHPUnit\Framework\TestCase;
use Sabberworm\CSS\CSSElement;
use Sabberworm\CSS\OutputFormat;
use Sabberworm\CSS\Parsing\ParserState;
use Sabberworm\CSS\Settings;
use Sabberworm\CSS\Tests\Unit\Value\Fixtures\ConcreteValue;
use Sabberworm\CSS\Value\CSSFunction;
use Sabberworm\CSS\Value\Value;

Expand All @@ -25,6 +27,16 @@ final class ValueTest extends TestCase
*/
private const DEFAULT_DELIMITERS = [',', ' ', '/'];

/**
* @test
*/
public function implementsCSSElement(): void
{
$subject = new ConcreteValue();

self::assertInstanceOf(CSSElement::class, $subject);
}

/**
* @return array<string, array{0: string}>
*/
Expand Down