Added option to control the uuid-behavior #185
Conversation
wachterjohannes
force-pushed
the
enhancement/workspace-import-uuid-behavior
branch
from
fa7b32b to
14ed8b4
Compare
wachterjohannes
force-pushed
the
enhancement/workspace-import-uuid-behavior
branch
3 times, most recently
from
f04ee36 to
cb6d1fa
Compare
wachterjohannes
force-pushed
the
enhancement/workspace-import-uuid-behavior
branch
from
cb6d1fa to
bd16097
Compare
| @@ -159,7 +159,7 @@ protected function scan($sql2) | |||
| $token = strtok(" \n\t"); | |||
| } | |||
|
|
|||
| $regexp = ''; | |||
| $regexp = array(); | |||
There was a problem hiding this comment.
@dbu i have no idea how this could work in the past :)
There was a problem hiding this comment.
i think old php versions are more tolerant about this. but i agree it was wrong.
| @@ -88,7 +88,7 @@ public function testNodeUpdate($options) | |||
| $this->setupQueryManager($options); | |||
|
|
|||
| $args = array( | |||
| '--query-language' => null, | |||
| '--query-language' => 'jcr-sql2', | |||
There was a problem hiding this comment.
this is the default value in the command - when the null is passed the command throws an error.
|
hhvm installs the wrong phpunit, but i don't care about that much anymore. i will tag a version and then start to merge this branch up again. |
|
i tagged 1.2.11 i won't merge this up, as the feature is in the 1.4.0 release already. |
wachterjohannes
deleted the
enhancement/workspace-import-uuid-behavior
branch
|
@dbu will you also merge this into 1.3 branch and create a tag there? |
|
there is no 1.3 branch atm. i'd rather not - its wrong to add it in the 1.2 branch as well, as its a new feature. and there are a ton of conflicts when merging to master. but if there is a specific reason to need it in 1.3 as well, i can do that. |
|
@dbu in sulu we need this to be able to use this command for backup/restore where the uuid should not change |
|
so if possible it would be cool to have it also in 1.3 release (i can do the PR for you if you create me the branch) |
|
deal. i just created a 1.3 branch. can you merge 1.2 into 1.3 in your fork and solve conflicts (most should be no-issues i hope) and provide a pull request with the result? 1.3 should not need the "precise" image on travis-ci for example. |
Backport of #184