Added PHP_DIRECTORY rule to NewControllerDialog

Author: drpayyne

resources/magento2/validation.properties

@@ -7,10 +7,11 @@ validator.startWithNumberOrCapitalLetter=The {0} must start from a number or a c
 validator.onlyNumbers={0} must contain numbers only
 validator.mustNotBeNegative={0} must not be negative
 validator.identifier={0} must contain letters, numbers, dashes, and underscores only
-validator.class.isNotValid=The {0} is not valid class name
+validator.class.isNotValid=The {0} field does not contain a valid class name
 validator.class.shouldBeUnique=Duplicated class {0}
 validator.namespace.isNotValid=The {0} is not valid namespace name
 validator.directory.isNotValid={0} is not valid
+validator.directory.php.isNotValid=The {0} field does not contain a valid PHP directory
 validator.module.noSuchModule=No such module {0}
 validator.file.alreadyExists={0} already exists
 validator.file.cantBeCreated={0} can't be created

src/com/magento/idea/magento2plugin/actions/generation/dialog/NewControllerDialog.java

@@ -14,6 +14,7 @@
 import com.magento.idea.magento2plugin.actions.generation.dialog.validator.annotation.RuleRegistry;
 import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.NotEmptyRule;
 import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.PhpClassRule;
+import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.PhpDirectoryRule;
 import com.magento.idea.magento2plugin.actions.generation.generator.ModuleControllerClassGenerator;
 import com.magento.idea.magento2plugin.magento.files.ControllerBackendPhp;
 import com.magento.idea.magento2plugin.magento.files.ControllerFrontendPhp;
@@ -60,8 +61,8 @@ public class NewControllerDialog extends AbstractDialog {
 
     @FieldValidation(rule = RuleRegistry.NOT_EMPTY,
             message = {NotEmptyRule.MESSAGE, CONTROLLER_NAME})
-    @FieldValidation(rule = RuleRegistry.PHP_CLASS,
-            message = {PhpClassRule.MESSAGE, CONTROLLER_NAME})
+    @FieldValidation(rule = RuleRegistry.PHP_DIRECTORY,
+            message = {PhpDirectoryRule.MESSAGE, CONTROLLER_NAME})
     private JTextField controllerName;
 
     @FieldValidation(rule = RuleRegistry.NOT_EMPTY,

src/com/magento/idea/magento2plugin/actions/generation/dialog/validator/annotation/RuleRegistry.java

@@ -14,6 +14,7 @@
 import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.NotEmptyRule;
 import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.NumericRule;
 import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.PhpClassRule;
+import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.PhpDirectoryRule;
 import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.PhpNamespaceNameRule;
 import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.RouteIdRule;
 import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.StartWithNumberOrCapitalLetterRule;
@@ -25,6 +26,7 @@ public enum RuleRegistry {
     ALPHANUMERIC(AlphanumericRule.class),
     ALPHANUMERIC_WITH_UNDERSCORE(AlphanumericWithUnderscoreRule.class),
     DIRECTORY(DirectoryRule.class),
+    PHP_DIRECTORY(PhpDirectoryRule.class),
     IDENTIFIER(IdentifierRule.class),
     PHP_NAMESPACE_NAME(PhpNamespaceNameRule.class),
     START_WITH_NUMBER_OR_CAPITAL_LETTER(StartWithNumberOrCapitalLetterRule.class),

src/com/magento/idea/magento2plugin/actions/generation/dialog/validator/rule/PhpDirectoryRule.java

@@ -0,0 +1,22 @@
+/*
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+package com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule;
+
+import com.magento.idea.magento2plugin.util.RegExUtil;
+
+public class PhpDirectoryRule implements ValidationRule {
+    public static final String MESSAGE = "validator.directory.php.isNotValid";
+    private static final ValidationRule INSTANCE = new PhpDirectoryRule();
+
+    @Override
+    public boolean check(final String value) {
+        return value.matches(RegExUtil.Magento.PHP_CLASS);
+    }
+
+    public static ValidationRule getInstance() {
+        return INSTANCE;
+    }
+}