Commit 76717e9d authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Correction problèmes de gén de la liste des viewhelpers et du phprenderer

parent d06be0ff

code/generator/applicationPhpRenderer.php

+27 −24
Original line number Diff line number Diff line
@@ -2,16 +2,18 @@ 


use UnicaenCode\Util;



Util::getContainer()->setService('request', new \Laminas\Http\Request());





$class = 'Application\View\Renderer\PhpRenderer';



return [

    'title'     => 'Génération du PhpRenderer de l\'application',

    'class'     => 'Application\View\Renderer\PhpRenderer',

    'generator' => function (array $params) {

        Util::getContainer()->setService('request', new \Laminas\Http\Request());



        $vhs = Util::introspection()->getViewHelpers();



        $methods = [];

        foreach ($vhs as $key => $vhClass) {

            if ($vhClass) {

                $rc = new \ReflectionClass($vhClass);

                if ($rc->hasMethod('__invoke')) {

                    $method    = $rc->getMethod('__invoke');
@@ -20,11 +22,12 @@ foreach ($vhs as $key => $vhClass) { 
                    $methods[] = " * @method \\$vhClass $key()";

                }

            }

        }



return [

    'title'    => 'Génération du PhpRenderer de l\'application',

    'template' => 'ApplicationPhpRenderer',

    'class'    => $class,

    'filename' => Util::classFilename($class),

    'methods'  => implode("\n", $methods),

        $params['template'] = 'ApplicationPhpRenderer';

        $params['filename'] = Util::classFilename($params['class']);

        $params['methods']  = implode("\n", $methods);



        return $params;

    },

];

src/Manager/ViewHelperManager.php

+6 −2
Original line number Diff line number Diff line
@@ -88,8 +88,12 @@ class ViewHelperManager extends HelperPluginManager 
        $container = $this->container->get('ViewHelperManager');

        foreach( $names as $name ) {

            if ($container->has($name)) {

                try {

                    $object = @$container->get($name);

                    $result[$name] = is_object($object) ? get_class($object) : gettype($object);

                }catch(\Exception|\Error $e){

                    $result[$name] = null;

                }

            }

        }

        asort($result);

src/Service/CodeGeneratorService.php

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ class CodeGeneratorService 




        /* Affichage éventuel de la ligne de commande */

        if ($state === self::STATE_WEB_GEN) {

        if ($state === self::STATE_WEB_GEN || (isset($form) && !$form->hasSaisieElements())) {

            ?>

            <h1>Création des fichiers depuis la ligne de commandes</h1>

            <div class="alert alert-warning">