Skip to content

Dependencies: Update versions#484

Merged
rebeccahum merged 1 commit intodevelopfrom
feature/update-dependency-versions
Jul 3, 2020
Merged

Dependencies: Update versions#484
rebeccahum merged 1 commit intodevelopfrom
feature/update-dependency-versions

Conversation

@GaryJones
Copy link
Contributor

@GaryJones GaryJones commented Jul 3, 2020

WPCS 2.3.0 and PHPCS 3.5.5 have been out for a little while.

The Composer plugin has only been out a week, but has tested fine, and is a development dependency only anyway (until WPCS 3.0.0 is pulled in).

@GaryJones GaryJones added this to the 2.1.0 milestone Jul 3, 2020
@GaryJones GaryJones requested a review from rebeccahum July 3, 2020 13:29
@GaryJones GaryJones mentioned this pull request Jul 3, 2020
Merged
GaryJones added a commit that referenced this pull request Jul 3, 2020
@GaryJones
Switch to Generic.VersionControl.GitMergeConflict
b537522 
Removes WordPressVIPMinimum.VersionControl.MergeConflict sniff.

The merge conflict boundary detection sniff in the built-in Generic standard is a more comprehensive sniff, and it means one less thing for VIP to maintain.

Requires PHPCS 3.4+ (made a requirement in #484).

Fixes #330.
@GaryJones GaryJones mentioned this pull request Jul 3, 2020
Merged
@rebeccahum rebeccahum merged commit e1d50c7 into develop Jul 3, 2020
@rebeccahum rebeccahum deleted the feature/update-dependency-versions branch July 3, 2020 16:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rebeccahum rebeccahum rebeccahum approved these changes

Assignees

No one assigned

Labels

Type: Maintenance

Projects

None yet

Milestone

2.1.0

Development

Successfully merging this pull request may close these issues.

2 participants

@GaryJones @rebeccahum