Skip to content

Commit cda0fa7

Browse files
Merge branch '6.2' into 6.3
* 6.2: minor #49253 [PHPUnit 10] Use `TestCase` suffix for abstract tests in `/Tests/` (OskarStark) [Intl] Generate all emoji short name returned by slack api [Serializer] Fix CsvEncoder decode on empty data [Tests] Migrate data providers to static ones stop using assertObjectHasAttribute()/assertObjectHasNotAttribute() [Cache] Fix Redis proxies [Dotenv] Fix phpdoc Dotenv [Config] Fix phpdoc nullable Replace deprecated/removed way to configure enabled_locales fix typo Fix some typos
2 parents 36cd558 + 7cb4a07 commit cda0fa7

10 files changed

+20
-20
lines changed

Tests/Node/AbstractNodeTestCase.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public function testSpecificityValue(NodeInterface $node, $value)
2828
$this->assertEquals($value, $node->getSpecificity()->getValue());
2929
}
3030

31-
abstract public function getToStringConversionTestData();
31+
abstract public static function getToStringConversionTestData();
3232

33-
abstract public function getSpecificityValueTestData();
33+
abstract public static function getSpecificityValueTestData();
3434
}

Tests/Node/AttributeNodeTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
class AttributeNodeTest extends AbstractNodeTestCase
1818
{
19-
public function getToStringConversionTestData()
19+
public static function getToStringConversionTestData()
2020
{
2121
return [
2222
[new AttributeNode(new ElementNode(), null, 'attribute', 'exists', null), 'Attribute[Element[*][attribute]]'],
@@ -25,7 +25,7 @@ public function getToStringConversionTestData()
2525
];
2626
}
2727

28-
public function getSpecificityValueTestData()
28+
public static function getSpecificityValueTestData()
2929
{
3030
return [
3131
[new AttributeNode(new ElementNode(), null, 'attribute', 'exists', null), 10],

Tests/Node/ClassNodeTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616

1717
class ClassNodeTest extends AbstractNodeTestCase
1818
{
19-
public function getToStringConversionTestData()
19+
public static function getToStringConversionTestData()
2020
{
2121
return [
2222
[new ClassNode(new ElementNode(), 'class'), 'Class[Element[*].class]'],
2323
];
2424
}
2525

26-
public function getSpecificityValueTestData()
26+
public static function getSpecificityValueTestData()
2727
{
2828
return [
2929
[new ClassNode(new ElementNode(), 'class'), 10],

Tests/Node/CombinedSelectorNodeTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616

1717
class CombinedSelectorNodeTest extends AbstractNodeTestCase
1818
{
19-
public function getToStringConversionTestData()
19+
public static function getToStringConversionTestData()
2020
{
2121
return [
2222
[new CombinedSelectorNode(new ElementNode(), '>', new ElementNode()), 'CombinedSelector[Element[*] > Element[*]]'],
2323
[new CombinedSelectorNode(new ElementNode(), ' ', new ElementNode()), 'CombinedSelector[Element[*] <followed> Element[*]]'],
2424
];
2525
}
2626

27-
public function getSpecificityValueTestData()
27+
public static function getSpecificityValueTestData()
2828
{
2929
return [
3030
[new CombinedSelectorNode(new ElementNode(), '>', new ElementNode()), 0],

Tests/Node/ElementNodeTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
class ElementNodeTest extends AbstractNodeTestCase
1717
{
18-
public function getToStringConversionTestData()
18+
public static function getToStringConversionTestData()
1919
{
2020
return [
2121
[new ElementNode(), 'Element[*]'],
@@ -24,7 +24,7 @@ public function getToStringConversionTestData()
2424
];
2525
}
2626

27-
public function getSpecificityValueTestData()
27+
public static function getSpecificityValueTestData()
2828
{
2929
return [
3030
[new ElementNode(), 0],

Tests/Node/FunctionNodeTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
class FunctionNodeTest extends AbstractNodeTestCase
1919
{
20-
public function getToStringConversionTestData()
20+
public static function getToStringConversionTestData()
2121
{
2222
return [
2323
[new FunctionNode(new ElementNode(), 'function'), 'Function[Element[*]:function()]'],
@@ -31,7 +31,7 @@ public function getToStringConversionTestData()
3131
];
3232
}
3333

34-
public function getSpecificityValueTestData()
34+
public static function getSpecificityValueTestData()
3535
{
3636
return [
3737
[new FunctionNode(new ElementNode(), 'function'), 10],

Tests/Node/HashNodeTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616

1717
class HashNodeTest extends AbstractNodeTestCase
1818
{
19-
public function getToStringConversionTestData()
19+
public static function getToStringConversionTestData()
2020
{
2121
return [
2222
[new HashNode(new ElementNode(), 'id'), 'Hash[Element[*]#id]'],
2323
];
2424
}
2525

26-
public function getSpecificityValueTestData()
26+
public static function getSpecificityValueTestData()
2727
{
2828
return [
2929
[new HashNode(new ElementNode(), 'id'), 100],

Tests/Node/NegationNodeTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717

1818
class NegationNodeTest extends AbstractNodeTestCase
1919
{
20-
public function getToStringConversionTestData()
20+
public static function getToStringConversionTestData()
2121
{
2222
return [
2323
[new NegationNode(new ElementNode(), new ClassNode(new ElementNode(), 'class')), 'Negation[Element[*]:not(Class[Element[*].class])]'],
2424
];
2525
}
2626

27-
public function getSpecificityValueTestData()
27+
public static function getSpecificityValueTestData()
2828
{
2929
return [
3030
[new NegationNode(new ElementNode(), new ClassNode(new ElementNode(), 'class')), 10],

Tests/Node/PseudoNodeTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616

1717
class PseudoNodeTest extends AbstractNodeTestCase
1818
{
19-
public function getToStringConversionTestData()
19+
public static function getToStringConversionTestData()
2020
{
2121
return [
2222
[new PseudoNode(new ElementNode(), 'pseudo'), 'Pseudo[Element[*]:pseudo]'],
2323
];
2424
}
2525

26-
public function getSpecificityValueTestData()
26+
public static function getSpecificityValueTestData()
2727
{
2828
return [
2929
[new PseudoNode(new ElementNode(), 'pseudo'), 10],

Tests/Node/SelectorNodeTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616

1717
class SelectorNodeTest extends AbstractNodeTestCase
1818
{
19-
public function getToStringConversionTestData()
19+
public static function getToStringConversionTestData()
2020
{
2121
return [
2222
[new SelectorNode(new ElementNode()), 'Selector[Element[*]]'],
2323
[new SelectorNode(new ElementNode(), 'pseudo'), 'Selector[Element[*]::pseudo]'],
2424
];
2525
}
2626

27-
public function getSpecificityValueTestData()
27+
public static function getSpecificityValueTestData()
2828
{
2929
return [
3030
[new SelectorNode(new ElementNode()), 0],

0 commit comments

Comments
 (0)