Skip to content

Added option to control the uuid-behavior #185

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

Merged

Conversation

wachterjohannes
Copy link
Contributor

Backport of #184

@wachterjohannes wachterjohannes force-pushed the enhancement/workspace-import-uuid-behavior branch from fa7b32b to 14ed8b4 Compare February 8, 2018 16:42
@wachterjohannes wachterjohannes force-pushed the enhancement/workspace-import-uuid-behavior branch 3 times, most recently from f04ee36 to cb6d1fa Compare February 9, 2018 07:14
@wachterjohannes wachterjohannes force-pushed the enhancement/workspace-import-uuid-behavior branch from cb6d1fa to bd16097 Compare February 9, 2018 07:17
@@ -159,7 +159,7 @@ protected function scan($sql2)
$token = strtok(" \n\t");
}

$regexp = '';
$regexp = array();
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@dbu i have no idea how this could work in the past :)

Copy link
Member

Choose a reason for hiding this comment

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

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',
Copy link
Contributor Author

Choose a reason for hiding this comment

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

this is the default value in the command - when the null is passed the command throws an error.

@dbu dbu merged commit 14e1560 into phpcr:1.2 Feb 12, 2018
@dbu
Copy link
Member

dbu commented Feb 12, 2018

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.

@dbu
Copy link
Member

dbu commented Feb 12, 2018

i tagged 1.2.11

i won't merge this up, as the feature is in the 1.4.0 release already.

@wachterjohannes wachterjohannes deleted the enhancement/workspace-import-uuid-behavior branch February 12, 2018 08:08
@wachterjohannes
Copy link
Contributor Author

wachterjohannes commented Feb 12, 2018

@dbu will you also merge this into 1.3 branch and create a tag there?

@dbu
Copy link
Member

dbu commented Feb 12, 2018

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.

@wachterjohannes
Copy link
Contributor Author

@dbu in sulu we need this to be able to use this command for backup/restore where the uuid should not change

@wachterjohannes
Copy link
Contributor Author

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)

@dbu
Copy link
Member

dbu commented Feb 12, 2018

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.

dbu added a commit that referenced this pull request Feb 13, 2018
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.

2 participants