Commit 9bbbe255 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

COrrections

parent eb142f2a
Loading
Loading
Loading
Loading
Loading
+6 −6
Original line number Diff line number Diff line
@@ -2,10 +2,10 @@

namespace Exemple;

use Zend\Mvc\ModuleRouteListener;
use Zend\Mvc\MvcEvent;
use Zend\Http\Request as HttpRequest;
use Zend\Session\SessionManager;
use Laminas\Mvc\ModuleRouteListener;
use Laminas\Mvc\MvcEvent;
use Laminas\Http\Request as HttpRequest;
use Laminas\Session\SessionManager;

class Module
{
@@ -19,7 +19,7 @@ class Module
        $moduleRouteListener->attach($eventManager);

        /* Active un layout spécial si la requête est de type AJAX. Valable pour TOUS les modules de l'application. */
        $eventManager->getSharedManager()->attach('Zend\Mvc\Controller\AbstractActionController', 'dispatch',
        $eventManager->getSharedManager()->attach('Laminas\Mvc\Controller\AbstractActionController', 'dispatch',
            function (MvcEvent $e) {
                $request = $e->getRequest();
                if ($request instanceof HttpRequest && $request->isXmlHttpRequest()) {
@@ -41,7 +41,7 @@ class Module
    public function getAutoloaderConfig()
    {
        return [
            'Zend\Loader\StandardAutoloader' => [
            'Laminas\Loader\StandardAutoloader' => [
                'namespaces' => [
                    __NAMESPACE__ => __DIR__ . '/src/' . __NAMESPACE__,
                ],
+2 −2
Original line number Diff line number Diff line
@@ -5,8 +5,8 @@ namespace Exemple\Controller;
use Exemple\Form\ContactMultipageForm;
use UnicaenApp\Controller\Plugin\MultipageFormPlugin;
use UnicaenApp\Form\MultipageForm;
use Zend\Http\PhpEnvironment\Response;
use Zend\Mvc\Controller\AbstractActionController;
use Laminas\Http\PhpEnvironment\Response;
use Laminas\Mvc\Controller\AbstractActionController;

/**
 * @method MultipageFormPlugin multipageForm(MultipageForm $form)
+2 −2
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@

namespace Exemple\Controller;

use Zend\Mvc\Controller\AbstractActionController;
use Zend\View\Model\ViewModel;
use Laminas\Mvc\Controller\AbstractActionController;
use Laminas\View\Model\ViewModel;

class IndexController extends AbstractActionController
{
+6 −6
Original line number Diff line number Diff line
<?php
namespace Exemple\Fieldset;

use Zend\Form\Element\Text;
use Zend\Form\Fieldset;
use Zend\InputFilter\InputFilterProviderInterface;
use Laminas\Form\Element\Text;
use Laminas\Form\Fieldset;
use Laminas\InputFilter\InputFilterProviderInterface;

/**
 * 
@@ -20,13 +20,13 @@ class AdresseFieldset extends Fieldset implements InputFilterProviderInterface
             ->add(new Text('email', array('label'=>"Email")));
    }
 
    public function getInputFilterSpecification()
    public function getInputFilterSpecification(): array
    {
        return array(
            'email' => array(
                'required' => true,
                'filters'  => array(
                    array('name' => '\Zend\Filter\StringTrim'),
                    array('name' => '\Laminas\Filter\StringTrim'),
                ),
                'validators' => array(
                    array(
@@ -37,7 +37,7 @@ class AdresseFieldset extends Fieldset implements InputFilterProviderInterface
                        )
                    ),
                    array(
                        'name' => '\Zend\Validator\EmailAddress',
                        'name' => '\Laminas\Validator\EmailAddress',
                        'options' => array(
                            'messages' => array('emailAddressInvalidFormat' => "L'adresse mail spécifiée est invalide"),
                        ),
+33 −32
Original line number Diff line number Diff line
@@ -2,10 +2,10 @@
namespace Exemple\Fieldset;

use UnicaenApp\Form\MultipageFormFieldsetInterface;
use Zend\Form\Element\MultiCheckbox;
use Zend\Form\Element\Text;
use Zend\Form\Fieldset;
use Zend\InputFilter\InputFilterProviderInterface;
use Laminas\Form\Element\MultiCheckbox;
use Laminas\Form\Element\Text;
use Laminas\Form\Fieldset;
use Laminas\InputFilter\InputFilterProviderInterface;

/**
 * 
@@ -14,58 +14,59 @@ use Zend\InputFilter\InputFilterProviderInterface;
 */
class IdentiteFieldset extends Fieldset implements InputFilterProviderInterface, MultipageFormFieldsetInterface
{
    public function __construct($name = null, $options = array())
    public function __construct($name = null, $options = [])
    {
        parent::__construct($name, $options);
 
        $this->setLabel("Vous")
             ->add(new Text('nom', array('label' => "Nom")))
             ->add(new Text('prenom', array('label' => "Prénom")))
             ->add(new MultiCheckbox('civ', array('label'=>"Civilité", 'value_options' => array('Melle'=>'Melle', 'Mme'=>'Mme', 'M'=>'M'))));
             ->add(new Text('nom', ['label' => "Nom"]))
             ->add(new Text('prenom', ['label' => "Prénom"]))
             ->add(new MultiCheckbox('civ', ['label'=>"Civilité", 'value_options' => ['Melle'=>'Melle', 'Mme'=>'Mme', 'M'=>'M']]));
    }
 
    public function getInputFilterSpecification()
    public function getInputFilterSpecification(): array
    {
        return array(
            'nom' => array(
        return [
            'nom' => [
                'required' => true,
                'validators' => array(
                    array(
                'validators' => [
                    [
                        'name'=> 'NotEmpty',
                        'break_chain_on_failure' => true,
                        'options' => array(
                            'messages' => array('isEmpty' => "Vous devez renseigner votre nom"),
                        )
                    ),
                ),
            ),
        );
                        'options' => [
                            'messages' => ['isEmpty' => "Vous devez renseigner votre nom"],
                        ]
                    ],
                ],
            ],
        ];
    }
    
    /**
     * Retourne les labels ainsi que les valeurs des éléments d'un fieldset.
     *
     * @param array $data Données saisies au sein de ce fieldset
     * @return array 'element_name' => array('label' => Label de l'élément, 'value' => Valeur saisie au format texte)
     */
    public function getLabelsAndValues($data = null)
    public function getLabelsAndValues(): array
    {
        if ($data && array_key_exists($this->getName(), $data)) {
            $data = $data[$this->getName()];
        }
        $result = array();
        $result['nom'] = array(
        $data = [
            'nom' => $this->get('nom')->getValue(),
            'prenom' => $this->get('prenom')->getValue(),
            'civ' => $this->get('civ')->getValue(),
        ];
        $result = [];
        $result['nom'] = [
            'label' => "Nom",
            'value' => isset($data['nom']) && $data['nom'] ? $data['nom'] : "(Non renseigné)"
        );
        $result['prenom'] = array(
        ];
        $result['prenom'] = [
            'label' => "Prénom",
            'value' => isset($data['prenom']) && $data['prenom'] ? $data['prenom'] : "(Non renseigné)"
        );
        $result['civ'] = array(
        ];
        $result['civ'] = [
            'label' => "Civilité",
            'value' => isset($data['civ']) && $data['civ'] ? $data['civ'] : "(Non renseignée)"
        );
        ];
        return $result;
    }
}
Loading