From 21479ce9a592d576d41a3bca0f487e9fd819ff42 Mon Sep 17 00:00:00 2001 From: Jerome De Almeida Date: Tue, 10 Jan 2017 16:44:04 +0100 Subject: [PATCH] delete .dist not used --- config/autoload/config.local.php.dist | 10 --- config/autoload/database.local.php.dist | 24 ----- config/autoload/global.php | 109 ----------------------- config/autoload/languages.local.php.dist | 30 ------- config/autoload/local.php.dist | 7 -- 5 files changed, 180 deletions(-) delete mode 100755 config/autoload/config.local.php.dist delete mode 100644 config/autoload/database.local.php.dist delete mode 100644 config/autoload/global.php delete mode 100644 config/autoload/languages.local.php.dist diff --git a/config/autoload/config.local.php.dist b/config/autoload/config.local.php.dist deleted file mode 100755 index b02dce4..0000000 --- a/config/autoload/config.local.php.dist +++ /dev/null @@ -1,10 +0,0 @@ - [ - 1 => 'Français', - 2 => 'English', - 3 => 'Deutsch' - ], - 'defaultLanguageIndex' => 2 -]; \ No newline at end of file diff --git a/config/autoload/database.local.php.dist b/config/autoload/database.local.php.dist deleted file mode 100644 index 2e30aae..0000000 --- a/config/autoload/database.local.php.dist +++ /dev/null @@ -1,24 +0,0 @@ - array( - 'connection' => array( - 'orm_default' => array( - 'params' => array( - 'host' => '@db.host@', - 'user' => '@db.username@', - 'password' => '@db.password@', - 'dbname' => '@db.name@', - ) - ), - 'orm_cli' => array( - 'params' => array( - 'host' => '@db.host@', - 'user' => '@db.username@', - 'password' => '@db.password@', - 'dbname' => '@db.name@', - ) - ) - ) - ) -); diff --git a/config/autoload/global.php b/config/autoload/global.php deleted file mode 100644 index 39d5722..0000000 --- a/config/autoload/global.php +++ /dev/null @@ -1,109 +0,0 @@ - array( - 'factories' => array( - 'doctrine.cache.mycache' => 'MonarcCore\Service\DoctrineCacheServiceFactory', - ), - ), - 'doctrine' => array( - 'connection' => array( - 'orm_default' => array( - 'driverClass' => 'Doctrine\DBAL\Driver\PDOMySql\Driver', - 'params' => array( - 'host' => 'localhost', - 'port' => 3306, - 'user' => 'user', - 'password' => '', - 'dbname' => 'monarc_common', - 'charset' => 'utf8', - 'driverOptions' => array( - PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8', - ), - ), - ), - 'orm_cli' => array( - 'driverClass' => 'Doctrine\DBAL\Driver\PDOMySql\Driver', - 'params' => array( - 'host' => 'localhost', - 'port' => 3306, - 'user' => 'root', - 'password' => '', - 'dbname' => 'monarc_cli', - 'charset' => 'utf8', - 'driverOptions' => array( - PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8', - ), - ), - ), - ), - /*'migrations_configuration' => array( - 'orm_default' => array( - 'name' => 'Monarc Migrations', - 'directory' => __DIR__."/../../migrations", - 'namespace' => 'Monarc\Migrations', - 'table' => 'migrations', - 'column' => 'version', - ), - 'orm_cli' => array( - 'name' => 'Monarc Common Migrations', - 'directory' => __DIR__."/../../migrations", - 'namespace' => 'MonarcCli\Migrations', - 'table' => 'migrations', - 'column' => 'version', - ), - ),*/ - 'entitymanager' => array( - 'orm_default' => array( - 'connection' => 'orm_default', - 'configuration' => 'orm_default' - ), - 'orm_cli' => array( - 'connection' => 'orm_cli', - 'configuration' => 'orm_cli', - ), - ), - 'configuration' => array( - 'orm_default' => array( - 'metadata_cache' => 'mycache', - 'query_cache' => 'mycache', - 'result_cache' => 'mycache', - 'driver' => 'orm_default', // This driver will be defined later - 'generate_proxies' => true, - 'proxy_dir' => 'data/DoctrineORMModule/Proxy', - 'proxy_namespace' => 'DoctrineORMModule\Proxy', - 'filters' => array(), - 'datetime_functions' => array(), - 'string_functions' => array(), - 'numeric_functions' => array(), - 'second_level_cache' => array(), - ), - 'orm_cli' => array( - 'metadata_cache' => 'mycache', - 'query_cache' => 'mycache', - 'result_cache' => 'mycache', - 'driver' => 'orm_cli', // This driver will be defined later - 'generate_proxies' => true, - 'proxy_dir' => 'data/DoctrineORMModule/Proxy', - 'proxy_namespace' => 'DoctrineORMModule\Proxy', - 'filters' => array(), - 'datetime_functions' => array(), - 'string_functions' => array(), - 'numeric_functions' => array(), - 'second_level_cache' => array(), - ), - ), - ), - // END DOCTRINE CONF -); diff --git a/config/autoload/languages.local.php.dist b/config/autoload/languages.local.php.dist deleted file mode 100644 index fbc7c8b..0000000 --- a/config/autoload/languages.local.php.dist +++ /dev/null @@ -1,30 +0,0 @@ - [ - 1 => 'Français', - 2 => 'English', - 3 => 'Deutsch' - ], - - 'defaultLanguageIndex' => 1, - - /* Link with (ModuleCore) - config['languages'] = [ - 'fr' => array( - 'index' => 1, - 'label' => 'Français' - ), - 'en' => array( - 'index' => 2, - 'label' => 'English' - ), - 'de' => array( - 'index' => 3, - 'label' => 'Deutsch' - ), - ] - */ - - 'activeLanguages' => array('fr','en','de',) -); diff --git a/config/autoload/local.php.dist b/config/autoload/local.php.dist index f20e523..a726764 100644 --- a/config/autoload/local.php.dist +++ b/config/autoload/local.php.dist @@ -33,13 +33,6 @@ return array( ), ), - 'languages' => [ - 1 => 'Français', - 2 => 'English', - 3 => 'Deutsch' - ], - 'defaultLanguageIndex' => 2, - /* Link with (ModuleCore) config['languages'] = [ 'fr' => array(