flack / midgard-portable

src/api/dbobject.php

Spacing +8 added lines, -8 removed lines

@@ -59,7 +59,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 = [];
@@ -74,7 +74,7 @@ 
     {
         $this->initialize();
 
-        if (   !$this->cm->hasField($field)
+        if (!$this->cm->hasField($field)
             && isset($this->cm->midgard['field_aliases'][$field])) {
             $field = $this->cm->midgard['field_aliases'][$field];
         }
@@ -84,7 +84,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;
                 }
@@ -94,7 +94,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') {
@@ -104,7 +104,7 @@ 
             } elseif ($mapping['type'] === 'float') {
                 $value = (float) $value;
             } elseif ($mapping['type'] === '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)) {
@@ -120,7 +120,7 @@ 
     {
         $this->initialize();
 
-        if (   !$this->cm->hasField($field)
+        if (!$this->cm->hasField($field)
             && isset($this->cm->midgard['field_aliases'][$field])) {
             $field = $this->cm->midgard['field_aliases'][$field];
         }
@@ -133,11 +133,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 +11 added lines, -11 removed lines

@@ -77,7 +77,7 @@ 
 
     public function __get($field)
     {
-        if (   $field === 'metadata'
+        if ($field === 'metadata'
             && $this->metadata === null
             && $this instanceof metadata_interface) {
             $this->metadata = new metadata($this);
@@ -97,13 +97,13 @@ 
     protected function load_parent(array $candidates) : ?dbobject
     {
         foreach ($candidates as $candidate) {
-            if (   is_string($this->$candidate)
+            if (is_string($this->$candidate)
                 && mgd_is_guid($this->$candidate)) {
                 return \midgard_object_class::get_object_by_guid($this->$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);
@@ -127,7 +127,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();
@@ -173,7 +173,7 @@ 
             exception::duplicate();
             return false;
         }
-        if (   !$this->is_unique()
+        if (!$this->is_unique()
             || !$this->check_parent()) {
             return false;
         }
@@ -224,7 +224,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;
@@ -310,7 +310,7 @@ 
     {
         $this->initialize();
 
-        if (   empty($this->cm->midgard['parentfield'])
+        if (empty($this->cm->midgard['parentfield'])
             || empty($this->cm->midgard['parent'])) {
             return true;
         }
@@ -327,7 +327,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.");
@@ -339,7 +339,7 @@ 
 
     private function check_upfield() : bool
     {
-        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()) {
@@ -376,7 +376,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();
@@ -687,7 +687,7 @@ 
             exception::not_exists();
             return false;
         }
-        if (   $check_dependencies
+        if ($check_dependencies
             && $this->has_dependents()) {
             exception::has_dependants();
             return false;

src/api/user.php

Spacing +4 added lines, -4 removed lines

@@ -64,7 +64,7 @@ 
 
     private function load_by_properties(array $properties)
     {
-        if (   !array_key_exists('authtype', $properties)
+        if (!array_key_exists('authtype', $properties)
             || !array_key_exists('login', $properties)) {
             throw exception::invalid_property_value();
         }
@@ -107,7 +107,7 @@ 
 
     public function &get_person() : person
     {
-        if (   $this->person_object === null
+        if ($this->person_object === null
             && $this->person !== null) {
             $this->person_object = connection::get_em()->getRepository(connection::get_fqcn('midgard_person'))->findOneBy(['guid' => $this->person]);
         }
@@ -116,7 +116,7 @@ 
 
     public function create() : bool
     {
-        if (   empty($this->authtype)
+        if (empty($this->authtype)
             || !empty($this->id)) {
             exception::invalid_property_value();
             return false;
@@ -180,7 +180,7 @@ 
 
     protected function is_unique() : bool
     {
-        if (   empty($this->login)
+        if (empty($this->login)
             || empty($this->authtype)) {
             return true;
         }

src/storage/subscriber.php

Spacing +5 added lines, -5 removed lines

@@ -107,8 +107,8 @@ 
             $cs = $em->getUnitOfWork()->getEntityChangeSet($entity);
             // We only need to update repligard if we're coming from create (revision 0)
             // or if we delete/undelete
-            if (   !array_key_exists('metadata_deleted', $cs)
-                && $entity->metadata_revision > 0)  {
+            if (!array_key_exists('metadata_deleted', $cs)
+                && $entity->metadata_revision > 0) {
                 $check_repligard = false;
             }
 
@@ -177,7 +177,7 @@ 
 
         foreach ($columns as $name => &$config) {
             if ($platform instanceof SqlitePlatform) {
-                if (   !empty($config['comment'])
+                if (!empty($config['comment'])
                     && $config['comment'] == 'BINARY') {
                     $modified = true;
                     $config['columnDefinition'] = $config['type']->getSQLDeclaration($config, $platform) . ' COLLATE BINARY' . $platform->getDefaultValueDeclarationSQL($config);
@@ -194,7 +194,7 @@ 
                         $config['columnDefinition'] = $config['comment'] . $platform->getDefaultValueDeclarationSQL($config);
                     }
                     if (!empty($config['columnDefinition']) && $platform->supportsInlineColumnComments()) {
-                        $config['columnDefinition'] .=  " COMMENT " . $platform->quoteStringLiteral($config['comment']);
+                        $config['columnDefinition'] .= " COMMENT " . $platform->quoteStringLiteral($config['comment']);
                     }
                 }
             }
@@ -278,7 +278,7 @@ 
     public function postGenerateSchemaTable(GenerateSchemaTableEventArgs $args)
     {
         $table = $args->getClassTable();
-        if (   !$table->hasOption('engine')
+        if (!$table->hasOption('engine')
             || $table->getOption('engine') !== 'MyISAM') {
             return;
         }