fix reorder to allow multiple reorders on one node #278

Merged
merged 1 commit into from May 5, 2013

Conversation

Projects
None yet
2 participants
@dbu

This comment has been minimized.

Show comment Hide comment
@dbu

dbu Apr 22, 2013

Member

@lsmith77 do you want to review this or should i simply merge?

Member

dbu commented Apr 22, 2013

@lsmith77 do you want to review this or should i simply merge?

composer.json
@@ -18,7 +18,8 @@
"phpcr/phpcr-utils": "~1.0.0-beta6"
},
"require-dev": {
- "symfony/yaml": ">=2.0.0,<2.4.0-dev"
+ "symfony/yaml": ">=2.0.0,<2.4.0-dev",
+ "jackalope/jackalope-jackrabbit":"dev-master"

This comment has been minimized.

Show comment Hide comment
@lsmith77

lsmith77 Apr 22, 2013

Member

revert

@lsmith77

lsmith77 Apr 22, 2013

Member

revert

case self::STATE_REMOVED:
- unset($this->scheduledRemovals[$oid]);
+ throw new \InvalidArgumentException('Removed document passed to reorder(): '.self::objToStr($document, $this->dm));

This comment has been minimized.

Show comment Hide comment
@lsmith77

lsmith77 Apr 22, 2013

Member

i guess it makes sense that people first need to revert the remove .. but did you review how we deal with this in other places?

@lsmith77

lsmith77 Apr 22, 2013

Member

i guess it makes sense that people first need to revert the remove .. but did you review how we deal with this in other places?

This comment has been minimized.

Show comment Hide comment
@dbu

dbu Apr 22, 2013

Member

i just stumbled over this and it looked a lot like being a copy-paste error from the above doScheduleInsert to me. i think only insert should ever lead to re-attach a document, everything else would more likely hide a programming error than be of any real value. if you think we need further discussion, i can take that out of this PR again so we can fix the actual issue and then discuss.

@dbu

dbu Apr 22, 2013

Member

i just stumbled over this and it looked a lot like being a copy-paste error from the above doScheduleInsert to me. i think only insert should ever lead to re-attach a document, everything else would more likely hide a programming error than be of any real value. if you think we need further discussion, i can take that out of this PR again so we can fix the actual issue and then discuss.

@dbu

This comment has been minimized.

Show comment Hide comment
@dbu

dbu May 5, 2013

Member

shall i take out the not directly related thing we discussed out of the PR? or can we merge as is?

Member

dbu commented May 5, 2013

shall i take out the not directly related thing we discussed out of the PR? or can we merge as is?

@lsmith77

This comment has been minimized.

Show comment Hide comment
@lsmith77

lsmith77 May 5, 2013

Member

fine for me

Member

lsmith77 commented May 5, 2013

fine for me

dbu added a commit that referenced this pull request May 5, 2013

Merge pull request #278 from doctrine/fix-reorder
fix reorder to allow multiple reorders on one node

@dbu dbu merged commit e4d723f into master May 5, 2013

1 check passed

default The Travis build passed
Details

@dbu dbu deleted the fix-reorder branch May 5, 2013

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment