Skip to content

Commit c45dbb8

Browse files
author
Vitaliy Boyko
committed
Merge branch '3.2.0-develop' of github.com:magento/magento2-phpstorm-plugin into issue-186
� Conflicts: � src/com/magento/idea/magento2plugin/actions/generation/data/ModuleXmlData.java � src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleXmlGenerator.java � src/com/magento/idea/magento2plugin/generation/php/MagentoModuleGenerator.java � src/com/magento/idea/magento2plugin/magento/files/ModuleXml.java
2 parents f5708e1 + 9741814 commit c45dbb8

File tree

565 files changed

+24088
-5013
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

565 files changed

+24088
-5013
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ If applicable, add screenshots to help explain your problem.
3939

4040
**Please complete the following information:** (*)
4141

42-
- OS: [e.g. iOS]
43-
- PhpStorm/Intellij version [e.g. 2019.3.3]
44-
- Version [e.g. 1.0.0]
42+
- OS: [e.g. MacOS or Ubuntu Linux 20.04]
43+
- PhpStorm/Intellij version: [e.g. 2019.3.3]
44+
- Plugin Version: [e.g. 1.0.0]
4545

4646
**Additional context**
4747

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
If relevant, please provide a list of fixed issues in the format magento/magento2-phpstorm-plugin#<issue_number>.
2121
There could be 1 or more issues linked here and it will help us find some more information about the reasoning behind this change.
2222
-->
23-
1. magento/magento2-phpstorm-plugin#<issue_number>: Issue title
23+
1. Fixes magento/magento2-phpstorm-plugin#<issue_number>
2424

2525
**Questions or comments**
2626
<!---

‎.github/workflows/gradle.yml‎

Lines changed: 42 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,26 @@ name: Run automated tests
55

66
on:
77
pull_request:
8-
branches: [ master, 1.0.2-develop, 2.0.0-develop ]
8+
branches: [ master, 3.2.0-develop ]
99

1010
jobs:
1111
build-linux:
12-
1312
runs-on: ubuntu-latest
1413

1514
steps:
1615
- uses: actions/checkout@v2
17-
- name: Set up JDK 1.8
16+
- name: Set up JDK 11
1817
uses: actions/setup-java@v1
1918
with:
20-
java-version: 1.8
19+
java-version: 11
20+
- uses: actions/cache@v2
21+
with:
22+
path: |
23+
~/.gradle/caches
24+
~/.gradle/wrapper
25+
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
26+
restore-keys: |
27+
${{ runner.os }}-gradle-
2128
- name: Gradle wrapper
2229
run: gradle wrapper
2330
- name: Grant execute permission for gradlew
@@ -26,15 +33,22 @@ jobs:
2633
run: ./gradlew test -i --no-daemon
2734

2835
build-windows:
29-
3036
runs-on: windows-latest
3137

3238
steps:
3339
- uses: actions/checkout@v2
34-
- name: Set up JDK 1.8
40+
- name: Set up JDK 11
3541
uses: actions/setup-java@v1
3642
with:
37-
java-version: 1.8
43+
java-version: 11
44+
- uses: actions/cache@v2
45+
with:
46+
path: |
47+
~/.gradle/caches
48+
~/.gradle/wrapper
49+
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
50+
restore-keys: |
51+
${{ runner.os }}-gradle-
3852
- name: Gradle wrapper
3953
run: gradle wrapper
4054
- name: Grant execute permission for gradlew
@@ -43,15 +57,22 @@ jobs:
4357
run: ./gradlew test -i --no-daemon
4458

4559
build-macos:
46-
4760
runs-on: macos-latest
4861

4962
steps:
5063
- uses: actions/checkout@v2
51-
- name: Set up JDK 1.8
64+
- name: Set up JDK 11
5265
uses: actions/setup-java@v1
5366
with:
54-
java-version: 1.8
67+
java-version: 11
68+
- uses: actions/cache@v2
69+
with:
70+
path: |
71+
~/.gradle/caches
72+
~/.gradle/wrapper
73+
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
74+
restore-keys: |
75+
${{ runner.os }}-gradle-
5576
- name: Gradle wrapper
5677
run: gradle wrapper
5778
- name: Grant execute permission for gradlew
@@ -60,21 +81,28 @@ jobs:
6081
run: ./gradlew test -i --no-daemon
6182

6283
static-tests:
63-
6484
runs-on: ubuntu-latest
6585

6686
steps:
6787
- uses: actions/checkout@v2
68-
- name: Set up JDK 1.8
88+
- name: Set up JDK 11
6989
uses: actions/setup-java@v1
7090
with:
71-
java-version: 1.8
91+
java-version: 11
92+
- uses: actions/cache@v2
93+
with:
94+
path: |
95+
~/.gradle/caches
96+
~/.gradle/wrapper
97+
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
98+
restore-keys: |
99+
${{ runner.os }}-gradle-
72100
- name: Gradle wrapper
73101
run: gradle wrapper
74102
- name: Grant execute permission for gradlew
75103
run: chmod +x gradlew
76104
- id: file_changes
77-
uses: trilom/file-changes-action@v1.2.3
105+
uses: trilom/file-changes-action@v1.2.4
78106
- name: Run Code Style Check
79107
run: ./gradlew checkstyleCI -i --no-daemon
80108
env:

‎.github/workflows/gradlepublish.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313

1414
steps:
1515
- uses: actions/checkout@v2
16-
- name: Set up JDK 1.8
16+
- name: Set up JDK 11
1717
uses: actions/setup-java@v1
1818
with:
19-
java-version: 1.8
19+
java-version: 11
2020
- name: Gradle wrapper
2121
run: gradle wrapper
2222
- name: Grant execute permission for gradlew

‎.github/workflows/gradlepublishalpha.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414

1515
steps:
1616
- uses: actions/checkout@v2
17-
- name: Set up JDK 1.8
17+
- name: Set up JDK 11
1818
uses: actions/setup-java@v1
1919
with:
20-
java-version: 1.8
20+
java-version: 11
2121
- name: Gradle wrapper
2222
run: gradle wrapper
2323
- name: Grant execute permission for gradlew

0 commit comments

Comments
 (0)