Skip to content

[4.3] fix: merge mistake for rector.php#6980

Merged
kenjis merged 2 commits intocodeigniter4:4.3from
kenjis:fix-rector.php
Dec 15, 2022
Merged

[4.3] fix: merge mistake for rector.php#6980
kenjis merged 2 commits intocodeigniter4:4.3from
kenjis:fix-rector.php

Conversation

@kenjis
Copy link
Copy Markdown
Member

@kenjis kenjis commented Dec 15, 2022

Description
I forgot to add it when merging.
Remove the line that was removed in develop.
It should be removed when merging, but maybe I did something wrong when resolving conflicts.

Checklist:

  • Securely signed commits
  • [] Component(s) with PHPDoc blocks, only if necessary or adds value
  • [] Unit testing, with >80% coverage
  • [] User guide updated
  • Conforms to style guide

I forgot to add it when merging.
Comment thread rector.php Outdated
Copy link
Copy Markdown
Member

@samsonasik samsonasik left a comment

Choose a reason for hiding this comment

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

TypedPropertyFromAssignsRector already enabled at develop

so no need to skip it

I don't know why it is not removed. Did I mistake on merging?
@kenjis
Copy link
Copy Markdown
Member Author

kenjis commented Dec 15, 2022

Yes, TypedPropertyFromAssignsRector should not be skipped.

Frankly, I am not sure why the line in skip was not deleted when I merged develop.
But in fact, the line is still there in 4.3, so I will remove it in this PR.

@kenjis kenjis merged commit 438ccad into codeigniter4:4.3 Dec 15, 2022
@kenjis kenjis deleted the fix-rector.php branch December 15, 2022 02:04
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