Merge branch 'nb120'

Author: junichi11

README.md

@@ -1,17 +1,27 @@
-# NetBeans CakePHP3 Plugin (Dev)
+# NetBeans CakePHP3/4 Plugin
 
-This plugin provides support for CakePHP3.
+This plugin provides support for CakePHP3/4.
 
 ## Requirements
 
-- NetBeans 8.1+
+- NetBeans 12.0+
 
 ## Downloads
 
 - https://github.com/junichi11/cakephp3-netbeans/releases
+- https://plugins.netbeans.apache.org/catalogue/?id=27
 
 ## How To Install
 
+### Via NetBeans Plugin Portal Update Center
+
+- Tools > Plugins > Available Plugins
+- Click the "Check for Newest" button
+- Check "CakePHP3/4 Framework"
+- Click the "Install" button
+
+### Use downloaded nbms
+
 - Download a nbm (e.g. org-netbeans-modules-php-cake3-0.0.1-dev-201408251540.nbm)
 - Tools > Plugins > Downloaded > Add Plugins
 - Select the nbm
@@ -21,16 +31,14 @@ This plugin provides support for CakePHP3.
 
 You can update to the new version by the same way as the install. You don't have to uninstall the old version.
 
-Currently, this plugin is not available on NetBeans Plugin Portal. But you can update directly from NetBeans IDE when it's available on it later.
-
 ## How To Enable
 
 - Open the project properties dialog (Right-Click your project > properties)
-- Frameworks > CakePHP3 > Check `Enabled`
+- Frameworks > CakePHP3/4 > Check `Enabled`
 
 ## Use Your Custom Directory Structure
 
-If you just installed Cake3 via Composer, you don't have to do anything.
+If you just installed Cake3/4 via Composer, you don't have to do anything.
 
 - Open the project properties
 - Set relative paths from your Source Directory to Path settings
@@ -138,12 +146,12 @@ $this->Html->docType('[Ctrl+Space]');
 ```
 
 **NOTE**
-At first, add a semicolon(<kbd>;</kbd>) if you want to use code completions for parameters. Tips: You can add it like the following: <kbd>Ctrl</kbd>+<kbd>;</kbd>
+Please add a semicolon(<kbd>;</kbd>) if you want to use code completions for parameters. Tips: You can add it like the following: <kbd>Ctrl</kbd>+<kbd>;</kbd>
 
 ### Smart Go To
 
 This feature is not enabled by default. If you want to use it, please set the KeyMap to it.
-(Tools > Options > Keymap > Search `CakePHP` > CakePHP3: Smart Go To > e.g. set <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>J</kbd>) 
+(Tools > Options > Keymap > Search `CakePHP` > CakePHP3/4: Smart Go To > e.g. set <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>J</kbd>) 
 
 Files related to the current editor are shown when you run this action.
 e.g. If your current file is a Controller, template, table, entity, testcase, conponent and helper file(s) will be shown.
@@ -224,11 +232,11 @@ The file format is the following:
 ### Custom nodes
 
 You can add some directories(nodes) under the your project tree. Controller, Model, e.t.c. are shown by default.
-If you want to hide/show them, please change the options.(Tools > Options > PHP > Frameworks and Tools > CakePHP3 > Custom nodes)
+If you want to hide/show them, please change the options.(Tools > Options > PHP > Frameworks and Tools > CakePHP3/4 > Custom nodes)
 
 ## Actions
 
-Right-click a project > CakePHP3
+Right-click a project > CakePHP3/4
 
 - Run Command
 - Run server
@@ -251,6 +259,11 @@ Refresh the version number and category paths.
 
 - https://github.com/sponsors/junichi11
 
+## Issues
+
+If you have issues, please submit them to [GitHub Issues](https://github.com/junichi11/cakephp3-netbeans/issues) .
+Please don't create PRs soon.
+
 ## License
 
 Apache License, Version 2.0

build.xml

@@ -13,7 +13,7 @@
     <property name="groupId" value="com.junichi11.netbeans.modules" />
     <property name="artifactId" value="netbeans-cakephp3" />
     <!-- also change the version of pom.xml -->
-    <property name="version" value="0.8.0" />
+    <property name="version" value="0.9.0" />
     <!-- defined maven snapshots and staging repository id and url -->
     <property name="ossrh-snapshots-repository-url"
               value="https://oss.sonatype.org/content/repositories/snapshots/" />
@@ -22,7 +22,18 @@
     <!-- there server id in the Maven settings.xml -->
     <property name="ossrh-server-id" value="ossrh" />
 
-    <target name="deploy" depends="nbm" description="deploy release version to Maven repository">
+    <target name="update-version-number">
+        <replaceregexp file="pom.xml"
+                       match="(^    &lt;version&gt;).+(&lt;/version&gt;)"
+                       replace="\1${version}\2"
+                       byline="true" />
+        <replaceregexp file="manifest.mf"
+                       match="(OpenIDE-Module-Specification-Version:[ ]*).+"
+                       replace="\1${version}"
+                       byline="true" />
+    </target>
+
+    <target name="deploy" depends="update-version-number,nbm" description="deploy release version to Maven repository">
         <move file="${build}/org-netbeans-modules-php-cake3.nbm" toFile="${build}/${artifactId}-${version}.nbm"/>
         <artifact:mvn>
             <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.3:sign-and-deploy-file" />

manifest.mf

@@ -3,4 +3,4 @@ AutoUpdate-Show-In-Client: true
 OpenIDE-Module: org.netbeans.modules.php.cake3
 OpenIDE-Module-Layer: org/netbeans/modules/php/cake3/resources/layer.xml
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/cake3/Bundle.properties
-OpenIDE-Module-Specification-Version: 0.8.0
+OpenIDE-Module-Specification-Version: 0.9.0

pom.xml

@@ -4,11 +4,11 @@
     <groupId>com.junichi11.netbeans.modules</groupId>
     <artifactId>netbeans-cakephp3</artifactId>
     <!-- change the version of build.xml -->
-    <version>0.8.0</version>
+    <version>0.9.0</version>
     <packaging>nbm</packaging>
-    <name>NetBeans CakePHP3 Framework</name>
+    <name>NetBeans CakePHP3/4 Framework</name>
     <url>https://github.com/junichi11/</url>
-    <description>This plugin provides support for CakePHP3.</description>
+    <description>This plugin provides support for CakePHP3/4.</description>
     <developers>
         <developer>
             <id>junichi11</id>

src/org/netbeans/modules/php/cake3/Bundle.properties

@@ -1,5 +1,5 @@
 OpenIDE-Module-Display-Category=PHP
 OpenIDE-Module-Long-Description=\
-    Provides support for CakePHP3
-OpenIDE-Module-Name=CakePHP3 Framework
-OpenIDE-Module-Short-Description=Provides support for CakePHP3
+    Provides support for CakePHP3/4.<br/><br/>Details: See <a href="https://github.com/junichi11/cakephp3-netbeans/blob/master/README.md">README.md</a>.
+OpenIDE-Module-Name=CakePHP3/4 Framework
+OpenIDE-Module-Short-Description=Provides support for CakePHP3/4

src/org/netbeans/modules/php/cake3/CakePHP3ActionsExtender.java

@@ -21,8 +21,8 @@
 import javax.swing.Action;
 import org.netbeans.modules.php.api.phpmodule.PhpModule;
 import org.netbeans.modules.php.cake3.dotcake.Dotcake;
-import org.netbeans.modules.php.cake3.modules.CakePHP3Module;
-import org.netbeans.modules.php.cake3.modules.CakePHP3Module.Category;
+import org.netbeans.modules.php.cake3.modules.CakePHPModule;
+import org.netbeans.modules.php.cake3.modules.CakePHPModule.Category;
 import org.netbeans.modules.php.cake3.ui.actions.CakePHP3BaseAction;
 import org.netbeans.modules.php.cake3.ui.actions.CakePHP3GoToActionAction;
 import org.netbeans.modules.php.cake3.ui.actions.CakePHP3GoToViewAction;
@@ -50,11 +50,16 @@ public CakePHP3ActionsExtender(PhpModule phpModule) {
     }
 
     @NbBundle.Messages({
-        "CakePHP3ActionsExtender.menuName=CakePHP3"
+        "# {0} - version",
+        "CakePHP3ActionsExtender.menuName=CakePHP{0}"
     })
     @Override
     public String getMenuName() {
-        return Bundle.CakePHP3ActionsExtender_menuName();
+        CakePHPModule cakeModule = CakePHPModule.forPhpModule(phpModule);
+        int majorVersion = cakeModule.getVersion().getMajor();
+        assert majorVersion >= 3 : "Invalid major version:" + majorVersion; // NOI18N
+        String version = majorVersion < 3 ? "" : String.valueOf(majorVersion);
+        return Bundle.CakePHP3ActionsExtender_menuName(version);
     }
 
     @Override
@@ -64,7 +69,7 @@ public List<? extends Action> getActions() {
                 new CakePHP3RefreshModuleAction()
         );
         List<CakePHP3BaseAction> actions = new ArrayList<>(defaultActions);
-        CakePHP3Module cakeModule = CakePHP3Module.forPhpModule(phpModule);
+        CakePHPModule cakeModule = CakePHPModule.forPhpModule(phpModule);
         Dotcake dotcake = cakeModule.getDotcake();
         if (dotcake != null) {
             actions.add(new OpenDotcakeAction());
@@ -84,14 +89,14 @@ public GoToActionAction getGoToActionAction(FileObject fo, int offset) {
 
     @Override
     public boolean isActionWithView(FileObject fo) {
-        CakePHP3Module cakeModule = CakePHP3Module.forFileObject(fo);
-        CakePHP3Module.Category category = cakeModule.getCategory(fo);
+        CakePHPModule cakeModule = CakePHPModule.forFileObject(fo);
+        CakePHPModule.Category category = cakeModule.getCategory(fo);
         return category == Category.CONTROLLER;
     }
 
     @Override
     public boolean isViewWithAction(FileObject fo) {
-        CakePHP3Module cakeModule = CakePHP3Module.forFileObject(fo);
+        CakePHPModule cakeModule = CakePHPModule.forFileObject(fo);
         return cakeModule.isTemplateFile(fo);
     }
 

src/org/netbeans/modules/php/cake3/CakePHP3FrameworkProvider.java

@@ -21,7 +21,7 @@
 import org.netbeans.modules.php.api.phpmodule.PhpModuleProperties;
 import org.netbeans.modules.php.cake3.commands.CakePHP3FrameworkCommandSupport;
 import org.netbeans.modules.php.cake3.editor.CakePHP3EditorExtender;
-import org.netbeans.modules.php.cake3.modules.CakePHP3ModuleFactory;
+import org.netbeans.modules.php.cake3.modules.CakePHPModuleFactory;
 import org.netbeans.modules.php.cake3.preferences.CakePHP3Preferences;
 import org.netbeans.modules.php.spi.editor.EditorExtender;
 import org.netbeans.modules.php.spi.framework.PhpFrameworkProvider;
@@ -46,8 +46,8 @@ public class CakePHP3FrameworkProvider extends PhpFrameworkProvider {
     private final BadgeIcon badgeIcon;
 
     @NbBundle.Messages({
-        "CakePHP3FrameworkProvider.name=CakePHP3",
-        "CakePHP3FrameworkProvider.description=CakePHP3"
+        "CakePHP3FrameworkProvider.name=CakePHP3/4",
+        "CakePHP3FrameworkProvider.description=CakePHP3/4"
     })
     private CakePHP3FrameworkProvider() {
         super("cakephp3", // NOI18N
@@ -122,8 +122,8 @@ public EditorExtender getEditorExtender(PhpModule phpModule) {
 
     @Override
     public void phpModuleClosed(PhpModule phpModule) {
-        // release CakePHP3Module
-        CakePHP3ModuleFactory factory = CakePHP3ModuleFactory.getInstance();
+        // release CakePHPModule
+        CakePHPModuleFactory factory = CakePHPModuleFactory.getInstance();
         factory.remove(phpModule);
     }
 

src/org/netbeans/modules/php/cake3/CakePHP3ModuleCustomizerExtender.java

@@ -21,7 +21,7 @@
 import javax.swing.event.ChangeListener;
 import org.netbeans.modules.php.api.phpmodule.PhpModule;
 import org.netbeans.modules.php.api.validation.ValidationResult;
-import org.netbeans.modules.php.cake3.modules.CakePHP3ModuleFactory;
+import org.netbeans.modules.php.cake3.modules.CakePHPModuleFactory;
 import org.netbeans.modules.php.cake3.preferences.CakePHP3Preferences;
 import org.netbeans.modules.php.cake3.ui.customizer.CakePHP3CustomizerPanel;
 import org.netbeans.modules.php.cake3.validators.CakePHP3CustomizerValidator;
@@ -65,7 +65,7 @@ public CakePHP3ModuleCustomizerExtender(PhpModule phpModule) {
     }
 
     @NbBundle.Messages({
-        "CakePHP3ModuleCustomizerExtender.displayName=CakePHP3"
+        "CakePHP3ModuleCustomizerExtender.displayName=CakePHP3/4"
     })
     @Override
     public String getDisplayName() {
@@ -149,7 +149,7 @@ public EnumSet<Change> save(PhpModule phpModule) {
         CakePHP3Preferences.setJsUrl(phpModule, p.getJs());
         CakePHP3Preferences.setDotcakePath(phpModule, p.getDotcakePath());
         // release CakePHP3Module
-        CakePHP3ModuleFactory.getInstance().remove(phpModule);
+        CakePHPModuleFactory.getInstance().remove(phpModule);
         return EnumSet.of(Change.FRAMEWORK_CHANGE);
     }
 

src/org/netbeans/modules/php/cake3/ConfigurationFiles.java

@@ -21,7 +21,7 @@
 import java.util.List;
 import javax.swing.event.ChangeListener;
 import org.netbeans.modules.php.api.phpmodule.PhpModule;
-import org.netbeans.modules.php.cake3.modules.CakePHP3Module;
+import org.netbeans.modules.php.cake3.modules.CakePHPModule;
 import org.netbeans.modules.php.spi.phpmodule.ImportantFilesImplementation;
 import org.openide.filesystems.FileChangeAdapter;
 import org.openide.filesystems.FileEvent;
@@ -64,8 +64,8 @@ public Collection<FileInfo> getFiles() {
     }
 
     private synchronized List<FileObject> getConfigDirectories() {
-        CakePHP3Module cakeModule = CakePHP3Module.forPhpModule(phpModule);
-        List<FileObject> directories = cakeModule.getDirectories(CakePHP3Module.Base.APP, CakePHP3Module.Category.CONFIG, null);
+        CakePHPModule cakeModule = CakePHPModule.forPhpModule(phpModule);
+        List<FileObject> directories = cakeModule.getDirectories(CakePHPModule.Base.APP, CakePHPModule.Category.CONFIG, null);
         if (!isInitialized) {
             isInitialized = true;
             for (FileObject directory : directories) {

src/org/netbeans/modules/php/cake3/commands/Cake3Script.java

@@ -40,8 +40,8 @@
 import org.netbeans.modules.php.api.phpmodule.PhpModule;
 import org.netbeans.modules.php.api.util.UiUtils;
 import org.netbeans.modules.php.cake3.CakeVersion;
-import org.netbeans.modules.php.cake3.modules.CakePHP3Module;
-import org.netbeans.modules.php.cake3.modules.CakePHP3Module.Base;
+import org.netbeans.modules.php.cake3.modules.CakePHPModule;
+import org.netbeans.modules.php.cake3.modules.CakePHPModule.Base;
 import org.netbeans.modules.php.spi.framework.commands.FrameworkCommand;
 import org.openide.DialogDisplayer;
 import org.openide.NotifyDescriptor;
@@ -117,7 +117,7 @@ public static Cake3Script forPhpModule(PhpModule phpModule, boolean warn) throws
     }
 
     private static FileObject getScript(PhpModule phpModule) {
-        CakePHP3Module module = CakePHP3Module.forPhpModule(phpModule);
+        CakePHPModule module = CakePHPModule.forPhpModule(phpModule);
         if (module == null) {
             return null;
         }
@@ -276,10 +276,11 @@ private List<FrameworkCommand> getFrameworkCommandsInternalXml(PhpModule phpModu
 
     private List<String> getCommandListParams(PhpModule phpModule) {
         List<String> params = new ArrayList<>();
-        CakePHP3Module cakeModule = CakePHP3Module.forPhpModule(phpModule);
+        CakePHPModule cakeModule = CakePHPModule.forPhpModule(phpModule);
         CakeVersion version = cakeModule.getVersion();
         if (version != null) {
-            if (version.getMajor() >= 3 && version.getMinor() >= 5) {
+            if ((version.getMajor() >= 3 && version.getMinor() >= 5)
+                    || version.getMajor() >= 4) { // cakephp 4
                 params.addAll(COMMAND_LIST_XML_COMMAND_350);
             } else {
                 params.addAll(COMMAND_LIST_XML_COMMAND);
@@ -326,7 +327,7 @@ private ExecutionDescriptor getSilentDescriptor() {
     }
 
     private PhpExecutable createPhpExecutable(PhpModule phpModule) {
-        CakePHP3Module module = CakePHP3Module.forPhpModule(phpModule);
+        CakePHPModule module = CakePHPModule.forPhpModule(phpModule);
         List<FileObject> directories = module.getDirectories(Base.APP);
         PhpExecutable phpExecutable = new PhpExecutable(cakePath)
                 .viaAutodetection(true);