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

[stable10] Update backported code from 33302 33859 now we have PHP7 #34925

Merged
merged 1 commit into from
Mar 29, 2019

Conversation

phil-davis
Copy link
Contributor

@phil-davis phil-davis commented Mar 29, 2019

Description

PR #33302 used some PHP7 specific code, e.g. "null coalescing operator" https://www.php.net/manual/en/migration70.new-features.php

So that had to be backported differently in stable10 PR #33859

This PR applies the "null coalescing operator" changes to stable10 to make these files the same in stable10 and master

Related Issue

Aligning core master and stable10

Motivation and Context

How Has This Been Tested?

CI

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Database schema changes (next release will require increase of minor version instead of patch)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Technical debt
  • Tests only (no source changes)

Checklist:

  • Code changes
  • Unit tests added
  • Acceptance tests added
  • Documentation ticket raised:

Open tasks:

  • Backport (if applicable set "backport-request" label and remove when the backport was done)

Copy link
Contributor

@PVince81 PVince81 left a comment

Choose a reason for hiding this comment

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

Brrr, I remember undoing these when backporting said PRs...

👍

@PVince81 PVince81 merged commit 7769da1 into stable10 Mar 29, 2019
@PVince81 PVince81 deleted the stable10-fix-versions-performance-PHP7 branch March 29, 2019 13:39
@phil-davis
Copy link
Contributor Author

Yes, life would have been much easier if PHP5.6 security support had not been extended an extra year - we could have dropped it a long time ago and not had these backport diffs.

@PVince81 PVince81 added this to the QA milestone Apr 12, 2019
@lock lock bot locked as resolved and limited conversation to collaborators Apr 15, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants