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

ZF3 : rétablissement de l'utilisation du mode console

parent 1831fa41

admin/actions/clear-cache.php

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ try { 
    $c->exec([

        "cd $osedir",

        "rm -Rf cache/*",

        "php vendor/bin/doctrine-module orm:generate-proxies",

        "php admin/actions/doctrine.php orm:generate-proxies",

        "chmod -R 777 cache/DoctrineProxy",

        "chmod -R 777 cache/Doctrine",

    ], false);

admin/actions/doctrine.php

0 → 100644
+11 −0
Original line number Diff line number Diff line 
<?php



/* Chargement de la config globale */

require_once dirname(dirname(__DIR__)).'/config/application.config.php';



Application::init();

Application::run();



/* @var $cli \Symfony\Component\Console\Application */

$cli = Application::$container->get('doctrine.cli');

exit($cli->run());
 
 No newline at end of file

admin/actions/test.php

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ try { 
    $c->exec([

        "cd $osedir",

        "rm -Rf cache/*",

        "php vendor/bin/doctrine-module orm:generate-proxies",

        "php admin/actions/doctrine.php orm:generate-proxies",

        "chmod -R 777 cache/DoctrineProxy",

        "chmod -R 777 cache/Doctrine",

    ], false);

config/application.config.php

+2 −7
Original line number Diff line number Diff line 
<?php







include_once dirname(__DIR__).'/module/Application/Application.php';





class AppConfig
@@ -90,7 +90,6 @@ class AppConfig 
            'DoctrineModule',

            'DoctrineORMModule',

            'ZfcUser',

            'BjyAuthorize',

            'UnicaenApp',

            'UnicaenAuth',

            'UnicaenImport',
@@ -134,11 +133,7 @@ class AppConfig 


    private static function inConsole()

    {

        if (class_exists('Zend\Console\Console')){

            return \Zend\Console\Console::isConsole();

        }else{

            return true;

        }

        return PHP_SAPI == 'cli';

    }

module/Application/Application.php

+0 −2
Original line number Diff line number Diff line
@@ -31,8 +31,6 @@ class Application 
        define('REQUEST_MICROTIME', microtime(true));

        chdir($appDir);



        /* Chargement de la config globale */

        require_once $appDir.'/config/application.config.php';



        /* Définition de la config globale, éventuellement à partir du fichier de config général */

        if (AppConfig::get('global', 'affichageErreurs')) {