add defalts

juliangut · Oct 7, 2017 · 430b3b6 · 430b3b6
1 parent 1010c01
commit 430b3b6
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 23 deletions.
diff --git a/README.md b/README.md
@@ -38,35 +38,35 @@ require_once './vendor/autoload.php';
 
 Each kind of manager has its configurations stored on a key in the settings array
 
-* `entity_manager` for `ORM`
-* `mongodb_document_manager` for `MongoDB ODM`
-* `couchdb_document_manager` for `CouchDB ODM`
+* `ManagerBuilder::DEFAULT_RELATIONAL_MANAGER_KEY` ("entity_manager") for `ORM`
+* `ManagerBuilder::DEFAULT_RELATIONAL_MANAGER_KEY` ("mongodb_document_manager") for `MongoDB ODM`
+* `ManagerBuilder::DEFAULT_COUCHDB_MANAGER_KEY` ("couchdb_document_manager") for `CouchDB ODM`
 
 ```php
 [
-    'entity_manager' => [
-        'manager_name' => <manager_builder_configuration>,
-        'manager_name' => <manager_builder_configuration>,
+    ManagerBuilder::DEFAULT_RELATIONAL_MANAGER_KEY => [
+        'manager1_name' => <relational_manager_builder_configuration>,
+        'manager2_name' => <relational_manager_builder_configuration>,
         ...
     ],
-    'mongodb_document_manager' => [
-        'manager_name' => <manager_builder_configuration>,
-        'manager_name' => <manager_builder_configuration>,
+    ManagerBuilder::DEFAULT_RELATIONAL_MANAGER_KEY => [
+        'manager3_name' => <mongodb_manager_builder_configuration>,
+        'manager4_name' => <mongodb_manager_builder_configuration>,
         ...
     ],
-    'couchdb_document_manager' => [
-        'manager_name' => <manager_builder_configuration>,
-        'manager_name' => <manager_builder_configuration>,
+    ManagerBuilder::DEFAULT_COUCHDB_MANAGER_KEY => [
+        'manager5_name' => <couchdb_manager_builder_configuration>,
+        'manager6_name' => <couchdb_manager_builder_configuration>,
         ...
     ],
 ]
 ```
 
 If a manager is not given a name then a default one will be used:
 
-* `entityManager` for `ORM`
-* `mongoDocumentManager` for `MongoDB ODM`
-* `couchDocumentManager` for `CouchDB ODM`
+* `ManagerBuilder::DEFAULT_RELATIONAL_MANAGER_NAME` ("entityManager) for `ORM`
+* `ManagerBuilder::DEFAULT_MONGODB_MANAGER_NAME` ("mongoDocumentManager") for `MongoDB ODM`
+* `ManagerBuilder::DEFAULT_COUCHDB_MANAGER_NAME` ("couchDocumentManager") for `CouchDB ODM`
 
 ### Options
 
@@ -142,7 +142,7 @@ use Slim\App;
 // Probably loaded from a file...
 $settings = [
     'settings.doctrineManagers' => [
-        'mongodb_document_manager' => [
+        ManagerBuilder::DEFAULT_RELATIONAL_MANAGER_KEY => [
             'mainDocumentManager' => [
                 'connection' => [
                     'server' => 'mongodb://localhost:27017',
@@ -196,7 +196,7 @@ $app->get('/', function () {
 
 ## CLI Application builder
 
-`doctrine-manager` is a CLI tool that is installed with this package. It provides the same functionality that Doctrine's ORM `doctrine` CLI tool does but it doesn't need ORM to be installed. Additionally `doctrine-manager` allows you to have numerous managers configured thanks to prepending manager name.
+`doctrine-manager` is a CLI tool that is installed with this package. It provides the same functionality that Doctrine's ORM `doctrine` CLI tool does but it does not need ORM to be installed. Additionally `doctrine-manager` allows you to have numerous managers configured thanks to prepending manager name.
 
 The way to using `doctrine-manager` is the same as with `doctrine` by creating a `cli-config.php` file returning a Symfony\Component\Console\Application
 

diff --git a/src/ManagerBuilder.php b/src/ManagerBuilder.php
@@ -35,10 +35,18 @@ class ManagerBuilder extends AbstractBuilderCollection
     const MONGODB_MANAGER_KEY = 'mongodb_manager_key';
     const COUCHDB_MANAGER_KEY = 'couchdb_manager_key';
 
+    const DEFAULT_RELATIONAL_MANAGER_KEY = 'entity_manager';
+    const DEFAULT_MONGODB_MANAGER_KEY = 'mongodb_document_manager';
+    const DEFAULT_COUCHDB_MANAGER_KEY = 'couchdb_document_manager';
+
     const RELATIONAL_MANAGER_NAME = 'relational_manager_name';
     const MONGODB_MANAGER_NAME = 'mongodb_manager_name';
     const COUCHDB_MANAGER_NAME = 'couchdb_manager_name';
 
+    const DEFAULT_RELATIONAL_MANAGER_NAME = 'entityManager';
+    const DEFAULT_MONGODB_MANAGER_NAME = 'mongoDocumentManager';
+    const DEFAULT_COUCHDB_MANAGER_NAME = 'couchDocumentManager';
+
     /**
      * Global annotation loader control.
      *
@@ -55,12 +63,12 @@ public function __construct(array $options = [])
     {
         $options = array_merge(
             [
-                static::RELATIONAL_MANAGER_KEY => 'entity_manager',
-                static::MONGODB_MANAGER_KEY => 'mongodb_document_manager',
-                static::COUCHDB_MANAGER_KEY => 'couchdb_document_manager',
-                static::RELATIONAL_MANAGER_NAME => 'entityManager',
-                static::MONGODB_MANAGER_NAME => 'mongoDocumentManager',
-                static::COUCHDB_MANAGER_NAME => 'couchDocumentManager',
+                static::RELATIONAL_MANAGER_KEY => static::DEFAULT_RELATIONAL_MANAGER_KEY,
+                static::MONGODB_MANAGER_KEY => static::DEFAULT_MONGODB_MANAGER_KEY,
+                static::COUCHDB_MANAGER_KEY => static::DEFAULT_COUCHDB_MANAGER_KEY,
+                static::RELATIONAL_MANAGER_NAME => static::DEFAULT_RELATIONAL_MANAGER_NAME,
+                static::MONGODB_MANAGER_NAME => static::DEFAULT_MONGODB_MANAGER_NAME,
+                static::COUCHDB_MANAGER_NAME => static::DEFAULT_COUCHDB_MANAGER_NAME,
             ],
             $options
         );