Merge branch 'nb81'

Author: junichi11

README.md

@@ -15,7 +15,7 @@ https://github.com/FriendsOfPHP/PHP-CS-Fixer
 ## Settings
 
 ### Global
- `Tools > Options > PHP > PHP CS Fixer`
+ `Tools > Options > PHP > Framework & Tools > PHP CS Fixer`
 - set PHP CS Fixer path
 - set fix command options
 

manifest.mf

@@ -1,4 +1,4 @@
 Manifest-Version: 1.0
 OpenIDE-Module: org.netbeans.modules.php.phpcsfixer
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/phpcsfixer/Bundle.properties
-OpenIDE-Module-Specification-Version: 0.5.2
+OpenIDE-Module-Specification-Version: 0.5.3

nbproject/project.xml

@@ -86,6 +86,15 @@
                         <specification-version>1.65.1.8</specification-version>
                     </run-dependency>
                 </dependency>
+                <dependency>
+                    <code-name-base>org.netbeans.modules.projectuiapi.base</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <release-version>1</release-version>
+                        <specification-version>1.83.1.9</specification-version>
+                    </run-dependency>
+                </dependency>
                 <dependency>
                     <code-name-base>org.openide.awt</code-name-base>
                     <build-prerequisite/>

src/org/netbeans/modules/php/phpcsfixer/ui/actions/PhpCsFixerActionsFactory.java

@@ -45,9 +45,12 @@
 import javax.swing.AbstractAction;
 import javax.swing.JMenu;
 import javax.swing.JMenuItem;
+import org.netbeans.api.project.FileOwnerQuery;
+import org.netbeans.api.project.Project;
 import org.netbeans.modules.php.api.phpmodule.PhpModule;
 import org.netbeans.modules.php.api.util.StringUtils;
 import org.netbeans.modules.php.phpcsfixer.options.PhpCsFixerOptions;
+import org.netbeans.spi.project.ui.support.ProjectConvertors;
 import org.openide.awt.ActionID;
 import org.openide.awt.ActionReference;
 import org.openide.awt.ActionReferences;
@@ -68,10 +71,10 @@
 @ActionRegistration(
         displayName = "#PhpCsFixerActionsFactory.name", lazy = false)
 @ActionReferences({
-    @ActionReference(path = "Loaders/folder/any/Actions", position = 1600),
-    @ActionReference(path = "Loaders/text/x-php5/Actions", position = 1600),
-    @ActionReference(path = "Editors/text/x-php5/Popup", position = 600),
-    @ActionReference(path = "Projects/org-netbeans-modules-php-project/Actions", position = 1100)
+    @ActionReference(path = "Loaders/folder/any/Actions", position = 1690),
+    @ActionReference(path = "Loaders/text/x-php5/Actions", position = 1690),
+    @ActionReference(path = "Editors/text/x-php5/Popup", position = 590),
+    @ActionReference(path = "Projects/org-netbeans-modules-php-project/Actions", position = 1090)
 })
 @NbBundle.Messages("PhpCsFixerActionsFactory.name=PHP CS Fixer")
 public class PhpCsFixerActionsFactory extends AbstractAction implements Presenter.Popup {
@@ -87,7 +90,7 @@ public void actionPerformed(ActionEvent e) {
     @Override
     public JMenuItem getPopupPresenter() {
         if (!isInPhpModule()) {
-            return null;
+            return new JMenuItem();
         }
         String phpCsFixerPath = PhpCsFixerOptions.getInstance().getPhpCsFixerPath();
         if (StringUtils.isEmpty(phpCsFixerPath)) {
@@ -107,7 +110,21 @@ private boolean isInPhpModule() {
         if (target == null) {
             return false;
         }
-        PhpModule phpModule = PhpModule.Factory.forFileObject(target);
+        if (!target.isFolder()) {
+            return true;
+        }
+        Project nonConvertorOwner = ProjectConvertors.getNonConvertorOwner(target);
+        if (nonConvertorOwner == null) {
+            nonConvertorOwner = FileOwnerQuery.getOwner(target);
+            if (nonConvertorOwner == null) {
+                return false;
+            }
+        }
+        PhpModule phpModule = PhpModule.Factory.lookupPhpModule(nonConvertorOwner);
+        if (phpModule != null) {
+            return true;
+        }
+        phpModule = PhpModule.Factory.forFileObject(target);
         return phpModule != null;
     }