as3io / modlr-persister-mongodb

src/Logger.php

Spacing +3 added lines, -3 removed lines

@@ -46,8 +46,8 @@ 
      */
     public function logQuery(array $query)
     {
-        if (isset($query['batchInsert']) && null !== $this->batchInsertThreshold && $this->batchInsertThreshold <= $query['num']) {
-            $query['data'] = '**'.$query['num'].' item(s)**';
+        if (isset($query[ 'batchInsert' ]) && null !== $this->batchInsertThreshold && $this->batchInsertThreshold <= $query[ 'num' ]) {
+            $query[ 'data' ] = '**'.$query[ 'num' ].' item(s)**';
         }
 
         array_walk_recursive($query, function(&$value, $key) {
@@ -56,7 +56,7 @@ 
                 return;
             }
             if (is_float($value) && is_infinite($value)) {
-                $value = ($value < 0 ? '-' : '') . 'Infinity';
+                $value = ($value < 0 ? '-' : '').'Infinity';
                 return;
             }
             if (is_float($value) && is_nan($value)) {

src/Hydrator.php

Spacing +18 added lines, -18 removed lines

@@ -80,19 +80,19 @@ 
     private function convertRelationships(EntityMetadata $metadata, array $data)
     {
         foreach ($metadata->getRelationships() as $key => $relMeta) {
-            if (!isset($data[$key])) {
+            if (!isset($data[ $key ])) {
                 continue;
             }
-            if (true === $relMeta->isMany() && !is_array($data[$key])) {
-                throw PersisterException::badRequest(sprintf('Relationship key "%s" is a reference many. Expected record data type of array, "%s" found on model "%s" for identifier "%s"', $key, gettype($data[$key]), $type, $identifier));
+            if (true === $relMeta->isMany() && !is_array($data[ $key ])) {
+                throw PersisterException::badRequest(sprintf('Relationship key "%s" is a reference many. Expected record data type of array, "%s" found on model "%s" for identifier "%s"', $key, gettype($data[ $key ]), $type, $identifier));
             }
-            $references = $relMeta->isOne() ? [$data[$key]] : $data[$key];
+            $references = $relMeta->isOne() ? [ $data[ $key ] ] : $data[ $key ];
 
-            $extracted = [];
+            $extracted = [ ];
             foreach ($references as $reference) {
-                $extracted[] =  $this->extractRelationship($relMeta, $reference);
+                $extracted[ ] = $this->extractRelationship($relMeta, $reference);
             }
-            $data[$key] = $relMeta->isOne() ? reset($extracted) : $extracted;
+            $data[ $key ] = $relMeta->isOne() ? reset($extracted) : $extracted;
         }
         return $data;
     }
@@ -107,10 +107,10 @@ 
      */
     private function extractField($key, array $data)
     {
-        if (!isset($data[$key])) {
+        if (!isset($data[ $key ])) {
             throw PersisterException::badRequest(sprintf('Unable to extract a field value. The "%s" key was not found.', $key));
         }
-        return $data[$key];
+        return $data[ $key ];
     }
 
     /**
@@ -125,14 +125,14 @@ 
     private function extractIdAndType(EntityMetadata $metadata, array &$data)
     {
         $identifier = $this->extractField(Persister::IDENTIFIER_KEY, $data);
-        unset($data[Persister::IDENTIFIER_KEY]);
+        unset($data[ Persister::IDENTIFIER_KEY ]);
 
         $key = Persister::POLYMORPHIC_KEY;
         $type = $this->extractType($metadata, $data);
-        if (isset($data[$key])) {
-            unset($data[$key]);
+        if (isset($data[ $key ])) {
+            unset($data[ $key ]);
         }
-        return [$identifier, $type];
+        return [ $identifier, $type ];
     }
 
     /**
@@ -149,9 +149,9 @@ 
         $idKey   = Persister::IDENTIFIER_KEY;
         $typeKey = Persister::POLYMORPHIC_KEY;
 
-        if (true === $simple && is_array($reference) && isset($reference[$idKey])) {
+        if (true === $simple && is_array($reference) && isset($reference[ $idKey ])) {
             return [
-                'id'    => $reference[$idKey],
+                'id'    => $reference[ $idKey ],
                 'type'  => $relMeta->getEntityType(),
             ];
         }
@@ -163,10 +163,10 @@ 
             ];
         }
 
-        if (false === $simple && is_array($reference) && isset($reference[$idKey]) && isset($reference[$typeKey])) {
+        if (false === $simple && is_array($reference) && isset($reference[ $idKey ]) && isset($reference[ $typeKey ])) {
             return [
-                'id'    => $reference[$idKey],
-                'type'  => $reference[$typeKey],
+                'id'    => $reference[ $idKey ],
+                'type'  => $reference[ $typeKey ],
             ];
         }
         throw PersisterException::badRequest('Unable to extract a reference id.');

src/Formatter.php

Spacing +52 added lines, -52 removed lines

@@ -30,11 +30,11 @@ 
      * @var array
      */
     private $ops = [
-        'root'      => ['$and', '$or', '$nor'],
-        'single'    => ['$eq', '$gt', '$gte', '$lt', '$lte', '$ne'],
-        'multiple'  => ['$in', '$nin', '$all'],
-        'recursive' => ['$not', '$elemMatch'],
-        'ignore'    => ['$exists', '$type', '$mod', '$size', '$regex', '$text', '$where'],
+        'root'      => [ '$and', '$or', '$nor' ],
+        'single'    => [ '$eq', '$gt', '$gte', '$lt', '$lte', '$ne' ],
+        'multiple'  => [ '$in', '$nin', '$all' ],
+        'recursive' => [ '$not', '$elemMatch' ],
+        'ignore'    => [ '$exists', '$type', '$mod', '$size', '$regex', '$text', '$where' ],
     ];
 
     /**
@@ -49,23 +49,23 @@ 
      */
     public function formatQuery(EntityMetadata $metadata, Store $store, array $criteria)
     {
-        $formatted = [];
+        $formatted = [ ];
         foreach ($criteria as $key => $value) {
 
             if ($this->isOpType('root', $key) && is_array($value)) {
                 foreach ($value as $subKey => $subValue) {
-                    $formatted[$key][$subKey] = $this->formatQuery($metadata, $store, $subValue);
+                    $formatted[ $key ][ $subKey ] = $this->formatQuery($metadata, $store, $subValue);
                 }
                 continue;
             }
 
             if ($this->isOperator($key) && is_array($value)) {
-                $formatted[$key] = $this->formatQuery($metadata, $store, $value);
+                $formatted[ $key ] = $this->formatQuery($metadata, $store, $value);
                 continue;
             }
 
             list($key, $value) = $this->formatQueryElement($key, $value, $metadata, $store);
-            $formatted[$key] = $value;
+            $formatted[ $key ] = $value;
         }
         return $formatted;
     }
@@ -105,9 +105,9 @@ 
         if (null === $embeds) {
             return;
         }
-        $created = [];
+        $created = [ ];
         foreach ($embeds as $embed) {
-            $created[] = $this->createEmbed($embeddedPropMeta, $embed);
+            $created[ ] = $this->createEmbed($embeddedPropMeta, $embed);
         }
         return empty($created) ? null : $created;
     }
@@ -154,9 +154,9 @@ 
         if (null === $models || true === $relMeta->isInverse) {
             return null;
         }
-        $references = [];
+        $references = [ ];
         foreach ($models as $model) {
-            $references[] = $this->createReference($relMeta, $model);
+            $references[ ] = $this->createReference($relMeta, $model);
         }
         return empty($references) ? null : $references;
     }
@@ -182,7 +182,7 @@ 
      */
     public function getIdentifierFields()
     {
-        return [Persister::IDENTIFIER_KEY, EntityMetadata::ID_KEY];
+        return [ Persister::IDENTIFIER_KEY, EntityMetadata::ID_KEY ];
     }
 
     /**
@@ -192,7 +192,7 @@ 
      */
     public function getTypeFields()
     {
-        return [Persister::POLYMORPHIC_KEY, EntityMetadata::TYPE_KEY];
+        return [ Persister::POLYMORPHIC_KEY, EntityMetadata::TYPE_KEY ];
     }
 
     /**
@@ -241,20 +241,20 @@ 
     {
         $embedMeta = $embeddedPropMeta->embedMeta;
 
-        $obj = [];
+        $obj = [ ];
         foreach ($embedMeta->getAttributes() as $key => $attrMeta) {
             $value = $this->getAttributeDbValue($attrMeta, $embed->get($key));
             if (null === $value) {
                 continue;
             }
-            $obj[$key] = $value;
+            $obj[ $key ] = $value;
         }
         foreach ($embedMeta->getEmbeds() as $key => $propMeta) {
             $value = (true === $propMeta->isOne()) ? $this->getEmbedOneDbValue($propMeta, $embed->get($key)) : $this->getEmbedManyDbValue($propMeta, $embed->get($key));
             if (null === $value) {
                 continue;
             }
-            $obj[$key] = $value;
+            $obj[ $key ] = $value;
         }
         return $obj;
     }
@@ -268,11 +268,11 @@ 
      */
     private function createReference(RelationshipMetadata $relMeta, Model $model)
     {
-        $reference = [];
+        $reference = [ ];
         $identifier = $this->getIdentifierDbValue($model->getId());
         if (true === $relMeta->isPolymorphic()) {
-            $reference[Persister::IDENTIFIER_KEY]  = $identifier;
-            $reference[Persister::POLYMORPHIC_KEY] = $model->getType();
+            $reference[ Persister::IDENTIFIER_KEY ]  = $identifier;
+            $reference[ Persister::POLYMORPHIC_KEY ] = $model->getType();
             return $reference;
         }
         return $identifier;
@@ -311,7 +311,7 @@ 
         }
 
         // Pass remaining elements unconverted.
-        return [$key, $value];
+        return [ $key, $value ];
     }
 
     /**
@@ -335,15 +335,15 @@ 
         if (is_array($value)) {
 
             if (true === $this->hasOperators($value)) {
-                return [$key, $this->formatQueryExpression($value, $converter)];
+                return [ $key, $this->formatQueryExpression($value, $converter) ];
             }
 
-            if (in_array($attrMeta->dataType, ['array', 'object'])) {
-                return [$key, $value];
+            if (in_array($attrMeta->dataType, [ 'array', 'object' ])) {
+                return [ $key, $value ];
             }
-            return [$key, $this->formatQueryExpression(['$in' => $value], $converter)];
+            return [ $key, $this->formatQueryExpression([ '$in' => $value ], $converter) ];
         }
-        return [$key, $converter($value)];
+        return [ $key, $converter($value) ];
     }
 
     /**
@@ -366,30 +366,30 @@ 
         $root = array_shift($parts);
         if (false === $metadata->hasRelationship($root)) {
             // Nothing to format. Allow the dotted field to pass normally.
-            return [$key, $value];
+            return [ $key, $value ];
         }
-        $hasIndex = is_numeric($parts[0]);
+        $hasIndex = is_numeric($parts[ 0 ]);
 
         if (true === $hasIndex) {
-            $subKey = isset($parts[1]) ? $parts[1] : 'id';
+            $subKey = isset($parts[ 1 ]) ? $parts[ 1 ] : 'id';
         } else {
-            $subKey = $parts[0];
+            $subKey = $parts[ 0 ];
         }
 
         if ($this->isIdentifierField($subKey)) {
             // Handle like a regular relationship
             list($key, $value) = $this->formatQueryElementRel($root, $value, $metadata, $store);
-            $key = (true === $hasIndex) ? sprintf('%s.%s', $key, $parts[0]) : $key;
-            return [$key, $value];
+            $key = (true === $hasIndex) ? sprintf('%s.%s', $key, $parts[ 0 ]) : $key;
+            return [ $key, $value ];
         }
 
         if ($this->isTypeField($subKey)) {
             // Handle as a model type field.
             list($key, $value) = $this->formatQueryElementRoot($subKey, $value, $metadata);
-            $key = (true === $hasIndex) ? sprintf('%s.%s.%s', $root, $parts[0], $key) : sprintf('%s.%s', $root, $key);
-            return [$key, $value];
+            $key = (true === $hasIndex) ? sprintf('%s.%s.%s', $root, $parts[ 0 ], $key) : sprintf('%s.%s', $root, $key);
+            return [ $key, $value ];
         }
-        return [$key, $value];
+        return [ $key, $value ];
     }
 
     /**
@@ -415,10 +415,10 @@ 
         }
 
         if (is_array($value)) {
-            $value = (true === $this->hasOperators($value)) ? $value : ['$in' => $value];
-            return [$key, $this->formatQueryExpression($value, $converter)];
+            $value = (true === $this->hasOperators($value)) ? $value : [ '$in' => $value ];
+            return [ $key, $this->formatQueryExpression($value, $converter) ];
         }
-        return [$key, $converter($value)];
+        return [ $key, $converter($value) ];
     }
 
 
@@ -443,10 +443,10 @@ 
 
         $converter = $this->getQueryRootConverter($metadata, $dbKey);
         if (is_array($value)) {
-            $value = (true === $this->hasOperators($value)) ? $value : ['$in' => $value];
-            return [$dbKey, $this->formatQueryExpression($value, $converter)];
+            $value = (true === $this->hasOperators($value)) ? $value : [ '$in' => $value ];
+            return [ $dbKey, $this->formatQueryExpression($value, $converter) ];
         }
-        return [$dbKey, $converter($value)];
+        return [ $dbKey, $converter($value) ];
     }
 
     /**
@@ -461,7 +461,7 @@ 
         foreach ($expression as $key => $value) {
 
             if ('$regex' === $key && !$value instanceof \MongoRegex) {
-                $expression[$key] = new \MongoRegex($value);
+                $expression[ $key ] = new \MongoRegex($value);
                 continue;
             }
 
@@ -470,25 +470,25 @@ 
             }
 
             if (true === $this->isOpType('single', $key)) {
-                $expression[$key] = $converter($value);
+                $expression[ $key ] = $converter($value);
                 continue;
             }
 
             if (true === $this->isOpType('multiple', $key)) {
                 $value = (array) $value;
                 foreach ($value as $subKey => $subValue) {
-                    $expression[$key][$subKey] = $converter($subValue);
+                    $expression[ $key ][ $subKey ] = $converter($subValue);
                 }
                 continue;
             }
 
             if (true === $this->isOpType('recursive', $key)) {
                 $value = (array) $value;
-                $expression[$key] = $this->formatQueryExpression($value, $converter);
+                $expression[ $key ] = $this->formatQueryExpression($value, $converter);
                 continue;
             }
 
-            $expression[$key] = $converter($value);
+            $expression[ $key ] = $converter($value);
         }
         return $expression;
     }
@@ -502,8 +502,8 @@ 
      */
     private function getQueryAttrConverter(Store $store, AttributeMetadata $attrMeta)
     {
-        return function ($value) use ($store, $attrMeta) {
-            if (in_array($attrMeta->dataType, ['object', 'array'])) {
+        return function($value) use ($store, $attrMeta) {
+            if (in_array($attrMeta->dataType, [ 'object', 'array' ])) {
                 // Leave the value as is.
                 return $value;
             }
@@ -577,7 +577,7 @@ 
      */
     private function isOperator($key)
     {
-        return isset($key[0]) && '$' === $key[0];
+        return isset($key[ 0 ]) && '$' === $key[ 0 ];
     }
 
     /**
@@ -589,9 +589,9 @@ 
      */
     private function isOpType($type, $key)
     {
-        if (!isset($this->ops[$type])) {
+        if (!isset($this->ops[ $type ])) {
             return false;
         }
-        return in_array($key, $this->ops[$type]);
+        return in_array($key, $this->ops[ $type ]);
     }
 }

src/Query.php

Spacing +8 added lines, -8 removed lines

@@ -83,7 +83,7 @@ 
      * @param   int             $limit      The number of Models to limit.
      * @return  \Doctrine\MongoDB\Cursor
      */
-    public function executeFind(EntityMetadata $metadata, Store $store, array $criteria, array $fields = [], array $sort = [], $offset = 0, $limit = 0)
+    public function executeFind(EntityMetadata $metadata, Store $store, array $criteria, array $fields = [ ], array $sort = [ ], $offset = 0, $limit = 0)
     {
         $criteria = $this->getFormatter()->formatQuery($metadata, $store, $criteria);
 
@@ -162,7 +162,7 @@ 
         ];
         if (true === $related->isChildEntity()) {
             // The relationship is owned by a polymorphic model. Must include the type in the root criteria.
-            $criteria[Persister::POLYMORPHIC_KEY] = $related->type;
+            $criteria[ Persister::POLYMORPHIC_KEY ] = $related->type;
         }
         return $criteria;
     }
@@ -190,16 +190,16 @@ 
      */
     public function getRetrieveCritiera(EntityMetadata $metadata, $identifiers = null)
     {
-        $criteria = [];
+        $criteria = [ ];
         if (true === $metadata->isChildEntity()) {
-            $criteria[Persister::POLYMORPHIC_KEY] = $metadata->type;
+            $criteria[ Persister::POLYMORPHIC_KEY ] = $metadata->type;
         }
 
         $identifiers = (array) $identifiers;
         if (empty($identifiers)) {
             return $criteria;
         }
-        $criteria[Persister::IDENTIFIER_KEY] = (1 === count($identifiers)) ? reset($identifiers) : $identifiers;
+        $criteria[ Persister::IDENTIFIER_KEY ] = (1 === count($identifiers)) ? reset($identifiers) : $identifiers;
         return $criteria;
     }
 
@@ -283,7 +283,7 @@ 
      */
     private function isSearchQuery(array $criteria)
     {
-        if (isset($criteria['$text'])) {
+        if (isset($criteria[ '$text' ])) {
             return true;
         }
         foreach ($criteria as $key => $value) {
@@ -312,8 +312,8 @@ 
             if ($type !== $include) {
                 PersisterException::badRequest('Field projection mismatch. You cannot both exclude and include fields.');
             }
-            $fields[$key] = $type;
+            $fields[ $key ] = $type;
         }
-        return [$fields, $include];
+        return [ $fields, $include ];
     }
 }

src/SchemaManager.php

Doc Comments -2 removed lines

@@ -16,7 +16,6 @@ 
      * Applies schemata
      *
      * @param   Collection  $collection     The MongoDB Collection
-     * @param   array       $index          Associative array containing index data
      */
     public function createSchemata(Collection $collection, array $schemata)
     {
@@ -31,7 +30,6 @@ 
      * @todo    Implement
      *
      * @param   Collection  $collection     The MongoDB Collection
-     * @param   array       $index              Associative array containing index data
      */
     public function syncSchemata(Collection $collection, array $schemata)
     {

Spacing +3 added lines, -3 removed lines

@@ -21,11 +21,11 @@
     public function createSchemata(Collection $collection, array $schemata)
     {
         foreach ($schemata as $schema) {
-            if (!isset($schema['keys']) || empty($schema['keys'])) {
+            if (!isset($schema[ 'keys' ]) || empty($schema[ 'keys' ])) {
                 throw new \InvalidArgumentException('Cannot create an index with no keys defined.');
             }
-            $schema['options']['background'] = true;
-            $collection->ensureIndex($schema['keys'], $schema['options']);
+            $schema[ 'options' ][ 'background' ] = true;
+            $collection->ensureIndex($schema[ 'keys' ], $schema[ 'options' ]);
         }
     }
 

src/StorageMetadata.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
      *
      * @var array
      */
-    public $schemata = [];
+    public $schemata = [ ];
 
     /**
      * {@inheritDoc}

src/Persister.php

Spacing +17 added lines, -17 removed lines

@@ -27,11 +27,11 @@ 
      * @var array
      */
     private $changeSetMethods = [
-        'attributes'    => ['getAttribute', 'getAttributeDbValue'],
-        'hasOne'        => ['getRelationship', 'getHasOneDbValue'],
-        'hasMany'       => ['getRelationship', 'getHasManyDbValue'],
-        'embedOne'      => ['getEmbed', 'getEmbedOneDbValue'],
-        'embedMany'     => ['getEmbed', 'getEmbedManyDbValue'],
+        'attributes'    => [ 'getAttribute', 'getAttributeDbValue' ],
+        'hasOne'        => [ 'getRelationship', 'getHasOneDbValue' ],
+        'hasMany'       => [ 'getRelationship', 'getHasManyDbValue' ],
+        'embedOne'      => [ 'getEmbed', 'getEmbedOneDbValue' ],
+        'embedMany'     => [ 'getEmbed', 'getEmbedManyDbValue' ],
     ];
 
     /**
@@ -76,7 +76,7 @@ 
     /**
      * {@inheritDoc}
      */
-    public function all(EntityMetadata $metadata, Store $store, array $identifiers = [], array $fields = [], array $sort = [], $offset = 0, $limit = 0)
+    public function all(EntityMetadata $metadata, Store $store, array $identifiers = [ ], array $fields = [ ], array $sort = [ ], $offset = 0, $limit = 0)
     {
         $criteria = $this->getQuery()->getRetrieveCritiera($metadata, $identifiers);
         $cursor = $this->getQuery()->executeFind($metadata, $store, $criteria, $fields, $sort, $offset, $limit);
@@ -109,7 +109,7 @@ 
     public function createSchemata(EntityMetadata $metadata)
     {
         $collection = $this->getQuery()->getModelCollection($metadata);
-        $schemata = $metadata->persistence->schemata ?: [];
+        $schemata = $metadata->persistence->schemata ?: [ ];
         return $this->schemaManager->createSchemata($collection, $schemata);
     }
 
@@ -119,7 +119,7 @@ 
     public function syncSchemata(EntityMetadata $metadata)
     {
         $collection = $this->getQuery()->getModelCollection($metadata);
-        $schemata = $metadata->persistence->schemata ?: [];
+        $schemata = $metadata->persistence->schemata ?: [ ];
         return $this->schemaManager->syncSchemata($collection);
     }
 
@@ -222,7 +222,7 @@ 
     /**
      * {@inheritDoc}
      */
-    public function query(EntityMetadata $metadata, Store $store, array $criteria, array $fields = [], array $sort = [], $offset = 0, $limit = 0)
+    public function query(EntityMetadata $metadata, Store $store, array $criteria, array $fields = [ ], array $sort = [ ], $offset = 0, $limit = 0)
     {
         $cursor = $this->getQuery()->executeFind($metadata, $store, $criteria, $fields, $sort, $offset, $limit);
         return $this->getHydrator()->createCursorRecordSet($metadata, $cursor, $store);
@@ -272,8 +272,8 @@ 
 
         foreach ($this->changeSetMethods as $setKey => $methods) {
             list($metaMethod, $formatMethod) = $methods;
-            foreach ($changeset[$setKey] as $key => $values) {
-                $value = $formatter->$formatMethod($metadata->$metaMethod($key), $values['new']);
+            foreach ($changeset[ $setKey ] as $key => $values) {
+                $value = $formatter->$formatMethod($metadata->$metaMethod($key), $values[ 'new' ]);
                 $obj = $handler($key, $value, $obj);
             }
         }
@@ -293,7 +293,7 @@ 
             $this->getIdentifierKey()   => $this->convertId($model->getId()),
         ];
         if (true === $metadata->isChildEntity()) {
-            $insert[$this->getPolymorphicKey()] = $metadata->type;
+            $insert[ $this->getPolymorphicKey() ] = $metadata->type;
         }
         return $this->appendChangeSet($model, $insert, $this->getCreateChangeSetHandler());
     }
@@ -306,7 +306,7 @@ 
      */
     private function createUpdateObj(Model $model)
     {
-        return $this->appendChangeSet($model, [], $this->getUpdateChangeSetHandler());
+        return $this->appendChangeSet($model, [ ], $this->getUpdateChangeSetHandler());
     }
 
     /**
@@ -316,9 +316,9 @@ 
      */
     private function getCreateChangeSetHandler()
     {
-        return function ($key, $value, $obj) {
+        return function($key, $value, $obj) {
             if (null !== $value) {
-                $obj[$key] = $value;
+                $obj[ $key ] = $value;
             }
             return $obj;
         };
@@ -331,13 +331,13 @@ 
      */
     private function getUpdateChangeSetHandler()
     {
-        return function ($key, $value, $obj) {
+        return function($key, $value, $obj) {
             $op = '$set';
             if (null === $value) {
                 $op = '$unset';
                 $value = 1;
             }
-            $obj[$op][$key] = $value;
+            $obj[ $op ][ $key ] = $value;
             return $obj;
         };
     }

tests/PersisterTest.php

Spacing +16 added lines, -16 removed lines

@@ -125,8 +125,8 @@ 
         $metadata = $this->getMetadata()->persistence;
 
         foreach ($metadata->schemata as $schema) {
-            $this->assertTrue(isset($schema['options']['name']) && !empty($schema['options']['name']), 'index name was not applied to schema');
-            $this->assertSame(stripos($schema['options']['name'], 'modlr_'), 0, '`modlr_` prefix missing from schema name');
+            $this->assertTrue(isset($schema[ 'options' ][ 'name' ]) && !empty($schema[ 'options' ][ 'name' ]), 'index name was not applied to schema');
+            $this->assertSame(stripos($schema[ 'options' ][ 'name' ], 'modlr_'), 0, '`modlr_` prefix missing from schema name');
         }
     }
 
@@ -136,7 +136,7 @@ 
      */
     public function testSchemaRequiresKeys()
     {
-        $schemata = [['options' => ['unique' => true]]];
+        $schemata = [ [ 'options' => [ 'unique' => true ] ] ];
         $metadata = $this->getMetadata($schemata);
     }
 
@@ -146,7 +146,7 @@ 
      */
     public function testSchemaRequiresAtLeastOneKey()
     {
-        $schemata = ['keys' => [], ['options' => ['unique' => true]]];
+        $schemata = [ 'keys' => [ ], [ 'options' => [ 'unique' => true ] ] ];
         $metadata = $this->getMetadata($schemata);
     }
 
@@ -160,7 +160,7 @@ 
         $manager = new Modlr\Persister\MongoDb\SchemaManager;
 
         $schemata = [
-            ['options' => ['unique' => true]]
+            [ 'options' => [ 'unique' => true ] ]
         ];
 
         $manager->createSchemata($collection, $schemata);
@@ -176,7 +176,7 @@ 
         $manager = new Modlr\Persister\MongoDb\SchemaManager;
 
         $schemata = [
-            ['keys' => [], 'options' => ['unique' => true]]
+            [ 'keys' => [ ], 'options' => [ 'unique' => true ] ]
         ];
 
         $manager->createSchemata($collection, $schemata);
@@ -193,36 +193,36 @@ 
         foreach ($metadata->persistence->schemata as $schema) {
             $found = false;
             foreach ($indices as $index) {
-                if ($index['name'] === $schema['options']['name']) {
+                if ($index[ 'name' ] === $schema[ 'options' ][ 'name' ]) {
                     $found = true;
                 }
             }
-            $this->assertTrue($found, sprintf('Index for "%s" was not created!', $schema['options']['name']));
+            $this->assertTrue($found, sprintf('Index for "%s" was not created!', $schema[ 'options' ][ 'name' ]));
         }
     }
 
-    private function getMetadata(array $schemata = [])
+    private function getMetadata(array $schemata = [ ])
     {
         $mapping = [
             'type'          => 'test-model',
             'attributes'    => [
-                'name'          => ['data_type' => 'string'],
-                'active'        => ['data_type' => 'boolean']
+                'name'          => [ 'data_type' => 'string' ],
+                'active'        => [ 'data_type' => 'boolean' ]
             ],
             'persistence'   => [
                 'db'            => self::$dbName,
                 'collection'    => 'test-model',
                 'schemata'      => [
-                    ['keys' => ['name' => 1]],
-                    ['keys' => ['active' => 1], ['options' => ['unique' => true]]]
+                    [ 'keys' => [ 'name' => 1 ] ],
+                    [ 'keys' => [ 'active' => 1 ], [ 'options' => [ 'unique' => true ] ] ]
                 ]
             ]
         ];
         if (!empty($schemata)) {
-            $mapping['persistence']['schemata'] = $schemata;
+            $mapping[ 'persistence' ][ 'schemata' ] = $schemata;
         }
-        $metadata = new Modlr\Metadata\EntityMetadata($mapping['type']);
-        $pmd = $this->smf->createInstance($mapping['persistence']);
+        $metadata = new Modlr\Metadata\EntityMetadata($mapping[ 'type' ]);
+        $pmd = $this->smf->createInstance($mapping[ 'persistence' ]);
         $metadata->setPersistence($pmd);
         $this->smf->handleValidate($metadata);
         return $metadata;

src/StorageMetadataFactory.php

Spacing +10 added lines, -10 removed lines

@@ -37,16 +37,16 @@ 
     {
         $persistence = new StorageMetadata();
 
-        if (isset($mapping['db'])) {
-            $persistence->db = $mapping['db'];
+        if (isset($mapping[ 'db' ])) {
+            $persistence->db = $mapping[ 'db' ];
         }
 
-        if (isset($mapping['collection'])) {
-            $persistence->collection = $mapping['collection'];
+        if (isset($mapping[ 'collection' ])) {
+            $persistence->collection = $mapping[ 'collection' ];
         }
 
-        if (isset($mapping['schemata'])) {
-            $persistence->schemata = $this->rksort($mapping['schemata']);
+        if (isset($mapping[ 'schemata' ])) {
+            $persistence->schemata = $this->rksort($mapping[ 'schemata' ]);
         }
         return $persistence;
     }
@@ -82,7 +82,7 @@ 
         ksort($array);
         foreach ($array as $k => $v) {
             if (is_array($v)) {
-                $array[$k] = $this->rksort($v);
+                $array[ $k ] = $this->rksort($v);
             }
         }
         return $array;
@@ -131,7 +131,7 @@ 
     private function validateIdStrategy(EntityMetadata $metadata)
     {
         $persistence = $metadata->persistence;
-        $validIdStrategies = ['object'];
+        $validIdStrategies = [ 'object' ];
         if (!in_array($persistence->idStrategy, $validIdStrategies)) {
             throw MetadataException::invalidMetadata($metadata->type, sprintf('The persistence id strategy "%s" is invalid. Valid types are "%s"', $persistence->idStrategy, implode('", "', $validIdStrategies)));
         }
@@ -147,10 +147,10 @@ 
     {
         $persistence = $metadata->persistence;
         foreach ($persistence->schemata as $k => $schema) {
-            if (!isset($schema['keys']) || empty($schema['keys'])) {
+            if (!isset($schema[ 'keys' ]) || empty($schema[ 'keys' ])) {
                 throw MetadataException::invalidMetadata($metadata->type, 'At least one key must be specified to define an index.');
             }
-            $persistence->schemata[$k]['options']['name'] = sprintf('modlr_%s', md5(json_encode($schema)));
+            $persistence->schemata[ $k ][ 'options' ][ 'name' ] = sprintf('modlr_%s', md5(json_encode($schema)));
         }
     }
 }