Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactored reference update #231

Merged
merged 2 commits into from
Feb 13, 2015
Merged

Conversation

dantleech
Copy link
Contributor

This should also fix #222

This PR refactors some of the node reference logic, having no effect on the behavior but making things clearer and also preparing the way for when Doctrine DBAL will support bulk inserts.

Tests at phpcr/phpcr-api-tests#153

@dbu
Copy link
Member

dbu commented Dec 28, 2014

the tests fail because travis is using development builds of phpunit and there was a hickup with something (there was a discussion somewhere else but can't remember where) - the solution was to install our own phpunit.

@dbu dbu force-pushed the allow_duplicate_multivalue_properties branch from ad1690c to 7caa4c9 Compare January 15, 2015 07:46
@dbu
Copy link
Member

dbu commented Jan 15, 2015

removed the offending phpunit option from the phpunit.xml.dist and rebased this on master, hope the fail goes away.

@dbu
Copy link
Member

dbu commented Jan 15, 2015

now its a lot less errors. @dantleech can you check?

@dantleech dantleech force-pushed the allow_duplicate_multivalue_properties branch from 7caa4c9 to 77b53b5 Compare January 22, 2015 16:32
@dantleech
Copy link
Contributor Author

Updated. The try catch block was in the wrong place.

@dantleech
Copy link
Contributor Author

See the associated test PR for this issue: phpcr/phpcr-api-tests#146

@lsmith77
Copy link
Member

should we maybe not allow dev dependencies?

@dantleech
Copy link
Contributor Author

@lsmith77 I guess we could disallow them by default

@lsmith77
Copy link
Member

@lsmith77
Copy link
Member

do we have a flaky test case?
https://travis-ci.org/jackalope/jackalope-doctrine-dbal/jobs/48041585

@dbu
Copy link
Member

dbu commented Jan 27, 2015

@lsmith77 what you linked to is a successful build, but we seem to have some sqlite issue of lately: #239

@lsmith77
Copy link
Member

yeah .. I retriggered the test .. should have copied the failure here ..

@dbu
Copy link
Member

dbu commented Jan 27, 2015

merged phpcr/phpcr-api-tests#146 and now restarting the build

@dbu
Copy link
Member

dbu commented Jan 27, 2015

this is the travis build that fails: https://travis-ci.org/jackalope/jackalope-doctrine-dbal/builds/48041560 i now reverted the phpcr-api-tests to get rid of the failure.

can you please have another look @dantleech and create a new PR on the api tests that works with this branch?

@dantleech
Copy link
Contributor Author

Do we know why the tests are flaky even with the reversion on the tests?

@dbu
Copy link
Member

dbu commented Feb 6, 2015

hm, now everything is green. maybe i was too impatient with restarting the tests.

@lsmith77
Copy link
Member

lsmith77 commented Feb 6, 2015

but seems it needs a rebase

@dantleech dantleech force-pushed the allow_duplicate_multivalue_properties branch from 3d3435b to 6fa2c42 Compare February 7, 2015 07:44
@dantleech
Copy link
Contributor Author

Rebased.. lets see.

@dbu
Copy link
Member

dbu commented Feb 7, 2015

okay. looks green again. can you try to rebuild the tests that i reverted, so that we actually test the feature?

@dbu dbu added this to the 1.2 milestone Feb 9, 2015
@dbu
Copy link
Member

dbu commented Feb 9, 2015

the test change that i removed is phpcr/phpcr-api-tests@7494a2a - reverting that commit and then cleaning them up would be a start.

@lsmith77
Copy link
Member

@dantleech can you adjust the phpcr api test dep to point to the branch of the PR so that we can see things running through? we can then revert that change before merging.

@dantleech dantleech force-pushed the allow_duplicate_multivalue_properties branch from 6fa2c42 to 4158818 Compare February 11, 2015 15:54
@dantleech
Copy link
Contributor Author

Updated composer (to link to the phpcr-api-tests branch) and also enabled container builds.

Tests seem to pass - although there seems to be two builds, one of which fails with a seemingly unrelated error (/container/idExample not found).

@dbu
Copy link
Member

dbu commented Feb 11, 2015

did somebody restart the tests? they are green now. only failing thing is hhvm because of DTD

@@ -1,5 +1,7 @@
language: php

sulu: false
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we need this? would be a bit awkward imho

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

erm, then s/sulu/sudo/ ?

@dbu
Copy link
Member

dbu commented Feb 13, 2015

merged the tests and reverted the dep in composer.json. changed sulu: false to sudo: false.

if the tests are green, this can be merge imo.

@dantleech
Copy link
Contributor Author

errr.. damned muscle memory.

dbu added a commit that referenced this pull request Feb 13, 2015
@dbu dbu merged commit 4d1adcd into master Feb 13, 2015
@dbu dbu deleted the allow_duplicate_multivalue_properties branch February 13, 2015 15:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

storing multivalue reference should not eliminate duplicates
3 participants