flack / midgard-portable

src/api/dbobject.php

Spacing +8 added lines, -8 removed lines

@@ -63,7 +63,7 @@ 
     {
         $this->initialize();
         $properties = array_merge($this->cm->getFieldNames(), $this->cm->getAssociationNames(), array_keys($this->cm->midgard['field_aliases']));
-        $properties = array_filter($properties, function ($input) {
+        $properties = array_filter($properties, function($input) {
             return strpos($input, 'metadata_') === false;
         });
         $ret = [];
@@ -78,7 +78,7 @@ 
     {
         $this->initialize();
 
-        if (   !$this->cm->hasField($field)
+        if (!$this->cm->hasField($field)
             && isset($field, $this->cm->midgard['field_aliases'][$field])) {
             $field = $this->cm->midgard['field_aliases'][$field];
         }
@@ -88,7 +88,7 @@ 
             if (empty($value)) {
                 $value = null;
             } else {
-                if (   !\is_object($this->$field)
+                if (!\is_object($this->$field)
                     || $this->$field->id != $value) {
                     $this->changed_associations[$field] = true;
                 }
@@ -98,7 +98,7 @@ 
         } elseif ($this->cm->hasField($field)) {
             $mapping = $this->cm->getFieldMapping($field);
 
-            if (   $mapping['type'] === 'string'
+            if ($mapping['type'] === 'string'
                 || $mapping['type'] == 'text') {
                 $value = (string) $value;
             } elseif ($mapping['type'] === 'integer') {
@@ -108,7 +108,7 @@ 
             } elseif ($mapping['type'] === 'float') {
                 $value = (float) $value;
             } elseif ($mapping['type'] === 'midgard_datetime') {
-                if (   \is_string($value)
+                if (\is_string($value)
                     && $value !== '0000-00-00 00:00:00') {
                     $value = new midgard_datetime($value);
                 } elseif (!($value instanceof midgard_datetime)) {
@@ -124,7 +124,7 @@ 
     {
         $this->initialize();
 
-        if (   !$this->cm->hasField($field)
+        if (!$this->cm->hasField($field)
             && array_key_exists($field, $this->cm->midgard['field_aliases'])) {
             $field = $this->cm->midgard['field_aliases'][$field];
         }
@@ -137,11 +137,11 @@ 
             }
             return 0;
         }
-        if (   $this->$field === null
+        if ($this->$field === null
             && $this->cm->isIdentifier($field)) {
             return 0;
         }
-        if (   $this->$field instanceof midgard_datetime
+        if ($this->$field instanceof midgard_datetime
             && $this->$field->format('U') == -62169984000) {
             //This is mainly needed for working with converted Legacy databases. Midgard2 somehow handles this internally
             //@todo Find a nicer solution and research how QB handles this

src/api/mgdobject.php

Spacing +10 added lines, -10 removed lines

@@ -80,7 +80,7 @@ 
 
     public function __get($field)
     {
-        if (   $field === 'metadata'
+        if ($field === 'metadata'
             && $this->metadata === null
             && $this instanceof metadata_interface) {
             $this->metadata = new metadata($this);
@@ -102,7 +102,7 @@ 
         foreach ($candidates as $candidate) {
             if ($this->$candidate !== null) {
                 //Proxies become stale if the object itself is detached, so we have to re-fetch
-                if (   $this->$candidate instanceof Proxy
+                if ($this->$candidate instanceof Proxy
                     && $this->$candidate->__isInitialized()) {
                     try {
                         $this->$candidate->get_by_id($this->$candidate->id);
@@ -130,7 +130,7 @@ 
         }
         // According to Doctrine documentation, proxies should be transparent, but in practice,
         // there will be problems if we don't force-load
-        if (   $entity instanceof Proxy
+        if ($entity instanceof Proxy
             && !$entity->__isInitialized()) {
             try {
                 $entity->__load();
@@ -183,7 +183,7 @@ 
             exception::duplicate();
             return false;
         }
-        if (   !$this->is_unique()
+        if (!$this->is_unique()
             || !$this->check_parent()) {
             return false;
         }
@@ -239,7 +239,7 @@ 
             midgard_connection::get_instance()->set_error(MGD_ERR_INVALID_PROPERTY_VALUE);
             return false;
         }
-        if (   $check_dependencies
+        if ($check_dependencies
             && $this->has_dependents()) {
             exception::has_dependants();
             return false;
@@ -330,7 +330,7 @@ 
     {
         $this->initialize();
 
-        if (   empty($this->cm->midgard['parentfield'])
+        if (empty($this->cm->midgard['parentfield'])
             || empty($this->cm->midgard['parent'])) {
             return true;
         }
@@ -347,7 +347,7 @@ 
         $this->initialize();
 
         foreach ($this->cm->fieldMappings as $name => $field) {
-            if (   $field['midgard:midgard_type'] == translator::TYPE_GUID
+            if ($field['midgard:midgard_type'] == translator::TYPE_GUID
                 && !empty($this->$name)
                 && !mgd_is_guid($this->$name)) {
                 exception::invalid_property_value("'" . $name . "' property's value is not a guid.");
@@ -359,7 +359,7 @@ 
 
     private function check_upfield()
     {
-        if (   !empty($this->id)
+        if (!empty($this->id)
             && !empty($this->cm->midgard['upfield'])
             && $this->__get($this->cm->midgard['upfield']) === $this->id
             && $this->cm->getAssociationMapping($this->cm->midgard['upfield'])['targetEntity'] === $this->cm->getName()) {
@@ -396,7 +396,7 @@ 
             $stat = $results > 0;
         }
 
-        if (   !$stat
+        if (!$stat
             && !empty($this->cm->midgard['childtypes'])) {
             foreach ($this->cm->midgard['childtypes'] as $typename => $parentfield) {
                 $qb = connection::get_em()->createQueryBuilder();
@@ -755,7 +755,7 @@ 
             exception::not_exists();
             return false;
         }
-        if (   $check_dependencies
+        if ($check_dependencies
             && $this->has_dependents()) {
             exception::has_dependants();
             return false;

src/classgenerator.php

Spacing +7 added lines, -7 removed lines

@@ -68,8 +68,8 @@ 
         }
 
         $types = $this->manager->get_types();
-        uasort($types, function ($a, $b) {
-            if (   !empty($a->extends)
+        uasort($types, function($a, $b) {
+            if (!empty($a->extends)
                 && !empty($b->extends)) {
                 return strnatcmp($a->extends, $b->extends);
             }
@@ -112,7 +112,7 @@ 
         $prefix = $this->get_class_prefix($namespace);
 
         foreach ($this->manager->get_types() as $type) {
-            if (   $prefix !== ''
+            if ($prefix !== ''
                 && !class_exists($type->name)) {
                 $this->add_line('class_alias( "' . $prefix . $type->name . '", "' . $type->name . '");');
             }
@@ -120,7 +120,7 @@ 
 
         foreach ($this->manager->get_inherited_mapping() as $child => $parent) {
             $this->add_line('class_alias( "' . $prefix . $parent . '", "' . $prefix . $child . '");');
-            if (   $prefix !== ''
+            if ($prefix !== ''
                 && !class_exists($child)) {
                 $this->add_line('class_alias( "' . $prefix . $parent . '", "' . $child . '");');
             }
@@ -181,9 +181,9 @@ 
                     $objects[$name] = 'new midgard_datetime("0001-01-01 00:00:00")';
                     break;
             }
-            if (   $default !== null
+            if ($default !== null
                    // we need to skip working links because in this case, Doctrine expects objects as values
-                && (   !$property->link
+                && (!$property->link
                     || $this->manager->resolve_targetclass($property) === false)) {
                 $line .= ' = ' . $default;
             }
@@ -243,7 +243,7 @@ 
         $this->write_annotations($type);
         $this->add_line('class ' . $type->name . ' extends ' . $type->extends);
         $mixins = $type->get_mixins();
-        $interfaces = array_filter(array_map(function ($name) {
+        $interfaces = array_filter(array_map(function($name) {
             if (interface_exists('\\midgard\\portable\\storage\\interfaces\\' . $name)) {
                 return '\\midgard\\portable\\storage\\interfaces\\' . $name;
             }

src/query.php

Spacing +3 added lines, -3 removed lines

@@ -260,7 +260,7 @@ 
                 } else {
                     $mrp = new \midgard_reflection_property($targetclass);
 
-                    if (   !$mrp->is_link($part)
+                    if (!$mrp->is_link($part)
                         && !$mrp->is_special_link($part)) {
                         throw exception::ok();
                     }
@@ -277,7 +277,7 @@ 
             $column = $cm->midgard['field_aliases'][$column];
         }
 
-        if (   !$cm->hasField($column)
+        if (!$cm->hasField($column)
             && !$cm->hasAssociation($column)) {
             throw exception::ok();
         }
@@ -298,7 +298,7 @@ 
             $expression = $operator . '( ?' . $this->parameters . ')';
         }
 
-        if (   $value === 0
+        if ($value === 0
             || $value === null
             || is_array($value)) {
             $cm = connection::get_em()->getClassMetadata($parsed['targetclass']);