#6129 Added unit test for boolean option values. #6130
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
It fail now. In `XmlDriver::_parseOptions` we need somehow to maintain a list of options, that are supposed to be boolean, and then call `$this->evaluateBoolean()` on them.
|
Ref: #6129 |
Ocramius
changed the title
Ocramius
reviewed
Nov 16, 2016
| * @expectedExceptionMessage Invalid mapping file 'Doctrine.Tests.Models.Generic.SerializationModel.dcm.xml' for class 'Doctrine\Tests\Models\Generic\SerializationModel'. | ||
| */ | ||
| public function testInvalidMappingFileException() | ||
| { | ||
| $this->createClassMetadata('Doctrine\Tests\Models\Generic\SerializationModel'); | ||
| } | ||
|
|
||
| public function testBooleanValuesForOptionIsSetCorrectly() | ||
| { | ||
| $class = $this->createClassMetadata('Doctrine\Tests\ORM\Mapping\User'); |
| * @expectedExceptionMessage Invalid mapping file 'Doctrine.Tests.Models.Generic.SerializationModel.dcm.xml' for class 'Doctrine\Tests\Models\Generic\SerializationModel'. | ||
| */ | ||
| public function testInvalidMappingFileException() | ||
| { | ||
| $this->createClassMetadata('Doctrine\Tests\Models\Generic\SerializationModel'); | ||
| } | ||
|
|
||
| public function testBooleanValuesForOptionIsSetCorrectly() |
There was a problem hiding this comment.
Can you please add an /** @group #6129 */ or similar?
|
@kalimatas thanks for converting it into an actual failing scenario! |
Ocramius
suggested changes
Nov 17, 2016
| @@ -653,6 +653,8 @@ private function _parseOptions(SimpleXMLElement $options) | |||
| { | |||
| $array = array(); | |||
|
|
|||
| $booleanOptions = ['unsigned', 'fixed']; | |||
There was a problem hiding this comment.
Since this constant is not used anywhere else, it can be inlined into the in_array() call
| @@ -664,7 +666,10 @@ private function _parseOptions(SimpleXMLElement $options) | |||
| $attr = $option->attributes(); | |||
|
|
|||
| if (isset($attr->name)) { | |||
| $array[(string) $attr->name] = $value; | |||
| $attrName = (string) $attr->name; | |||
There was a problem hiding this comment.
Please don't abbreviate. I know the previous code did, but we should really call it $attributeName or such
| @@ -245,6 +248,26 @@ public function testIdentifier($class) | |||
| } | |||
|
|
|||
| /** | |||
| * @group #6129 | |||
| * | |||
| * @depends testIdentifier | |||
|
@Ocramius fixed |
|
@kalimatas thanks! This looks good, merging! 👍 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
It fails now. In
XmlDriver::_parseOptionswe need somehow to maintain a list of options, that are supposed to be boolean, and then call$this->evaluateBoolean()on them.