flack / midgard-portable

src/xmlreader.php

Doc Comments +3 added lines

@@ -103,6 +103,9 @@
         $type->add_property($property);
     }
 
+    /**
+     * @param string $name
+     */
     private function add_mixin($name, type $type)
     {
         if (empty($this->mixins[$name]))

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/bootstrap.php

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
 use midgard\portable\mgdschema\translator;
 use midgard\portable\api\error\exception;
 
-if (   extension_loaded('midgard')
+if (extension_loaded('midgard')
     || extension_loaded('midgard2'))
 {
     //TODO: Print some error?

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>');
                 }

Spacing +2 added lines, -2 removed lines

@@ -60,7 +60,7 @@ 
 
         $mgd_config = midgard_connection::get_instance()->config;
         $mgdobjects_file = $mgd_config->vardir . '/midgard_objects.php';
-        if (   file_exists($mgdobjects_file)
+        if (file_exists($mgdobjects_file)
             && !unlink($mgdobjects_file))
         {
             throw new \RuntimeException('Could not unlink ' . $mgdobjects_file);
@@ -80,7 +80,7 @@ 
         $cms = $em->getMetadataFactory()->getAllMetadata();
 
         // create storage
-        if (    !midgard_storage::create_base_storage()
+        if (!midgard_storage::create_base_storage()
              && midgard_connection::get_instance()->get_error_string() != 'MGD_ERR_OK')
         {
             throw new \Exception("Failed to create base database structures" . midgard_connection::get_instance()->get_error_string());

src/mgdschema/translator.php

Spacing +1 added lines, -2 removed lines

@@ -19,8 +19,7 @@
     const TYPE_TIMESTAMP = 139645924049440;
     const TYPE_GUID = 139645923896704;
 
-    private static $typemap = array
-    (
+    private static $typemap = array(
         'unsigned integer' => self::TYPE_UINT,
         'integer' => self::TYPE_INT,
         'boolean' => self::TYPE_BOOLEAN,

src/mgdschema/manager.php

Spacing +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
             $fqcn = $this->namespace . '\\' . $fqcn;
         }
 
-        if (   array_key_exists($fqcn, $this->types)
+        if (array_key_exists($fqcn, $this->types)
             || $property->link['target'] === $property->get_parent()->name)
         {
             $target_class = $property->link['target'];

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

Spacing +1 added lines, -1 removed lines

@@ -76,7 +76,7 @@
             if ($property->parentfield)
             {
                 $this->parentfield = $property->name;
-                if (   empty($this->parent)
+                if (empty($this->parent)
                     && $property->link)
                 {
                     $this->parent = $property->link['target'];

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];
             }

src/api/user.php

Spacing +5 added lines, -6 removed lines

@@ -65,7 +65,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();
@@ -117,7 +117,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));
@@ -127,7 +127,7 @@ 
 
     public function create()
     {
-        if (   empty($this->authtype)
+        if (empty($this->authtype)
             || !empty($this->id))
         {
             exception::invalid_property_value();
@@ -205,7 +205,7 @@ 
 
     protected function is_unique()
     {
-        if (   empty($this->login)
+        if (empty($this->login)
             || empty($this->authtype))
         {
             return true;
@@ -214,8 +214,7 @@ 
         $qb = connection::get_em()->createQueryBuilder();
         $qb->from(get_class($this), 'c');
         $conditions = $qb->expr()->andX();
-        $parameters = array
-        (
+        $parameters = array(
             'login' => $this->login,
             'authtype' => $this->authtype
         );

Braces +3 added lines, -6 removed lines

@@ -143,8 +143,7 @@ 
         {
             $om = new objectmanager(connection::get_em());
             $om->create($this);
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             exception::internal($e);
             return false;
@@ -170,8 +169,7 @@ 
         {
             $om = new objectmanager(connection::get_em());
             $om->update($this);
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             exception::internal($e);
             return false;
@@ -192,8 +190,7 @@ 
         {
             $om = new objectmanager(connection::get_em());
             $om->purge($this);
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             exception::internal($e);
             return false;

src/api/object.php

Indentation +1 added lines, -1 removed lines

@@ -883,7 +883,7 @@
 
     public function approve()
     {
-       return $this->manage_meta_property("approve", true);
+        return $this->manage_meta_property("approve", true);
     }
 
     public function is_approved()

Spacing +14 added lines, -17 removed lines

@@ -66,7 +66,7 @@ 
 
     public function __get($field)
     {
-        if (   $field === 'metadata'
+        if ($field === 'metadata'
             && property_exists($this, 'metadata')
             && $this->metadata === null)
         {
@@ -92,7 +92,7 @@ 
             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
@@ -121,7 +121,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
@@ -176,7 +176,7 @@ 
             exception::duplicate();
             return false;
         }
-        if (   !$this->is_unique()
+        if (!$this->is_unique()
             || !$this->check_parent())
         {
             return false;
@@ -238,7 +238,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();
@@ -282,8 +282,7 @@ 
         $conditions = $qb->expr()->andX();
         if ($this->id)
         {
-            $parameters = array
-            (
+            $parameters = array(
                 'id' => $this->id
             );
             $conditions->add($qb->expr()->neq('c.id', ':id'));
@@ -337,7 +336,7 @@ 
     {
         $this->initialize();
 
-        if (   empty($this->cm->midgard['parentfield'])
+        if (empty($this->cm->midgard['parentfield'])
             || empty($this->cm->midgard['parent']))
         {
             return true;
@@ -357,7 +356,7 @@ 
 
         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))
             {
@@ -395,7 +394,7 @@ 
             $stat = ($results > 0);
         }
 
-        if (   !$stat
+        if (!$stat
             && !empty($this->cm->midgard['childtypes']))
         {
             foreach ($this->cm->midgard['childtypes'] as $typename => $parentfield)
@@ -534,8 +533,7 @@ 
         $qb->from($classname, 'c');
         $conditions = $qb->expr()->andX();
         $conditions->add($qb->expr()->eq('c.' . $field, ':' . $field));
-        $parameters = array
-        (
+        $parameters = array(
             $field => $part
         );
 
@@ -621,10 +619,9 @@ 
 
     public function set_parameter($domain, $name, $value)
     {
-        $constraints = array
-        (
-            array ('domain', '=', $domain),
-            array ('name', '=', $name),
+        $constraints = array(
+            array('domain', '=', $domain),
+            array('name', '=', $name),
         );
         $params = $this->get_collection('midgard_parameter')->find($this->guid, $constraints);
 
@@ -765,7 +762,7 @@ 
             exception::not_exists();
             return false;
         }
-        if (   $check_dependencies
+        if ($check_dependencies
             && $this->has_dependents())
         {
             exception::has_dependants();

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;

Doc Comments +15 added lines, -2 removed lines

@@ -131,6 +131,9 @@ 
         return null;
     }
 
+    /**
+     * @param integer $id
+     */
     public function get_by_id($id)
     {
         $entity = connection::get_em()->find(get_class($this), $id);
@@ -171,6 +174,9 @@ 
         return true;
     }
 
+    /**
+     * @param string $guid
+     */
     public function get_by_guid($guid)
     {
         if (!mgd_is_guid($guid))
@@ -546,7 +552,8 @@ 
     }
 
     /**
-     * @return int
+     * @param integer $up
+     * @return \Doctrine\ORM\QueryBuilder
      */
     protected function get_uniquefield_query($classname, $field, $part, $upfield, $up)
     {
@@ -639,6 +646,9 @@ 
         }
     }
 
+    /**
+     * @param string $value
+     */
     public function set_parameter($domain, $name, $value)
     {
         $constraints = array
@@ -729,7 +739,7 @@ 
      *
      * @param array $constraints
      * @param boolean $delete_blob
-     * @return boolean False if one or more attachments couldn't be deleted
+     * @return integer False if one or more attachments couldn't be deleted
      * @todo Implement delete_blob & return value
      */
     public function purge_attachments(array $constraints = array(), $delete_blob = true)
@@ -834,6 +844,9 @@ 
         return new \midgard_reflection_property(get_called_class());
     }
 
+    /**
+     * @param string $guid
+     */
     public function set_guid($guid)
     {
         parent::__set('guid', $guid);