psfs / nosql

src/NOSQL/Models/NOSQLQuery.php

Spacing +8 added lines, -8 removed lines

@@ -28,7 +28,7 @@ 
         $con = NOSQLParserTrait::initConnection($model, $con);
         $collection = $con->selectCollection($model->getSchema()->name);
         $result = $collection->findOne(['_id' => new ObjectId($pk)]);
-        if(null !== $result) {
+        if (null !== $result) {
             $model->feed($result->getArrayCopy());
         } else {
             throw new ApiException(t('Document not found'), 404);
@@ -55,8 +55,8 @@ 
 
         $resultSet->count = $collection->countDocuments($filters, $nosqlOptions);
 
-        $nosqlOptions["limit"] = (integer)(array_key_exists(self::NOSQL_LIMIT_FIELD, $criteria) ? $criteria[self::NOSQL_LIMIT_FIELD] : Config::getParam('pagination.limit', 50));
-        $nosqlOptions["skip"] = (integer)(array_key_exists(self::NOSQL_PAGE_FIELD, $criteria) ? $criteria[self::NOSQL_PAGE_FIELD] : 0);
+        $nosqlOptions["limit"] = (integer) (array_key_exists(self::NOSQL_LIMIT_FIELD, $criteria) ? $criteria[self::NOSQL_LIMIT_FIELD] : Config::getParam('pagination.limit', 50));
+        $nosqlOptions["skip"] = (integer) (array_key_exists(self::NOSQL_PAGE_FIELD, $criteria) ? $criteria[self::NOSQL_PAGE_FIELD] : 0);
 
         if (array_key_exists(self::NOSQL_SORT_FIELD, $criteria)) {
             $nosqlOptions["sort"] = [];
@@ -67,7 +67,7 @@ 
         $results = $collection->find($filters, $nosqlOptions);
         /** @var  $result */
         $items = $results->toArray();
-        foreach($items as $item) {
+        foreach ($items as $item) {
             $model->feed($item->getArrayCopy(), true);
             $resultSet->items[] = $model->getDtoCopy(true);
         }
@@ -92,7 +92,7 @@ 
         // Check index collation
         $options = [];
         $indexes = $collection->listIndexes();
-        foreach($indexes as $index) {
+        foreach ($indexes as $index) {
             $indexInfo = $index->__debugInfo();
             if (empty(array_diff(array_keys($index["key"]), array_keys($filters)))) {
                 if (array_key_exists("collation", $indexInfo)) {
@@ -104,7 +104,7 @@ 
         }
 
         if (array_key_exists("collation", $options)) {
-            foreach($filters as $key=>$filter) {
+            foreach ($filters as $key=>$filter) {
                 if (is_string($criteria[$key])) {
                     $filters[$key] = $criteria[$key];
                 }
@@ -143,9 +143,9 @@ 
                         break;
                 }
             } elseif (NOSQLBase::NOSQL_TYPE_INTEGER === $property->type) {
-                $filterValue = (integer)$filterValue;
+                $filterValue = (integer) $filterValue;
             } else {
-                $filterValue = (float)$filterValue;
+                $filterValue = (float) $filterValue;
             }
             $filterValue = [
                 '$eq' => $filterValue,

src/NOSQL/Models/NOSQLActiveRecord.php

Spacing +22 added lines, -22 removed lines

@@ -44,7 +44,7 @@ 
      */
     public function getDtoCopy($cleanPk = false) {
         $copy = clone $this->dto;
-        if($cleanPk) {
+        if ($cleanPk) {
             $this->dto->resetPk();
         }
         return $copy;
@@ -60,7 +60,7 @@ 
      */
     public function save(Database $con = null) {
         $saved = false;
-        if(null === $con) {
+        if (null === $con) {
             $con = ParserService::getInstance()->createConnection($this->getDomain());
         }
         $collection = $con->selectCollection($this->getSchema()->name);
@@ -68,7 +68,7 @@ 
             $isInsert = $isUpdate = false;
             $this->prepareData();
             $this->dto->setLastUpdate();
-            if($this->isNew()) {
+            if ($this->isNew()) {
                 $this->preInsert($con);
                 $isInsert = true;
             } elseif ($this->isModified()) {
@@ -76,19 +76,19 @@ 
                 $isUpdate = true;
             }
             $result = $collection->insertOne($this->toArray());
-            if($result->getInsertedCount() > 0) {
+            if ($result->getInsertedCount() > 0) {
                 $id = $result->getInsertedId();
                 $this->dto->setPk($id->jsonSerialize()['$oid']);
-                if($isInsert) {
+                if ($isInsert) {
                     $this->postInsert($con);
-                } elseif($isUpdate) {
+                } elseif ($isUpdate) {
                     $this->postUpdate($con);
                 }
                 $saved = true;
                 $this->countAction();
             }
-        } catch(\Exception $exception) {
-            if($exception instanceof NOSQLValidationException) {
+        } catch (\Exception $exception) {
+            if ($exception instanceof NOSQLValidationException) {
                 throw $exception;
             } else {
                 Logger::log($exception->getMessage(), LOG_CRIT, $this->toArray());
@@ -103,7 +103,7 @@ 
      */
     public function update(Database $con = null) {
         $updated = false;
-        if(null === $con) {
+        if (null === $con) {
             $con = ParserService::getInstance()->createConnection($this->getDomain());
         }
         $collection = $con->selectCollection($this->getSchema()->name);
@@ -117,8 +117,8 @@ 
             $this->postUpdate($con);
             $updated = true;
             $this->countAction();
-        } catch(\Exception $exception) {
-            if($exception instanceof NOSQLValidationException) {
+        } catch (\Exception $exception) {
+            if ($exception instanceof NOSQLValidationException) {
                 throw $exception;
             } else {
                 Logger::log($exception->getMessage(), LOG_CRIT, $this->toArray());
@@ -134,7 +134,7 @@ 
      */
     public function bulkInsert(array $data, Database $con = null) {
         $inserts = 0;
-        if(null === $con) {
+        if (null === $con) {
             $con = ParserService::getInstance()->createConnection($this->getDomain());
         }
         $collection = $con->selectCollection($this->getSchema()->name);
@@ -144,7 +144,7 @@ 
             $ids = $result->getInsertedIds();
             $inserts = $this->parseInsertedDtos($con, $ids, $dtos);
             $this->setActionCount($inserts);
-        } catch(\Exception $exception) {
+        } catch (\Exception $exception) {
             Logger::log($exception->getMessage(), LOG_CRIT, $this->toArray());
         }
         return $inserts;
@@ -158,7 +158,7 @@ 
      * @return int
      */
     public function bulkUpsert(array $data, $id, Database $con = null) {
-        if(null === $con) {
+        if (null === $con) {
             $con = ParserService::getInstance()->createConnection($this->getDomain());
         }
         $collection = $con->selectCollection($this->getSchema()->name);
@@ -168,7 +168,7 @@ 
         try {
             // Check index collation
             $indexes = $collection->listIndexes();
-            foreach($indexes as $index) {
+            foreach ($indexes as $index) {
                 $indexInfo = $index->__debugInfo();
                 $keys = array_keys($index["key"]);
                 if ((count($keys) === 1) && ($keys[0] === $id) && (array_key_exists("collation", $indexInfo))) {
@@ -178,7 +178,7 @@ 
                 }
             }
 
-            foreach($data as $item) {
+            foreach ($data as $item) {
                 $filter[$id] = ['$eq' => $item[$id]];
                 $update = [];
                 $update['$set'] = $item;
@@ -204,7 +204,7 @@ 
      */
     public function delete(Database $con = null) {
         $deleted = false;
-        if(null === $con) {
+        if (null === $con) {
             $con = ParserService::getInstance()->createConnection($this->getDomain());
         }
         $collection = $con->selectCollection($this->getSchema()->name);
@@ -215,7 +215,7 @@ 
             $deleted = true;
             $this->dto = null;
             $this->countAction();
-        } catch(\Exception $exception) {
+        } catch (\Exception $exception) {
             Logger::log($exception->getMessage(), LOG_CRIT, $this->toArray());
         }
         return $deleted;
@@ -229,14 +229,14 @@ 
      */
     public function bulkDelete(array $filters, Database $con = null) {
         $deletedCount = 0;
-        if(null === $con) {
+        if (null === $con) {
             $con = ParserService::getInstance()->createConnection($this->getDomain());
         }
         $collection = $con->selectCollection($this->getSchema()->name);
         try {
             $result = $collection->deleteMany($filters);
             $deletedCount = $result->getDeletedCount();
-        } catch(\Exception $exception) {
+        } catch (\Exception $exception) {
             Logger::log($exception->getMessage(), LOG_CRIT, $this->toArray());
         }
         return $deletedCount;
@@ -253,7 +253,7 @@ 
         $dtos = [];
         /** @var NOSQLModelDto $dto */
         foreach ($data as &$insertData) {
-            if(is_object($insertData) && $insertData instanceof NOSQLModelDto) {
+            if (is_object($insertData) && $insertData instanceof NOSQLModelDto) {
                 $dto = clone $insertData;
             } else {
                 $dto = $this->getDtoCopy(true);
@@ -283,7 +283,7 @@ 
         foreach ($ids as $index => $insertedId) {
             $id = $insertedId->jsonSerialize();
             $dto = $dtos[$index];
-            if($dto instanceof  NOSQLModelDto) {
+            if ($dto instanceof  NOSQLModelDto) {
                 $dto->setPk($id['$oid']);
             } else {
 

src/NOSQL/Services/NOSQLService.php

Spacing +18 added lines, -18 removed lines

@@ -57,9 +57,9 @@ 
      */
     private function extractTypes() {
         $baseClass = new \ReflectionClass(NOSQLBase::class);
-        if(null !== $baseClass) {
+        if (null !== $baseClass) {
             $types = [];
-            foreach($baseClass->getConstants() as $constant) {
+            foreach ($baseClass->getConstants() as $constant) {
                 $types[] = $constant;
             }
             $this->setTypes($types);
@@ -81,10 +81,10 @@ 
     public function getDomains() {
         $domains = [];
         $storedDomains = $this->cache->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . 'domains.json', Cache::JSON, TRUE);
-        if(!empty($storedDomains)) {
-            foreach($storedDomains as $domain => $data) {
+        if (!empty($storedDomains)) {
+            foreach ($storedDomains as $domain => $data) {
                 $domainLabel = str_replace(['@', '/'], '', $domain);
-                if('ROOT' !== $domainLabel) {
+                if ('ROOT' !== $domainLabel) {
                     $domains[] = $domainLabel;
                 }
             }
@@ -100,7 +100,7 @@ 
         $collections = [];
         $path = GeneratorHelper::getDomainPaths($module);
         $schemaFilename = $path['base'] . DIRECTORY_SEPARATOR . $module . DIRECTORY_SEPARATOR . 'Config' . DIRECTORY_SEPARATOR . 'schema.json';
-        if(file_exists($schemaFilename)) {
+        if (file_exists($schemaFilename)) {
             $collections = $this->cache->getDataFromFile($schemaFilename, Cache::JSON, TRUE);
         }
         return $collections;
@@ -123,10 +123,10 @@ 
             '@NOSQL/generator/api.base.php.twig' => CORE_DIR . DIRECTORY_SEPARATOR . $module . DIRECTORY_SEPARATOR . 'Api' . DIRECTORY_SEPARATOR . 'Base',
             '@NOSQL/generator/dto.php.twig' => CORE_DIR . DIRECTORY_SEPARATOR . $module . DIRECTORY_SEPARATOR . 'Dto' . DIRECTORY_SEPARATOR . 'Models',
         ];
-        foreach($collections as $raw) {
+        foreach ($collections as $raw) {
             $collection = new CollectionDto(false);
             $collection->fromArray($raw);
-            foreach($files as $template => $path) {
+            foreach ($files as $template => $path) {
                 GeneratorHelper::createDir($path);
                 $templateDump = $tpl->dump($template, [
                     'domain' => $module,
@@ -134,7 +134,7 @@ 
                     'properties' => $collection->properties,
                 ]);
                 $force = false;
-                if(false !== strpos($template, 'dto') || false !== strpos(strtolower($template), 'base')) {
+                if (false !== strpos($template, 'dto') || false !== strpos(strtolower($template), 'base')) {
                     $force = true;
                 }
                 $this->writeTemplateToFile($templateDump, $path . DIRECTORY_SEPARATOR . $collection->name . '.php', $force);
@@ -172,12 +172,12 @@ 
         try {
             $collection = $db->selectCollection($collectionDto['name']);
             $textIndexes = [];
-            foreach($collectionDto['properties'] as $property) {
-                if(in_array($property['type'], [NOSQLBase::NOSQL_TYPE_STRING, NOSQLBase::NOSQL_TYPE_OBJECT])) {
+            foreach ($collectionDto['properties'] as $property) {
+                if (in_array($property['type'], [NOSQLBase::NOSQL_TYPE_STRING, NOSQLBase::NOSQL_TYPE_OBJECT])) {
                     $textIndexes[$property['name']] = 'text';
                 }
             }
-            if(count($textIndexes)) {
+            if (count($textIndexes)) {
                 $collection->createIndex($textIndexes, ['name' => 'idx_text_' . $collectionDto['name']]);
             }
         } catch (\Exception $exception) {
@@ -194,7 +194,7 @@ 
         $db = ParserService::getInstance()->createConnection($module);
         $collections = $this->getCollections($module);
         $success = true;
-        foreach($collections as $raw) {
+        foreach ($collections as $raw) {
             $jsonSchema = $this->parseCollection($raw);
             try {
                 /** @var BSONDocument $result */
@@ -205,8 +205,8 @@ 
                 ]);
                 $response = $result->getArrayCopy();
                 $success = array_key_exists('ok', $response) && $response['ok'] > 0;
-            } catch(\Exception $exception) {
-                if($exception->getCode() !== 48) {
+            } catch (\Exception $exception) {
+                if ($exception->getCode() !== 48) {
                     $success = false;
                 }
             }
@@ -238,10 +238,10 @@ 
                     $property = new StringPropertyDto(false);
                     break;
             }
-            if(array_key_exists('type', $rawProperty)) {
+            if (array_key_exists('type', $rawProperty)) {
                 $property->bsonType = $rawProperty['type'];
             }
-            if(array_key_exists('description', $rawProperty)) {
+            if (array_key_exists('description', $rawProperty)) {
                 $property->description = $rawProperty['description'];
             }
             if (array_key_exists('required', $rawProperty) && $rawProperty['required']) {
@@ -259,7 +259,7 @@ 
     public function getValidations() {
         $fieldTypes = new \ReflectionClass(Field::class);
         $validations = [];
-        foreach($fieldTypes->getConstants() as $validation) {
+        foreach ($fieldTypes->getConstants() as $validation) {
             $validations[] = $validation;
         }
         return $validations;

src/NOSQL/Models/base/NOSQLParserTrait.php

Spacing +4 added lines, -4 removed lines

@@ -73,18 +73,18 @@
      * @throws \PSFS\base\exception\GeneratorException
      */
     protected function hydrate() {
-        if(empty($this->domain)) {
+        if (empty($this->domain)) {
             throw new NOSQLParserException(t('Domain not defined'), NOSQLParserException::NOSQL_PARSER_DOMAIN_NOT_DEFINED);
         }
         $pahts = GeneratorHelper::getDomainPaths($this->domain);
         $schemaFilename = $pahts['base'] . DIRECTORY_SEPARATOR . $this->domain . DIRECTORY_SEPARATOR . 'Config' . DIRECTORY_SEPARATOR . 'schema.json';
-        if(file_exists($schemaFilename)) {
+        if (file_exists($schemaFilename)) {
             $schema = Cache::getInstance()->getDataFromFile($schemaFilename, Cache::JSON, true);
             $class = get_called_class();
             $this->schema = new CollectionDto(false);
-            foreach($schema as $collection) {
+            foreach ($schema as $collection) {
                 $collectionName = $collection['name'];
-                if(false !== strpos($class, $collectionName)) {
+                if (false !== strpos($class, $collectionName)) {
                     $this->schema->fromArray($collection);
                     break;
                 }