Forced failing unit test for #247 #281
Conversation
| @@ -125,7 +125,9 @@ public function getFormSpecification($entity) | |||
| protected function checkForExcludeElementFromMetadata(ClassMetadata $metadata, $name) | |||
| { | |||
| $params = array('metadata' => $metadata, 'name' => $name); | |||
| $test = function($r) { return (true === $r); }; | |||
| $test = function ($r) { | |||
| return (true === $r); | |||
|
@mpalourdio could you rebase this one? |
|
I just have a few question before pushing. Here is what I do to rebase : (after checking out my Fix247 branch)
At this point, if I try to push, i am asked if I want to rebase (again?) or merge before pushing. What am I supposed to do not to screw all commits ?
Please let me know. |
|
Don't ever merge. This is how I usually do it: git checkout master
git pull --ff-only upstream master #please use only with --ff-only
git checkout my-working-branch
git rebase master |
|
I have done as you purposed, but same message. So i rebased as asked and pushed, instead of merge. Hope it's ok. |
|
@mpalourdio ah, I see - rebase gone wrong :-( I'll pull locally and check |
|
erf, we crossed commit/comment. Ok, let you see. I can reintroduce my initial commits in a separate branch if it's easier for you |
|
@mpalourdio can work, though I could probably fix it when I have time. |
|
ok, let me know if you need a clean PR. |
|
@mpalourdio if you can do that, that'd be easier - not on an awesome connection here :( |
|
|
||
| if (!isset($elementSpec['spec']['options']['empty_option'])) { | ||
| if ((isset($elementSpec['spec']['options']) && | ||
| !array_key_exists('empty_option', $elementSpec['spec']['options'])) || |
There was a problem hiding this comment.
Alignment seems to be a bit scrambled here
Forced failing unit test for #247
This small test is made to actually fail, regarding #247.
Merged @mjhca fix too.