flack / midgard-portable

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;

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

Doc Comments +11 added lines, -2 removed lines

@@ -240,7 +240,7 @@ 
     }
 
     /**
-     * @return boolean Indicating success
+     * @return boolean|null Indicating success
      */
     public static function import_from_xml($xml, $force = false)
     {
@@ -264,6 +264,9 @@ 
         $blob->write_content($blob->content);
     }
 
+    /**
+     * @return string|null
+     */
     private static function resolve_link_id(ClassMetadata $cm, dbobject $object, $name)
     {
         if ($object->$name == 0) {
@@ -339,7 +342,7 @@ 
      *
      * @param SimpleXMLElement $node
      * @param boolean $force
-     * @return dbobject
+     * @return blob
      */
     private static function blob_from_xml(SimpleXMLElement $node, $force)
     {
@@ -350,6 +353,9 @@ 
         return $blob;
     }
 
+    /**
+     * @param string $guid
+     */
     private static function get_object_action($guid)
     {
         $result = connection::get_em()
@@ -376,6 +382,9 @@ 
         }
     }
 
+    /**
+     * @return string|null
+     */
     private static function convert_value($value)
     {
         if ($value instanceof midgard_datetime) {

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

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)
@@ -122,6 +125,9 @@ 
         return true;
     }
 
+    /**
+     * @param string $key
+     */
     private function convert_to_storage($key, $value)
     {
         if (is_bool($value)) {

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

Doc Comments +6 added lines

@@ -205,6 +205,9 @@ 
         }
     }
 
+    /**
+     * @param string $targetclass
+     */
     protected function add_collection_join($current_table, $targetclass)
     {
         if (!array_key_exists($targetclass, $this->join_tables)) {
@@ -215,6 +218,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);

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

Doc Comments +4 added lines

@@ -123,6 +123,7 @@ 
 
     /**
      * Toggle autostart
+     * @param boolean $autostart
      */
     public static function set_autostart($autostart)
     {
@@ -156,6 +157,9 @@ 
         }
     }
 
+    /**
+     * @param string $name
+     */
     public static function get_parameter($name)
     {
         if (!array_key_exists($name, self::$parameters)) {

src/driver.php

Spacing +1 added lines, -1 removed lines

@@ -156,7 +156,7 @@
 
         foreach ($type->get_properties() as $name => $property) {
             // doctrine can handle id links only
-            if (   $property->link
+            if ($property->link
                 && $target_class = $this->manager->resolve_targetclass($property)) {
                 $link_mapping = array(
                     'fieldName' => $property->name,

src/storage/subscriber.php

Spacing +4 added lines, -4 removed lines

@@ -99,7 +99,7 @@ 
         if (!($entity instanceof repligard)) {
             $repligard_entry = $em->getRepository('midgard:midgard_repligard')->findOneBy(array('guid' => $entity->guid));
 
-            if (   $entity instanceof metadata
+            if ($entity instanceof metadata
                 && $entity->{metadata::DELETED_FIELD}) {
                 $repligard_entry->object_action = self::ACTION_DELETE;
             } else {
@@ -140,7 +140,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
@@ -149,7 +149,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);
@@ -257,7 +257,7 @@ 
     public function postGenerateSchemaTable(GenerateSchemaTableEventArgs $args)
     {
         $table = $args->getClassTable();
-        if (   !$table->hasOption('engine')
+        if (!$table->hasOption('engine')
             || $table->getOption('engine') !== 'MyISAM') {
             return;
         }