Merge branch 'master' of github.com:mrsuh/mongo-odm into dev

# Conflicts: # src/DBAL.php # src/Document/Document.php # src/DocumentMapper/DataMapper.php # src/DocumentMapper/DataMapperFactory.php
mrsuh · Jul 3, 2017 · c265bb0 · c265bb0
1 parent 298854e
commit c265bb0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -41,7 +41,7 @@ class Note extends ODM\Document\Document
 }
 
 /* Initialize connection */
-$dbal = new ODM\DBAL('127.0.0.1', '27017', 'test2');
+$dbal = new ODM\DBAL('127.0.0.1', '27017', 'test');
 $factory = new ODM\DocumentMapper\DataMapperFactory($dbal);
 
 /* Initialize DataMapper for your Document */

diff --git a/composer.json b/composer.json
@@ -3,7 +3,8 @@
     "description": "mongo odm",
     "type": "library",
     "require": {
-        "mongodb/mongodb": "^1.1"
+        "mongodb/mongodb": "^1.1",
+        "php": "7.*"
     },
     "autoload": {
         "psr-4": { "ODM\\": "src/" }

diff --git a/src/Instantiator/Instantiator.php b/src/Instantiator/Instantiator.php
@@ -4,9 +4,6 @@
 
 class Instantiator
 {
-    const SERIALIZATION_FORMAT_USE_UNSERIALIZER   = 'C';
-    const SERIALIZATION_FORMAT_AVOID_UNSERIALIZER = 'O';
-
     /**
      * @param string $class_name
      * @return mixed