From d07caecaaf2783b174967be873e005f4975bc56c Mon Sep 17 00:00:00 2001
From: Bertrand Gauthier <bertrand.gauthier@unicaen.fr>
Date: Tue, 3 Apr 2018 09:32:40 +0200
Subject: [PATCH] =?UTF-8?q?Modif=20pour=20test=20d=C3=A9ploiement=20avec?=
=?UTF-8?q?=20git?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
config/autoload/README.md | 8 -----
config/autoload/database.local.php.dist | 34 ----------------------
config/autoload/global.php | 2 +-
config/autoload/local.php.dist | 15 ++++++++++
module/ImportData/config/module.config.php | 3 +-
5 files changed, 18 insertions(+), 44 deletions(-)
delete mode 100644 config/autoload/README.md
delete mode 100644 config/autoload/database.local.php.dist
diff --git a/config/autoload/README.md b/config/autoload/README.md
deleted file mode 100644
index 4e504db..0000000
--- a/config/autoload/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-About this directory:
-=====================
-
-By default, this application is configured to load all configs in
-`./config/autoload/{,*.}{global,local}.php`. Doing this provides a
-location for a developer to drop in configuration override files provided by
-modules, as well as cleanly provide individual, application-wide config files
-for things like database connections, etc.
diff --git a/config/autoload/database.local.php.dist b/config/autoload/database.local.php.dist
deleted file mode 100644
index b66b81a..0000000
--- a/config/autoload/database.local.php.dist
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-return [
- 'doctrine' => [
- 'connection' => [
- 'orm_default' => [
- 'driverClass' => 'Doctrine\DBAL\Driver\OCI8\Driver',
- 'params' => [
- 'host' => 'XXXXX',
- 'dbname' => 'XXXXX',
- 'port' => 'XXXXX',
- 'user' => 'XXXXX',
- 'password' => 'XXXXX',
- 'charset' => 'AL32UTF8',
- ],
- ],
- ],
- 'driver' => [
- 'orm_default_xml_driver' => [
- 'class' => 'Doctrine\ORM\Mapping\Driver\XmlDriver',
- 'cache' => 'array',
- 'paths' => [
- __DIR__ . '/../../module/ImportData/src/V1/Entity/Db/Mapping',
- ],
- ],
- 'orm_default' => [
- 'class' => 'Doctrine\ORM\Mapping\Driver\DriverChain',
- 'drivers' => [
- 'ImportData\V1\Entity\Db' => 'orm_default_xml_driver',
- ],
- ],
- ],
- ],
-];
diff --git a/config/autoload/global.php b/config/autoload/global.php
index dbfa43d..809e9e0 100644
--- a/config/autoload/global.php
+++ b/config/autoload/global.php
@@ -5,7 +5,7 @@ return [
],
'db' => [
'adapters' => [
-// 'dummy' => [],
+ 'dummy' => [],
],
],
];
diff --git a/config/autoload/local.php.dist b/config/autoload/local.php.dist
index 79e7412..148b84d 100644
--- a/config/autoload/local.php.dist
+++ b/config/autoload/local.php.dist
@@ -1,5 +1,20 @@
<?php
return [
+ 'doctrine' => [
+ 'connection' => [
+ 'orm_default' => [
+ 'driverClass' => 'Doctrine\DBAL\Driver\OCI8\Driver',
+ 'params' => [
+ 'host' => 'XXXXX',
+ 'dbname' => 'XXXXX',
+ 'port' => 'XXXXX',
+ 'user' => 'XXXXX',
+ 'password' => 'XXXXX',
+ 'charset' => 'AL32UTF8',
+ ],
+ ],
+ ],
+ ],
'zf-mvc-auth' => [
'authentication' => [
'adapters' => [
diff --git a/module/ImportData/config/module.config.php b/module/ImportData/config/module.config.php
index 1abba94..841287f 100644
--- a/module/ImportData/config/module.config.php
+++ b/module/ImportData/config/module.config.php
@@ -1,4 +1,5 @@
<?php
+
return [
'doctrine' => [
'driver' => [
@@ -10,7 +11,7 @@ return [
],
],
'orm_default' => [
- 'class' => \Doctrine\ORM\Mapping\Driver\DriverChain::class,
+ 'class' => \Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain::class,
'drivers' => [
'ImportData\\V1\\Entity\\Db' => 'orm_default_xml_driver',
],
--
GitLab