Skip to content

Commit 6131779

Browse files
authored
Merge pull request #2473 from vitaliyboykocontributor/upgrade-gradle-to-version-2
Updated Gradle Intellij plugin to version 2 [WIP]
2 parents 4807653 + 77b3662 commit 6131779

File tree

1,351 files changed

+698
-312
lines changed

Some content is hidden

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

1,351 files changed

+698
-312
lines changed

.gitignore

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,3 @@
1-
# Windows image file caches
2-
Thumbs.db
3-
ehthumbs.db
4-
5-
# Folder config file
6-
Desktop.ini
7-
8-
# Recycle Bin used on file shares
9-
$RECYCLE.BIN/
10-
11-
# Windows Installer files
12-
*.cab
13-
*.msi
141
*.msm
152
*.msp
163

@@ -49,6 +36,4 @@ out
4936
.gradle
5037
.idea-sandbox
5138
build
52-
gradle
53-
gradlew
54-
gradlew.bat
39+
.intellijPlatform/*

CHANGELOG.md

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0).
66

77
## 5.4.0
88

9+
### Changed
10+
11+
- Updated Gradle Intellij plugin to version 2 [#2473](https://github.com/magento/magento2-phpstorm-plugin/pull/2473)
12+
The project no longer requires the paid Ultimate edition of IntelliJ IDEA. It can now run seamlessly in the Community edition.
13+
Enabled code emulation directly within PHPStorm, eliminating the dependency on IntelliJ IDEA for this functionality.
14+
915
## 5.3.1
1016

1117
### Fixed
@@ -431,7 +437,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0).
431437

432438
### Added
433439

434-
- PWA pure function Live Template
440+
- PWA pure function Live Template
435441

436442
### Fixed
437443

@@ -516,7 +522,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0).
516522
- Code Inspection: GraphQL resolver in the scope of a PHP Class
517523
- Code Inspection: Duplicated Observer Usage in events XML
518524
- Moved plugin configuration from `Settings > Preferences > Languages & Frameworks > PHP > Magento` to
519-
`Settings > Preferences > Languages & Frameworks > PHP > Frameworks > Magento`
525+
`Settings > Preferences > Languages & Frameworks > PHP > Frameworks > Magento`
520526
- Fixed support of 202## 0.* versions of IDE's
521527

522528
## 0.3.0
@@ -541,7 +547,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0).
541547
- Added project detector
542548
- Move configuration section to "Languages & Frameworks > Php > Magento"
543549
- Remove deprecated elements
544-
550+
545551
## 0.2.2
546552

547553
### Added
@@ -551,23 +557,23 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0).
551557
### Fixed
552558

553559
- Fixed "Project disposed" exception
554-
560+
555561
## 0.2.1
556-
562+
557563
### Added
558564

559565
- added module name for "Goto configuration" labels
560-
566+
561567
## 0.2.0
562568

563569
### Added
564570

565571
- WebApi routes
566572
- nicer "Goto configuration" labels
567573
- plugin settings (manual reindex, URN generation, plugin on/off)
568-
569-
## 0.1
570-
574+
575+
## 0.1.0
576+
571577
### Added
572578

573579
- Context type completion for:
@@ -580,9 +586,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0).
580586
- virtualType arguments resolution
581587
- webapi.xml interface/method completion/references
582588
- Support for old people using PhpStorm 8 or JDK## 1.7
583-
589+
584590
## 0.0.9
585-
591+
586592
### Added
587593

588594
- Added Reference and completion support for layouts
@@ -607,13 +613,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0).
607613
- Added reference to configuration and observers (classes or virtualType)
608614
- Added reference to observers from configuration
609615
- Added reference to event dispatch from configuration
610-
616+
611617
## 0.0.6
612618

613619
### Added
614620

615621
- Added reference and completion support for virtual types/classes/arguments in DI configuration
616-
622+
617623
## 0.0.5
618624

619625
### Added

README.md

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,12 @@
44
</a>
55
</p>
66

7+
<!-- Plugin description -->
78
# PhpStorm Magento 2 Plugin
89

10+
This is a PhpStorm IDE plugin for a better Magento 2 development workflow.
11+
<!-- Plugin description end -->
12+
913
[![Version](http://phpstorm.espend.de/badge/8024/version)](https://plugins.jetbrains.com/plugin/8024)
1014
[![Downloads](http://phpstorm.espend.de/badge/8024/downloads)](https://plugins.jetbrains.com/plugin/8024)
1115
[![Made With Love](https://img.shields.io/badge/Made%20With-Love-orange.svg)](https://magento.com)
@@ -41,21 +45,21 @@
4145
## Setting up development environment
4246

4347
1. Check out this repository
44-
1. Open a folder with the project in the IntelliJ Ultimate using the `open` action button.
48+
1. Open a folder with the project in the IntelliJ CE using the `open` action button.
4549
1. Make sure that you on the latest develop branch (e.g `5.4.0-develop`)
4650
1. Right-click on the `build.gradle` file, choose "Import Gradle project" (if this is not exist look for "Build module '<root folder name>'") (you need to have Gradle plugin installed)
4751
1. Check if the right SDK version is used for the project.
48-
- Current Java version for the project is **java 11**, so you should additionally download **SDK 11** and choose it in the module settings: `Right click by the project root > Open Module Settings > Project Settings > Project > Project SDK`
49-
- Check if right SDK version is used for the Gradle plugin: `Intellij IDEA > Preferences... > Build, Execution, Deployment > Build Tools > Gradle > Gradle JVM` and choose your JDK.
52+
- Current Java version for the project is **java 11**, so you should additionally download **SDK 11** and choose it in the module settings: `Right click by the project root > Open Module Settings > Project Settings > Project > Project SDK`
53+
- Check if right SDK version is used for the Gradle plugin: `Intellij IDEA > Preferences... > Build, Execution, Deployment > Build Tools > Gradle > Gradle JVM` and choose your JDK.
5054
1. When the Gradle sections appeared in the right bar, navigate there and right-click `magento-2-php-storm-plugin > Tasks -> Intellij -> runIde`
5155
1. Click `Run "magento-2-php-storm-plugin"` to run the plugin. You should see a new instance of IntelliJ launched with the plugin installed. Make sure the plugin is enabled in IntelliJ settings and indexing is finished. Plugin features should be accessible at this point.
5256

5357
## How to contribute
5458
1) Start with looking into [Community Backlog](https://github.com/magento/magento2-phpstorm-plugin/projects/2). Any ticket in `Ready for Development` and `Good First Issue` columns are a good candidates to start.
5559
2) Didn't satisfy your requirements? [Create a new issue](https://github.com/magento/magento2-phpstorm-plugin/issues/new). It can be for example:
56-
- **Bug report** - Found a bug in the code? Let us know!
57-
- **Enhancement** - Know how to improve existing functionality? Open an issue describe how to enhance the plugin.
58-
- **New feature proposal** - Know how to make a killer feature? Do not hesitate to submit your proposal.
60+
- **Bug report** - Found a bug in the code? Let us know!
61+
- **Enhancement** - Know how to improve existing functionality? Open an issue describe how to enhance the plugin.
62+
- **New feature proposal** - Know how to make a killer feature? Do not hesitate to submit your proposal.
5963
3) The issue will appear in the `Ready for Grooming` column of the [Community Backlog](https://github.com/magento/magento2-phpstorm-plugin/projects/2). Once it will be discussed and approved the issue will be ready for development.
6064
4) Refer to the [Contributing Guide](https://github.com/magento/magento2-phpstorm-plugin/blob/2.1.0-develop/.github/CONTRIBUTING.md) for more information on how to contribute.
6165

@@ -65,7 +69,7 @@
6569
3. In sandbox folder create `app/code` and `vendor/magento`
6670
4. Copy any of the magento modules (as for example: `framework`, `module-catalog`, `module-checkout`, `module-customer`, `module-sales`) into the `vendor/magento` folder. It is better to add as few modules as possible to reduce reindexing time during application running
6771
5. (Nice to have) Open IDE and go to `Preferences > Editor > File and Code Templates > Includes tab` and add default headers for `PHP File Header` and `XML File Header`
68-
72+
6973
**PHP File Header:**
7074
```php
7175
/**
@@ -91,4 +95,4 @@ declare(strict_types=1);
9195

9296
Each Magento source file included in this distribution is licensed under OSL-3.0 license.
9397

94-
Please read the [LICENSE.txt](https://github.com/magento/magento2-phpstorm-plugin/blob/master/LICENSE.txt) for the full text of the [Open Software License v. 3.0 (OSL-3.0)](http://opensource.org/licenses/osl-3.0.php).
98+
Please read the [LICENSE.txt](https://github.com/magento/magento2-phpstorm-plugin/blob/master/LICENSE.txt) for the full text of the [Open Software License v. 3.0 (OSL-3.0)](http://opensource.org/licenses/osl-3.0.php).

build.gradle

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

0 commit comments

Comments
 (0)