RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-03-06 21:06:16 +03:00
Code Issues Projects Releases Wiki Activity

#6129 Fixed code style and @depends in test.

Browse Source
This commit is contained in:
Alexander Guz 2016-11-17 21:05:58 +01:00
parent 7bf206adb4
commit 8d433cdb39
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php
View File

@ -653,8 +653,6 @@ class XmlDriver extends FileDriver
{ {
$array = array(); $array = array();
$booleanOptions = ['unsigned', 'fixed'];
/* @var $option SimpleXMLElement */ /* @var $option SimpleXMLElement */
foreach ($options as $option) { foreach ($options as $option) {
if ($option->count()) { if ($option->count()) {
@ -663,11 +661,11 @@ class XmlDriver extends FileDriver
$value = (string) $option; $value = (string) $option;
} }
$attr = $option->attributes(); $attributes = $option->attributes();
if (isset($attr->name)) { if (isset($attributes->name)) {
$attrName = (string) $attr->name; $nameAttribute = (string) $attributes->name;
$array[$attrName] = in_array($attrName, $booleanOptions) $array[$nameAttribute] = in_array($nameAttribute, ['unsigned', 'fixed'])
? $this->evaluateBoolean($value) ? $this->evaluateBoolean($value)
: $value; : $value;
} else { } else {

2
tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php
View File

@ -250,7 +250,7 @@ abstract class AbstractMappingDriverTest extends OrmTestCase
/** /**
* @group #6129 * @group #6129
* *
* @depends testIdentifier * @depends testLoadMapping
* *
* @param ClassMetadata $class * @param ClassMetadata $class
* *