Fixed PHP class validation rule

Author: drpayyne

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

@@ -12,11 +12,8 @@
 import com.magento.idea.magento2plugin.actions.generation.data.ControllerFileData;
 import com.magento.idea.magento2plugin.actions.generation.dialog.validator.annotation.FieldValidation;
 import com.magento.idea.magento2plugin.actions.generation.dialog.validator.annotation.RuleRegistry;
-import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.AlphanumericRule;
 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.PhpNamespaceNameRule;
-import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.StartWithNumberOrCapitalLetterRule;
 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;
@@ -63,16 +60,12 @@ public class NewControllerDialog extends AbstractDialog {
 
     @FieldValidation(rule = RuleRegistry.NOT_EMPTY,
             message = {NotEmptyRule.MESSAGE, CONTROLLER_NAME})
-    @FieldValidation(rule = RuleRegistry.PHP_NAMESPACE_NAME,
-            message = {PhpNamespaceNameRule.MESSAGE, CONTROLLER_NAME})
+    @FieldValidation(rule = RuleRegistry.PHP_CLASS,
+            message = {PhpClassRule.MESSAGE, CONTROLLER_NAME})
     private JTextField controllerName;
 
     @FieldValidation(rule = RuleRegistry.NOT_EMPTY,
             message = {NotEmptyRule.MESSAGE, ACTION_NAME})
-    @FieldValidation(rule = RuleRegistry.START_WITH_NUMBER_OR_CAPITAL_LETTER,
-            message = {StartWithNumberOrCapitalLetterRule.MESSAGE, ACTION_NAME})
-    @FieldValidation(rule = RuleRegistry.ALPHANUMERIC,
-            message = {AlphanumericRule.MESSAGE, ACTION_NAME})
     @FieldValidation(rule = RuleRegistry.PHP_CLASS,
             message = {PhpClassRule.MESSAGE, ACTION_NAME})
     private JTextField actionName;

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

@@ -5,15 +5,15 @@
 
 package com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule;
 
-import com.jetbrains.php.refactoring.PhpNameUtil;
+import com.magento.idea.magento2plugin.util.RegExUtil;
 
 public class PhpClassRule implements ValidationRule {
     public static final String MESSAGE = "validator.class.isNotValid";
     private static final ValidationRule INSTANCE = new PhpClassRule();
 
     @Override
     public boolean check(final String value) {
-        return PhpNameUtil.isValidClassName(value);
+        return value.matches(RegExUtil.Magento.PHP_CLASS);
     }
 
     public static ValidationRule getInstance() {

src/com/magento/idea/magento2plugin/util/RegExUtil.java

@@ -32,6 +32,9 @@ public class RegExUtil {
             = "(\\d+)\\.(\\d+)\\.(\\d+)[a-zA-Z0-9_\\-]*";
 
     public static class Magento {
+        public static final String PHP_CLASS
+                = "[A-Z][a-zA-Z0-9]+";
+
         public static final String MODULE_NAME
                 = "[A-Z][a-zA-Z0-9]+_[A-Z][a-zA-Z0-9]+";