Merge branch '5.3' into 5.4

diff --cc wcfsetup/install/files/lib/system/form/builder/field/acl/AclFormField.class.php
index b78e1b666ececf695b4a11557437b5269dcc0164,0dde4882733a706c0cbd849fb23886586110b0d2..421c0bd5efedc63051f6e9b86d1f0d89d803f493
--- 1/wcfsetup/install/files/lib/system/form/builder/field/acl/AclFormField.class.php
--- 2/wcfsetup/install/files/lib/system/form/builder/field/acl/AclFormField.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/field/acl/AclFormField.class.php
@@@ -13,173 -11,165 +13,181 @@@ use wcf\system\form\builder\TObjectType
  /**
   * Implementation of a form field for setting acl option values.
   *
 - * @author    Matthias Schmidt
 - * @copyright 2001-2020 WoltLab GmbH
 - * @license   GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
 - * @package   WoltLabSuite\Core\System\Form\Builder\Field\Acl
 - * @since     5.2
 + * @author  Matthias Schmidt
 + * @copyright   2001-2020 WoltLab GmbH
 + * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
 + * @package WoltLabSuite\Core\System\Form\Builder\Field\Acl
 + * @since   5.2
   */
 -class AclFormField extends AbstractFormField implements IObjectTypeFormNode {
 -      use TObjectTypeFormNode;
 -
 -      /**
 -       * name of/filter for the name(s) of the shown acl option categories
 -       * @var null|string
 -       */
 -      protected $categoryName;
 -
 -      /**
 -       * @inheritDoc
 -       * @since       5.2.3
 -       */
 -      protected $javaScriptDataHandlerModule = 'WoltLabSuite/Core/Form/Builder/Field/Acl';
 -
 -      /**
 -       * id of the edited object or `null` if no object is edited
 -       * @var null|int
 -       */
 -      protected $objectID;
 -
 -      /**
 -       * @inheritDoc
 -       */
 -      protected $templateName = '__aclFormField';
 -
 -      /**
 -       * is `true` if acl-related global JavaScript code has already been included
 -       * and is `false` otherwise
 -       * @var bool
 -       */
 -      protected static $includedAclJavaScript = false;
 -
 -      /**
 -       * Sets the name of/filter for the name(s) of the shown acl option categories and
 -       * returns this field.
 -       *
 -       * @param       string          $categoryName   name of/filter for the acl option categories
 -       * @return      static          $this           this field
 -       *
 -       * @throws      \InvalidArgumentException       if given category name is invalid
 -       */
 -      public function categoryName($categoryName) {
 -              if (!is_string($categoryName) || !preg_match('~^[A-z0-9\-\_]+(\.[A-z0-9\-\_]+)+$~', $categoryName)) {
 -                      throw new \InvalidArgumentException("Invalid category name given.");
 -              }
 -
 -              $this->categoryName = $categoryName;
 -
 -              return $this;
 -      }
 -
 -      /**
 -       * Returns the name of/filter for the name(s) of the shown acl option categories
 -       * or returns `null` if no category name has been set.
 -       *
 -       * @return      null|string
 -       */
 -      public function getCategoryName() {
 -              return $this->categoryName;
 -      }
 -
 -      /**
 -       * @inheritDoc
 -       */
 -      public function getHtmlVariables() {
 -              ACLHandler::getInstance()->assignVariables($this->getObjectType()->objectTypeID);
 -
 -              $includeAclJavaScript = !static::$includedAclJavaScript;
 -              if (!static::$includedAclJavaScript) {
 -                      static::$includedAclJavaScript = true;
 -              }
 -
 -              return [
 -                      'includeAclJavaScript' => $includeAclJavaScript
 -              ];
 -      }
 -
 -      /**
 -       * Returns the id of the edited object or `null` if no object is edited.
 -       *
 -       * @return      null|int
 -       */
 -      public function getObjectID() {
 -              return $this->objectID;
 -      }
 -
 -      /**
 -       * @inheritDoc
 -       */
 -      public function getObjectTypeDefinition() {
 -              return 'com.woltlab.wcf.acl';
 -      }
 -
 -      /**
 -       * @inheritDoc
 -       */
 -      public function hasSaveValue() {
 -              return false;
 -      }
 -
 -      /**
 -       * @inheritDoc
 -       */
 -      public function updatedObject(array $data, IStorableObject $object, $loadValues = true) {
 -              $this->objectID = $object->{$object::getDatabaseTableIndexName()};
 -
 -              if ($this->objectID === null) {
 -                      throw new \UnexpectedValueException("Cannot read object id from object of class '" . get_class($object). "'.");
 -              }
 -
 -              return $this;
 -      }
 -
 -      /**
 -       * @inheritDoc
 -       */
 -      public function populate() {
 -              parent::populate();
 -
 -              $this->getDocument()->getDataHandler()->addProcessor(new CustomFormDataProcessor('acl', function(IFormDocument $document, array $parameters) {
 -                      $parameters[$this->getObjectProperty() . '_aclObjectTypeID'] = $this->getObjectType()->objectTypeID;
 -
 -                      return $parameters;
 -              }));
 -
 -              return $this;
 -      }
 -
 -      /**
 -       * @inheritDoc
 -       */
 -      public function readValue() {
 -              $valueSource = $_POST[$this->getPrefixedId()] ?? [];
 -              if ($this->getDocument()->isAjax()) {
 -                      $valueSource = [];
 -                      if (
 -                              $this->getDocument()->hasRequestData($this->getPrefixedId())
 -                              && is_array($this->getDocument()->getRequestData($this->getPrefixedId()))
 -                      ) {
 -                              $valueSource = $this->getDocument()->getRequestData($this->getPrefixedId());
 -                      }
 -              }
 -
 -              ACLHandler::getInstance()->readValues($this->getObjectType()->objectTypeID, $valueSource);
 -
 -              return $this;
 -      }
 -
 -      /**
 -       * @inheritDoc
 -       */
 -      public function cleanup() {
 -              ACLHandler::getInstance()->resetValues($this->getObjectType()->objectTypeID);
 -      }
 +class AclFormField extends AbstractFormField implements IObjectTypeFormNode
 +{
 +    use TObjectTypeFormNode;
 +
 +    /**
 +     * name of/filter for the name(s) of the shown acl option categories
 +     * @var null|string
 +     */
 +    protected $categoryName;
 +
 +    /**
 +     * @inheritDoc
 +     * @since   5.2.3
 +     */
 +    protected $javaScriptDataHandlerModule = 'WoltLabSuite/Core/Form/Builder/Field/Acl';
 +
 +    /**
 +     * id of the edited object or `null` if no object is edited
 +     * @var null|int
 +     */
 +    protected $objectID;
 +
 +    /**
 +     * @inheritDoc
 +     */
 +    protected $templateName = '__aclFormField';
 +
 +    /**
 +     * is `true` if acl-related global JavaScript code has already been included
 +     * and is `false` otherwise
 +     * @var bool
 +     */
 +    protected static $includedAclJavaScript = false;
 +
 +    /**
 +     * Sets the name of/filter for the name(s) of the shown acl option categories and
 +     * returns this field.
 +     *
 +     * @param string $categoryName name of/filter for the acl option categories
 +     * @return  static      $this       this field
 +     *
 +     * @throws  \InvalidArgumentException   if given category name is invalid
 +     */
 +    public function categoryName($categoryName)
 +    {
 +        if (!\is_string($categoryName) || !\preg_match('~^[A-z0-9\-\_]+(\.[A-z0-9\-\_]+)+$~', $categoryName)) {
 +            throw new \InvalidArgumentException("Invalid category name given.");
 +        }
 +
 +        $this->categoryName = $categoryName;
 +
 +        return $this;
 +    }
 +
 +    /**
 +     * Returns the name of/filter for the name(s) of the shown acl option categories
 +     * or returns `null` if no category name has been set.
 +     *
 +     * @return  null|string
 +     */
 +    public function getCategoryName()
 +    {
 +        return $this->categoryName;
 +    }
 +
 +    /**
 +     * @inheritDoc
 +     */
 +    public function getHtmlVariables()
 +    {
 +        ACLHandler::getInstance()->assignVariables($this->getObjectType()->objectTypeID);
 +
 +        $includeAclJavaScript = !static::$includedAclJavaScript;
 +        if (!static::$includedAclJavaScript) {
 +            static::$includedAclJavaScript = true;
 +        }
 +
 +        return [
 +            'includeAclJavaScript' => $includeAclJavaScript,
 +        ];
 +    }
 +
 +    /**
 +     * Returns the id of the edited object or `null` if no object is edited.
 +     *
 +     * @return  null|int
 +     */
 +    public function getObjectID()
 +    {
 +        return $this->objectID;
 +    }
 +
 +    /**
 +     * @inheritDoc
 +     */
 +    public function getObjectTypeDefinition()
 +    {
 +        return 'com.woltlab.wcf.acl';
 +    }
 +
 +    /**
 +     * @inheritDoc
 +     */
 +    public function hasSaveValue()
 +    {
 +        return false;
 +    }
 +
 +    /**
 +     * @inheritDoc
 +     */
 +    public function updatedObject(array $data, IStorableObject $object, $loadValues = true)
 +    {
 +        $this->objectID = $object->{$object::getDatabaseTableIndexName()};
 +
 +        if ($this->objectID === null) {
 +            throw new \UnexpectedValueException(
 +                "Cannot read object id from object of class '" . \get_class($object) . "'."
 +            );
 +        }
 +
 +        return $this;
 +    }
 +
 +    /**
 +     * @inheritDoc
 +     */
 +    public function populate()
 +    {
 +        parent::populate();
 +
 +        $this->getDocument()->getDataHandler()->addProcessor(new CustomFormDataProcessor(
 +            'acl',
 +            function (IFormDocument $document, array $parameters) {
 +                $parameters[$this->getObjectProperty() . '_aclObjectTypeID'] = $this->getObjectType()->objectTypeID;
 +
 +                return $parameters;
 +            }
 +        ));
 +
 +        return $this;
 +    }
 +
 +    /**
 +     * @inheritDoc
 +     */
 +    public function readValue()
 +    {
 +        $valueSource = $_POST[$this->getPrefixedId()] ?? [];
 +        if ($this->getDocument()->isAjax()) {
 +            $valueSource = [];
 +            if (
 +                $this->getDocument()->hasRequestData($this->getPrefixedId())
 +                && \is_array($this->getDocument()->getRequestData($this->getPrefixedId()))
 +            ) {
 +                $valueSource = $this->getDocument()->getRequestData($this->getPrefixedId());
 +            }
 +        }
 +
 +        ACLHandler::getInstance()->readValues($this->getObjectType()->objectTypeID, $valueSource);
 +
 +        return $this;
 +    }
++
++    /**
++     * @inheritDoc
++     */
++    public function cleanup()
++    {
++        ACLHandler::getInstance()->resetValues($this->getObjectType()->objectTypeID);
++    }
  }