flack / midgard-portable

api/midgard/replicator.php

Spacing +3 added lines, -3 removed lines

@@ -201,19 +201,19 @@
                 break;
         }
 
-        if (   $dbobject->id > 0
+        if ($dbobject->id > 0
             && $dbobject->metadata->revised >= $object->metadata->revised) {
             midgard_connection::get_instance()->set_error(exception::OBJECT_IMPORTED);
             return false;
         }
 
-        if (   $dbobject->metadata->deleted
+        if ($dbobject->metadata->deleted
             && !$object->metadata->deleted) {
             if (!midgard_object_class::undelete($dbobject->guid)) {
                 return false;
             }
             $dbobject->metadata_deleted = false;
-        } elseif (   !$dbobject->metadata->deleted
+        } elseif (!$dbobject->metadata->deleted
                  && $object->metadata->deleted) {
             return $dbobject->delete();
         }

src/classgenerator.php

Spacing +7 added lines, -7 removed lines

@@ -63,8 +63,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);
             } elseif (!empty($a->extends)) {
@@ -105,7 +105,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 . '");');
             }
@@ -113,7 +113,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 . '");');
             }
@@ -177,9 +177,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;
             }
@@ -223,7 +223,7 @@ 
     {
         $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\\' . $name . '\\entity')) {
                 return '\\midgard\\portable\\storage\\' . $name . '\\entity';
             }

src/api/user.php

Spacing +4 added lines, -4 removed lines

@@ -61,7 +61,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();
         }
@@ -109,7 +109,7 @@ 
 
     public function &get_person()
     {
-        if (   $this->person_object === null
+        if ($this->person_object === null
             && $this->person !== null) {
             $this->person_object = connection::get_em()->getRepository('midgard:midgard_person')->findOneBy(array('guid' => $this->person));
         }
@@ -118,7 +118,7 @@ 
 
     public function create()
     {
-        if (   empty($this->authtype)
+        if (empty($this->authtype)
             || !empty($this->id)) {
             exception::invalid_property_value();
             return false;
@@ -182,7 +182,7 @@ 
 
     protected function is_unique()
     {
-        if (   empty($this->login)
+        if (empty($this->login)
             || empty($this->authtype)) {
             return true;
         }

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 = array();
@@ -78,7 +78,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];
         }
@@ -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/object.php

Spacing +9 added lines, -9 removed lines

@@ -77,7 +77,7 @@ 
 
     public function __get($field)
     {
-        if (   $field === 'metadata'
+        if ($field === 'metadata'
             && property_exists($this, 'metadata')
             && $this->metadata === null) {
             $this->metadata = new metadata($this);
@@ -99,7 +99,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 \Doctrine\ORM\Proxy\Proxy
+                if ($this->$candidate instanceof \Doctrine\ORM\Proxy\Proxy
                     && $this->$candidate->__isInitialized()) {
                     try {
                         $this->$candidate->get_by_id($this->$candidate->id);
@@ -123,7 +123,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 \Doctrine\ORM\Proxy\Proxy
+        if ($entity instanceof \Doctrine\ORM\Proxy\Proxy
             && !$entity->__isInitialized()) {
             try {
                 $entity->__load();
@@ -169,7 +169,7 @@ 
             exception::duplicate();
             return false;
         }
-        if (   !$this->is_unique()
+        if (!$this->is_unique()
             || !$this->check_parent()) {
             return false;
         }
@@ -220,7 +220,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;
@@ -302,7 +302,7 @@ 
     {
         $this->initialize();
 
-        if (   empty($this->cm->midgard['parentfield'])
+        if (empty($this->cm->midgard['parentfield'])
             || empty($this->cm->midgard['parent'])) {
             return true;
         }
@@ -319,7 +319,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.");
@@ -355,7 +355,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();
@@ -684,7 +684,7 @@ 
             exception::not_exists();
             return false;
         }
-        if (   $check_dependencies
+        if ($check_dependencies
             && $this->has_dependents()) {
             exception::has_dependants();
             return false;

src/api/config.php

Spacing +2 added lines, -2 removed lines

@@ -32,7 +32,7 @@ 
 
     public function read_file_at_path($path)
     {
-        if (   !file_exists($path)
+        if (!file_exists($path)
             || !is_readable($path)) {
             return false;
         }
@@ -145,7 +145,7 @@ 
         $subdirs = array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 'A', 'B', 'C', 'D', 'E', 'F');
         foreach ($subdirs as $dir) {
             foreach ($subdirs as $subdir) {
-                if (   !is_dir($this->blobdir . '/' . $dir . '/' . $subdir)
+                if (!is_dir($this->blobdir . '/' . $dir . '/' . $subdir)
                     && !mkdir($this->blobdir . '/' . $dir . '/' . $subdir, 0777, true)) {
                     return false;
                 }

src/query.php

Spacing +6 added lines, -6 removed lines

@@ -95,7 +95,7 @@ 
 
             $value = (array) $value;
             $value = array_merge($value, $this->get_child_ids($mapping['targetEntity'], $parentfield, $value));
-        } elseif (   $operator === 'IN'
+        } elseif ($operator === 'IN'
                  || $operator === 'NOT IN') {
             $value = array_values($value);
         } elseif (!in_array($operator, array('=', '>', '<', '<>', '<=', '>=', 'LIKE', 'NOT LIKE'))) {
@@ -254,14 +254,14 @@ 
             $parts = explode('.', $name);
             $column = array_pop($parts);
             foreach ($parts as $part) {
-                if (   $part === 'parameter'
+                if ($part === 'parameter'
                     || $part === 'attachment') {
                     $targetclass = 'midgard_' . $part;
                     $current_table = $this->add_collection_join($current_table, $targetclass);
                 } 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();
                     }
@@ -278,7 +278,7 @@ 
             $column = $cm->midgard['field_aliases'][$column];
         }
 
-        if (   !$cm->hasField($column)
+        if (!$cm->hasField($column)
             && !$cm->hasAssociation($column)) {
             throw exception::ok();
         }
@@ -295,12 +295,12 @@ 
         $parsed = $this->parse_constraint_name($name);
         $expression = $operator . ' ?' . $this->parameters;
 
-        if (   $operator === 'IN'
+        if ($operator === 'IN'
             || $operator === 'NOT IN') {
             $expression = $operator . '( ?' . $this->parameters . ')';
         }
 
-        if (   $value === 0
+        if ($value === 0
             || $value === null
             || is_array($value)) {
             $cm = connection::get_em()->getClassMetadata($parsed['targetclass']);

src/storage/subscriber.php

Spacing +4 added lines, -4 removed lines

@@ -97,7 +97,7 @@ 
         if (!($entity instanceof repligard)) {
             $repligard_entry = $em->getRepository('midgard:midgard_repligard')->findOneBy(array('guid' => $entity->guid));
 
-            if (   $entity instanceof entity
+            if ($entity instanceof entity
                 && $entity->metadata->deleted) {
                 $repligard_entry->object_action = self::ACTION_DELETE;
             } else {
@@ -138,7 +138,7 @@ 
 
         foreach ($columns as $name => &$config) {
             if ($platform->getName() === 'sqlite') {
-                if (   !empty($config['primary'])
+                if (!empty($config['primary'])
                     && !empty($config['autoincrement'])) {
                     /*
                      * This is essentially a workaround for http://www.doctrine-project.org/jira/browse/DBAL-642
@@ -147,7 +147,7 @@ 
                     $modified = true;
                     $config['columnDefinition'] = 'INTEGER PRIMARY KEY AUTOINCREMENT';
                 }
-                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);
@@ -255,7 +255,7 @@ 
     public function postGenerateSchemaTable(GenerateSchemaTableEventArgs $args)
     {
         $table = $args->getClassTable();
-        if (   !$table->hasOption('engine')
+        if (!$table->hasOption('engine')
             || $table->getOption('engine') !== 'MyISAM') {
             return;
         }

src/storage/connection.php

Spacing +1 added lines, -1 removed lines

@@ -213,7 +213,7 @@
             $midgard = midgard_connection::get_instance();
             if ($midgard->config->logfilename) {
                 $logdir = dirname($midgard->config->logfilename);
-                if (   !is_dir($logdir)
+                if (!is_dir($logdir)
                     && !mkdir($logdir, 0777, true)) {
                     throw exception::user_data('Log directory could not be created');
                 }