Skip to content

Commit beaf22a

Browse files
pmclainpmclain
authored
Merge branch '1.0.1-develop' into issues/64
2 parents 93a14f1 + 267f558 commit beaf22a

File tree

9 files changed

+152
-40
lines changed

9 files changed

+152
-40
lines changed

‎.github/ISSUE_TEMPLATE.md

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
title: ''
5+
labels: bug
6+
assignees: ''
7+
8+
---
9+
10+
<!---
11+
Thank you for contributing to Magento.
12+
To help us process this issue we recommend that you add the following information:
13+
- Summary of the issue,
14+
- Information on your environment,
15+
- Steps to reproduce,
16+
- Expected and actual results,
17+
Fields marked with (*) are required. Please don't remove the template.
18+
-->
19+
20+
**Describe the bug** (*)
21+
22+
A clear and concise description of what the bug is.
23+
24+
**To Reproduce** (*)
25+
26+
Steps to reproduce the behavior:
27+
1. Go to '...'
28+
2. Click on '....'
29+
3. Scroll down to '....'
30+
4. See error
31+
32+
**Expected behavior** (*)
33+
34+
A clear and concise description of what you expected to happen.
35+
36+
**Screenshots**
37+
38+
If applicable, add screenshots to help explain your problem.
39+
40+
**Please complete the following information:** (*)
41+
42+
- OS: [e.g. iOS]
43+
- PhpStorm/Intellij version [e.g. 2019.3.3]
44+
- Version [e.g. 1.0.0]
45+
46+
**Additional context**
47+
48+
Add any other context about the problem here.

‎.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
<!---
11+
Thank you for contributing to Magento.
12+
To help us process this issue we recommend that you add the following information:
13+
- Summary of the issue,
14+
- Expected and actual results,
15+
Fields marked with (*) are required. Please don't remove the template.
16+
-->
17+
18+
**Is your feature request related to a problem? Please describe.**
19+
20+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
21+
22+
**Describe the solution you'd like** (*)
23+
24+
A clear and concise description of what you want to happen.
25+
26+
**Describe alternatives you've considered**
27+
28+
A clear and concise description of any alternative solutions or features you've considered.
29+
30+
**Additional context**
31+
32+
Add any other context or screenshots about the feature request here.

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,27 @@
99

1010
<!--- Please provide a general summary of the Pull Request in the Title above -->
1111

12-
### Description (*)
12+
**Description** (*)
1313
<!---
1414
Please provide a description of the changes proposed in the pull request.
1515
Letting us know what has changed and why it needed changing will help us validate this pull request.
1616
-->
1717

18-
### Fixed Issues (if relevant)
18+
**Fixed Issues (if relevant)**
1919
<!---
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
-->
2323
1. magento/magento2-phpstorm-plugin#<issue_number>: Issue title
2424

25-
### Questions or comments
25+
**Questions or comments**
2626
<!---
2727
If relevant, here you can ask questions or provide comments on your pull request for the reviewer
2828
For example if you need assistance with writing tests or would like some feedback on one of your development ideas
2929
-->
3030

31-
### Contribution checklist (*)
31+
**Contribution checklist** (*)
3232
- [ ] Pull request has a meaningful description of its purpose
3333
- [ ] All commits are accompanied by meaningful commit messages
34-
34+
- [ ] All new or changed code is covered with integration/functional tests (if applicable)
35+
- [ ] All automated tests passed successfully (all builds are green)

‎.github/workflows/gradlepublish.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,4 @@ jobs:
2525
run: ./gradlew publishPlugin -i
2626
env:
2727
MAGENTO_PHPSTORM_intellijPublishToken: ${{ secrets.JET_BRAINS_TOKEN }}
28+
MAGENTO_PHPSTORM_isAlpha: false

‎.github/workflows/gradlepublishalpha.yml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# This workflow will build a package using Gradle and then publish it to JetBrains alpha repository when a PR is merged to the develop branch
2+
3+
name: Publish Plugin alpha version
4+
5+
on:
6+
push:
7+
branches:
8+
- 1.0.1-develop
9+
10+
jobs:
11+
build:
12+
13+
runs-on: ubuntu-latest
14+
15+
steps:
16+
- uses: actions/checkout@v2
17+
- name: Set up JDK 1.8
18+
uses: actions/setup-java@v1
19+
with:
20+
java-version: 1.8
21+
- name: Gradle wrapper
22+
run: gradle wrapper
23+
- name: Grant execute permission for gradlew
24+
run: chmod +x gradlew
25+
- name: Run publish plugin
26+
run: ./gradlew publishPlugin -i
27+
env:
28+
MAGENTO_PHPSTORM_intellijPublishToken: ${{ secrets.JET_BRAINS_TOKEN }}
29+
MAGENTO_PHPSTORM_isAlpha: true

‎build.gradle

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ plugins {
88
}
99

1010
group 'com.magento.idea'
11-
version '1.0.1'
11+
version '0.0.9'
1212

1313
apply plugin: 'org.jetbrains.intellij'
1414
apply plugin: 'java'
@@ -45,4 +45,14 @@ sourceSets {
4545

4646
publishPlugin {
4747
token = System.getenv("MAGENTO_PHPSTORM_intellijPublishToken")
48+
if (Boolean.valueOf(System.getenv("MAGENTO_PHPSTORM_isAlpha"))) {
49+
channels 'alpha'
50+
//version = version + "-alpha-" + getDate()
51+
}
52+
}
53+
54+
static def getDate() {
55+
def date = new Date()
56+
def formattedDate = date.format('yyyy-MM-dd-HH-mm')
57+
return formattedDate
4858
}

‎resources/META-INF/plugin.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<idea-plugin>
88
<id>com.magento.idea.magento2plugin</id>
99
<name>Magento PhpStorm</name>
10-
<version>1.0.1</version>
10+
<version>0.0.9</version>
1111
<vendor url="https://github.com/magento/magento2-phpstorm-plugin">Magento Inc.</vendor>
1212

1313
<description><![CDATA[

‎resources/fileTemplates/internal/Magento Module DI Xml.xml.html

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<!--
2+
/*
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
-->
7+
<html>
8+
<body>
9+
<table width="100%" border="0" cellpadding="5" cellspacing="0" style="border-collapse: collapse">
10+
<tr>
11+
<td><font face="verdana" size="-1">
12+
The di.xml file configures which dependencies are injected by the object manager. You can also specify sensitive configuration settings using di.xml.
13+
</font><br>
14+
</td>
15+
</tr>
16+
<tr>
17+
<td><font face="verdana" size="-1">
18+
<a href="https://devdocs.magento.com/guides/v2.3/extension-dev-guide/build/di-xml-file.html">Read more</a> about di.xml.
19+
</font><br>
20+
</td>
21+
</tr>
22+
</table>
23+
</body>
24+
</html>

0 commit comments

Comments
 (0)