flack / midgard-portable

api/midgard/collector.php

Doc Comments +3 added lines

@@ -25,6 +25,9 @@
 
     private $value_properties = array();
 
+    /**
+     * @param string $class
+     */
     function __construct($class, $field, $value)
     {
         parent::__construct($class);

Spacing +2 added lines, -2 removed lines

@@ -70,7 +70,7 @@ 
         $parsed = $this->parse_constraint_name($property);
 
         // for properties like up.name
-        if (   strpos($property, ".") !== false
+        if (strpos($property, ".") !== false
             && !(strpos($property, "metadata") === 0))
         {
             return $parsed['name'] . " as " . str_replace(".", "_", $property);
@@ -154,7 +154,7 @@ 
      */
     public function get($key)
     {
-        if (   !$this->_has_results()
+        if (!$this->_has_results()
             || !isset($this->_results[$key]))
         {
             return false;

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

Doc Comments +3 added lines

@@ -37,6 +37,9 @@
         //??
     }
 
+    /**
+     * @return integer
+     */
     public static function get_instance()
     {
         if (self::$instance === null)

Spacing +2 added lines, -2 removed lines

@@ -84,7 +84,7 @@ 
         return is_object($this->config);
     }
 
-    public function connect($signal, $callback, $userdata = '???' )
+    public function connect($signal, $callback, $userdata = '???')
     {
 
     }
@@ -123,7 +123,7 @@ 
         return connection::get_user();
     }
 
-    public function set_loglevel($level, $callback = '???' )
+    public function set_loglevel($level, $callback = '???')
     {
         if (!in_array($level, $this->available_loglevels))
         {

api/midgard/object/class.php

Doc Comments +3 added lines

@@ -106,6 +106,9 @@
         return true;
     }
 
+    /**
+     * @param string $guid
+     */
     public static function get_object_by_guid($guid)
     {
         if (!mgd_is_guid($guid))

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
         {
             throw exception::object_purged();
         }
-        if (    !$include_deleted
+        if (!$include_deleted
              && $result["object_action"] == subscriber::ACTION_DELETE)
         {
             throw exception::object_deleted();

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/query/builder.php

Doc Comments +3 added lines

@@ -22,6 +22,9 @@
         }
     }
 
+    /**
+     * @param string $operator
+     */
     public function add_constraint($name, $operator, $value)
     {
         try

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

Doc Comments +11 added lines, -2 removed lines

@@ -274,7 +274,7 @@ 
     }
 
     /**
-     * @return boolean Indicating success
+     * @return boolean|null Indicating success
      */
     public static function import_from_xml($xml, $force = false)
     {
@@ -302,6 +302,9 @@ 
         $blob->write_content($blob->content);
     }
 
+    /**
+     * @return string|null
+     */
     private static function resolve_link_id(ClassMetadata $cm, dbobject $object, $name)
     {
         if ($object->$name == 0)
@@ -387,7 +390,7 @@ 
      *
      * @param SimpleXMLElement $node
      * @param boolean $force
-     * @return dbobject
+     * @return blob
      */
     private static function blob_from_xml(SimpleXMLElement $node, $force)
     {
@@ -398,6 +401,9 @@ 
         return $blob;
     }
 
+    /**
+     * @param string $guid
+     */
     private static function get_object_action($guid)
     {
         $result = connection::get_em()
@@ -425,6 +431,9 @@ 
         }
     }
 
+    /**
+     * @return string|null
+     */
     private static function convert_value($value)
     {
         if ($value instanceof midgard_datetime)

Spacing +3 added lines, -3 removed lines

@@ -225,14 +225,14 @@ 
                 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))
@@ -241,7 +241,7 @@ 
             }
             $dbobject->metadata_deleted = false;
         }
-        else if (   !$dbobject->metadata->deleted
+        else if (!$dbobject->metadata->deleted
                  && $object->metadata->deleted)
         {
             return $dbobject->delete();

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

Doc Comments +8 added lines

@@ -61,6 +61,9 @@ 
         return true;
     }
 
+    /**
+     * @param string $classname
+     */
     public static function create_class_storage($classname)
     {
         $em = connection::get_em();
@@ -95,6 +98,11 @@ 
         $generator->generateProxyClass($cm, $filename);
     }
 
+    /**
+     * @param Doctrine\ORM\EntityManagerInterface $em
+     *
+     * @return ClassMetadata
+     */
     private static function get_cm($em, $classname)
     {
         if (!class_exists($classname))

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/api/blob.php

Doc Comments +3 added lines

@@ -31,6 +31,9 @@
         return null;
     }
 
+    /**
+     * @param string $content
+     */
     public function write_content($content)
     {
         return file_put_contents($this->get_path(), $content) !== false;

src/api/config.php

Doc Comments +6 added lines

@@ -30,6 +30,9 @@ 
     public $cachedir = '/var/cache/midgard2';
     public $gdathreads = false;
 
+    /**
+     * @param string $path
+     */
     public function read_file_at_path($path)
     {
         if (   !file_exists($path)
@@ -136,6 +139,9 @@ 
         return true;
     }
 
+    /**
+     * @param string $key
+     */
     private function convert_to_storage($key, $value)
     {
         if (is_bool($value))

Spacing +3 added lines, -4 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;
@@ -47,8 +47,7 @@ 
     // TODO: find out if this could be moved to read_data()
     private function apply_config(array $config)
     {
-        $mapping = array
-        (
+        $mapping = array(
             'type' => 'dbtype',
             'name' => 'database',
             'username' => 'dbuser',
@@ -166,7 +165,7 @@ 
         {
             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;

Braces +3 added lines, -6 removed lines

@@ -80,8 +80,7 @@ 
         if (!$user)
         {
             $prefix = '/etc/midgard2/conf.d';
-        }
-        else
+        } else
         {
             $prefix = getenv('HOME') . '/.midgard2/conf.d';
         }
@@ -93,8 +92,7 @@ 
         if (!$user)
         {
             $prefix = '/etc/midgard2/conf.d';
-        }
-        else
+        } else
         {
             $prefix = getenv('HOME') . '/.midgard2/conf.d';
         }
@@ -141,8 +139,7 @@ 
         if (is_bool($value))
         {
             $value = ($value) ? 'true' : 'false';
-        }
-        else if ($value === '')
+        } else if ($value === '')
         {
             $value = '""';
         }

src/query.php

Doc Comments +6 added lines

@@ -239,6 +239,9 @@ 
         }
     }
 
+    /**
+     * @param string $targetclass
+     */
     protected function add_collection_join($current_table, $targetclass)
     {
         if (!array_key_exists($targetclass, $this->join_tables))
@@ -250,6 +253,9 @@ 
         return $this->join_tables[$targetclass];
     }
 
+    /**
+     * @param \midgard_reflection_property $mrp
+     */
     protected function add_join($current_table, $mrp, $property)
     {
         $targetclass = $mrp->get_link_name($property);

Spacing +7 added lines, -8 removed lines

@@ -99,7 +99,7 @@ 
             $value = (array) $value;
             $value = array_merge($value, $this->get_child_ids($mapping['targetEntity'], $parentfield, $value));
         }
-        else if (   $operator === 'IN'
+        else if ($operator === 'IN'
                  || $operator === 'NOT IN')
         {
             $value = array_values($value);
@@ -285,7 +285,7 @@ 
             $column = array_pop($parts);
             foreach ($parts as $part)
             {
-                if (   $part === 'parameter'
+                if ($part === 'parameter'
                     || $part === 'attachment')
                 {
                     $targetclass = 'midgard_' . $part;
@@ -295,7 +295,7 @@ 
                 {
                     $mrp = new \midgard_reflection_property($targetclass);
 
-                    if (   !$mrp->is_link($part)
+                    if (!$mrp->is_link($part)
                         && !$mrp->is_special_link($part))
                     {
                         throw exception::ok();
@@ -314,14 +314,13 @@ 
             $column = $cm->midgard['field_aliases'][$column];
         }
 
-        if (   !$cm->hasField($column)
+        if (!$cm->hasField($column)
             && !$cm->hasAssociation($column))
         {
             throw exception::ok();
         }
 
-        return array
-        (
+        return array(
             'name' => $current_table . '.' . $column,
             'column' => $column,
             'targetclass' => $targetclass
@@ -333,13 +332,13 @@ 
         $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))
         {

Braces +11 added lines, -22 removed lines

@@ -98,13 +98,11 @@ 
 
             $value = (array) $value;
             $value = array_merge($value, $this->get_child_ids($mapping['targetEntity'], $parentfield, $value));
-        }
-        else if (   $operator === 'IN'
+        } else if (   $operator === 'IN'
                  || $operator === 'NOT IN')
         {
             $value = array_values($value);
-        }
-        else if (!in_array($operator, array('=', '>', '<', '<>', '<=', '>=', 'LIKE', 'NOT LIKE')))
+        } else if (!in_array($operator, array('=', '>', '<', '<>', '<=', '>=', 'LIKE', 'NOT LIKE')))
         {
             return false;
         }
@@ -124,8 +122,7 @@ 
         try
         {
             $parsed = $this->parse_constraint_name($name);
-        }
-        catch (exception $e)
+        } catch (exception $e)
         {
             return false;
         }
@@ -175,12 +172,10 @@ 
         if ($operator === 'OR')
         {
             $this->groupstack[] = $this->qb->expr()->orX();
-        }
-        else if ($operator === 'AND')
+        } else if ($operator === 'AND')
         {
             $this->groupstack[] = $this->qb->expr()->andX();
-        }
-        else
+        } else
         {
             return false;
         }
@@ -200,8 +195,7 @@ 
             if (!empty($this->groupstack))
             {
                 $this->get_current_group()->add($group);
-            }
-            else
+            } else
             {
                 $this->qb->andWhere($group);
             }
@@ -262,8 +256,7 @@ 
             {
                 $c = $this->join_tables[$targetclass] . "." . $mrp->get_link_target($property) . " = " . $current_table . "." . $property;
                 $this->qb->innerJoin("midgard:" . $targetclass, $this->join_tables[$targetclass], Join::WITH, $c);
-            }
-            else
+            } else
             {
                 $this->qb->join($current_table . '.' . $property, $this->join_tables[$targetclass]);
             }
@@ -290,8 +283,7 @@ 
                 {
                     $targetclass = 'midgard_' . $part;
                     $current_table = $this->add_collection_join($current_table, $targetclass);
-                }
-                else
+                } else
                 {
                     $mrp = new \midgard_reflection_property($targetclass);
 
@@ -353,24 +345,21 @@ 
                 {
                     $group = $this->qb->expr()->andX();
                     $group->add($parsed['name'] . ' IS NOT NULL');
-                }
-                else if ($operator === 'IN')
+                } else if ($operator === 'IN')
                 {
                     if (array_search(0, $value) !== false)
                     {
                         $group = $this->qb->expr()->orX();
                         $group->add($parsed['name'] . ' IS NULL');
                     }
-                }
-                else if ($operator === 'NOT IN')
+                } else if ($operator === 'NOT IN')
                 {
                     if (array_search(0, $value) === false)
                     {
                         $group = $this->qb->expr()->orX();
                         $group->add($parsed['name'] . ' IS NULL');
                     }
-                }
-                else
+                } else
                 {
                     $group = $this->qb->expr()->orX();
                     $group->add($parsed['name'] . ' IS NULL');