flack / midgard-portable

src/api/object.php

Braces +18 added lines, -36 removed lines

@@ -33,8 +33,7 @@ 
             if (is_int($id))
             {
                 $this->get_by_id($id);
-            }
-            else if (is_string($id))
+            } else if (is_string($id))
             {
                 $this->get_by_guid($id);
             }
@@ -98,8 +97,7 @@ 
                     try
                     {
                         $this->$candidate->get_by_id($this->$candidate->id);
-                    }
-                    catch (exception $e)
+                    } catch (exception $e)
                     {
                         connection::log()->error('Failed to refresh parent from proxy: ' . $e->getMessage());
                         return null;
@@ -127,8 +125,7 @@ 
             try
             {
                 $entity->__load();
-            }
-            catch (\Doctrine\ORM\EntityNotFoundException $e)
+            } catch (\Doctrine\ORM\EntityNotFoundException $e)
             {
                 throw exception::object_purged();
             }
@@ -189,8 +186,7 @@ 
         {
             $om = new objectmanager(connection::get_em());
             $om->create($this);
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             exception::internal($e);
             return false;
@@ -216,8 +212,7 @@ 
         {
             $om = new objectmanager(connection::get_em());
             $om->update($this);
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             exception::internal($e);
             return false;
@@ -257,8 +252,7 @@ 
         {
             $om = new objectmanager(connection::get_em());
             $om->delete($this);
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             exception::internal($e);
             return false;
@@ -312,8 +306,7 @@ 
             if ($this->{$this->cm->midgard['upfield']} === null)
             {
                 $conditions->add($qb->expr()->isNull('c.' . $this->cm->midgard['upfield']));
-            }
-            else
+            } else
             {
                 $conditions->add($qb->expr()->eq('c.' . $this->cm->midgard['upfield'], ':' . $this->cm->midgard['upfield']));
                 $parameters[$this->cm->midgard['upfield']] = $this->{$this->cm->midgard['upfield']};
@@ -480,14 +473,12 @@ 
             $parentclass = $this->cm->fullyQualifiedClassName($this->cm->midgard['parent']);
             $parentfield = $parent_cm->midgard['upfield'];
             $upfield = $this->cm->midgard['parentfield'];
-        }
-        else if (!empty($this->cm->midgard['upfield']))
+        } else if (!empty($this->cm->midgard['upfield']))
         {
             $parentclass = get_class($this);
             $upfield = $this->cm->midgard['upfield'];
             $parentfield = $upfield;
-        }
-        else
+        } else
         {
             return false;
         }
@@ -546,8 +537,7 @@ 
                 ->add($qb->expr()->isNull('c.' . $upfield))
                 ->add($qb->expr()->eq('c.' . $upfield, '0'));
             $conditions->add($empty_conditions);
-        }
-        else
+        } else
         {
             $conditions->add($qb->expr()->eq('c.' . $upfield, ':' . $upfield));
             $parameters[$upfield] = $up;
@@ -612,8 +602,7 @@ 
         try
         {
             return $qb->getQuery()->getOneOrNullResult(Query::HYDRATE_SINGLE_SCALAR);
-        }
-        catch (\Doctrine\ORM\NoResultException $e)
+        } catch (\Doctrine\ORM\NoResultException $e)
         {
             return null;
         }
@@ -665,8 +654,7 @@ 
             }
             midgard_connection::get_instance()->set_error(MGD_ERR_OK);
             return true;
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             exception::internal($e);
             return false;
@@ -737,8 +725,7 @@ 
             $om->create($att);
             midgard_connection::get_instance()->set_error(MGD_ERR_OK);
             return $att;
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             exception::internal($e);
             return null;
@@ -773,13 +760,11 @@ 
         {
             $om = new objectmanager(connection::get_em());
             $om->purge($this);
-        }
-        catch (\Doctrine\ORM\EntityNotFoundException $e)
+        } catch (\Doctrine\ORM\EntityNotFoundException $e)
         {
             exception::not_exists();
             return false;
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             exception::internal($e);
             return false;
@@ -842,12 +827,10 @@ 
         if ($action == 'lock')
         {
             $flag = 'islocked';
-        }
-        else if ($action == 'approve')
+        } else if ($action == 'approve')
         {
             $flag = 'isapproved';
-        }
-        else
+        } else
         {
             throw new exception('Unsupported action ' . $action);
         }
@@ -867,8 +850,7 @@ 
             {
                 $om = new objectmanager(connection::get_em());
                 $om->{$action}($this);
-            }
-            catch (\Exception $e)
+            } catch (\Exception $e)
             {
                 exception::internal($e);
                 return false;

src/api/error/exception.php

Spacing +1 added lines, -2 removed lines

@@ -41,8 +41,7 @@
     const TREE_IS_CIRCULAR = -26;
     const OBJECT_IS_LOCKED = -27;
 
-    private static $messages = array
-    (
+    private static $messages = array(
         self::OK => "MGD_ERR_OK",
         self::ACCESS_DENIED => "Access Denied.",
         self::NO_METADATA => "Metadata class not defined.",