Skip to content

Commit 40d763d

Browse files
committed
Merge remote-tracking branch 'origin/5.4.0-develop' into fix/full-text-search
2 parents b01965c + 5472bb6 commit 40d763d

File tree

1,357 files changed

+1137
-686
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,357 files changed

+1137
-686
lines changed

.github/workflows/gradlepublishalpha.yml

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

.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: 32 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,25 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0).
66

77
## 5.4.0
88

9+
### Added
10+
11+
- Clear notifications for the process status of URN generation [#2486](https://github.com/magento/magento2-phpstorm-plugin/pull/2486)
12+
13+
### Fixed
14+
15+
- Fixed Upgrade Compatibility Tool [#2482](https://github.com/magento/magento2-phpstorm-plugin/pull/2482)
16+
Replaced hardcoded Magento versions with dynamic fetching via Packagist API.
17+
Fixed UI icon references.
18+
Updated Run command.
19+
- java.lang.Throwable: Assertion failed: Do not use PsiElement for popup model. See PsiTargetNavigator [#2485](https://github.com/magento/magento2-phpstorm-plugin/pull/2485)
20+
- Slow operations are prohibited on EDT [#2486](https://github.com/magento/magento2-phpstorm-plugin/pull/2486)
21+
22+
### Changed
23+
24+
- Updated Gradle Intellij plugin to version 2 [#2473](https://github.com/magento/magento2-phpstorm-plugin/pull/2473)
25+
The project no longer requires the paid Ultimate edition of IntelliJ IDEA. It can now run seamlessly in the Community edition.
26+
Enabled code emulation directly within PHPStorm, eliminating the dependency on IntelliJ IDEA for this functionality.
27+
928
## 5.3.1
1029

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

432451
### Added
433452

434-
- PWA pure function Live Template
453+
- PWA pure function Live Template
435454

436455
### Fixed
437456

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

522541
## 0.3.0
@@ -541,7 +560,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0).
541560
- Added project detector
542561
- Move configuration section to "Languages & Frameworks > Php > Magento"
543562
- Remove deprecated elements
544-
563+
545564
## 0.2.2
546565

547566
### Added
@@ -551,23 +570,23 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0).
551570
### Fixed
552571

553572
- Fixed "Project disposed" exception
554-
573+
555574
## 0.2.1
556-
575+
557576
### Added
558577

559578
- added module name for "Goto configuration" labels
560-
579+
561580
## 0.2.0
562581

563582
### Added
564583

565584
- WebApi routes
566585
- nicer "Goto configuration" labels
567586
- plugin settings (manual reindex, URN generation, plugin on/off)
568-
569-
## 0.1
570-
587+
588+
## 0.1.0
589+
571590
### Added
572591

573592
- Context type completion for:
@@ -580,9 +599,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0).
580599
- virtualType arguments resolution
581600
- webapi.xml interface/method completion/references
582601
- Support for old people using PhpStorm 8 or JDK## 1.7
583-
602+
584603
## 0.0.9
585-
604+
586605
### Added
587606

588607
- Added Reference and completion support for layouts
@@ -607,13 +626,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0).
607626
- Added reference to configuration and observers (classes or virtualType)
608627
- Added reference to observers from configuration
609628
- Added reference to event dispatch from configuration
610-
629+
611630
## 0.0.6
612631

613632
### Added
614633

615634
- Added reference and completion support for virtual types/classes/arguments in DI configuration
616-
635+
617636
## 0.0.5
618637

619638
### Added

README.md

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,16 @@
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)
16+
[![Buy Me a Coffee](https://img.shields.io/badge/Buy%20Me%20a%20Coffee-Support-orange.svg)](https://buymeacoffee.com/vitalii_b)
1217

1318
## Installation
1419

@@ -41,31 +46,36 @@
4146
## Setting up development environment
4247

4348
1. Check out this repository
44-
1. Open a folder with the project in the IntelliJ Ultimate using the `open` action button.
49+
1. Open a folder with the project in the IntelliJ CE using the `open` action button.
4550
1. Make sure that you on the latest develop branch (e.g `5.4.0-develop`)
4651
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)
4752
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.
53+
- 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`
54+
- 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.
5055
1. When the Gradle sections appeared in the right bar, navigate there and right-click `magento-2-php-storm-plugin > Tasks -> Intellij -> runIde`
5156
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.
5257

5358
## How to contribute
54-
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.
59+
1) Start with looking into [Community Backlog](https://github.com/magento/magento2-phpstorm-plugin/issues?q=is%3Aissue%20state%3Aopen%20label%3A%22good%20first%20issue%22). Any ticket in `Ready for Development` and `Good First Issue` columns are a good candidates to start.
5560
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.
59-
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.
60-
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.
61+
- **Bug report** - Found a bug in the code? Let us know!
62+
- **Enhancement** - Know how to improve existing functionality? Open an issue describe how to enhance the plugin.
63+
- **New feature proposal** - Know how to make a killer feature? Do not hesitate to submit your proposal.
64+
3) The issue will appear in the `Ready for Grooming` column of the [Community Backlog](https://github.com/magento/magento2-phpstorm-plugin/issues?q=is%3Aissue%20state%3Aopen%20label%3A%22good%20first%20issue%22). Once it will be discussed and approved the issue will be ready for development.
65+
4) Refer to the [Contributing Guide](https://github.com/magento/magento2-phpstorm-plugin/blob/5.4.0-develop/.github/CONTRIBUTING.md) for more information on how to contribute.
66+
67+
## Learn to contribute
68+
1) SDK [Developing a Plugin](https://plugins.jetbrains.com/docs/intellij/developing-plugins.html)
69+
2) Good Presentation about platform [How We Built Comma, the Raku IDE, on the IntelliJ Platform](https://www.youtube.com/watch?v=zDP9uUMYrvs)
70+
3) Plugin example [idea-php-symfony2-plugin](https://github.com/Haehnchen/idea-php-symfony2-plugin)
6171

6272
## How to create SandBox for development
6373
1. Create sandbox folder
6474
2. Copy to sandbox folder `composer.json` and `composer.lock`
6575
3. In sandbox folder create `app/code` and `vendor/magento`
6676
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
6777
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-
78+
6979
**PHP File Header:**
7080
```php
7181
/**
@@ -91,4 +101,4 @@ declare(strict_types=1);
91101

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

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).
104+
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)