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

Refactoring et mise en place des nouveaux generators plus souples (WIP)

parent e3ae361e
Loading
Loading
Loading
Loading
Loading
+0 −11
Changes for autoload_classmap.php: 0 added lines, 11 removed lines.
Original line number Diff line number Diff line
@@ -12,17 +12,6 @@ return [
    'UnicaenCode\Controller\Factory\ControllerFactory'          => __DIR__ . '/src/Controller/Factory/ControllerFactory.php',
    'UnicaenCode\DBAL\Logging\DebugStack'                       => __DIR__ . '/src/DBAL/Logging/DebugStack.php',
    'UnicaenCode\Form\FormMaker'                                => __DIR__ . '/src/Form/FormMaker.php',
    'UnicaenCode\Generator\Assertion'                           => __DIR__ . '/src/Generator/Assertion.php',
    'UnicaenCode\Generator\AwareInterface'                      => __DIR__ . '/src/Generator/AwareInterface.php',
    'UnicaenCode\Generator\AwareTrait'                          => __DIR__ . '/src/Generator/AwareTrait.php',
    'UnicaenCode\Generator\Controller'                          => __DIR__ . '/src/Generator/Controller.php',
    'UnicaenCode\Generator\ControllerConfig'                    => __DIR__ . '/src/Generator/ControllerConfig.php',
    'UnicaenCode\Generator\Entity'                              => __DIR__ . '/src/Generator/Entity.php',
    'UnicaenCode\Generator\Factory'                             => __DIR__ . '/src/Generator/Factory.php',
    'UnicaenCode\Generator\Form'                                => __DIR__ . '/src/Generator/Form.php',
    'UnicaenCode\Generator\GeneratorInterface'                  => __DIR__ . '/src/Generator/GeneratorInterface.php',
    'UnicaenCode\Generator\Service'                             => __DIR__ . '/src/Generator/Service.php',
    'UnicaenCode\Generator\ViewHelper'                          => __DIR__ . '/src/Generator/ViewHelper.php',
    'UnicaenCode\Manager\FormManager'                           => __DIR__ . '/src/Manager/FormManager.php',
    'UnicaenCode\Manager\ServiceManager'                        => __DIR__ . '/src/Manager/ServiceManager.php',
    'UnicaenCode\Manager\ViewHelperManager'                     => __DIR__ . '/src/Manager/ViewHelperManager.php',
+3 −31
Changes for code/GenerateApplicationPhpRenderer.php: 3 added lines, 31 removed lines.
Original line number Diff line number Diff line
<?php

use UnicaenCode\Util;

/**
 * @var $this       \Application\View\Renderer\PhpRenderer
 * @var $controller \Laminas\Mvc\Controller\AbstractController
@@ -10,15 +8,7 @@ use UnicaenCode\Util;
 * @var $viewFile   string
 */

$cg = \UnicaenCode\Util::codeGenerator();

$container->setService('request', new \Laminas\Http\Request());

$params = [
    'title' => 'Génération du PhpRenderer de l\'application',
];

$fullClassName = 'Application\View\Renderer\PhpRenderer';
$params = \UnicaenCode\Util::codeGenerator()->getGenerator('applicationPhpRenderer');

if (!\Unicaen\Console\Console::isConsole()){
    ?>
@@ -28,28 +18,10 @@ if (!\Unicaen\Console\Console::isConsole()){
        Le PhpRenderer permet de bénéficier de l'auto-complétion des view helpers depuis vos vues.
        Pour l'utiliser, il convient de déclarer la ligne suivante au début de chaque vue :

        <?php phpDump('/* @var $this \\' . $fullClassName . ' */'); ?>
        <?php phpDump('/* @var $this \\' . $params['class'] . ' */'); ?>

    </div>
    <?php
}


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

$methods = [];
foreach ($vhs as $key => $class) {
    $rc = new \ReflectionClass($class);
    if ($rc->hasMethod('__invoke')) {
        $method    = $rc->getMethod('__invoke');
        $methods[] = ' * ' . Util::getMethodDocDeclaration($rc->getMethod('__invoke'), $key, '\\' . $class);
    } else {
        $methods[] = " * @method \\$class $key()";
    }
}

$params['template'] = 'ApplicationPhpRenderer';
$params['filename'] = Util::classFilename($fullClassName);
$params['methods']  = implode("\n", $methods);

$cg->generer($params);
 No newline at end of file
\UnicaenCode\Util::codeGenerator()->generer($params);
 No newline at end of file
+1 −37
Changes for code/GenerateAutoloadClassmap.php: 1 added line, 37 removed lines.
Original line number Diff line number Diff line
<?php

use UnicaenCode\Form\AbstractForm;
use UnicaenCode\Form\ElementMaker;
use UnicaenCode\Util;

/**
 * @var $this       \Application\View\Renderer\PhpRenderer
 * @var $controller \Laminas\Mvc\Controller\AbstractController
@@ -12,36 +8,4 @@ use UnicaenCode\Util;
 * @var $viewFile   string
 */

$cg = \UnicaenCode\Util::codeGenerator();

$params = [
    'title'  => 'Génération d\'une Classmap pour optimiser l\'autoload',
    'module' => [
        'label' => 'Module concerné',
        'type'  => 'selectModule',
    ],

    'generator' => function (array $params) {
        $moduleName = $params['module'];
        $module     = Util::introspection()->getModule($moduleName);
        $map        = Util::introspection()->getClasses($module['namespace']);

        $mc = 0;
        foreach ($map as $c => $f) {
            $lc = strlen($c);
            if ($lc > $mc) $mc = $lc;
        }
        $php = '';
        foreach ($map as $c => $f) {
            $php .= "    " . str_pad("'$c'", $mc + 2, ' ') . " => __DIR__ . '$f',\n";
        }

        $params['template'] = 'autoload_classmap';
        $params['filename'] = $module['relPath'] . '/autoload_classmap.php';
        $params['map']      = trim($php);

        return $params;
    },
];

$cg->generer($params);
 No newline at end of file
\UnicaenCode\Util::codeGenerator()->generer('autoloadClassmap');
 No newline at end of file
+1 −39
Changes for code/GeneratePrivileges.php: 1 added line, 39 removed lines.
Original line number Diff line number Diff line
<?php

use UnicaenCode\Util;

/**
 * @var $this       \Application\View\Renderer\PhpRenderer
 * @var $controller \Laminas\Mvc\Controller\AbstractController
@@ -10,40 +8,4 @@ use UnicaenCode\Util;
 * @var $viewFile   string
 */

$cg = \UnicaenCode\Util::codeGenerator();

$sPrivileges = Util::getContainer()->get('UnicaenAuth\Service\Privilege');
/* @var $sPrivileges \UnicaenAuth\Service\PrivilegeService */

$privileges = $sPrivileges->getList();

$privilegesConsts = [];
$constMaxLen      = 0;
foreach ($privileges as $privilege) {
    $value = var_export($privilege->getFullCode(), true);
    $const = strtoupper($privilege->getFullCode());
    $const = str_replace(['-', ' '], ['_', '_'], $const);
    if (strlen($const) > $constMaxLen) $constMaxLen = strlen($const);

    if (!defined(\UnicaenAuth\Provider\Privilege\Privileges::class . '::' . $const)) {
        $privilegesConsts[$const] = $value;
    }
}

asort($privilegesConsts);

$data = '';
foreach ($privilegesConsts as $const => $value) {
    if ('' !== $data) $data .= "\n";
    $data .= "    const " . str_pad($const, $constMaxLen) . " = $value;";
}


$params = [
    'title'      => 'Génération de la classe listant les constantes de privilèges',
    'template'   => 'Privileges',
    'privileges' => $data,
    'filename'   => 'module/Application/src/Provider/Privilege/Privileges.php',
];

$cg->generer($params);
 No newline at end of file
\UnicaenCode\Util::codeGenerator()->generer('privileges');
 No newline at end of file
+1 −38
Changes for code/GenerateTemplateMap.php: 1 added line, 38 removed lines.
Original line number Diff line number Diff line
<?php

use UnicaenCode\Form\AbstractForm;
use UnicaenCode\Form\ElementMaker;
use UnicaenCode\Util;

/**
 * @var $this       \Application\View\Renderer\PhpRenderer
 * @var $controller \Laminas\Mvc\Controller\AbstractController
@@ -12,37 +8,4 @@ use UnicaenCode\Util;
 * @var $viewFile   string
 */

$cg = \UnicaenCode\Util::codeGenerator();

$params = [
    'title'    => 'Génération d\'une TemplateMap pour optimiser le traitement des vues',
    'template' => 'template_map',
    'module' => [
        'label' => 'Module concerné',
        'type'  => 'selectModule',
    ],

    'generator' => function (array $params) {
        $moduleName = $params['module'];
        $module     = Util::introspection()->getModule($moduleName);
        $map        = Util::introspection()->getViews($moduleName);

        $mc = 0;
        foreach ($map as $f) {
            $lc = strlen($f);
            if ($lc > $mc) $mc = $lc;
        }
        $php = '';
        foreach ($map as $f) {
            $c   = $f;
            $php .= "    " . str_pad("'$c'", $mc + 2, ' ') . " => __DIR__ . '/" . $module['viewDir'] . "/$f.phtml',\n";
        }

        $params['filename'] = $module['relPath'] . '/template_map.php';
        $params['map'] = trim($php);

        return $params;
    },
];

$cg->generer($params);
 No newline at end of file
\UnicaenCode\Util::codeGenerator()->generer('templateMap');
 No newline at end of file
Loading