Merge pull request #9 from maliboot/2025.1.x

2025.1.x

Author: isettle

CHANGELOG.md

@@ -3,6 +3,17 @@
 # Changelog
 <hr>
 
+## [2.1.0] - 2025-05-01
+### Added
+- Nothing
+
+### Removed
+- 去除旧版本不兼容api相应的功能
+
+### Changed
+- 适配PHPStorm-251.*
+<hr>
+
 ## [1.1.2] - 2025-04-30
 ### Added
 - 添加框架创建骨架

README.md

@@ -26,8 +26,13 @@ This is a PHPStorm plugin that provides support for the hyperf framework/compone
 * 重复类声明：当AOP类产生代理文件，屏蔽重复类声明的异常报错。如`App_User.proxy.php 处存在类 'User' 的其他声明`错误将不再显示
 * 拼写检查：屏蔽框架常用词如`hyperf`、`swoole`、`jsonrpc`等等单词的拼写错误警告。如有遗漏或补充，请提交Issue给我。
 
+## 项目创建向导
+![Skeleton Preview](doc/skeleton.png)
+* 支持像创建`Symfony`项目一样，创建`Hyperf`项目。
+* 提供多版本的`Hyperf`骨架版本选择
+
 ## debug
-`swoole`官网提到，在版本`5.1`以上支持了`xdebug`调试，所以做了这样一个功能
+`swoole`官网提到，在版本`5.1`以上支持了`xdebug`调试，所以做了这样一个功能。此功能主要是为了解决`Hyperf`调试时，断点跳到代理文件内的问题。
 > 调试准备，php.ini中修改: 
 > 
 > swoole.enable_fiber_mock=On
@@ -39,7 +44,7 @@ This is a PHPStorm plugin that provides support for the hyperf framework/compone
 ## Lombok‼️（**该功能完全不依赖`代理文件`**）
 ![Debug Preview](doc/lombok.gif)
 * Lombok支持：[maliboot/lombok](https://github.com/maliboot/lombok)适配，解决该PHP扩展使用时编辑器没有自动补全、参数提示、错误语法高量、导航等功能。
-* **该功能完全不依赖`代理文件`**。通过构建了相应的`FakePhpPsiElement`元素, 旨在极端情况下，提供对[maliboot/lombok](https://github.com/maliboot/lombok)的全方位支持
+* **该功能完全不依赖`代理文件`**。通过构建了相应的`FakePhpPsiElement`元素, 旨在极端情况下（如项目没有热启动，无法更新代理文件时），提供对[maliboot/lombok](https://github.com/maliboot/lombok)的全方位支持
 
 # Idea
 * 如果使用插件过程中有报错，可以[提交堆栈报告](https://github.com/maliboot/idea-hyperf-plugin/issues/new?title=[BUG]XXX主题&body=...)给我。这对我非常重要，我会及时修复

build.gradle.kts

@@ -1,5 +1,6 @@
 import org.jetbrains.changelog.Changelog
 import org.jetbrains.changelog.markdownToHTML
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
   id("java")
@@ -91,6 +92,15 @@ changelog {
 }
 
 tasks {
+  // Set the JVM compatibility versions
+  withType<JavaCompile> {
+    sourceCompatibility = providers.gradleProperty("javaVersion").get()
+    targetCompatibility = providers.gradleProperty("javaVersion").get()
+  }
+  withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+      compilerOptions.jvmTarget.set(JvmTarget.JVM_21)
+  }
+
   wrapper {
     gradleVersion = providers.gradleProperty("gradleVersion").get()
   }

doc/skeleton.png

@@ -1,13 +1,14 @@
 pluginGroup = io.maliboot.devkit
 pluginName = Hyperf Booster
-pluginVersion = 1.1.2
+# x/y/z->2025/1/x
+pluginVersion = 2.1.0
 pluginRepositoryUrl = https://github.com/maliboot/idea-hyperf-plugin
 
-pluginSinceBuild = 243.21565.202
-pluginUntilBuild = 243.26053.13
+pluginSinceBuild = 251.23774.466
+pluginUntilBuild = 251.25410.64
 
 platformType = PS
-platformVersion = 2024.3.5
+platformVersion = 2025.1.0.1
 platformPlugins =
 platformBundledPlugins = com.jetbrains.php
 

gradle.properties

@@ -1,17 +1,21 @@
 package io.maliboot.devkit.idea.hyperf.skeleton.php;
 
+import com.intellij.ide.IdeCoreBundle;
 import com.intellij.ide.impl.ProjectUtil;
 import com.intellij.ide.util.projectWizard.AbstractNewProjectStep;
+import com.intellij.ide.util.projectWizard.ProjectSettingsStepBase;
 import com.intellij.ide.util.projectWizard.WebProjectSettingsStepWrapper;
 import com.intellij.ide.util.projectWizard.WebProjectTemplate;
+import com.intellij.lang.javascript.boilerplate.AbstractGithubTagDownloadedProjectGenerator;
 import com.intellij.openapi.ui.LabeledComponent;
 import com.intellij.openapi.ui.VerticalFlowLayout;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.platform.DirectoryProjectGenerator;
 import com.intellij.platform.templates.TemplateProjectDirectoryGenerator;
+import com.intellij.ui.components.ActionLink;
 import com.intellij.util.ui.JBDimension;
+import com.intellij.util.ui.JBUI;
 import com.intellij.util.ui.UIUtil;
-import com.jetbrains.php.actions.PhpStormProjectSpecificSettingsStep;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
@@ -21,12 +25,28 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class ProjectSpecificSettingsStep extends PhpStormProjectSpecificSettingsStep {
+public class ProjectSpecificSettingsStep extends ProjectSettingsStepBase {
 
     public ProjectSpecificSettingsStep(DirectoryProjectGenerator projectGenerator, AbstractNewProjectStep.AbstractCallback callback) {
         super(projectGenerator, callback);
     }
 
+    public JPanel createPanel() {
+        JPanel var1 = super.createPanel();
+        JPanel var2 = new JPanel(new BorderLayout());
+        JLabel var3 = new JLabel(IdeCoreBundle.message("title.new.project", new Object[0]));
+        var3.setFont(var3.getFont().deriveFont(1));
+        var2.add(var3, "West");
+        if (this.myProjectGenerator instanceof AbstractGithubTagDownloadedProjectGenerator) {
+            ActionLink var4 = ((AbstractGithubTagDownloadedProjectGenerator)this.myProjectGenerator).createGitHubLink();
+            var2.add(var4, "East");
+        }
+
+        var2.setBorder(JBUI.Borders.emptyBottom(10));
+        var1.add(var2, "North");
+        return var1;
+    }
+
     @Override
     protected JPanel createAndFillContentPanel() {
         WebProjectSettingsStepWrapper settingsStep = new WebProjectSettingsStepWrapper(this);

src/main/java/io/maliboot/devkit/idea/hyperf/skeleton/php/ProjectSpecificSettingsStep.java

@@ -3,8 +3,6 @@ package io.maliboot.devkit.idea.lombok.index
 import com.intellij.lang.LighterAST
 import com.intellij.lang.LighterASTNode
 import com.intellij.openapi.diagnostic.Logger
-import com.intellij.openapi.project.Project
-import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.psi.PsiFile
 import com.intellij.psi.impl.source.tree.LightTreeUtil
 import com.intellij.psi.tree.IElementType
@@ -198,7 +196,7 @@ class CustomMemberPsiGist {
             if (myFieldName == null || myFieldTypeList.isEmpty()) {
                 return null
             }
-            return PhpFieldNode(myFieldName!!, myFieldTypeList.joinToString("|"), myFieldDefault, myFieldAttrs)
+            return PhpFieldNode(myFieldName, myFieldTypeList.joinToString("|"), myFieldDefault, myFieldAttrs)
         }
 
         private fun filterClassType(type: String, uses: Map<String, String>): String {

src/main/kotlin/io/maliboot/devkit/idea/lombok/index/CustomMemberPsiGist.kt

@@ -1,4 +1,4 @@
-<idea-plugin>
+<idea-plugin require-restart="true">
     <id>io.maliboot.www.hyperf</id>
     <name>Hyperf Booster</name>
     <vendor email="shilei_zhang@163.com" url="https://github.com/maliboot/maliboot">stone</vendor>