as3io / modlr-persister-mongodb

src/StorageMetadataFactory.php

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 
 use As3\Modlr\Exception\MetadataException;
 use As3\Modlr\Metadata\EntityMetadata;
-use As3\Modlr\Metadata\Interfaces\StorageLayerInterface;
 use As3\Modlr\Metadata\Interfaces\StorageMetadataFactoryInterface;
 use As3\Modlr\Util\EntityUtility;
 

Spacing +5 added lines, -5 removed lines

@@ -38,12 +38,12 @@ 
     {
         $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' ];
         }
         return $persistence;
     }
@@ -113,7 +113,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)));
         }

src/Formatter.php

Doc Comments +1 added lines

@@ -120,6 +120,7 @@
 
     /**
      * {@inheritDoc}
+     * @param string $strategy
      */
     public function getIdentifierDbValue($identifier, $strategy = null)
     {

Spacing +45 added lines, -45 removed lines

@@ -28,11 +28,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' ],
     ];
 
     /**
@@ -47,23 +47,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;
     }
@@ -111,9 +111,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;
     }
@@ -139,7 +139,7 @@ 
      */
     public function getIdentifierFields()
     {
-        return [Persister::IDENTIFIER_KEY, EntityMetadata::ID_KEY];
+        return [ Persister::IDENTIFIER_KEY, EntityMetadata::ID_KEY ];
     }
 
     /**
@@ -149,7 +149,7 @@ 
      */
     public function getTypeFields()
     {
-        return [Persister::POLYMORPHIC_KEY, EntityMetadata::TYPE_KEY];
+        return [ Persister::POLYMORPHIC_KEY, EntityMetadata::TYPE_KEY ];
     }
 
     /**
@@ -196,11 +196,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::TYPE_KEY] = $model->getType();
+            $reference[ Persister::IDENTIFIER_KEY ] = $identifier;
+            $reference[ Persister::TYPE_KEY ] = $model->getType();
             return $reference;
         }
         return $identifier;
@@ -239,7 +239,7 @@ 
         }
 
         // Pass remaining elements unconverted.
-        return [$key, $value];
+        return [ $key, $value ];
     }
 
     /**
@@ -263,15 +263,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) ];
     }
 
     /**
@@ -294,30 +294,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->formatQueryElementType($subKey, $value);
-            $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 ];
     }
 
     /**
@@ -343,10 +343,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) ];
     }
 
 
@@ -371,10 +371,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) ];
     }
 
     /**
@@ -393,25 +393,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;
     }
@@ -425,7 +425,7 @@ 
      */
     private function getQueryAttrConverter(Store $store, AttributeMetadata $attrMeta)
     {
-        return function ($value) use ($store, $attrMeta) {
+        return function($value) use ($store, $attrMeta) {
             $value = $store->convertAttributeValue($attrMeta->dataType, $value);
             return $this->getAttributeDbValue($attrMeta, $value);
         };
@@ -496,7 +496,7 @@ 
      */
     private function isOperator($key)
     {
-        return isset($key[0]) && '$' === $key[0];
+        return isset($key[ 0 ]) && '$' === $key[ 0 ];
     }
 
     /**
@@ -508,9 +508,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/Hydrator.php

Doc Comments -2 removed lines

@@ -57,7 +57,6 @@ 
      * Processes multiple, raw MongoDB results and converts them into an array of standardized Record objects.
      *
      * @param   EntityMetadata  $metadata
-     * @param   array           $data
      * @param   Store           $store
      * @return  Record[]
      */
@@ -117,7 +116,6 @@ 
      * Extracts the identifier and model type from a raw result and removes them from the source data.
      * Returns as a tuple.
      *
-     * @param   string  $key
      * @param   array   $data
      * @return  array
      * @throws  PersisterException

Spacing +20 added lines, -20 removed lines

@@ -63,9 +63,9 @@ 
      */
     public function hydrateMany(EntityMetadata $metadata, array $results, Store $store)
     {
-        $records = [];
+        $records = [ ];
         foreach ($results as $data) {
-            $records[] = $this->hydrateOne($metadata, $data, $store);
+            $records[ ] = $this->hydrateOne($metadata, $data, $store);
         }
         return $records;
     }
@@ -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/Persister.php

Unused Use Statements -3 removed lines

@@ -6,11 +6,8 @@
 use As3\Modlr\Models\Model;
 use As3\Modlr\Models\Collection;
 use As3\Modlr\Metadata\EntityMetadata;
-use As3\Modlr\Metadata\AttributeMetadata;
-use As3\Modlr\Metadata\RelationshipMetadata;
 use As3\Modlr\Persister\PersisterInterface;
 use As3\Modlr\Persister\PersisterException;
-use As3\Modlr\Persister\Record;
 use Doctrine\MongoDB\Connection;
 use \MongoId;
 

Spacing +34 added lines, -34 removed lines

@@ -86,7 +86,7 @@ 
      * {@inheritDoc}
      * @todo    Implement sorting and pagination (limit/skip).
      */
-    public function all(EntityMetadata $metadata, Store $store, array $identifiers = [])
+    public function all(EntityMetadata $metadata, Store $store, array $identifiers = [ ])
     {
         $criteria = $this->getRetrieveCritiera($metadata, $identifiers);
         $cursor = $this->doQuery($metadata, $store, $criteria);
@@ -96,7 +96,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->doQuery($metadata, $store, $criteria);
         return $this->getHydrator()->hydrateMany($metadata, $cursor->toArray(), $store);
@@ -132,32 +132,32 @@ 
     public function create(Model $model)
     {
         $metadata = $model->getMetadata();
-        $insert[$this->getIdentifierKey()] = $this->convertId($model->getId());
+        $insert[ $this->getIdentifierKey() ] = $this->convertId($model->getId());
         if (true === $metadata->isChildEntity()) {
-            $insert[$this->getPolymorphicKey()] = $metadata->type;
+            $insert[ $this->getPolymorphicKey() ] = $metadata->type;
         }
 
         $changeset = $model->getChangeSet();
-        foreach ($changeset['attributes'] as $key => $values) {
-            $value = $this->getFormatter()->getAttributeDbValue($metadata->getAttribute($key), $values['new']);
+        foreach ($changeset[ 'attributes' ] as $key => $values) {
+            $value = $this->getFormatter()->getAttributeDbValue($metadata->getAttribute($key), $values[ 'new' ]);
             if (null === $value) {
                 continue;
             }
-            $insert[$key] = $value;
+            $insert[ $key ] = $value;
         }
-        foreach ($changeset['hasOne'] as $key => $values) {
-            $value = $this->getFormatter()->getHasOneDbValue($metadata->getRelationship($key), $values['new']);
+        foreach ($changeset[ 'hasOne' ] as $key => $values) {
+            $value = $this->getFormatter()->getHasOneDbValue($metadata->getRelationship($key), $values[ 'new' ]);
             if (null === $value) {
                 continue;
             }
-            $insert[$key] = $value;
+            $insert[ $key ] = $value;
         }
-        foreach ($changeset['hasMany'] as $key => $values) {
-            $value = $this->getFormatter()->getHasManyDbValue($metadata->getRelationship($key), $values['new']);
+        foreach ($changeset[ 'hasMany' ] as $key => $values) {
+            $value = $this->getFormatter()->getHasManyDbValue($metadata->getRelationship($key), $values[ 'new' ]);
             if (null === $value) {
                 continue;
             }
-            $insert[$key] = $value;
+            $insert[ $key ] = $value;
         }
         $this->createQueryBuilder($metadata)
             ->insert()
@@ -178,39 +178,39 @@ 
         $criteria = $this->getRetrieveCritiera($metadata, $model->getId());
         $changeset = $model->getChangeSet();
 
-        $update = [];
-        foreach ($changeset['attributes'] as $key => $values) {
-            if (null === $values['new']) {
+        $update = [ ];
+        foreach ($changeset[ 'attributes' ] as $key => $values) {
+            if (null === $values[ 'new' ]) {
                 $op = '$unset';
                 $value = 1;
             } else {
                 $op = '$set';
-                $value = $this->getFormatter()->getAttributeDbValue($metadata->getAttribute($key), $values['new']);
+                $value = $this->getFormatter()->getAttributeDbValue($metadata->getAttribute($key), $values[ 'new' ]);
             }
-            $update[$op][$key] = $value;
+            $update[ $op ][ $key ] = $value;
         }
 
         // @todo Must prevent inverse relationships from persisting
-        foreach ($changeset['hasOne'] as $key => $values) {
-            if (null === $values['new']) {
+        foreach ($changeset[ 'hasOne' ] as $key => $values) {
+            if (null === $values[ 'new' ]) {
                 $op = '$unset';
                 $value = 1;
             } else {
                 $op = '$set';
-                $value = $this->getFormatter()->getHasOneDbValue($metadata->getRelationship($key), $values['new']);
+                $value = $this->getFormatter()->getHasOneDbValue($metadata->getRelationship($key), $values[ 'new' ]);
             }
-            $update[$op][$key] = $value;
+            $update[ $op ][ $key ] = $value;
         }
 
-        foreach ($changeset['hasMany'] as $key => $values) {
-            if (null === $values['new']) {
+        foreach ($changeset[ 'hasMany' ] as $key => $values) {
+            if (null === $values[ 'new' ]) {
                 $op = '$unset';
                 $value = 1;
             } else {
                 $op = '$set';
-                $value = $this->getFormatter()->getHasManyDbValue($metadata->getRelationship($key), $values['new']);
+                $value = $this->getFormatter()->getHasManyDbValue($metadata->getRelationship($key), $values[ 'new' ]);
             }
-            $update[$op][$key] = $value;
+            $update[ $op ][ $key ] = $value;
         }
 
         if (empty($update)) {
@@ -315,7 +315,7 @@ 
      * @param   int             $limit      The number of Models to limit.
      * @return  \Doctrine\MongoDB\Cursor
      */
-    protected function doQuery(EntityMetadata $metadata, Store $store, array $criteria, array $fields = [], array $sort = [], $offset = 0, $limit = 0)
+    protected function doQuery(EntityMetadata $metadata, Store $store, array $criteria, array $fields = [ ], array $sort = [ ], $offset = 0, $limit = 0)
     {
         $criteria = $this->getFormatter()->formatQuery($metadata, $store, $criteria);
         return $this->createQueryBuilder($metadata)
@@ -335,17 +335,17 @@ 
      */
     protected function getInverseCriteria(EntityMetadata $owner, EntityMetadata $related, $identifiers, $inverseField)
     {
-        $criteria[$inverseField] = (array) $identifiers;
+        $criteria[ $inverseField ] = (array) $identifiers;
         if (true === $owner->isChildEntity()) {
             // The owner is owned by a polymorphic model. Must include the type with the inverse field criteria.
-            $criteria[$inverseField] = [
-                $this->getIdentifierKey()   => $criteria[$inverseField],
+            $criteria[ $inverseField ] = [
+                $this->getIdentifierKey()   => $criteria[ $inverseField ],
                 $this->getPolymorphicKey()  => $owner->type,
             ];
         }
         if (true === $related->isChildEntity()) {
             // The relationship is owned by a polymorphic model. Must include the type in the root criteria.
-            $criteria[$this->getPolymorphicKey()] = $related->type;
+            $criteria[ $this->getPolymorphicKey() ] = $related->type;
         }
         return $criteria;
     }
@@ -359,9 +359,9 @@ 
      */
     protected function getRetrieveCritiera(EntityMetadata $metadata, $identifiers = null)
     {
-        $criteria = [];
+        $criteria = [ ];
         if (true === $metadata->isChildEntity()) {
-            $criteria[$this->getPolymorphicKey()] = $metadata->type;
+            $criteria[ $this->getPolymorphicKey() ] = $metadata->type;
         }
 
         if (null === $identifiers) {
@@ -371,7 +371,7 @@ 
         if (empty($identifiers)) {
             return $criteria;
         }
-        $criteria[$this->getIdentifierKey()] = (1 === count($identifiers)) ? $identifiers[0] : $identifiers;
+        $criteria[ $this->getIdentifierKey() ] = (1 === count($identifiers)) ? $identifiers[ 0 ] : $identifiers;
         return $criteria;
     }