Skip to content

Commit

Permalink
Merge branch '3.4' into 4.2
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
nicolas-grekas committed Feb 8, 2019
2 parents b551823 + 26dea32 commit c726ac9
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Resources/config/schema/symfony-1.0.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@
</xsd:restriction>
</xsd:simpleType>

<xsd:simpleType name="cookie_samesite">
<xsd:simpleType name="cookie_samesite">
<xsd:restriction base="xsd:string">
<xsd:enumeration value="" />
<xsd:enumeration value="lax" />
Expand Down
10 changes: 2 additions & 8 deletions Test/KernelTestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ protected static function createKernel(array $options = [])
}

/**
* @after
*
* Shuts the kernel down if it was used in the test.
*/
protected static function ensureKernelShutdown()
Expand All @@ -125,12 +127,4 @@ protected static function ensureKernelShutdown()
}
static::$container = null;
}

/**
* Clean up Kernel usage in this test.
*/
protected function tearDown()
{
static::ensureKernelShutdown();
}
}

0 comments on commit c726ac9

Please sign in to comment.