Merge pull request #55 from alcaeus/fix-hash-numeric-keys

Fix type conversion of objects with numeric keys

lib/Alcaeus/MongoDbAdapter/TypeConverter.php

@@ -148,14 +148,10 @@ class TypeConverter
      */
     private static function ensureCorrectType(array $array, $wasObject = false)
     {
-        if ($array === [] && $wasObject) {
-            return (object) $array;
+        if ($wasObject || ! static::isNumericArray($array)) {
+            return new Model\BSONDocument($array);
         }
 
-        if (static::isNumericArray($array)) {
-            return $array;
-        }
-
-        return new Model\BSONDocument($array);
+        return $array;
     }
 }

tests/Alcaeus/MongoDbAdapter/FunctionsTest.php → tests/Alcaeus/MongoDbAdapter/Mongo/FunctionsTest.php

@@ -1,6 +1,8 @@
 <?php
 
-namespace Alcaeus\MongoDbAdapter\Tests;
+namespace Alcaeus\MongoDbAdapter\Tests\Mongo;
+
+use Alcaeus\MongoDbAdapter\Tests\TestCase;
 
 /**
  * @author alcaeus <alcaeus@alcaeus.org>

tests/Alcaeus/MongoDbAdapter/MongoBinDataTest.php → tests/Alcaeus/MongoDbAdapter/Mongo/MongoBinDataTest.php

@@ -1,6 +1,8 @@
 <?php
 
-namespace Alcaeus\MongoDbAdapter\Tests;
+namespace Alcaeus\MongoDbAdapter\Tests\Mongo;
+
+use Alcaeus\MongoDbAdapter\Tests\TestCase;
 use Alcaeus\MongoDbAdapter\TypeInterface;
 
 /**

tests/Alcaeus/MongoDbAdapter/MongoClientTest.php → tests/Alcaeus/MongoDbAdapter/Mongo/MongoClientTest.php

@@ -1,6 +1,8 @@
 <?php
 
-namespace Alcaeus\MongoDbAdapter\Tests;
+namespace Alcaeus\MongoDbAdapter\Tests\Mongo;
+
+use Alcaeus\MongoDbAdapter\Tests\TestCase;
 
 /**
  * @author alcaeus <alcaeus@alcaeus.org>

tests/Alcaeus/MongoDbAdapter/MongoCodeTest.php → tests/Alcaeus/MongoDbAdapter/Mongo/MongoCodeTest.php

@@ -1,6 +1,8 @@
 <?php
 
-namespace Alcaeus\MongoDbAdapter\Tests;
+namespace Alcaeus\MongoDbAdapter\Tests\Mongo;
+
+use Alcaeus\MongoDbAdapter\Tests\TestCase;
 use Alcaeus\MongoDbAdapter\TypeInterface;
 
 /**

tests/Alcaeus/MongoDbAdapter/MongoCollectionTest.php → tests/Alcaeus/MongoDbAdapter/Mongo/MongoCollectionTest.php

@@ -1,7 +1,9 @@
 <?php
 
-namespace Alcaeus\MongoDbAdapter\Tests;
+namespace Alcaeus\MongoDbAdapter\Tests\Mongo;
+
 use MongoDB\Driver\ReadPreference;
+use Alcaeus\MongoDbAdapter\Tests\TestCase;
 
 /**
  * @author alcaeus <alcaeus@alcaeus.org>

tests/Alcaeus/MongoDbAdapter/MongoCommandCursorTest.php → tests/Alcaeus/MongoDbAdapter/Mongo/MongoCommandCursorTest.php

@@ -1,8 +1,9 @@
 <?php
 
-namespace Alcaeus\MongoDbAdapter\Tests;
+namespace Alcaeus\MongoDbAdapter\Tests\Mongo;
+
 use MongoDB\Driver\ReadPreference;
-use MongoDB\Operation\Find;
+use Alcaeus\MongoDbAdapter\Tests\TestCase;
 
 /**
  * @author alcaeus <alcaeus@alcaeus.org>

tests/Alcaeus/MongoDbAdapter/MongoCursorTest.php → tests/Alcaeus/MongoDbAdapter/Mongo/MongoCursorTest.php

@@ -1,6 +1,8 @@
 <?php
 
-namespace Alcaeus\MongoDbAdapter\Tests;
+namespace Alcaeus\MongoDbAdapter\Tests\Mongo;
+
+use Alcaeus\MongoDbAdapter\Tests\TestCase;
 use Alcaeus\MongoDbAdapter\TypeConverter;
 use MongoDB\Driver\ReadPreference;
 use MongoDB\Operation\Find;

tests/Alcaeus/MongoDbAdapter/MongoDBRefTest.php → tests/Alcaeus/MongoDbAdapter/Mongo/MongoDBRefTest.php

@@ -1,6 +1,8 @@
 <?php
 
-namespace Alcaeus\MongoDbAdapter\Tests;
+namespace Alcaeus\MongoDbAdapter\Tests\Mongo;
+
+use Alcaeus\MongoDbAdapter\Tests\TestCase;
 
 /**
  * @author alcaeus <alcaeus@alcaeus.org>

tests/Alcaeus/MongoDbAdapter/MongoDBTest.php → tests/Alcaeus/MongoDbAdapter/Mongo/MongoDBTest.php

@@ -1,6 +1,8 @@
 <?php
 
-namespace Alcaeus\MongoDbAdapter\Tests;
+namespace Alcaeus\MongoDbAdapter\Tests\Mongo;
+
+use Alcaeus\MongoDbAdapter\Tests\TestCase;
 use MongoDB\Driver\ReadPreference;
 
 /**

tests/Alcaeus/MongoDbAdapter/MongoDateTest.php → tests/Alcaeus/MongoDbAdapter/Mongo/MongoDateTest.php

@@ -1,6 +1,8 @@
 <?php
 
-namespace Alcaeus\MongoDbAdapter\Tests;
+namespace Alcaeus\MongoDbAdapter\Tests\Mongo;
+
+use Alcaeus\MongoDbAdapter\Tests\TestCase;
 use Alcaeus\MongoDbAdapter\TypeInterface;
 
 /**

tests/Alcaeus/MongoDbAdapter/MongoDeleteBatchTest.php → tests/Alcaeus/MongoDbAdapter/Mongo/MongoDeleteBatchTest.php

@@ -1,6 +1,8 @@
 <?php
 
-namespace Alcaeus\MongoDbAdapter\Tests;
+namespace Alcaeus\MongoDbAdapter\Tests\Mongo;
+
+use Alcaeus\MongoDbAdapter\Tests\TestCase;
 
 class MongoDeleteBatchTest extends TestCase
 {

tests/Alcaeus/MongoDbAdapter/MongoGridFSCursorTest.php → tests/Alcaeus/MongoDbAdapter/Mongo/MongoGridFSCursorTest.php

@@ -1,6 +1,8 @@
 <?php
 
-namespace Alcaeus\MongoDbAdapter\Tests;
+namespace Alcaeus\MongoDbAdapter\Tests\Mongo;
+
+use Alcaeus\MongoDbAdapter\Tests\TestCase;
 
 class MongoGridFSCursorTest extends TestCase
 {

tests/Alcaeus/MongoDbAdapter/MongoGridFSFileTest.php → tests/Alcaeus/MongoDbAdapter/Mongo/MongoGridFSFileTest.php

@@ -1,6 +1,8 @@
 <?php
 
-namespace Alcaeus\MongoDbAdapter\Tests;
+namespace Alcaeus\MongoDbAdapter\Tests\Mongo;
+
+use Alcaeus\MongoDbAdapter\Tests\TestCase;
 
 class MongoGridFSFileTest extends TestCase
 {

tests/Alcaeus/MongoDbAdapter/MongoGridFSTest.php → tests/Alcaeus/MongoDbAdapter/Mongo/MongoGridFSTest.php

@@ -1,6 +1,8 @@
 <?php
 
-namespace Alcaeus\MongoDbAdapter\Tests;
+namespace Alcaeus\MongoDbAdapter\Tests\Mongo;
+
+use Alcaeus\MongoDbAdapter\Tests\TestCase;
 
 class MongoGridFSTest extends TestCase
 {

tests/Alcaeus/MongoDbAdapter/MongoIdTest.php → tests/Alcaeus/MongoDbAdapter/Mongo/MongoIdTest.php

@@ -1,6 +1,8 @@
 <?php
 
-namespace Alcaeus\MongoDbAdapter\Tests;
+namespace Alcaeus\MongoDbAdapter\Tests\Mongo;
+
+use Alcaeus\MongoDbAdapter\Tests\TestCase;
 use MongoDB\BSON\ObjectID;
 
 /**

tests/Alcaeus/MongoDbAdapter/MongoInsertBatchTest.php → tests/Alcaeus/MongoDbAdapter/Mongo/MongoInsertBatchTest.php

@@ -1,6 +1,8 @@
 <?php
 
-namespace Alcaeus\MongoDbAdapter\Tests;
+namespace Alcaeus\MongoDbAdapter\Tests\Mongo;
+
+use Alcaeus\MongoDbAdapter\Tests\TestCase;
 
 class MongoInsertBatchTest extends TestCase
 {

tests/Alcaeus/MongoDbAdapter/MongoLogTest.php → tests/Alcaeus/MongoDbAdapter/Mongo/MongoLogTest.php

@@ -1,6 +1,8 @@
 <?php
 
-namespace Alcaeus\MongoDbAdapter\Tests;
+namespace Alcaeus\MongoDbAdapter\Tests\Mongo;
+
+use Alcaeus\MongoDbAdapter\Tests\TestCase;
 
 class MongoLogTest extends \PHPUnit_Framework_Testcase
 {

tests/Alcaeus/MongoDbAdapter/MongoMaxKeyTest.php → tests/Alcaeus/MongoDbAdapter/Mongo/MongoMaxKeyTest.php

@@ -1,6 +1,8 @@
 <?php
 
-namespace Alcaeus\MongoDbAdapter\Tests;
+namespace Alcaeus\MongoDbAdapter\Tests\Mongo;
+
+use Alcaeus\MongoDbAdapter\Tests\TestCase;
 use Alcaeus\MongoDbAdapter\TypeInterface;
 
 /**

tests/Alcaeus/MongoDbAdapter/MongoMinKeyTest.php → tests/Alcaeus/MongoDbAdapter/Mongo/MongoMinKeyTest.php

@@ -1,6 +1,8 @@
 <?php
 
-namespace Alcaeus\MongoDbAdapter\Tests;
+namespace Alcaeus\MongoDbAdapter\Tests\Mongo;
+
+use Alcaeus\MongoDbAdapter\Tests\TestCase;
 use Alcaeus\MongoDbAdapter\TypeInterface;
 
 /**

tests/Alcaeus/MongoDbAdapter/MongoRegexTest.php → tests/Alcaeus/MongoDbAdapter/Mongo/MongoRegexTest.php

@@ -1,6 +1,8 @@
 <?php
 
-namespace Alcaeus\MongoDbAdapter\Tests;
+namespace Alcaeus\MongoDbAdapter\Tests\Mongo;
+
+use Alcaeus\MongoDbAdapter\Tests\TestCase;
 use Alcaeus\MongoDbAdapter\TypeInterface;
 
 /**

tests/Alcaeus/MongoDbAdapter/MongoTimestampTest.php → tests/Alcaeus/MongoDbAdapter/Mongo/MongoTimestampTest.php

@@ -1,6 +1,8 @@
 <?php
 
-namespace Alcaeus\MongoDbAdapter\Tests;
+namespace Alcaeus\MongoDbAdapter\Tests\Mongo;
+
+use Alcaeus\MongoDbAdapter\Tests\TestCase;
 use Alcaeus\MongoDbAdapter\TypeInterface;
 
 /**

tests/Alcaeus/MongoDbAdapter/MongoUpdateBatchTest.php → tests/Alcaeus/MongoDbAdapter/Mongo/MongoUpdateBatchTest.php

@@ -1,6 +1,8 @@
 <?php
 
-namespace Alcaeus\MongoDbAdapter\Tests;
+namespace Alcaeus\MongoDbAdapter\Tests\Mongo;
+
+use Alcaeus\MongoDbAdapter\Tests\TestCase;
 
 class MongoUpdateBatchTest extends TestCase
 {

tests/Alcaeus/MongoDbAdapter/TypeConverterTest.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace Alcaeus\MongoDbAdapter\Tests;
+
+use MongoDB\BSON;
+use MongoDB\Driver\Exception;
+use Alcaeus\MongoDbAdapter\TypeConverter;
+use MongoDB\Model\BSONDocument;
+
+class TypeConverterTest extends TestCase
+{
+    /**
+     * @dataProvider converterData
+     */
+    public function testFromLegacy($legacyValue, $modernValue)
+    {
+        $this->skipTestIf(extension_loaded('mongo'));
+        $this->assertEquals($modernValue, TypeConverter::fromLegacy($legacyValue));
+    }
+
+    public static function converterData()
+    {
+        $id = str_repeat('0123', 6);
+
+        return [
+            'objectId' => [
+                new \MongoId($id), new BSON\ObjectID($id)
+            ],
+            'numericArray' => [
+                ['foo', 'bar'], ['foo', 'bar']
+            ],
+            'hashWithNumericKeys' => [
+                (object) ['foo', 'bar'], new BSONDocument(['foo', 'bar'])
+            ],
+            'hash' => [
+                ['foo' => 'bar'], new BSONDocument(['foo' => 'bar'])
+            ],
+            'nestedArrays' => [
+                [['foo' => 'bar']], [new BSONDocument(['foo' => 'bar'])]
+            ],
+        ];
+    }
+}