Commit bf88712c authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Divers refactoring

parent 046f80d1

code/generator/autoloadClassmap.php

+5 −2
Changes for code/generator/autoloadClassmap.php: 5 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -15,12 +15,15 @@ return [ 
        $map        = Util::introspection()->getClasses(namespace: $module['namespace']);



        $mc = 0;

        foreach ($map as $c => $f) {

        foreach ($map as $c) {

            $lc = strlen($c);

            if ($lc > $mc) $mc = $lc;

        }

        $php = '';

        foreach ($map as $c => $f) {

        foreach ($map as $c) {

            $rc = new ReflectionClass($c);

            $f = substr($rc->getFileName(), strlen($module['absPath']));



            $php .= "    " . str_pad("'$c'", $mc + 2, ' ') . " => __DIR__ . '$f',\n";

        }

code/template/ApplicationPhpRenderer.php

+1 −0
Changes for code/template/ApplicationPhpRenderer.php: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ namespace Application\View\Renderer; 
 * Description of PhpRenderer

 *

 * Permet d'utiliser les aides de vue avec de l'auto-complétion et de rendre le Refactoring des aides de vues efficace

 * Commande : <commandLine>

 *

<methods>

 *

code/template/autoload_classmap.php

+4 −1
Changes for code/template/autoload_classmap.php: 4 added lines, 1 removed line.
Original line number Diff line number Diff line 
<?php

// Generated by UnicaenCode

/**

 * Generated by UnicaenCode

 * Commande : <commandLine>

 */

return [

    <map>

];

code/template/template_map.php

+4 −1
Changes for code/template/template_map.php: 4 added lines, 1 removed line.
Original line number Diff line number Diff line 
<?php

// Generated by UnicaenCode

/**

 * Generated by UnicaenCode

 * Commande : <commandLine>

 */

return [

    <map>

];

src/Service/CodeGeneratorService.php

+9 −5
Changes for src/Service/CodeGeneratorService.php: 9 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -36,12 +36,16 @@ class CodeGeneratorService 
            $params = $this->getGenerator($params);

        }



        if (is_array($input)){

        $hasInputData = is_array($input);



        if ($hasInputData){

            if (isset($input['expanded'])){

                $params['expanded'] = $input['expanded'];

            }

        }







        $oriParams = $params;



        if ($title = $params['title'] ?? null) {
@@ -91,7 +95,7 @@ class CodeGeneratorService 
            }



            $form = FormMaker::createFromArray($formParams);

            if ($input === true && $form->hasSaisieElements()) {

            if (!$hasInputData && $form->hasSaisieElements()) {

                $form->afficher();

            } else {

                $doGen = true;
@@ -102,11 +106,11 @@ class CodeGeneratorService 
                    $params[$name] = $form->getParamValue($name);

                }

            }

        }



            if ($input === true && $cmd = $this->genCmd($oriParams, $params)) {

        if ($cmd = $this->genCmd($oriParams, $params)) {

            $params['commandLine'] = $cmd;

        }

        }



        if ($doGen) {

            $params = $this->generate($params);
@@ -175,7 +179,7 @@ class CodeGeneratorService 
            $this->echo($params);

        }



        if (isset($params['commandLine'])) {

        if (!Console::isConsole() && isset($params['commandLine'])) {

            ?>

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

            <div class="alert alert-warning">