diff --git a/composer.phar b/composer.phar index 295abe4..5001689 100755 Binary files a/composer.phar and b/composer.phar differ diff --git a/config/autoload/.gitignore b/config/autoload/.gitignore index 1a83fda..d74c4d0 100644 --- a/config/autoload/.gitignore +++ b/config/autoload/.gitignore @@ -1,2 +1,4 @@ local.php *.local.php +global.php +*.global.php diff --git a/config/autoload/global.dist.php b/config/autoload/global.dist.php new file mode 100644 index 0000000..e5fc794 --- /dev/null +++ b/config/autoload/global.dist.php @@ -0,0 +1,114 @@ + 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' => 'root', + 'password' => '', + 'dbname' => 'monarc_common', + 'charset' => 'utf8', + 'driverOptions' => array( + PDO::ATTR_STRINGIFY_FETCHES => false, + PDO::ATTR_EMULATE_PREPARES => false, + 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::ATTR_STRINGIFY_FETCHES => false, + PDO::ATTR_EMULATE_PREPARES => false, + 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', + ), + ), + // https://github.com/beberlei/DoctrineExtensions/blob/master/config/mysql.yml + '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/global.php b/config/autoload/global.php index e3b1dc0..34c0904 100644 --- a/config/autoload/global.php +++ b/config/autoload/global.php @@ -22,13 +22,15 @@ return array( 'orm_default' => array( 'driverClass' => 'Doctrine\DBAL\Driver\PDOMySql\Driver', 'params' => array( - 'host' => 'localhost', + 'host' => '127.0.0.1', 'port' => 3306, - 'user' => 'user', - 'password' => 'password', + 'user' => 'root', + 'password' => '', 'dbname' => 'monarc_common', 'charset' => 'utf8', 'driverOptions' => array( + PDO::ATTR_STRINGIFY_FETCHES => false, + PDO::ATTR_EMULATE_PREPARES => false, PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8', ), ), @@ -36,13 +38,15 @@ return array( 'orm_cli' => array( 'driverClass' => 'Doctrine\DBAL\Driver\PDOMySql\Driver', 'params' => array( - 'host' => 'localhost', + 'host' => '127.0.0.1', 'port' => 3306, 'user' => 'root', - 'password' => 'password', + 'password' => '', 'dbname' => 'monarc_cli', 'charset' => 'utf8', 'driverOptions' => array( + PDO::ATTR_STRINGIFY_FETCHES => false, + PDO::ATTR_EMULATE_PREPARES => false, PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8', ), ),