SoliDry / api-generator

src/Blocks/ContentManager.php

Spacing +3 added lines, -6 removed lines

@@ -83,13 +83,11 @@ 
         // get params
         $params = $this->getMethodParams($methodOptions->getParams());
         $this->sourceCode .= PhpInterface::TAB_PSR4 . $methodOptions->getModifier() . PhpInterface::SPACE .
-            (($methodOptions->isStatic() !== false) ? PhpInterface::PHP_STATIC . PhpInterface::SPACE :
-                '') .
+            (($methodOptions->isStatic() !== false) ? PhpInterface::PHP_STATIC . PhpInterface::SPACE : '') .
             PhpInterface::PHP_FUNCTION . PhpInterface::SPACE .
             $methodOptions->getName()
             . PhpInterface::OPEN_PARENTHESES . $params . PhpInterface::CLOSE_PARENTHESES .
-            ((empty($methodOptions->getReturnType())) ? '' :
-                PhpInterface::COLON . PhpInterface::SPACE . $methodOptions->getReturnType()) .
+            ((empty($methodOptions->getReturnType())) ? '' : PhpInterface::COLON . PhpInterface::SPACE . $methodOptions->getReturnType()) .
             PhpInterface::SPACE . PHP_EOL . PhpInterface::TAB_PSR4
             . PhpInterface::OPEN_BRACE . PHP_EOL;
     }
@@ -103,8 +101,7 @@ 
     protected function setMethodReturn(string $value, $isString = false): void
     {
         $this->setTabs(2);
-        $this->sourceCode .= PhpInterface::PHP_RETURN . PhpInterface::SPACE . (($isString === false) ? $value :
-                PhpInterface::DOUBLE_QUOTES . $value . PhpInterface::DOUBLE_QUOTES) . PhpInterface::SEMICOLON . PHP_EOL;
+        $this->sourceCode .= PhpInterface::PHP_RETURN . PhpInterface::SPACE . (($isString === false) ? $value : PhpInterface::DOUBLE_QUOTES . $value . PhpInterface::DOUBLE_QUOTES) . PhpInterface::SEMICOLON . PHP_EOL;
     }
 
     /**

src/Blocks/Migrations.php

Indentation +10 added lines, -10 removed lines

@@ -44,8 +44,8 @@ 
     public function create()
     {
         $migrationName = ModelsInterface::MIGRATION_CREATE . PhpInterface::UNDERSCORE .
-                         $this->tableName .
-                         PhpInterface::UNDERSCORE . ModelsInterface::MIGRATION_TABLE;
+                            $this->tableName .
+                            PhpInterface::UNDERSCORE . ModelsInterface::MIGRATION_TABLE;
         $attrKey = $this->generator->objectName . CustomsInterface::CUSTOM_TYPES_ATTRIBUTES;
 
         $isFileNonExistent = FileManager::migrationNotExists($this->generator, $migrationName);
@@ -82,20 +82,20 @@ 
             foreach($relations as $relationEntity)
             {
                 $entityFile = $this->generator->formatEntitiesPath()
-                              . PhpInterface::SLASH .
-                              $this->generator->objectName .
-                              ucfirst($relationEntity) .
-                              PhpInterface::PHP_EXT;
+                                . PhpInterface::SLASH .
+                                $this->generator->objectName .
+                                ucfirst($relationEntity) .
+                                PhpInterface::PHP_EXT;
                 if(file_exists($entityFile))
                 {
                     $this->setPivotContent($relationEntity);
 
                     $migrationMask = date(self::PATTERN_TIME) . (self::$counter + 1);
                     $migrationName = ModelsInterface::MIGRATION_CREATE . PhpInterface::UNDERSCORE
-                                     . $this->tableName
-                                     . PhpInterface::UNDERSCORE .
-                                     MigrationsHelper::getTableName($relationEntity) .
-                                     PhpInterface::UNDERSCORE . ModelsInterface::MIGRATION_TABLE;
+                                        . $this->tableName
+                                        . PhpInterface::UNDERSCORE .
+                                        MigrationsHelper::getTableName($relationEntity) .
+                                        PhpInterface::UNDERSCORE . ModelsInterface::MIGRATION_TABLE;
 
                     if(FileManager::migrationNotExists($this->generator, $migrationName))
                     {

Spacing +6 added lines, -6 removed lines

@@ -51,7 +51,7 @@ 
         $isFileNonExistent = FileManager::migrationNotExists($this->generator, $migrationName);
         $isAdding = ($this->generator->isMerge === true && empty($this->generator->diffTypes[$attrKey]) === false);
 
-        if($isFileNonExistent === true)
+        if ($isFileNonExistent === true)
         {
             $this->setContent();
         } else if ($isAdding === true) {
@@ -76,17 +76,17 @@ 
         $formRequestEntity = $this->getFormRequestEntity($this->generator->version, $this->className);
         /** @var BaseFormRequest $formRequest **/
         $formRequest       = new $formRequestEntity();
-        if(method_exists($formRequest, ModelsInterface::MODEL_METHOD_RELATIONS))
+        if (method_exists($formRequest, ModelsInterface::MODEL_METHOD_RELATIONS))
         {
             $relations = $formRequest->relations();
-            foreach($relations as $relationEntity)
+            foreach ($relations as $relationEntity)
             {
                 $entityFile = $this->generator->formatEntitiesPath()
                               . PhpInterface::SLASH .
                               $this->generator->objectName .
                               ucfirst($relationEntity) .
                               PhpInterface::PHP_EXT;
-                if(file_exists($entityFile))
+                if (file_exists($entityFile))
                 {
                     $this->setPivotContent($relationEntity);
 
@@ -97,13 +97,13 @@ 
                                      MigrationsHelper::getTableName($relationEntity) .
                                      PhpInterface::UNDERSCORE . ModelsInterface::MIGRATION_TABLE;
 
-                    if(FileManager::migrationNotExists($this->generator, $migrationName))
+                    if (FileManager::migrationNotExists($this->generator, $migrationName))
                     {
                         $file = $this->generator->formatMigrationsPath() . $migrationMask
                                 . PhpInterface::UNDERSCORE . $migrationName . PhpInterface::PHP_EXT;
                         // if migration file with the same name ocasionally exists we do not override it
                         $isCreated = FileManager::createFile($file, $this->sourceCode);
-                        if($isCreated)
+                        if ($isCreated)
                         {
                             Console::out($file . PhpInterface::SPACE . Console::CREATED, Console::COLOR_GREEN);
                         }

src/Blocks/RoutesTrait.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
      */
     public function openGroup() : void
     {
-        $versionNamespace =  DirsInterface::MODULES_DIR .
+        $versionNamespace = DirsInterface::MODULES_DIR .
             PhpInterface::BACKSLASH . PhpInterface::BACKSLASH
             . strtoupper($this->generator->version);
 

src/Extension/BitMaskTrait.php

Spacing +14 added lines, -14 removed lines

@@ -19,10 +19,10 @@ 
     {
         $data->map(function($v) {
             $field = $this->bitMask->getField();
-            if(isset($v[$field])) {
+            if (isset($v[$field])) {
                 $flags = $this->bitMask->getFlags();
                 $mask  = $v[$field];
-                foreach($flags as $flag => $fVal) {
+                foreach ($flags as $flag => $fVal) {
                     $v[$flag] = (bool)($fVal & $mask);
                 }
             }
@@ -39,10 +39,10 @@ 
     protected function setFlagsView(BaseModel $data)
     {
         $field = $this->bitMask->getField();
-        if(isset($data[$field])) {
+        if (isset($data[$field])) {
             $flags = $this->bitMask->getFlags();
             $mask  = $data[$field];
-            foreach($flags as $flag => $fVal) {
+            foreach ($flags as $flag => $fVal) {
                 $data[$flag] = ($fVal & $mask) ? true : false;
             }
         }
@@ -58,11 +58,11 @@ 
     {
         $field = $this->bitMask->getField();
         $flags = $this->bitMask->getFlags();
-        foreach($flags as $flag => $fVal) {
+        foreach ($flags as $flag => $fVal) {
             if (isset($jsonProps[$flag])) {
-                if ((bool) $jsonProps[$flag] === true) {
+                if ((bool)$jsonProps[$flag] === true) {
                     $this->model->$field |= $fVal;
-                } else if ((bool) $jsonProps[$flag] === false) {
+                } else if ((bool)$jsonProps[$flag] === false) {
                     $this->model->$field &= ~$fVal;
                 }
             }
@@ -77,10 +77,10 @@ 
     protected function setFlagsCreate()
     {
         $field = $this->bitMask->getField();
-        if(isset($this->model->$field)) {
+        if (isset($this->model->$field)) {
             $flags = $this->bitMask->getFlags();
             $mask  = $this->model->$field;
-            foreach($flags as $flag => $fVal) {
+            foreach ($flags as $flag => $fVal) {
                 $this->model->$flag = (bool)($fVal & $mask);
             }
         }
@@ -98,11 +98,11 @@ 
     {
         $field = $this->bitMask->getField();
         $flags = $this->bitMask->getFlags();
-        foreach($flags as $flag => $fVal) {
+        foreach ($flags as $flag => $fVal) {
             if (isset($jsonProps[$flag])) {
-                if ((bool) $jsonProps[$flag] === true) {
+                if ((bool)$jsonProps[$flag] === true) {
                     $model->$field |= $fVal;
-                } else if ((bool) $jsonProps[$flag] === false) {
+                } else if ((bool)$jsonProps[$flag] === false) {
                     $model->$field &= ~$fVal;
                 }
             }
@@ -118,10 +118,10 @@ 
     protected function setFlagsUpdate(&$model) : void
     {
         $field = $this->bitMask->getField();
-        if(isset($model[$field])) {
+        if (isset($model[$field])) {
             $flags = $this->bitMask->getFlags();
             $mask  = $model[$field];
-            foreach($flags as $flag => $fVal) {
+            foreach ($flags as $flag => $fVal) {
                 $model[$flag] = (bool)($fVal & $mask);
             }
         }

src/Extension/OptionsTrait.php

Spacing +3 added lines, -6 removed lines

@@ -38,17 +38,14 @@
     private function setSqlOptions(Request $request) : SqlOptions
     {
         $sqlOptions = new SqlOptions();
-        $page = ($request->input(ModelsInterface::PARAM_PAGE) === null) ? $this->defaultPage :
-            $request->input(ModelsInterface::PARAM_PAGE);
-        $limit = ($request->input(ModelsInterface::PARAM_LIMIT) === null) ? $this->defaultLimit :
-            $request->input(ModelsInterface::PARAM_LIMIT);
+        $page = ($request->input(ModelsInterface::PARAM_PAGE) === null) ? $this->defaultPage : $request->input(ModelsInterface::PARAM_PAGE);
+        $limit = ($request->input(ModelsInterface::PARAM_LIMIT) === null) ? $this->defaultLimit : $request->input(ModelsInterface::PARAM_LIMIT);
 
         if ($limit > ModelsInterface::MAX_LIMIT) {
             throw new AttributesException(ErrorsInterface::JSON_API_ERRORS[ErrorsInterface::HTTP_PARAM_LIMIT], ErrorsInterface::HTTP_PARAM_LIMIT);
         }
 
-        $sort = ($request->input(ModelsInterface::PARAM_SORT) === null) ? $this->defaultSort :
-            $request->input(ModelsInterface::PARAM_SORT);
+        $sort = ($request->input(ModelsInterface::PARAM_SORT) === null) ? $this->defaultSort : $request->input(ModelsInterface::PARAM_SORT);
 
         $data = ($request->input(ModelsInterface::PARAM_DATA) === NULL) ? ModelsInterface::DEFAULT_DATA
             : Json::decode(urldecode($request->input(ModelsInterface::PARAM_DATA)));

src/Helpers/SqlOptions.php

Spacing +1 added lines, -1 removed lines

@@ -84,7 +84,7 @@
     {
         // id must be there anyway
         $this->data = $data;
-        if(\in_array(ModelsInterface::ID, $this->data, true) === false)
+        if (\in_array(ModelsInterface::ID, $this->data, true) === false)
         {
             $this->data[] = ModelsInterface::ID;
         }

src/Extension/ApiController.php

Spacing +1 added lines, -1 removed lines

@@ -163,7 +163,7 @@
         }
 
         $resource = $this->json->setMeta($meta)->getResource($this->formRequest, $item, $this->entity);
-        return $this->getResponse(Json::prepareSerializedData($resource,  $data));
+        return $this->getResponse(Json::prepareSerializedData($resource, $data));
     }
 
     /**

src/Extension/BaseRelationsTrait.php

Spacing +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
         }
 
         $relEntity = ucfirst($relation);
-        $formRequestEntity  = $this->getFormRequestEntity(conf::getModuleName(), $relEntity);
+        $formRequestEntity = $this->getFormRequestEntity(conf::getModuleName(), $relEntity);
         $relFormRequest = new $formRequestEntity();
 
         $this->json->setIsCollection($model->$relation instanceof  \Illuminate\Database\Eloquent\Collection);