@@ -74,18 +74,18 @@ |
||
74 | 74 | * @throws \PSFS\base\exception\GeneratorException |
75 | 75 | */ |
76 | 76 | protected function hydrate() { |
77 | - if(empty($this->domain)) { |
|
77 | + if (empty($this->domain)) { |
|
78 | 78 | throw new NOSQLParserException(t('Domain not defined'), NOSQLParserException::NOSQL_PARSER_DOMAIN_NOT_DEFINED); |
79 | 79 | } |
80 | 80 | $paths = NOSQLService::getDomainPaths($this->domain); |
81 | 81 | $schemaFilename = $paths['base'] . 'Config' . DIRECTORY_SEPARATOR . 'schema.json'; |
82 | - if(file_exists($schemaFilename)) { |
|
82 | + if (file_exists($schemaFilename)) { |
|
83 | 83 | $schema = Cache::getInstance()->getDataFromFile($schemaFilename, Cache::JSON, true); |
84 | 84 | $class = get_called_class(); |
85 | 85 | $this->schema = new CollectionDto(false); |
86 | - foreach($schema as $collection) { |
|
86 | + foreach ($schema as $collection) { |
|
87 | 87 | $collectionName = $collection['name']; |
88 | - if(false !== strpos($class, $collectionName)) { |
|
88 | + if (false !== strpos($class, $collectionName)) { |
|
89 | 89 | $this->schema->fromArray($collection); |
90 | 90 | break; |
91 | 91 | } |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | */ |
45 | 45 | public function getDtoCopy($cleanPk = false) { |
46 | 46 | $copy = clone $this->dto; |
47 | - if($cleanPk) { |
|
47 | + if ($cleanPk) { |
|
48 | 48 | $this->dto->resetPk(); |
49 | 49 | } |
50 | 50 | return $copy; |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | */ |
61 | 61 | public function save(Database $con = null) { |
62 | 62 | $saved = false; |
63 | - if(null === $con) { |
|
63 | + if (null === $con) { |
|
64 | 64 | $con = ParserService::getInstance()->createConnection($this->getDomain()); |
65 | 65 | } |
66 | 66 | $collection = $con->selectCollection($this->getSchema()->name); |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | $isInsert = $isUpdate = false; |
69 | 69 | $this->prepareData(); |
70 | 70 | $this->dto->setLastUpdate(); |
71 | - if($this->isNew()) { |
|
71 | + if ($this->isNew()) { |
|
72 | 72 | $this->preInsert($con); |
73 | 73 | $isInsert = true; |
74 | 74 | } elseif ($this->isModified()) { |
@@ -76,19 +76,19 @@ discard block |
||
76 | 76 | $isUpdate = true; |
77 | 77 | } |
78 | 78 | $result = $collection->insertOne($this->toArray()); |
79 | - if($result->getInsertedCount() > 0) { |
|
79 | + if ($result->getInsertedCount() > 0) { |
|
80 | 80 | $id = $result->getInsertedId(); |
81 | 81 | $this->dto->setPk($id->jsonSerialize()['$oid']); |
82 | - if($isInsert) { |
|
82 | + if ($isInsert) { |
|
83 | 83 | $this->postInsert($con); |
84 | - } elseif($isUpdate) { |
|
84 | + } elseif ($isUpdate) { |
|
85 | 85 | $this->postUpdate($con); |
86 | 86 | } |
87 | 87 | $saved = true; |
88 | 88 | $this->countAction(); |
89 | 89 | } |
90 | - } catch(\Exception $exception) { |
|
91 | - if($exception instanceof NOSQLValidationException) { |
|
90 | + } catch (\Exception $exception) { |
|
91 | + if ($exception instanceof NOSQLValidationException) { |
|
92 | 92 | throw $exception; |
93 | 93 | } else { |
94 | 94 | Logger::log($exception->getMessage(), LOG_CRIT, $this->toArray()); |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | */ |
104 | 104 | public function update(Database $con = null) { |
105 | 105 | $updated = false; |
106 | - if(null === $con) { |
|
106 | + if (null === $con) { |
|
107 | 107 | $con = ParserService::getInstance()->createConnection($this->getDomain()); |
108 | 108 | } |
109 | 109 | $collection = $con->selectCollection($this->getSchema()->name); |
@@ -117,8 +117,8 @@ discard block |
||
117 | 117 | $this->postUpdate($con); |
118 | 118 | $updated = true; |
119 | 119 | $this->countAction(); |
120 | - } catch(\Exception $exception) { |
|
121 | - if($exception instanceof NOSQLValidationException) { |
|
120 | + } catch (\Exception $exception) { |
|
121 | + if ($exception instanceof NOSQLValidationException) { |
|
122 | 122 | throw $exception; |
123 | 123 | } else { |
124 | 124 | Logger::log($exception->getMessage(), LOG_CRIT, $this->toArray()); |
@@ -134,7 +134,7 @@ discard block |
||
134 | 134 | */ |
135 | 135 | public function bulkInsert(array $data, Database $con = null) { |
136 | 136 | $inserts = 0; |
137 | - if(null === $con) { |
|
137 | + if (null === $con) { |
|
138 | 138 | $con = ParserService::getInstance()->createConnection($this->getDomain()); |
139 | 139 | } |
140 | 140 | $collection = $con->selectCollection($this->getSchema()->name); |
@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | $ids = $result->getInsertedIds(); |
145 | 145 | $inserts = $this->parseInsertedDtos($con, $ids, $dtos); |
146 | 146 | $this->setActionCount($inserts); |
147 | - } catch(\Exception $exception) { |
|
147 | + } catch (\Exception $exception) { |
|
148 | 148 | Logger::log($exception->getMessage(), LOG_CRIT, $this->toArray()); |
149 | 149 | } |
150 | 150 | return $inserts; |
@@ -158,7 +158,7 @@ discard block |
||
158 | 158 | * @return int |
159 | 159 | */ |
160 | 160 | public function bulkUpsert(array $data, $id, Database $con = null) { |
161 | - if(null === $con) { |
|
161 | + if (null === $con) { |
|
162 | 162 | $con = ParserService::getInstance()->createConnection($this->getDomain()); |
163 | 163 | } |
164 | 164 | $collection = $con->selectCollection($this->getSchema()->name); |
@@ -168,7 +168,7 @@ discard block |
||
168 | 168 | try { |
169 | 169 | // Check index collation |
170 | 170 | $indexes = $collection->listIndexes(); |
171 | - foreach($indexes as $index) { |
|
171 | + foreach ($indexes as $index) { |
|
172 | 172 | $indexInfo = $index->__debugInfo(); |
173 | 173 | $keys = array_keys($index["key"]); |
174 | 174 | if ((count($keys) === 1) && ($keys[0] === $id) && (array_key_exists("collation", $indexInfo))) { |
@@ -178,7 +178,7 @@ discard block |
||
178 | 178 | } |
179 | 179 | } |
180 | 180 | |
181 | - foreach($data as $item) { |
|
181 | + foreach ($data as $item) { |
|
182 | 182 | $filter[$id] = ['$eq' => $item[$id]]; |
183 | 183 | $update = []; |
184 | 184 | $update['$set'] = $item; |
@@ -204,7 +204,7 @@ discard block |
||
204 | 204 | */ |
205 | 205 | public function delete(Database $con = null) { |
206 | 206 | $deleted = false; |
207 | - if(null === $con) { |
|
207 | + if (null === $con) { |
|
208 | 208 | $con = ParserService::getInstance()->createConnection($this->getDomain()); |
209 | 209 | } |
210 | 210 | $collection = $con->selectCollection($this->getSchema()->name); |
@@ -215,7 +215,7 @@ discard block |
||
215 | 215 | $deleted = true; |
216 | 216 | $this->dto = null; |
217 | 217 | $this->countAction(); |
218 | - } catch(\Exception $exception) { |
|
218 | + } catch (\Exception $exception) { |
|
219 | 219 | Logger::log($exception->getMessage(), LOG_CRIT, $this->toArray()); |
220 | 220 | } |
221 | 221 | return $deleted; |
@@ -229,14 +229,14 @@ discard block |
||
229 | 229 | */ |
230 | 230 | public function bulkDelete(array $filters, Database $con = null) { |
231 | 231 | $deletedCount = 0; |
232 | - if(null === $con) { |
|
232 | + if (null === $con) { |
|
233 | 233 | $con = ParserService::getInstance()->createConnection($this->getDomain()); |
234 | 234 | } |
235 | 235 | $collection = $con->selectCollection($this->getSchema()->name); |
236 | 236 | try { |
237 | 237 | $result = $collection->deleteMany($filters); |
238 | 238 | $deletedCount = $result->getDeletedCount(); |
239 | - } catch(\Exception $exception) { |
|
239 | + } catch (\Exception $exception) { |
|
240 | 240 | Logger::log($exception->getMessage(), LOG_CRIT, $this->toArray()); |
241 | 241 | } |
242 | 242 | return $deletedCount; |
@@ -253,7 +253,7 @@ discard block |
||
253 | 253 | $dtos = []; |
254 | 254 | /** @var NOSQLModelDto $dto */ |
255 | 255 | foreach ($data as &$insertData) { |
256 | - if(is_object($insertData) && $insertData instanceof NOSQLModelDto) { |
|
256 | + if (is_object($insertData) && $insertData instanceof NOSQLModelDto) { |
|
257 | 257 | $dto = clone $insertData; |
258 | 258 | } else { |
259 | 259 | $dto = $this->getDtoCopy(true); |
@@ -283,7 +283,7 @@ discard block |
||
283 | 283 | foreach ($ids as $index => $insertedId) { |
284 | 284 | $id = is_string($insertedId) ? ['$oid' => $insertedId] : $insertedId->jsonSerialize(); |
285 | 285 | $dto = $dtos[$index]; |
286 | - if($dto instanceof NOSQLModelDto) { |
|
286 | + if ($dto instanceof NOSQLModelDto) { |
|
287 | 287 | $dto->setPk($id['$oid']); |
288 | 288 | } else { |
289 | 289 |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | $dns .= '@' . Config::getParam('nosql.host', 'localhost', $lowerDomain); |
28 | 28 | |
29 | 29 | $database = Config::getParam('nosql.database', 'nosql', $lowerDomain); |
30 | - if(null !== Config::getParam('nosql.replicaset')) { |
|
30 | + if (null !== Config::getParam('nosql.replicaset')) { |
|
31 | 31 | $dns .= '/' . $database . '?ssl=true&replicaSet=' . Config::getParam('nosql.replicaset', null, $lowerDomain); |
32 | 32 | $dns .= '&authSource=admin&serverSelectionTryOnce=false&serverSelectionTimeoutMS=15000'; |
33 | 33 | } else { |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | */ |
50 | 50 | public function checkAndSave($domain, $collection, NOSQLModelDto $dto) { |
51 | 51 | $errors = $dto->validate(); |
52 | - if(empty($errors)) { |
|
52 | + if (empty($errors)) { |
|
53 | 53 | |
54 | 54 | } else { |
55 | 55 | throw new ApiException(t('Dto not valid'), 400); |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | public function hydrateModelFromRequest(array $data, $className) { |
67 | 67 | $model = null; |
68 | 68 | $reflectionClass = new \ReflectionClass($className); |
69 | - if($reflectionClass->isSubclassOf(NOSQLBase::class)) { |
|
69 | + if ($reflectionClass->isSubclassOf(NOSQLBase::class)) { |
|
70 | 70 | /** @var NOSQLActiveRecord $modelName */ |
71 | 71 | $modelName = $className::MODEL_CLASS; |
72 | 72 | $model = $modelName::fromArray($data); |
@@ -61,9 +61,9 @@ discard block |
||
61 | 61 | */ |
62 | 62 | private function extractTypes() { |
63 | 63 | $baseClass = new \ReflectionClass(NOSQLBase::class); |
64 | - if(null !== $baseClass) { |
|
64 | + if (null !== $baseClass) { |
|
65 | 65 | $types = []; |
66 | - foreach($baseClass->getConstants() as $constant) { |
|
66 | + foreach ($baseClass->getConstants() as $constant) { |
|
67 | 67 | $types[] = $constant; |
68 | 68 | } |
69 | 69 | $this->setTypes($types); |
@@ -85,10 +85,10 @@ discard block |
||
85 | 85 | public function getDomains() { |
86 | 86 | $domains = []; |
87 | 87 | $storedDomains = $this->cache->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . 'domains.json', Cache::JSON, TRUE); |
88 | - if(!empty($storedDomains)) { |
|
89 | - foreach($storedDomains as $domain => $data) { |
|
88 | + if (!empty($storedDomains)) { |
|
89 | + foreach ($storedDomains as $domain => $data) { |
|
90 | 90 | $domainLabel = str_replace(['@', '/'], '', $domain); |
91 | - if('ROOT' !== $domainLabel) { |
|
91 | + if ('ROOT' !== $domainLabel) { |
|
92 | 92 | $domains[] = $domainLabel; |
93 | 93 | } |
94 | 94 | } |
@@ -99,8 +99,8 @@ discard block |
||
99 | 99 | public static function getDomainPaths($module) { |
100 | 100 | $domains = Router::getInstance()->getDomains(); |
101 | 101 | $path = null; |
102 | - foreach($domains as $domain => $paths) { |
|
103 | - if(preg_match("/^@" . $module . "\//i", $domain)) { |
|
102 | + foreach ($domains as $domain => $paths) { |
|
103 | + if (preg_match("/^@" . $module . "\//i", $domain)) { |
|
104 | 104 | $path = $paths; |
105 | 105 | break; |
106 | 106 | } |
@@ -115,11 +115,11 @@ discard block |
||
115 | 115 | public function getCollections($module) { |
116 | 116 | $collections = []; |
117 | 117 | $path = self::getDomainPaths($module); |
118 | - if(null === $path) { |
|
118 | + if (null === $path) { |
|
119 | 119 | throw new ApiException(t("Module not found"), 404); |
120 | 120 | } |
121 | 121 | $schemaFilename = $path['base'] . 'Config' . DIRECTORY_SEPARATOR . 'schema.json'; |
122 | - if(file_exists($schemaFilename)) { |
|
122 | + if (file_exists($schemaFilename)) { |
|
123 | 123 | $collections = $this->cache->getDataFromFile($schemaFilename, Cache::JSON, TRUE); |
124 | 124 | } |
125 | 125 | return $collections; |
@@ -142,10 +142,10 @@ discard block |
||
142 | 142 | '@NOSQL/generator/api.base.php.twig' => CORE_DIR . DIRECTORY_SEPARATOR . $module . DIRECTORY_SEPARATOR . 'Api' . DIRECTORY_SEPARATOR . 'Base', |
143 | 143 | '@NOSQL/generator/dto.php.twig' => CORE_DIR . DIRECTORY_SEPARATOR . $module . DIRECTORY_SEPARATOR . 'Dto' . DIRECTORY_SEPARATOR . 'Models', |
144 | 144 | ]; |
145 | - foreach($collections as $raw) { |
|
145 | + foreach ($collections as $raw) { |
|
146 | 146 | $collection = new CollectionDto(false); |
147 | 147 | $collection->fromArray($raw); |
148 | - foreach($files as $template => $path) { |
|
148 | + foreach ($files as $template => $path) { |
|
149 | 149 | GeneratorHelper::createDir($path); |
150 | 150 | $templateDump = $tpl->dump($template, [ |
151 | 151 | 'domain' => $module, |
@@ -154,7 +154,7 @@ discard block |
||
154 | 154 | 'indexes' => $collection->indexes, |
155 | 155 | ]); |
156 | 156 | $force = false; |
157 | - if(false !== strpos($template, 'dto') || false !== strpos(strtolower($template), 'base')) { |
|
157 | + if (false !== strpos($template, 'dto') || false !== strpos(strtolower($template), 'base')) { |
|
158 | 158 | $force = true; |
159 | 159 | } |
160 | 160 | $this->writeTemplateToFile($templateDump, $path . DIRECTORY_SEPARATOR . $collection->name . '.php', $force); |
@@ -191,12 +191,12 @@ discard block |
||
191 | 191 | private function createTextIndex(Database $db, $collectionDto) { |
192 | 192 | try { |
193 | 193 | $textIndexes = []; |
194 | - foreach($collectionDto['properties'] as $property) { |
|
195 | - if(in_array($property['type'], [NOSQLBase::NOSQL_TYPE_STRING, NOSQLBase::NOSQL_TYPE_OBJECT])) { |
|
194 | + foreach ($collectionDto['properties'] as $property) { |
|
195 | + if (in_array($property['type'], [NOSQLBase::NOSQL_TYPE_STRING, NOSQLBase::NOSQL_TYPE_OBJECT])) { |
|
196 | 196 | $textIndexes[$property['name']] = 'text'; |
197 | 197 | } |
198 | 198 | } |
199 | - if(count($textIndexes)) { |
|
199 | + if (count($textIndexes)) { |
|
200 | 200 | $collection = $db->selectCollection($collectionDto['name']); |
201 | 201 | $collection->createIndex($textIndexes, ['name' => 'idx_text_' . $collectionDto['name']]); |
202 | 202 | } |
@@ -214,7 +214,7 @@ discard block |
||
214 | 214 | private function createIndexes(Database $db, $collectionDto, array $indexes = []) { |
215 | 215 | try { |
216 | 216 | $collection = $db->selectCollection($collectionDto['name']); |
217 | - if(count($indexes)) { |
|
217 | + if (count($indexes)) { |
|
218 | 218 | $collection->createIndexes($indexes); |
219 | 219 | } |
220 | 220 | } catch (\Exception $exception) { |
@@ -231,7 +231,7 @@ discard block |
||
231 | 231 | $db = ParserService::getInstance()->createConnection($module); |
232 | 232 | $collections = $this->getCollections($module); |
233 | 233 | $success = true; |
234 | - foreach($collections as $raw) { |
|
234 | + foreach ($collections as $raw) { |
|
235 | 235 | $jsonSchema = $this->parseCollection($raw); |
236 | 236 | try { |
237 | 237 | /** @var BSONDocument $result */ |
@@ -242,21 +242,21 @@ discard block |
||
242 | 242 | ]); |
243 | 243 | $response = $result->getArrayCopy(); |
244 | 244 | $success = array_key_exists('ok', $response) && $response['ok'] > 0; |
245 | - } catch(\Exception $exception) { |
|
246 | - if($exception->getCode() !== 48) { |
|
245 | + } catch (\Exception $exception) { |
|
246 | + if ($exception->getCode() !== 48) { |
|
247 | 247 | $success = false; |
248 | 248 | } |
249 | 249 | } |
250 | - if($success) { |
|
250 | + if ($success) { |
|
251 | 251 | if (Config::getParam("nosql.sync.defaultIndex", false, $module)) { |
252 | 252 | $this->createTextIndex($db, $raw); |
253 | 253 | } |
254 | 254 | $indexToCreate = []; |
255 | - foreach($raw['indexes'] as $index) { |
|
255 | + foreach ($raw['indexes'] as $index) { |
|
256 | 256 | $dbIndex = []; |
257 | - foreach($index['properties'] as $idx) { |
|
257 | + foreach ($index['properties'] as $idx) { |
|
258 | 258 | list($property, $direction) = explode('.', $idx); |
259 | - switch(strtoupper($direction)) { |
|
259 | + switch (strtoupper($direction)) { |
|
260 | 260 | case 'ASC': $dbIndex[$property] = 1; break; |
261 | 261 | case 'DESC': $dbIndex[$property] = -1; break; |
262 | 262 | } |
@@ -297,10 +297,10 @@ discard block |
||
297 | 297 | $property = new StringPropertyDto(false); |
298 | 298 | break; |
299 | 299 | } |
300 | - if(array_key_exists('type', $rawProperty)) { |
|
300 | + if (array_key_exists('type', $rawProperty)) { |
|
301 | 301 | $property->bsonType = $rawProperty['type']; |
302 | 302 | } |
303 | - if(array_key_exists('description', $rawProperty)) { |
|
303 | + if (array_key_exists('description', $rawProperty)) { |
|
304 | 304 | $property->description = $rawProperty['description']; |
305 | 305 | } |
306 | 306 | if (array_key_exists('required', $rawProperty) && $rawProperty['required']) { |
@@ -318,7 +318,7 @@ discard block |
||
318 | 318 | public function getValidations() { |
319 | 319 | $fieldTypes = new \ReflectionClass(Field::class); |
320 | 320 | $validations = []; |
321 | - foreach($fieldTypes->getConstants() as $validation) { |
|
321 | + foreach ($fieldTypes->getConstants() as $validation) { |
|
322 | 322 | $validations[] = $validation; |
323 | 323 | } |
324 | 324 | return $validations; |