Skip to content

Commit c726ac9

Browse files
Merge branch '3.4' into 4.2
* 3.4: Remove "internal" annotation from datacollector serialization methods replace mocks with real objects in tests Fix phpunit 8 compatibility render integer types with grouping as text input ignore _method forms in NativeRequestHandler don't lose int precision with not needed type casts
2 parents b551823 + 26dea32 commit c726ac9

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

Resources/config/schema/symfony-1.0.xsd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@
343343
</xsd:restriction>
344344
</xsd:simpleType>
345345

346-
<xsd:simpleType name="cookie_samesite">
346+
<xsd:simpleType name="cookie_samesite">
347347
<xsd:restriction base="xsd:string">
348348
<xsd:enumeration value="" />
349349
<xsd:enumeration value="lax" />

Test/KernelTestCase.php

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,8 @@ protected static function createKernel(array $options = [])
112112
}
113113

114114
/**
115+
* @after
116+
*
115117
* Shuts the kernel down if it was used in the test.
116118
*/
117119
protected static function ensureKernelShutdown()
@@ -125,12 +127,4 @@ protected static function ensureKernelShutdown()
125127
}
126128
static::$container = null;
127129
}
128-
129-
/**
130-
* Clean up Kernel usage in this test.
131-
*/
132-
protected function tearDown()
133-
{
134-
static::ensureKernelShutdown();
135-
}
136130
}

0 commit comments

Comments
 (0)