ControleOnline / api-platform-common

src/Service/ExtraDataService.php

Spacing +3 added lines, -3 removed lines

@@ -46,7 +46,7 @@ 
     {
         $class = $this->getEntityName($entity);
 
-        $extraData = $this->getEntityByExtraData($extraFields,  $entityId,  $entity);
+        $extraData = $this->getEntityByExtraData($extraFields, $entityId, $entity);
         if ($extraData) return $extraData;
 
         $extraData = new ExtraData();
@@ -60,7 +60,7 @@ 
         return $this->manager->getRepository($class->getName())->find($extraData->getEntityId());
     }
 
-    public function discoveryExtraFields(string $fieldName, string $context, ?string $configs = '{}',  ?string $fieldType = 'text', ?bool $required = false): ExtraFields
+    public function discoveryExtraFields(string $fieldName, string $context, ?string $configs = '{}', ?string $fieldType = 'text', ?bool $required = false): ExtraFields
     {
 
         $extraFields = $this->manager->getRepository(ExtraFields::class)->findOneBy([
@@ -136,7 +136,7 @@ 
 
             //$this->manager->persist($entity);
         } else {
-            $json =       json_decode($this->request->getContent(), true);
+            $json = json_decode($this->request->getContent(), true);
             $extra_data = isset($json['extra-data']) ? $json['extra-data'] : null;
             if (!$extra_data)
                 return;

Braces +30 added lines, -18 removed lines

@@ -35,8 +35,9 @@ 
             'entity_name' => $class->getShortName(),
             'entity_id' => $entityId
         ]);
-        if ($extraData)
-            return $this->manager->getRepository($class->getName())->find($extraData->getEntityId());
+        if ($extraData) {
+                    return $this->manager->getRepository($class->getName())->find($extraData->getEntityId());
+        }
 
         return null;
     }
@@ -47,7 +48,9 @@ 
         $class = $this->getEntityName($entity);
 
         $extraData = $this->getEntityByExtraData($extraFields,  $entityId,  $entity);
-        if ($extraData) return $extraData;
+        if ($extraData) {
+            return $extraData;
+        }
 
         $extraData = new ExtraData();
         $extraData->setEntityId($entityId);
@@ -69,8 +72,9 @@ 
             'context' => $context
         ]);
 
-        if (!$extraFields)
-            $extraFields = new ExtraFields();
+        if (!$extraFields) {
+                    $extraFields = new ExtraFields();
+        }
 
         $extraFields->setName($fieldName);
         $extraFields->setContext($context);
@@ -91,12 +95,15 @@ 
 
     public function discoveryDevice(&$entity)
     {
-        if ($entity instanceof Device || $entity instanceof DeviceConfig || !$this->request->headers)
-            return;
+        if ($entity instanceof Device || $entity instanceof DeviceConfig || !$this->request->headers) {
+                    return;
+        }
 
         $deviceId = $this->request->headers->get('DEVICE') ?: $this->getUserIp();
         if (method_exists($entity, 'setDevice')) {
-            if ($entity->getDevice()) return;
+            if ($entity->getDevice()) {
+                return;
+            }
             $device = $this->deviceService->discoveryDevice($deviceId);
             $entity->setDevice($device);
         }
@@ -107,14 +114,16 @@ 
         $token = $this->security->getToken();
         $user = $token ? $token->getUser() : $this->skyNetService->getBotUser();
 
-        if (method_exists($entity, 'setUser') && !$entity->getUser())
-            $entity->setUser($user);
+        if (method_exists($entity, 'setUser') && !$entity->getUser()) {
+                    $entity->setUser($user);
+        }
     }
 
     public function persist(&$entity)
     {
-        if (self::$persisted == true)
-            return;
+        if (self::$persisted == true) {
+                    return;
+        }
         self::$persisted = true;
 
         //$this->manager->persist($entity);
@@ -138,15 +147,17 @@ 
         } else {
             $json =       json_decode($this->request->getContent(), true);
             $extra_data = isset($json['extra-data']) ? $json['extra-data'] : null;
-            if (!$extra_data)
-                return;
+            if (!$extra_data) {
+                            return;
+            }
             $entity_id = $extra_data['entity_id'];
             $entity_name = $extra_data['entity_name'];
         }
 
 
-        if (!$entity_id || !$entity_name)
-            return;
+        if (!$entity_id || !$entity_name) {
+                    return;
+        }
 
         foreach ($extra_data['data'] as $key => $data) {
             $extra_fields = $this->manager->getRepository(ExtraFields::class)->find($key);
@@ -157,8 +168,9 @@ 
                 'extra_fields' => $extra_fields
             ]);
 
-            if (!$extraData)
-                $extraData = new ExtraData();
+            if (!$extraData) {
+                            $extraData = new ExtraData();
+            }
 
             $extraData->setExtraFields($extra_fields);
             $extraData->setEntityName($entity_name);