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.

Sign up for GitHub

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

Jump to bottom

EZP-31287: Fixed FullText CriterionHandler merge #131

Merged
merged 1 commit into from
Oct 29, 2020
Merged

EZP-31287: Fixed FullText CriterionHandler merge #131

merged 1 commit into from
Oct 29, 2020

Conversation

barw4
Copy link
Member

@barw4 barw4 commented Oct 29, 2020 •
edited
Loading

Question Answer
JIRA issue EZP-31287
Type bug
Target eZ Platform version v3.1
BC breaks no
Doc needed no

This PR fixes the broken merge of ezsystems/ezpublish-kernel#3071.

Checklist:

  • Provided PR description.
  • Tested the solution manually.
  • Provided automated test coverage.
  • Checked that target branch is set correctly (master for features, the oldest supported for bugs).
  • Ran PHP CS Fixer for new PHP code (use $ composer fix-cs).
  • Asked for a review (ping @ezsystems/php-dev-team).

@barw4 barw4 changed the title EZP-31287: Fixed FullTextCriterionHandler query EZP-31287: Fixed FullTextCriterionHandler query merge Oct 29, 2020
@barw4 barw4 self-assigned this Oct 29, 2020
@barw4 barw4 added the Bug Something isn't working label Oct 29, 2020
@barw4 barw4 changed the title EZP-31287: Fixed FullTextCriterionHandler query merge EZP-31287: Fixed FullTextCriterionHandle merge Oct 29, 2020
@barw4 barw4 changed the title EZP-31287: Fixed FullTextCriterionHandle merge EZP-31287: Fixed FullText CriterionHandler merge Oct 29, 2020
@sonarqubecloud
Copy link

Kudos, SonarCloud Quality Gate passed!

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities (and Security Hotspot 0 Security Hotspots to review)
Code Smell A 0 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

@barw4 barw4 added the Ready for MERGE To be set by author or maintainer label Oct 29, 2020
@alongosz alongosz merged commit 32c8a7a into 1.1 Oct 29, 2020
@alongosz alongosz deleted the ezp-31287-merge-fix branch October 29, 2020 14:51
@alongosz
Copy link
Member

Thx @barw4, you can either merge it up now, or along with CS fix coming from 7.5

@barw4
Copy link
Member Author

barw4 commented Oct 29, 2020 •
edited
Loading

Yes, I'll do it after new stable branches for v3.2 are prepared.

Steveb-p pushed a commit that referenced this pull request Sep 27, 2022
@alongosz
Merged branch '1.3' of ezsystems/ezplatform-kernel into 4.1 (#131)
ff79358 
Merge up of: #325
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alongosz alongosz alongosz approved these changes

Assignees

@barw4 barw4

Labels
Bug Something isn't working Ready for MERGE To be set by author or maintainer
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@barw4 @alongosz