romm / formz / 941

pending completion

Build # 941

Build Type

push

travis-ci

Committed by

romm

Commit Message

<a href="https://github.com/romm/formz/commit/<a class=hub.com/romm/formz/commit/2c4763fa3f8d5eada45ddd99ed7bb204166e8eec">2c4763fa3<a href="https://github.com/romm/formz/commit/2c4763fa3f8d5eada45ddd99ed7bb204166e8eec">&quot;&gt;[BUGFIX] Instantiate fields validators with object manager in Ajax

Following the commit </a><a class="double-link" href="https://github.com/romm/formz/commit/<a class="double-link" href="https://github.com/romm/formz/commit/2f23f8088e8c7db58021eccde04a6f38de094c1f">2f23f8088</a>">2f23f8088</a><a href="https://github.com/romm/formz/commit/2c4763fa3f8d5eada45ddd99ed7bb204166e8eec">, a field
validator should be instantiated with the object manager, to allow more
Extbase feature.

The instantiation type was not modified in the Ajax controller, though.

Run Details

1 of 1 new or added line in 1 file covered. (100.0%)

2556 of 2808 relevant lines covered (91.03%)

14.78 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

73.91

/Classes/Service/ViewHelper/Form/FormViewHelperService.php

<?php
/*
 * 2017 Romain CANON <romain.hydrocanon@gmail.com>
 *
 * This file is part of the TYPO3 FormZ project.
 * It is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License, either
 * version 3 of the License, or any later version.
 *
 * For the full copyright and license information, see:
 * http://www.gnu.org/licenses/gpl-3.0.html
 */

namespace Romm\Formz\Service\ViewHelper\Form;

use Romm\Formz\Behaviours\BehavioursManager;
use Romm\Formz\Exceptions\DuplicateEntryException;
use Romm\Formz\Form\FormObject;
use TYPO3\CMS\Core\SingletonInterface;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext;

/**
 * This class contains methods that help view helpers to manipulate data and
 * know more things concerning the current form state.
 *
 * It is mainly configured inside the `FormViewHelper`, and used in other
 * view helpers.
 */
class FormViewHelperService implements SingletonInterface
{
    /**
     * @var bool
     */
    protected $formContext = false;

    /**
     * @var FormObject
     */
    protected $formObject;

    /**
     * Reset every state that can be used by this service.
     */
    public function resetState()
    {
        $this->formContext = false;
        $this->formObject = null;
    }

    /**
     * Will activate the form context, changing the result returned by the
     * function `formContextExists()`.
     *
     * @return FormViewHelperService
     * @throws DuplicateEntryException
     */
    public function activateFormContext()
    {
        if (true === $this->formContext) {
            throw DuplicateEntryException::duplicatedFormContext();
        }

        $this->formContext = true;

        return $this;
    }

    /**
     * Will loop on the submitted form fields and apply behaviours if their
     * configuration contains.
     *
     * @param ControllerContext $controllerContext
     */
    public function applyBehavioursOnSubmittedForm(ControllerContext $controllerContext)
    {
        if ($this->formObject->formWasSubmitted()) {
            $request = $controllerContext->getRequest()->getOriginalRequest();
            $formName = $this->formObject->getName();

            if ($request
                && $request->hasArgument($formName)
            ) {
                /** @var BehavioursManager $behavioursManager */
                $behavioursManager = GeneralUtility::makeInstance(BehavioursManager::class);

                /** @var array $originalForm */
                $originalForm = $request->getArgument($formName);

                $formProperties = $behavioursManager->applyBehaviourOnPropertiesArray(
                    $originalForm,
                    $this->formObject->getConfiguration()
                );

                $request->setArgument($formName, $formProperties);
            }
        }
    }

    /**
     * Returns `true` if the `FormViewHelper` context exists.
     *
     * @return bool
     */
    public function formContextExists()
    {
        return $this->formContext;
    }

    /**
     * @return FormObject
     */
    public function getFormObject()
    {
        return $this->formObject;
    }

    /**
     * @param FormObject $formObject
     */
    public function setFormObject(FormObject $formObject)
    {
        $this->formObject = $formObject;
    }
}

1	<?php
2	/*
3	* 2017 Romain CANON <romain.hydrocanon@gmail.com>
4	*
5	* This file is part of the TYPO3 FormZ project.
6	* It is free software; you can redistribute it and/or modify it
7	* under the terms of the GNU General Public License, either
8	* version 3 of the License, or any later version.
9	*
10	* For the full copyright and license information, see:
11	* http://www.gnu.org/licenses/gpl-3.0.html
12	*/
13
14	namespace Romm\Formz\Service\ViewHelper\Form;
15
16	use Romm\Formz\Behaviours\BehavioursManager;
17	use Romm\Formz\Exceptions\DuplicateEntryException;
18	use Romm\Formz\Form\FormObject;
19	use TYPO3\CMS\Core\SingletonInterface;
20	use TYPO3\CMS\Core\Utility\GeneralUtility;
21	use TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext;
22
23	/**
24	* This class contains methods that help view helpers to manipulate data and
25	* know more things concerning the current form state.
26	*
27	* It is mainly configured inside the `FormViewHelper`, and used in other
28	* view helpers.
29	*/
30	class FormViewHelperService implements SingletonInterface
31	{
32	/**
33	* @var bool
34	*/
35	protected $formContext = false;
36
37	/**
38	* @var FormObject
39	*/
40	protected $formObject;
41
42	/**
43	* Reset every state that can be used by this service.
44	*/
45	public function resetState()
46	{
47	$this->formContext = false;	7✔
48	$this->formObject = null;	7✔
49	}	7✔
50
51	/**
52	* Will activate the form context, changing the result returned by the
53	* function `formContextExists()`.
54	*
55	* @return FormViewHelperService
56	* @throws DuplicateEntryException
57	*/
58	public function activateFormContext()
59	{
60	if (true === $this->formContext) {	9✔
61	throw DuplicateEntryException::duplicatedFormContext();	1✔
62	}
63
64	$this->formContext = true;	9✔
65
66	return $this;	9✔
67	}
68
69	/**
70	* Will loop on the submitted form fields and apply behaviours if their
71	* configuration contains.
72	*
73	* @param ControllerContext $controllerContext
74	*/
75	public function applyBehavioursOnSubmittedForm(ControllerContext $controllerContext)
76	{
77	if ($this->formObject->formWasSubmitted()) {	5✔
78	$request = $controllerContext->getRequest()->getOriginalRequest();	1✔
79	$formName = $this->formObject->getName();	1✔
80
81	if ($request	1✔
82	&& $request->hasArgument($formName)	1✔
83	) {
84	/** @var BehavioursManager $behavioursManager */
85	$behavioursManager = GeneralUtility::makeInstance(BehavioursManager::class);	×
86
87	/** @var array $originalForm */
88	$originalForm = $request->getArgument($formName);	×
89
90	$formProperties = $behavioursManager->applyBehaviourOnPropertiesArray(	×
91	$originalForm,	×
92	$this->formObject->getConfiguration()	×
93	);
94
95	$request->setArgument($formName, $formProperties);	×
96	}
97	}
98	}	5✔
99
100	/**
101	* Returns `true` if the `FormViewHelper` context exists.
102	*
103	* @return bool
104	*/
105	public function formContextExists()
106	{
107	return $this->formContext;	4✔
108	}
109
110	/**
111	* @return FormObject
112	*/
113	public function getFormObject()
114	{
115	return $this->formObject;	10✔
116	}
117
118	/**
119	* @param FormObject $formObject
120	*/
121	public function setFormObject(FormObject $formObject)
122	{
123	$this->formObject = $formObject;	22✔
124	}	22✔
125	}

romm / formz / 941

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous