Move SerializingRulesetTrait to Httpwg test base class

gapple · gapple · commit c644a5c2d1dc · 2025-04-13T14:44:09.000-07:00
diff --git a/tests/Httpwg/BinaryTest.php b/tests/Httpwg/BinaryTest.php
@@ -3,12 +3,10 @@
 namespace gapple\Tests\StructuredFields\Httpwg;
 
 use gapple\Tests\StructuredFields\ParsingRulesetTrait;
-use gapple\Tests\StructuredFields\SerializingRulesetTrait;
 
 class BinaryTest extends HttpwgTestBase
 {
     use ParsingRulesetTrait;
-    use SerializingRulesetTrait;
 
     protected static string $ruleset = 'binary';
 }
diff --git a/tests/Httpwg/BooleanTest.php b/tests/Httpwg/BooleanTest.php
@@ -3,12 +3,10 @@
 namespace gapple\Tests\StructuredFields\Httpwg;
 
 use gapple\Tests\StructuredFields\ParsingRulesetTrait;
-use gapple\Tests\StructuredFields\SerializingRulesetTrait;
 
 class BooleanTest extends HttpwgTestBase
 {
     use ParsingRulesetTrait;
-    use SerializingRulesetTrait;
 
     protected static string $ruleset = 'boolean';
 }
diff --git a/tests/Httpwg/DateTest.php b/tests/Httpwg/DateTest.php
@@ -3,12 +3,10 @@
 namespace gapple\Tests\StructuredFields\Httpwg;
 
 use gapple\Tests\StructuredFields\ParsingRulesetTrait;
-use gapple\Tests\StructuredFields\SerializingRulesetTrait;
 
 class DateTest extends HttpwgTestBase
 {
     use ParsingRulesetTrait;
-    use SerializingRulesetTrait;
 
     protected static string $ruleset = 'date';
 }
diff --git a/tests/Httpwg/DictionaryTest.php b/tests/Httpwg/DictionaryTest.php
@@ -3,12 +3,10 @@
 namespace gapple\Tests\StructuredFields\Httpwg;
 
 use gapple\Tests\StructuredFields\ParsingRulesetTrait;
-use gapple\Tests\StructuredFields\SerializingRulesetTrait;
 
 class DictionaryTest extends HttpwgTestBase
 {
     use ParsingRulesetTrait;
-    use SerializingRulesetTrait;
 
     protected static string $ruleset = 'dictionary';
 }
diff --git a/tests/Httpwg/DisplayStringTest.php b/tests/Httpwg/DisplayStringTest.php
@@ -3,12 +3,10 @@
 namespace gapple\Tests\StructuredFields\Httpwg;
 
 use gapple\Tests\StructuredFields\ParsingRulesetTrait;
-use gapple\Tests\StructuredFields\SerializingRulesetTrait;
 
 class DisplayStringTest extends HttpwgTestBase
 {
     use ParsingRulesetTrait;
-    use SerializingRulesetTrait;
 
     protected static string $ruleset = 'display-string';
 }
diff --git a/tests/Httpwg/ExamplesTest.php b/tests/Httpwg/ExamplesTest.php
@@ -3,12 +3,10 @@
 namespace gapple\Tests\StructuredFields\Httpwg;
 
 use gapple\Tests\StructuredFields\ParsingRulesetTrait;
-use gapple\Tests\StructuredFields\SerializingRulesetTrait;
 
 class ExamplesTest extends HttpwgTestBase
 {
     use ParsingRulesetTrait;
-    use SerializingRulesetTrait;
 
     protected static string $ruleset = 'examples';
 }
diff --git a/tests/Httpwg/HttpwgTestBase.php b/tests/Httpwg/HttpwgTestBase.php
@@ -4,9 +4,12 @@
 
 use gapple\Tests\StructuredFields\Rule;
 use gapple\Tests\StructuredFields\RulesetTestBase;
+use gapple\Tests\StructuredFields\SerializingRulesetTrait;
 
 abstract class HttpwgTestBase extends RulesetTestBase
 {
+    use SerializingRulesetTrait;
+
     protected static string $ruleset;
 
     /**
diff --git a/tests/Httpwg/ItemTest.php b/tests/Httpwg/ItemTest.php
@@ -3,12 +3,10 @@
 namespace gapple\Tests\StructuredFields\Httpwg;
 
 use gapple\Tests\StructuredFields\ParsingRulesetTrait;
-use gapple\Tests\StructuredFields\SerializingRulesetTrait;
 
 class ItemTest extends HttpwgTestBase
 {
     use ParsingRulesetTrait;
-    use SerializingRulesetTrait;
 
     protected static string $ruleset = 'item';
 }
diff --git a/tests/Httpwg/KeyGeneratedTest.php b/tests/Httpwg/KeyGeneratedTest.php
@@ -3,12 +3,10 @@
 namespace gapple\Tests\StructuredFields\Httpwg;
 
 use gapple\Tests\StructuredFields\ParsingRulesetTrait;
-use gapple\Tests\StructuredFields\SerializingRulesetTrait;
 
 class KeyGeneratedTest extends HttpwgTestBase
 {
     use ParsingRulesetTrait;
-    use SerializingRulesetTrait;
 
     protected static string $ruleset = 'key-generated';
 }
diff --git a/tests/Httpwg/LargeGeneratedTest.php b/tests/Httpwg/LargeGeneratedTest.php
@@ -3,12 +3,10 @@
 namespace gapple\Tests\StructuredFields\Httpwg;
 
 use gapple\Tests\StructuredFields\ParsingRulesetTrait;
-use gapple\Tests\StructuredFields\SerializingRulesetTrait;
 
 class LargeGeneratedTest extends HttpwgTestBase
 {
     use ParsingRulesetTrait;
-    use SerializingRulesetTrait;
 
     protected static string $ruleset = 'large-generated';
 }
diff --git a/tests/Httpwg/ListListTest.php b/tests/Httpwg/ListListTest.php
@@ -3,12 +3,10 @@
 namespace gapple\Tests\StructuredFields\Httpwg;
 
 use gapple\Tests\StructuredFields\ParsingRulesetTrait;
-use gapple\Tests\StructuredFields\SerializingRulesetTrait;
 
 class ListListTest extends HttpwgTestBase
 {
     use ParsingRulesetTrait;
-    use SerializingRulesetTrait;
 
     protected static string $ruleset = 'listlist';
 }
diff --git a/tests/Httpwg/ListTest.php b/tests/Httpwg/ListTest.php
@@ -3,12 +3,10 @@
 namespace gapple\Tests\StructuredFields\Httpwg;
 
 use gapple\Tests\StructuredFields\ParsingRulesetTrait;
-use gapple\Tests\StructuredFields\SerializingRulesetTrait;
 
 class ListTest extends HttpwgTestBase
 {
     use ParsingRulesetTrait;
-    use SerializingRulesetTrait;
 
     protected static string $ruleset = 'list';
 }
diff --git a/tests/Httpwg/NumberGeneratedTest.php b/tests/Httpwg/NumberGeneratedTest.php
@@ -3,12 +3,10 @@
 namespace gapple\Tests\StructuredFields\Httpwg;
 
 use gapple\Tests\StructuredFields\ParsingRulesetTrait;
-use gapple\Tests\StructuredFields\SerializingRulesetTrait;
 
 class NumberGeneratedTest extends HttpwgTestBase
 {
     use ParsingRulesetTrait;
-    use SerializingRulesetTrait;
 
     protected static string $ruleset = 'number-generated';
 }
diff --git a/tests/Httpwg/NumberTest.php b/tests/Httpwg/NumberTest.php
@@ -3,12 +3,10 @@
 namespace gapple\Tests\StructuredFields\Httpwg;
 
 use gapple\Tests\StructuredFields\ParsingRulesetTrait;
-use gapple\Tests\StructuredFields\SerializingRulesetTrait;
 
 class NumberTest extends HttpwgTestBase
 {
     use ParsingRulesetTrait;
-    use SerializingRulesetTrait;
 
     protected static string $ruleset = 'number';
 }
diff --git a/tests/Httpwg/ParamDictTest.php b/tests/Httpwg/ParamDictTest.php
@@ -3,12 +3,10 @@
 namespace gapple\Tests\StructuredFields\Httpwg;
 
 use gapple\Tests\StructuredFields\ParsingRulesetTrait;
-use gapple\Tests\StructuredFields\SerializingRulesetTrait;
 
 class ParamDictTest extends HttpwgTestBase
 {
     use ParsingRulesetTrait;
-    use SerializingRulesetTrait;
 
     protected static string $ruleset = 'param-dict';
 }
diff --git a/tests/Httpwg/ParamListListTest.php b/tests/Httpwg/ParamListListTest.php
@@ -3,12 +3,10 @@
 namespace gapple\Tests\StructuredFields\Httpwg;
 
 use gapple\Tests\StructuredFields\ParsingRulesetTrait;
-use gapple\Tests\StructuredFields\SerializingRulesetTrait;
 
 class ParamListListTest extends HttpwgTestBase
 {
     use ParsingRulesetTrait;
-    use SerializingRulesetTrait;
 
     protected static string $ruleset = 'param-listlist';
 }
diff --git a/tests/Httpwg/ParamListTest.php b/tests/Httpwg/ParamListTest.php
@@ -3,12 +3,10 @@
 namespace gapple\Tests\StructuredFields\Httpwg;
 
 use gapple\Tests\StructuredFields\ParsingRulesetTrait;
-use gapple\Tests\StructuredFields\SerializingRulesetTrait;
 
 class ParamListTest extends HttpwgTestBase
 {
     use ParsingRulesetTrait;
-    use SerializingRulesetTrait;
 
     protected static string $ruleset = 'param-list';
 }
diff --git a/tests/Httpwg/SerializationKeyGeneratedTest.php b/tests/Httpwg/SerializationKeyGeneratedTest.php
@@ -2,11 +2,7 @@
 
 namespace gapple\Tests\StructuredFields\Httpwg;
 
-use gapple\Tests\StructuredFields\SerializingRulesetTrait;
-
 class SerializationKeyGeneratedTest extends HttpwgTestBase
 {
-    use SerializingRulesetTrait;
-
     protected static string $ruleset = 'serialisation-tests/key-generated';
 }
diff --git a/tests/Httpwg/SerializationNumberTest.php b/tests/Httpwg/SerializationNumberTest.php
@@ -2,11 +2,7 @@
 
 namespace gapple\Tests\StructuredFields\Httpwg;
 
-use gapple\Tests\StructuredFields\SerializingRulesetTrait;
-
 class SerializationNumberTest extends HttpwgTestBase
 {
-    use SerializingRulesetTrait;
-
     protected static string $ruleset = 'serialisation-tests/number';
 }
diff --git a/tests/Httpwg/SerializationStringGeneratedTest.php b/tests/Httpwg/SerializationStringGeneratedTest.php
@@ -2,11 +2,7 @@
 
 namespace gapple\Tests\StructuredFields\Httpwg;
 
-use gapple\Tests\StructuredFields\SerializingRulesetTrait;
-
 class SerializationStringGeneratedTest extends HttpwgTestBase
 {
-    use SerializingRulesetTrait;
-
     protected static string $ruleset = 'serialisation-tests/string-generated';
 }
diff --git a/tests/Httpwg/SerializationTokenGeneratedTest.php b/tests/Httpwg/SerializationTokenGeneratedTest.php
@@ -2,11 +2,7 @@
 
 namespace gapple\Tests\StructuredFields\Httpwg;
 
-use gapple\Tests\StructuredFields\SerializingRulesetTrait;
-
 class SerializationTokenGeneratedTest extends HttpwgTestBase
 {
-    use SerializingRulesetTrait;
-
     protected static string $ruleset = 'serialisation-tests/token-generated';
 }
diff --git a/tests/Httpwg/StringGeneratedTest.php b/tests/Httpwg/StringGeneratedTest.php
@@ -3,12 +3,10 @@
 namespace gapple\Tests\StructuredFields\Httpwg;
 
 use gapple\Tests\StructuredFields\ParsingRulesetTrait;
-use gapple\Tests\StructuredFields\SerializingRulesetTrait;
 
 class StringGeneratedTest extends HttpwgTestBase
 {
     use ParsingRulesetTrait;
-    use SerializingRulesetTrait;
 
     protected static string $ruleset = 'string-generated';
 }
diff --git a/tests/Httpwg/StringTest.php b/tests/Httpwg/StringTest.php
@@ -3,12 +3,10 @@
 namespace gapple\Tests\StructuredFields\Httpwg;
 
 use gapple\Tests\StructuredFields\ParsingRulesetTrait;
-use gapple\Tests\StructuredFields\SerializingRulesetTrait;
 
 class StringTest extends HttpwgTestBase
 {
     use ParsingRulesetTrait;
-    use SerializingRulesetTrait;
 
     protected static string $ruleset = 'string';
 }
diff --git a/tests/Httpwg/TokenGeneratedTest.php b/tests/Httpwg/TokenGeneratedTest.php
@@ -3,12 +3,10 @@
 namespace gapple\Tests\StructuredFields\Httpwg;
 
 use gapple\Tests\StructuredFields\ParsingRulesetTrait;
-use gapple\Tests\StructuredFields\SerializingRulesetTrait;
 
 class TokenGeneratedTest extends HttpwgTestBase
 {
     use ParsingRulesetTrait;
-    use SerializingRulesetTrait;
 
     protected static string $ruleset = 'token-generated';
 }
diff --git a/tests/Httpwg/TokenTest.php b/tests/Httpwg/TokenTest.php
@@ -3,12 +3,10 @@
 namespace gapple\Tests\StructuredFields\Httpwg;
 
 use gapple\Tests\StructuredFields\ParsingRulesetTrait;
-use gapple\Tests\StructuredFields\SerializingRulesetTrait;
 
 class TokenTest extends HttpwgTestBase
 {
     use ParsingRulesetTrait;
-    use SerializingRulesetTrait;
 
     protected static string $ruleset = 'token';
 }

Original file line number	Diff line number	Diff line change
`@@ -3,12 +3,10 @@`
`3`	`3`	`namespace gapple\Tests\StructuredFields\Httpwg;`
`4`	`4`
`5`	`5`	`use gapple\Tests\StructuredFields\ParsingRulesetTrait;`
`6`		`-use gapple\Tests\StructuredFields\SerializingRulesetTrait;`
`7`	`6`
`8`	`7`	`class BinaryTest extends HttpwgTestBase`
`9`	`8`	`{`
`10`	`9`	`use ParsingRulesetTrait;`
`11`		`- use SerializingRulesetTrait;`
`12`	`10`
`13`	`11`	`protected static string $ruleset = 'binary';`
`14`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,11 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace gapple\Tests\StructuredFields\Httpwg;`
`4`	`4`
`5`		`-use gapple\Tests\StructuredFields\SerializingRulesetTrait;`
`6`		`-`
`7`	`5`	`class SerializationKeyGeneratedTest extends HttpwgTestBase`
`8`	`6`	`{`
`9`		`- use SerializingRulesetTrait;`
`10`		`-`
`11`	`7`	`protected static string $ruleset = 'serialisation-tests/key-generated';`
`12`	`8`	`}`