Commit 7aff9327 authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Modif pour les triggers, utilisation de generator partout

parent 96f93904
Loading
Loading
Loading
Loading
Loading
+1 −0
Changes for code/generator/awareTrait.php: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ return [

        $filename = Util::classFilename($namespace . '\\' . $classname);

        $params['type']            = $type;
        $params['template']        = $template;
        $params['filename']        = $filename;
        $params['namespace']       = $namespace;
+0 −6
Changes for config/module.config.php: 0 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -12,12 +12,6 @@ return [
        'template-dirs'        => [$unicaenCodeDir . '/code/template'],
        'generator-dirs'       => [$unicaenCodeDir . '/code/generator'],
        'generator-output-dir' => '/tmp/UnicaenCode',
        'generators-from'      => [
            'factory'        => ['class', 'type', 'author', 'subDir'],
            'config'         => ['class', 'type', 'factory', 'name'],
            'awareTrait'     => ['class', 'type', 'subDir', 'useGetter'],
            'awareInterface' => ['class', 'type', 'subDir', 'useGetter'],
        ],
    ],

    'doctrine' => [
+11 −5
Changes for src/Service/CodeGeneratorService.php: 11 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -36,13 +36,19 @@ class CodeGeneratorService
            $params = $this->getGenerator($params);
        }

        if (is_array($input)){
            if (isset($input['expanded'])){
                $params['expanded'] = $input['expanded'];
            }
        }

        $oriParams = $params;

        if ($title = $params['title'] ?? null) {
            if (Console::isConsole()) {
                Util::getAuthor(); // sert à éviter un bug en console qui charge la session trop tard
                echo $title . "\n";
            } else {
            } elseif($input === true) {
                echo '<h1>' . $title . '</h1>';
            }
        }
@@ -85,7 +91,7 @@ class CodeGeneratorService
            }

            $form = FormMaker::createFromArray($formParams);
            if ($form->hasSaisieElements()) {
            if ($input === true && $form->hasSaisieElements()) {
                $form->afficher();
            } else {
                $doGen = true;
@@ -97,7 +103,7 @@ class CodeGeneratorService
                }
            }

            if ($cmd = $this->genCmd($oriParams, $params)) {
            if ($input === true && $cmd = $this->genCmd($oriParams, $params)) {
                $params['commandLine'] = $cmd;
            }
        }
@@ -244,8 +250,8 @@ class CodeGeneratorService
    {
        $triggers = $this->getServiceConfig()->getTriggers();
        foreach ($triggers as $t) {
            $function = $t['function'];
            unset($t['function']);
            $function = $t['generator'];
            unset($t['generator']);
            $run = true;
            if (!empty($t)) {
                foreach ($t as $pn => $pv) {