RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-10 01:09:26 +03:00
Code Issues Projects Releases Wiki Activity

Make entity generator create the correct options

Browse Source 
The `EntityGenerator` was not creating the field options for all
supported values.
This commit is contained in:
Luís Cobucci 2017-11-26 20:05:52 +01:00
parent 6e095f7c3b
commit bc7aeb9d11
No known key found for this signature in database
GPG Key ID: EC61C5F01750ED3C
2 changed files with 113 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/Doctrine/ORM/Tools/EntityGenerator.php
View File

@ -1665,10 +1665,30 @@ public function __construct(<params>)
$options = []; $options = [];
if (isset($fieldMapping['options']['default']) && $fieldMapping['options']['default']) {
$options[] = '"default"="' . $fieldMapping['options']['default'] .'"';
}
if (isset($fieldMapping['options']['unsigned']) && $fieldMapping['options']['unsigned']) { if (isset($fieldMapping['options']['unsigned']) && $fieldMapping['options']['unsigned']) {
$options[] = '"unsigned"=true'; $options[] = '"unsigned"=true';
} }
if (isset($fieldMapping['options']['fixed']) && $fieldMapping['options']['fixed']) {
$options[] = '"fixed"=true';
}
if (isset($fieldMapping['options']['comment']) && $fieldMapping['options']['comment']) {
$options[] = '"comment"="' . $fieldMapping['options']['comment'] .'"';
}
if (isset($fieldMapping['options']['collation']) && $fieldMapping['options']['collation']) {
$options[] = '"collation"="' . $fieldMapping['options']['collation'] .'"';
}
if (isset($fieldMapping['options']['check']) && $fieldMapping['options']['check']) {
$options[] = '"check"="' . $fieldMapping['options']['check'] .'"';
}
if ($options) { if ($options) {
$column[] = 'options={'.implode(',', $options).'}'; $column[] = 'options={'.implode(',', $options).'}';
} }

93
tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php
View File

@ -1174,6 +1174,99 @@ class
$this->assertEquals(1, preg_match('/@param\s+([^\s]+)/', $method->getDocComment(), $matches)); $this->assertEquals(1, preg_match('/@param\s+([^\s]+)/', $method->getDocComment(), $matches));
$this->assertEquals($type, $matches[1]); $this->assertEquals($type, $matches[1]);
} }
/**
* @group 6703
*
* @dataProvider columnOptionsProvider
*/
public function testOptionsAreGeneratedProperly(string $expectedAnnotation, array $fieldConfiguration) : void
{
$metadata = new ClassMetadataInfo($this->_namespace . '\GH6703Options');
$metadata->namespace = $this->_namespace;
$metadata->mapField(['fieldName' => 'id', 'type' => 'integer', 'id' => true]);
$metadata->mapField(['fieldName' => 'test'] + $fieldConfiguration);
$metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_SEQUENCE);
$this->_generator->writeEntityClass($metadata, $this->_tmpDir);
$filename = $this->_tmpDir . DIRECTORY_SEPARATOR . $this->_namespace . DIRECTORY_SEPARATOR . 'GH6703Options.php';
self::assertFileExists($filename);
require_once $filename;
$property = new \ReflectionProperty($metadata->name, 'test');
$docComment = $property->getDocComment();
self::assertContains($expectedAnnotation, $docComment);
}
public function columnOptionsProvider() : array
{
return [
'string-default' => [
'@Column(name="test", type="string", length=10, options={"default"="testing"})',
['type' => 'string', 'length' => 10, 'options' => ['default' => 'testing']],
],
'string-fixed' => [
'@Column(name="test", type="string", length=10, options={"fixed"=true})',
['type' => 'string', 'length' => 10, 'options' => ['fixed' => true]],
],
'string-comment' => [
'@Column(name="test", type="string", length=10, options={"comment"="testing"})',
['type' => 'string', 'length' => 10, 'options' => ['comment' => 'testing']],
],
'string-collation' => [
'@Column(name="test", type="string", length=10, options={"collation"="utf8mb4_general_ci"})',
['type' => 'string', 'length' => 10, 'options' => ['collation' => 'utf8mb4_general_ci']],
],
'string-check' => [
'@Column(name="test", type="string", length=10, options={"check"="CHECK (test IN (""test""))"})',
['type' => 'string', 'length' => 10, 'options' => ['check' => 'CHECK (test IN (""test""))']],
],
'string-all' => [
'@Column(name="test", type="string", length=10, options={"default"="testing","fixed"=true,"comment"="testing","collation"="utf8mb4_general_ci","check"="CHECK (test IN (""test""))"})',
[
'type' => 'string',
'length' => 10,
'options' => [
'default' => 'testing',
'fixed' => true,
'comment' => 'testing',
'collation' => 'utf8mb4_general_ci',
'check' => 'CHECK (test IN (""test""))'
]
],
],
'int-default' => [
'@Column(name="test", type="integer", options={"default"="10"})',
['type' => 'integer', 'options' => ['default' => 10]],
],
'int-unsigned' => [
'@Column(name="test", type="integer", options={"unsigned"=true})',
['type' => 'integer', 'options' => ['unsigned' => true]],
],
'int-comment' => [
'@Column(name="test", type="integer", options={"comment"="testing"})',
['type' => 'integer', 'options' => ['comment' => 'testing']],
],
'int-check' => [
'@Column(name="test", type="integer", options={"check"="CHECK (test > 5)"})',
['type' => 'integer', 'options' => ['check' => 'CHECK (test > 5)']],
],
'int-all' => [
'@Column(name="test", type="integer", options={"default"="10","unsigned"=true,"comment"="testing","check"="CHECK (test > 5)"})',
[
'type' => 'integer',
'options' => [
'default' => 10,
'unsigned' => true,
'comment' => 'testing',
'check' => 'CHECK (test > 5)',
]
],
],
];
}
} }
class EntityGeneratorAuthor {} class EntityGeneratorAuthor {}