Skip to content

Commit dbf533d

Browse files
committed
tidy: php 8.0 compatibility
1 parent 5a7572e commit dbf533d

File tree

2 files changed

+20
-9
lines changed

2 files changed

+20
-9
lines changed

src/PseudoSelectorConverter.php

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,17 @@
55
class PseudoSelectorConverter {
66
/** @var array<int, string> */
77
private const BOOLEAN_ATTRIBUTES = ["disabled", "checked", "selected"];
8+
private SelectorListSplitter $selectorListSplitter;
9+
private NotSelectorConditionBuilder $notSelectorConditionBuilder;
810

911
public function __construct(
10-
private readonly SelectorListSplitter $selectorListSplitter
11-
= new SelectorListSplitter(),
12-
private readonly NotSelectorConditionBuilder $notSelectorConditionBuilder
13-
= new NotSelectorConditionBuilder(),
12+
?SelectorListSplitter $selectorListSplitter = null,
13+
?NotSelectorConditionBuilder $notSelectorConditionBuilder = null,
1414
) {
15+
$this->selectorListSplitter = $selectorListSplitter
16+
?? new SelectorListSplitter();
17+
$this->notSelectorConditionBuilder = $notSelectorConditionBuilder
18+
?? new NotSelectorConditionBuilder();
1519
}
1620

1721
/**

src/SingleSelectorConverter.php

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,20 @@
33
namespace Gt\CssXPath;
44

55
class SingleSelectorConverter {
6+
private ThreadMatcher $threadMatcher;
7+
private PseudoSelectorConverter $pseudoSelectorConverter;
8+
private AttributeSelectorConverter $attributeSelectorConverter;
9+
610
public function __construct(
7-
private readonly ThreadMatcher $threadMatcher = new ThreadMatcher(),
8-
private readonly PseudoSelectorConverter $pseudoSelectorConverter
9-
= new PseudoSelectorConverter(),
10-
private readonly AttributeSelectorConverter $attributeSelectorConverter
11-
= new AttributeSelectorConverter(),
11+
?ThreadMatcher $threadMatcher = null,
12+
?PseudoSelectorConverter $pseudoSelectorConverter = null,
13+
?AttributeSelectorConverter $attributeSelectorConverter = null,
1214
) {
15+
$this->threadMatcher = $threadMatcher ?? new ThreadMatcher();
16+
$this->pseudoSelectorConverter = $pseudoSelectorConverter
17+
?? new PseudoSelectorConverter();
18+
$this->attributeSelectorConverter = $attributeSelectorConverter
19+
?? new AttributeSelectorConverter();
1320
}
1421

1522
public function convert(

0 commit comments

Comments
 (0)