Skip to content

Forward port 3.1.3 develop >3.2.0 develop #513

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
Merged
merged 16 commits into from
Mar 17, 2021
Merged

Forward port 3.1.3 develop >3.2.0 develop #513

merged 16 commits into from
Mar 17, 2021

Conversation

VitaliyBoyko
Copy link
Contributor

Description (*)

Fixed Issues (if relevant)

  1. Fixes magento/magento2-phpstorm-plugin#<issue_number>

Questions or comments

Contribution checklist (*)

  • Pull request has a meaningful description of its purpose
  • All commits are accompanied by meaningful commit messages
  • All new or changed code is covered with integration/functional tests (if applicable)
  • All automated tests passed successfully (all builds are green)

Vitaliy Boyko and others added 16 commits February 22, 2021 12:44
3.1.3 initial
05c4e3a
Require restart
14ac491
Removed caching the project global object in singletons
66b4808
Static fixes
30b4c74
Merge pull request #499 from magento/require-restart-on-plugin-update
02bb789 
Require restart
@anzin
Fixed bug invalid check setup_version
030b66c
502: Class completion doesn't display interfaces.
b4c7ea9
Merge branch '3.1.3-develop' of github.com:magento/magento2-phpstorm-…
7f175a3 
…plugin into 502-Class_completion_doesn't_display_interfaces
502: Updated CHANGELOG.md
9c91819
@eduard13
Merge pull request #505 from magento/502-Class_completion_doesn't_dis…
edcff33 
…play_interfaces

502: Fixed - Class completion doesn't display interfaces.
@anzin
Fixed code by recommendation, added test
c48a75d
@anzin
Merge branch '3.1.3-develop' of github.com:magento/magento2-phpstorm-…
07a3672 
…plugin into fix-bug-invalid-check-setup-version
Merge pull request #504 from anzin/fix-bug-invalid-check-setup-version
cc10d62 
Fixed bug invalid check setup_version
Merge branch '3.2.0-develop' of github.com:magento/magento2-phpstorm-…
6ac49c8 
…plugin into forwardport-3.1.3-develop->3.2.0-develop

� Conflicts:
�	.github/workflows/gradle.yml
�	CHANGELOG.md
�	build.gradle
�	resources/META-INF/plugin.xml
3.1.4 Classes compatibility fixes
2b618b8
Merge branch '3.2.0-develop' of github.com:magento/magento2-phpstorm-…
5245e0c 
…plugin into forward-port-3.1.3-develop->3.2.0-develop
@eduard13 eduard13 merged commit 80eab67 into 3.2.0-develop Mar 17, 2021
@VitaliyBoyko VitaliyBoyko deleted the forward-port-3.1.3-develop->3.2.0-develop_new branch March 17, 2021 11:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@eduard13 eduard13 eduard13 approved these changes

Assignees

@eduard13 eduard13

Labels

Cleanup Partner: Atwix partners-contribution Progress: done

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@VitaliyBoyko @eduard13 @magento-engcom-team @anzin