Added support for name chains.

The Model::required() now sets the value only for one property.
The Html::label() now supports obtaining a name from model annotations.
Added ValidateAntiForgeryToken to manage antiForgeryToken settings for controllers and actions.

Author: meet-aleksey

src/AppBuilder.php

@@ -440,6 +440,7 @@ private static function actionContext($route) {
         InternalHelper::setStaticPropertyValue('\\PhpMvc\\Model', 'actionContext', $actionContext);
         InternalHelper::setStaticPropertyValue('\\PhpMvc\\Filter', 'actionContext', $actionContext);
         InternalHelper::setStaticPropertyValue('\\PhpMvc\\OutputCache', 'actionContext', $actionContext);
+        InternalHelper::setStaticPropertyValue('\\PhpMvc\\ValidateAntiForgeryToken', 'actionContext', $actionContext);
 
         // create instance of controller
         if ($controllerClass->getConstructor() != null) {
@@ -857,7 +858,8 @@ private static function validation() {
         }
 
         // request verification token
-        if ($validators === true || (!isset($validators['antiForgeryToken']) || $validators['antiForgeryToken'] === true)) {
+        $antiForgeryTokenForAction = InternalHelper::getStaticPropertyValue('\\PhpMvc\\ValidateAntiForgeryToken', 'enable');
+        if ($antiForgeryTokenForAction === true || (($validators === true || (!isset($validators['antiForgeryToken']) || $validators['antiForgeryToken'] === true)) && $antiForgeryTokenForAction !== false)) {
             if (($request = self::$config['httpContext']->getRequest())->isPost()) {
                 $post = $request->post();
                 $expected = $request->cookies('__requestVerificationToken');
@@ -1095,10 +1097,8 @@ private static function makeActionState($actionContext) {
                     $arguments[$name] = $post;
 
                     // parse post data
-                    foreach (get_object_vars($post) as $key => $value) {
-                        $modelState[$key] = new ModelStateEntry($key, $value);
-                    }
-                    
+                    self::parseObjectToModelState($modelState, $post);
+
                     $hasModel = true;
                     continue;
                 }
@@ -1122,6 +1122,18 @@ private static function makeActionState($actionContext) {
         InternalHelper::setPropertyValue($actionContext, 'modelState', $modelState);
     }
 
+    private static function parseObjectToModelState(&$modelState, $object, $keys = array()) {
+        foreach (get_object_vars($object) as $key => $value) {
+            if (is_object($value)) {
+                self::parseObjectToModelState($modelState, $value, array_merge($keys, array($key)));
+            }
+            else {
+                $key = implode('_', array_merge($keys, array($key)));
+                $modelState[$key] = new ModelStateEntry($key, $value);
+            }
+        }
+    }
+
     /**
      * @param ActionContext $actionContext Action context and descriptor.
      * 

src/Html.php

@@ -25,13 +25,12 @@ final class Model {
      * and it is expected that the property value must be specified.
      * 
      * @param string $actionName Action name.
-     * @param string|array $propertyName Property name or names of properties to mark.
-     * It is possible to specify both the property names and the associative array. 
-     * In the array, the key is the property's name, and the value contains an error message.
+     * @param string $propertyName The property name.
+     * @param string $errorMessage The error message.
      * 
      * @return void
      */
-    public static function required($actionName, ...$propertyName) {
+    public static function required($actionName, $propertyName, $errorMessage = null) {
         if (!self::$actionContext->actionNameEquals($actionName)) {
             return;
         }
@@ -44,20 +43,9 @@ public static function required($actionName, ...$propertyName) {
             throw new \Exception('$propertyName must not be empty.');
         }
 
-        foreach ($propertyName as $item) {
-            $errorMessage = null;
-
-            if (is_array($item)) {
-                $key = key($item);
-                $errorMessage = $item[$key];
-            } else {
-                $key = $item;
-            }
-
-            self::makeDataAnnotation($key);
+        self::makeDataAnnotation($propertyName);
 
-            self::$annotations[$key]->required = array($errorMessage);
-        }
+        self::$annotations[$propertyName]->required = array($errorMessage);
     }
 
     /**
@@ -221,7 +209,9 @@ public static function display($actionName, $propertyName, $name, $text = null)
         self::$annotations[$propertyName]->displayText = $text;
     }
 
-    private static function makeDataAnnotation($propertyName) {
+    private static function makeDataAnnotation(&$propertyName) {
+        $propertyName = is_array($propertyName) ? implode('_', $propertyName) : $propertyName;
+
         if (!isset(self::$annotations[$propertyName])) {
             self::$annotations[$propertyName] = new ModelDataAnnotation();
         }

src/Model.php

@@ -0,0 +1,61 @@
+<?php
+namespace PhpMvc;
+
+/**
+ * Represents methods for managing the AntiForgeryToken validation.
+ */
+final class ValidateAntiForgeryToken {
+
+    /**
+     * Defines ActionContext.
+     * 
+     * @var ActionContext
+     */
+    private static $actionContext;
+
+    /**
+     * Gets or sets mode.
+     * 
+     * @var bool|null
+     */
+    private static $enable = null;
+
+    /**
+     * Disables verification for the specified action.
+     * 
+     * @param string $actionName Action name.
+     * 
+     * @return void
+     */
+    public static function disable($actionName) {
+        self::set($actionName, false);
+    }
+
+    /**
+     * Enables verification for the specified action.
+     * 
+     * @param string $actionName Action name.
+     * 
+     * @return void
+     */
+    public static function enable($actionName) {
+        self::set($actionName, true);
+    }
+
+    /**
+     * Sets verification mode for the specified action.
+     * 
+     * @param string $actionName Action name.
+     * @param bool $enable Enable (true) or disable (false) verification.
+     * 
+     * @return void
+     */
+    public static function set($actionName, $enable) {
+        if ($actionName != '.' && !self::$actionContext->actionNameEquals($actionName)) {
+            return;
+        }
+
+        self::$enable = $enable;
+    }
+
+}