Skip to content

Commit e7a98ec

Browse files
Merge branch '2.7' into 2.8
* 2.7: Remove usage of __CLASS__ outside of a class [HttpKernel] Fix variable conflicting name [Process] Fix double-fread() when reading unix pipes [Process] Fix AbstractPipes::write() for a situation seen on HHVM (at least) [Validator] Fix dockblock typehint in XmlFileLoader bumped Symfony version to 2.7.17 updated VERSION for 2.7.16 update CONTRIBUTORS for 2.7.16 updated CHANGELOG for 2.7.16 Conflicts: src/Symfony/Component/HttpKernel/Kernel.php
2 parents 244ff2a + f1b2d30 commit e7a98ec

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

Mapping/Loader/XmlFileLoader.php

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -182,13 +182,7 @@ protected function parseFile($path)
182182
return simplexml_import_dom($dom);
183183
}
184184

185-
/**
186-
* Loads the validation metadata from the given XML class description.
187-
*
188-
* @param ClassMetadata $metadata The metadata to load
189-
* @param array $classDescription The XML class description
190-
*/
191-
private function loadClassMetadataFromXml(ClassMetadata $metadata, $classDescription)
185+
private function loadClassMetadataFromXml(ClassMetadata $metadata, \SimpleXMLElement $classDescription)
192186
{
193187
if (count($classDescription->{'group-sequence-provider'}) > 0) {
194188
$metadata->setGroupSequenceProvider(true);

0 commit comments

Comments
 (0)