RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-03-14 00:26:08 +03:00
Code Issues Projects Releases Wiki Activity

#6129 Moved test to AbstractMappingDriverTest.

Browse Source
This commit is contained in:
Alexander Guz 2016-11-16 20:01:11 +01:00
parent 8580f02c6a
commit 7bf206adb4
6 changed files with 43 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -210,11 +210,14 @@ abstract class AbstractMappingDriverTest extends OrmTestCase
/**
* @depends testEntityTableNameAndInheritance
*
* @param ClassMetadata $class
*
* @return ClassMetadata
*/
public function testFieldOptions($class)
public function testFieldOptions(ClassMetadata $class)
{
$expected = array('foo' => 'bar', 'baz' => array('key' => 'val'));
$expected = ['foo' => 'bar', 'baz' => ['key' => 'val'], 'fixed' => false];
$this->assertEquals($expected, $class->fieldMappings['name']['options']);
return $class;
@ -226,7 +229,7 @@ abstract class AbstractMappingDriverTest extends OrmTestCase
*/
public function testIdFieldOptions($class)
{
$this->assertEquals(array('foo' => 'bar'), $class->fieldMappings['id']['options']);
$this->assertEquals(['foo' => 'bar', 'unsigned' => false], $class->fieldMappings['id']['options']);
return $class;
}
@ -244,6 +247,26 @@ abstract class AbstractMappingDriverTest extends OrmTestCase
return $class;
}
/**
* @group #6129
*
* @depends testIdentifier
*
* @param ClassMetadata $class
*
* @return ClassMetadata
*/
public function testBooleanValuesForOptionIsSetCorrectly(ClassMetadata $class)
{
$this->assertInternalType('bool', $class->fieldMappings['id']['options']['unsigned']);
$this->assertFalse($class->fieldMappings['id']['options']['unsigned']);
$this->assertInternalType('bool', $class->fieldMappings['name']['options']['fixed']);
$this->assertFalse($class->fieldMappings['name']['options']['fixed']);
return $class;
}
/**
* @depends testIdentifier
* @param ClassMetadata $class
@ -1048,14 +1071,14 @@ class User
{
/**
* @Id
* @Column(type="integer", options={"foo": "bar"})
* @Column(type="integer", options={"foo": "bar", "unsigned": false})
* @generatedValue(strategy="AUTO")
* @SequenceGenerator(sequenceName="tablename_seq", initialValue=1, allocationSize=100)
**/
public $id;
/**
* @Column(length=50, nullable=true, unique=true, options={"foo": "bar", "baz": {"key": "val"}})
* @Column(length=50, nullable=true, unique=true, options={"foo": "bar", "baz": {"key": "val"}, "fixed": false})
*/
public $name;
@ -1129,7 +1152,7 @@ class User
'fieldName' => 'id',
'type' => 'integer',
'columnName' => 'id',
'options' => array('foo' => 'bar'),
'options' => array('foo' => 'bar', 'unsigned' => false),
));
$metadata->mapField(array(
'fieldName' => 'name',
@ -1138,7 +1161,7 @@ class User
'unique' => true,
'nullable' => true,
'columnName' => 'name',
'options' => array('foo' => 'bar', 'baz' => array('key' => 'val')),
'options' => array('foo' => 'bar', 'baz' => array('key' => 'val'), 'fixed' => false),
));
$metadata->mapField(array(
'fieldName' => 'email',
@ -1474,4 +1497,4 @@ class SingleTableEntityIncompleteDiscriminatorColumnMapping
class SingleTableEntityIncompleteDiscriminatorColumnMappingSub1
extends SingleTableEntityIncompleteDiscriminatorColumnMapping {}
class SingleTableEntityIncompleteDiscriminatorColumnMappingSub2
extends SingleTableEntityIncompleteDiscriminatorColumnMapping {}
extends SingleTableEntityIncompleteDiscriminatorColumnMapping {}

10
tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php
View File

@ -140,16 +140,6 @@ class XmlMappingDriverTest extends AbstractMappingDriverTest
$this->createClassMetadata('Doctrine\Tests\Models\Generic\SerializationModel');
}
/**
* @group #6129
*/
public function testBooleanValuesForOptionIsSetCorrectly()
{
$class = $this->createClassMetadata(User::class);
$this->assertInternalType('bool', $class->fieldMappings['name']['options']['bool_opt']);
$this->assertFalse($class->fieldMappings['name']['options']['bool_opt']);
}
/**
* @param string $xmlMappingFile
* @dataProvider dataValidSchema

4
tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.User.php
View File

@ -19,7 +19,7 @@ $metadata->mapField(array(
'fieldName' => 'id',
'type' => 'integer',
'columnName' => 'id',
'options' => array('foo' => 'bar'),
'options' => array('foo' => 'bar', 'unsigned' => false),
));
$metadata->mapField(array(
'fieldName' => 'name',
@ -28,7 +28,7 @@ $metadata->mapField(array(
'unique' => true,
'nullable' => true,
'columnName' => 'name',
'options' => array('foo' => 'bar', 'baz' => array('key' => 'val')),
'options' => array('foo' => 'bar', 'baz' => array('key' => 'val'), 'fixed' => false),
));
$metadata->mapField(array(
'fieldName' => 'email',

3
tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.ORM.Mapping.User.dcm.xml
View File

@ -41,6 +41,7 @@
<sequence-generator sequence-name="tablename_seq" allocation-size="100" initial-value="1" />
<options>
<option name="foo">bar</option>
<option name="unsigned">false</option>
</options>
</id>
@ -50,7 +51,7 @@
<option name="baz">
<option name="key">val</option>
</option>
<option name="bool_opt">false</option>
<option name="fixed">false</option>
</options>
</field>
<field name="email" column="user_email" type="string" column-definition="CHAR(32) NOT NULL" />

2
tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.ORM.Mapping.User.dcm.yml
View File

@ -18,6 +18,7 @@ Doctrine\Tests\ORM\Mapping\User:
initialValue: 1
options:
foo: bar
unsigned: false
fields:
name:
type: string
@ -28,6 +29,7 @@ Doctrine\Tests\ORM\Mapping\User:
foo: bar
baz:
key: val
fixed: false
email:
type: string
column: user_email