flack / midgard-portable

api/midgard/replicator.php

Braces +6 added lines, -12 removed lines

@@ -112,8 +112,7 @@ 
             if (strpos($name, 'metadata_') === 0)
             {
                 $metadata[substr($name, 9)] = $object->$name;
-            }
-            else
+            } else
             {
                 $node->addChild($name, self::convert_value($object->$name));
             }
@@ -159,13 +158,11 @@ 
                 if ($node->getName() == 'midgard_blob')
                 {
                     $ret[] = self::blob_from_xml($node, $force);
-                }
-                else
+                } else
                 {
                     $ret[] = self::object_from_xml($node, $force);
                 }
-            }
-            catch (\Exception $e)
+            } catch (\Exception $e)
             {
                 connection::log()->warning($e->getMessage());
             }
@@ -240,8 +237,7 @@ 
                 return false;
             }
             $dbobject->metadata_deleted = false;
-        }
-        else if (   !$dbobject->metadata->deleted
+        } else if (   !$dbobject->metadata->deleted
                  && $object->metadata->deleted)
         {
             return $dbobject->delete();
@@ -284,8 +280,7 @@ 
             if ($object instanceof blob)
             {
                 self::import_blob($object, $force);
-            }
-            else
+            } else
             {
                 self::import_object($object, $force);
             }
@@ -367,8 +362,7 @@ 
                 try
                 {
                     $value = self::resolve_link_guid($cm, $field, $value);
-                }
-                catch (NoResultException $e)
+                } catch (NoResultException $e)
                 {
                     if (!$force)
                     {

api/midgard/query/builder.php

Braces +2 added lines, -4 removed lines

@@ -15,8 +15,7 @@ 
         try
         {
             return parent::add_constraint_with_property($name, $operator, $value);
-        }
-        catch (exception $e)
+        } catch (exception $e)
         {
             return false;
         }
@@ -27,8 +26,7 @@ 
         try
         {
             return parent::add_constraint($name, $operator, $value);
-        }
-        catch (exception $e)
+        } catch (exception $e)
         {
             return false;
         }

api/midgard/reflection/property.php

Braces +1 added lines, -2 removed lines

@@ -111,8 +111,7 @@
         {
             $mapping = $this->cm->getFieldMapping($property);
             return $mapping['midgard:midgard_type'];
-        }
-        else if ($this->cm->hasAssociation($property))
+        } else if ($this->cm->hasAssociation($property))
         {
             // for now, only PK fields are supported, which are always IDs, so..
             return translator::TYPE_UINT;

api/midgard/collector.php

Braces +2 added lines, -4 removed lines

@@ -53,8 +53,7 @@ 
         try
         {
             $property_select = $this->build_property_select($property);
-        }
-        catch (exception $e)
+        } catch (exception $e)
         {
             return false;
         }
@@ -103,8 +102,7 @@ 
             try
             {
                 $properties[] = $this->build_property_select($this->key_property);
-            }
-            catch (exception $e)
+            } catch (exception $e)
             {
                 throw new exception('Property "' . $this->key_property . '" not found in "' . $this->classname . '"', exception::INVALID_PROPERTY);
             }

api/midgard/object/class.php

Braces +3 added lines, -6 removed lines

@@ -24,8 +24,7 @@ 
         try
         {
             $result = $qb->getQuery()->getSingleResult();
-        }
-        catch (\Doctrine\ORM\NoResultException $e)
+        } catch (\Doctrine\ORM\NoResultException $e)
         {
             $result = null;
         }
@@ -67,8 +66,7 @@ 
         try
         {
             $classname = self::resolve_classname($guid, true);
-        }
-        catch (exception $e)
+        } catch (exception $e)
         {
             return false;
         }
@@ -95,8 +93,7 @@ 
         {
             $om = new objectmanager(connection::get_em());
             $om->undelete($entity);
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             exception::internal($e);
             return false;

api/midgard/storage.php

Braces +2 added lines, -4 removed lines

@@ -107,16 +107,14 @@
         try
         {
             return $factory->getMetadataFor($classname);
-        }
-        catch (MappingException $e)
+        } catch (MappingException $e)
         {
             // add namespace
             $classname = $em->getConfiguration()->getEntityNamespace("midgard") . '\\' . $classname;
             try
             {
                 return $factory->getMetadataFor($classname);
-            }
-            catch (MappingException $e)
+            } catch (MappingException $e)
             {
                 // check for merged classes (duplicate tablenames)
                 $classname = get_class(new $classname);

src/command/schema.php

Braces +6 added lines, -12 removed lines

@@ -43,8 +43,7 @@ 
             if (file_exists(OPENPSA_PROJECT_BASEDIR . 'config/midgard-portable.inc.php'))
             {
                 $path = OPENPSA_PROJECT_BASEDIR . 'config/midgard-portable.inc.php';
-            }
-            else
+            } else
             {
                 $dialog = $this->getHelper('question');
                 $path = $dialog->ask($input, $output, new Question('<question>Enter path to config file</question>'));
@@ -96,8 +95,7 @@ 
             if (!$em->getConnection()->getSchemaManager()->tablesExist(array($cm->getTableName())))
             {
                 $to_create[] = $cm;
-            }
-            else
+            } else
             {
                 $to_update[] = $cm;
             }
@@ -110,14 +108,12 @@ 
             try
             {
                 $tool->createSchema($to_create);
-            }
-            catch (\Exception $e)
+            } catch (\Exception $e)
             {
                 if (!$force)
                 {
                     throw $e;
-                }
-                else
+                } else
                 {
                     $output->writeln('<error>' . $e->getMessage() . '</error>');
                 }
@@ -187,14 +183,12 @@ 
             try
             {
                 $conn->executeQuery($sql_line);
-            }
-            catch (\Exception $e)
+            } catch (\Exception $e)
             {
                 if (!$force)
                 {
                     throw $e;
-                }
-                else
+                } else
                 {
                     $output->writeln('<error>' . $e->getMessage() . '</error>');
                 }

src/mgdschema/manager.php

Braces +2 added lines, -4 removed lines

@@ -84,8 +84,7 @@ 
             || $property->link['target'] === $property->get_parent()->name)
         {
             $target_class = $property->link['target'];
-        }
-        else
+        } else
         {
             if (!array_key_exists($property->link['target'], $this->merged_types))
             {
@@ -233,8 +232,7 @@ 
         if (array_key_exists($fqcn, $this->types))
         {
             return $this->types[$fqcn];
-        }
-        else if (array_key_exists($classname, $this->merged_types))
+        } else if (array_key_exists($classname, $this->merged_types))
         {
             $fqcn = $this->merged_types[$classname];
             if (!empty($this->namespace))

src/mgdschema/type.php

Braces +3 added lines, -6 removed lines

@@ -52,8 +52,7 @@ 
             if ($name == 'metadata')
             {
                 $this->has_metadata = ($value === 'true');
-            }
-            else
+            } else
             {
                 $this->$name = (string) $value;
             }
@@ -70,8 +69,7 @@ 
         if ($property instanceof mixin)
         {
             $this->mixins[$name] = $property;
-        }
-        else
+        } else
         {
             if ($property->parentfield)
             {
@@ -86,8 +84,7 @@ 
             {
                 $this->properties[$name] = $property;
                 $this->dbfields[$property->field] = $property->name;
-            }
-            else if (!array_key_exists($property->name, $this->properties))
+            } else if (!array_key_exists($property->name, $this->properties))
             {
                 $this->field_aliases[$property->name] = $this->dbfields[$property->field];
             }