flack / midgard-portable

src/storage/connection.php

Spacing +2 added lines, -3 removed lines

@@ -34,8 +34,7 @@ 
      *
      * @var array
      */
-    private static $loglevels = array
-    (
+    private static $loglevels = array(
         'error' => Logger::ERROR,
         'warn' => Logger::WARNING,
         'warning' => Logger::WARNING,
@@ -226,7 +225,7 @@ 
             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');

Braces +1 added lines, -2 removed lines

@@ -233,8 +233,7 @@
                 }
                 self::$logger = new Logger('midgard-portable');
                 self::$logger->pushHandler(new StreamHandler($midgard->config->logfilename, self::$loglevels[$midgard->get_loglevel()]));
-            }
-            else
+            } else
             {
                 throw exception::user_data('log filename not set in config');
             }

src/storage/subscriber.php

Spacing +7 added lines, -10 removed lines

@@ -109,7 +109,7 @@ 
         {
             $repligard_entry = $em->getRepository('midgard:midgard_repligard')->findOneBy(array('guid' => $entity->guid));
 
-            if (   $entity instanceof entity
+            if ($entity instanceof entity
                 && $entity->metadata->deleted)
             {
                 $repligard_entry->object_action = self::ACTION_DELETE;
@@ -158,7 +158,7 @@ 
         {
             if ($platform->getName() === 'sqlite')
             {
-                if (   !empty($config['primary'])
+                if (!empty($config['primary'])
                     && !empty($config['autoincrement']))
                 {
                     /*
@@ -168,7 +168,7 @@ 
                     $modified = true;
                     $config['columnDefinition'] = 'INTEGER PRIMARY KEY AUTOINCREMENT';
                 }
-                if (   !empty($config['comment'])
+                if (!empty($config['comment'])
                     && $config['comment'] == 'BINARY')
                 {
                     $modified = true;
@@ -263,8 +263,7 @@ 
         {
             $args->preventDefault();
 
-            $options = array
-            (
+            $options = array(
                 'length' => 255,
                 'default' => isset($column['default']) ? $column['default'] : null,
                 'notnull' => (bool) ($column['null'] != 'YES'),
@@ -276,8 +275,7 @@ 
         else if ($type == 'datetime')
         {
             $args->preventDefault();
-            $options = array
-            (
+            $options = array(
                 'default' => isset($column['default']) ? $column['default'] : null,
                 'notnull' => (bool) ($column['null'] != 'YES'),
             );
@@ -296,7 +294,7 @@ 
     public function postGenerateSchemaTable(GenerateSchemaTableEventArgs $args)
     {
         $table = $args->getClassTable();
-        if (   !$table->hasOption('engine')
+        if (!$table->hasOption('engine')
             || $table->getOption('engine') !== 'MyISAM')
         {
             return;
@@ -309,8 +307,7 @@ 
 
     public function getSubscribedEvents()
     {
-        return array
-        (
+        return array(
             Events::onFlush,
             dbal_events::onSchemaCreateTable, dbal_events::onSchemaColumnDefinition,
             ToolEvents::postGenerateSchemaTable

Braces +2 added lines, -4 removed lines

@@ -113,8 +113,7 @@ 
                 && $entity->metadata->deleted)
             {
                 $repligard_entry->object_action = self::ACTION_DELETE;
-            }
-            else
+            } else
             {
                 $repligard_entry->object_action = self::ACTION_UPDATE;
             }
@@ -272,8 +271,7 @@ 
             );
 
             $args->setColumn(new Column($column['field'], Type::getType(Type::STRING), $options));
-        }
-        else if ($type == 'datetime')
+        } else if ($type == 'datetime')
         {
             $args->preventDefault();
             $options = array

src/classgenerator.php

Indentation +1 added lines, -1 removed lines

@@ -200,7 +200,7 @@
                     break;
             }
             if (   $default !== null
-                   // we need to skip working links because in this case, Doctrine expects objects as values
+                    // we need to skip working links because in this case, Doctrine expects objects as values
                 && (   !$property->link
                     || $this->manager->resolve_targetclass($property) === false))
             {

Spacing +5 added lines, -5 removed lines

@@ -69,7 +69,7 @@ 
         $types = $this->manager->get_types();
         uasort($types, function($a, $b)
         {
-            if (   !empty($a->extends)
+            if (!empty($a->extends)
                 && !empty($b->extends))
             {
                 return strnatcmp($a->extends, $b->extends);
@@ -118,7 +118,7 @@ 
 
         foreach ($this->manager->get_types() as $type)
         {
-            if (   $prefix !== ''
+            if ($prefix !== ''
                 && !class_exists($type->name))
             {
                 $this->add_line('class_alias( "' . $prefix . $type->name . '", "' . $type->name . '");');
@@ -128,7 +128,7 @@ 
         foreach ($this->manager->get_inherited_mapping() as $child => $parent)
         {
             $this->add_line('class_alias( "' . $prefix . $parent . '", "' . $prefix . $child . '");');
-            if (   $prefix !== ''
+            if ($prefix !== ''
                 && !class_exists($child))
             {
                 $this->add_line('class_alias( "' . $prefix . $parent . '", "' . $child . '");');
@@ -199,9 +199,9 @@ 
                     $objects[$name] = 'new midgard_datetime("0001-01-01 00:00:00")';
                     break;
             }
-            if (   $default !== null
+            if ($default !== null
                    // we need to skip working links because in this case, Doctrine expects objects as values
-                && (   !$property->link
+                && (!$property->link
                     || $this->manager->resolve_targetclass($property) === false))
             {
                 $line .= ' = ' . $default;

Braces +3 added lines, -6 removed lines

@@ -52,8 +52,7 @@ 
         if ($this->dev_mode)
         {
             $this->output .= "\n";
-        }
-        else
+        } else
         {
             $this->output .= ' ';
         }
@@ -73,12 +72,10 @@ 
                 && !empty($b->extends))
             {
                 return strnatcmp($a->extends, $b->extends);
-            }
-            else if (!empty($a->extends))
+            } else if (!empty($a->extends))
             {
                 return -1;
-            }
-            else if (!empty($b->extends))
+            } else if (!empty($b->extends))
             {
                 return 1;
             }

src/driver.php

Spacing +8 added lines, -15 removed lines

@@ -20,8 +20,7 @@ 
 
 class driver implements driver_interface
 {
-    private $dbtypemap = array
-    (
+    private $dbtypemap = array(
         'unsigned integer' => array('type' => dtype::INTEGER, 'default' => 0), // <== UNSIGNED in Doctrine\DBAL\Schema\Column
         'integer' => array('type' => dtype::INTEGER, 'default' => 0),
         'boolean' => array('type' => dtype::BOOLEAN, 'default' => false),
@@ -145,11 +144,9 @@ 
 
         // TODO: extends
 
-        $table = array
-        (
+        $table = array(
             'name' => $type->table,
-            'options' => array
-            (
+            'options' => array(
                 //Doctrine's default on MySQL is InnoDB, and the foreign keys don't play well with Midgard logic
                 //TODO: Maybe at some point we could try to figure out how to explicitly disable foreign key constraint creation instead
                 'engine' => 'MyISAM'
@@ -167,17 +164,14 @@ 
         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
-                (
+                $link_mapping = array(
                     'fieldName' => $property->name,
                     'targetEntity' => $target_class,
-                    'joinColumns' => array
-                    (
-                        array
-                        (
+                    'joinColumns' => array(
+                        array(
                             'name' => $property->field,
                             'referencedColumnName' => $property->link['field']
                         )
@@ -260,8 +254,7 @@ 
     {
         if (strpos($property->dbtype, 'varchar') === 0)
         {
-            $mapping = array
-            (
+            $mapping = array(
                 'type' => dtype::STRING,
             );
 

Braces +5 added lines, -10 removed lines

@@ -69,8 +69,7 @@ 
         {
             $this->manager = new manager($schemadirs, $this->namespace);
             self::$processed_namespaces[$this->namespace] = array("manager" => $this->manager);
-        }
-        else
+        } else
         {
             // reuse manager instance
             $this->manager = self::$processed_namespaces[$this->namespace]["manager"];
@@ -198,8 +197,7 @@ 
             if (empty($this->dbtypemap[$property->dbtype]))
             {
                 $mapping = $this->parse_dbtype($property);
-            }
-            else
+            } else
             {
                 $mapping = $this->dbtypemap[$property->dbtype];
             }
@@ -209,8 +207,7 @@ 
                 if ($property->name == 'guid')
                 {
                     $mapping['unique'] = true;
-                }
-                else
+                } else
                 {
                     //we can't set this as a real DB constraint because of softdelete and tree hierarchies
                     $metadata->midgard['unique_fields'][] = $property->name;
@@ -234,8 +231,7 @@ 
                 if ($mapping['type'] == dtype::INTEGER)
                 {
                     $metadata->setIdGeneratorType(CM::GENERATOR_TYPE_AUTO);
-                }
-                else
+                } else
                 {
                     $metadata->setIdGeneratorType(CM::GENERATOR_TYPE_NONE);
                 }
@@ -278,8 +274,7 @@ 
                 $mapping['comment'] = 'BINARY';
                 return $mapping;
             }
-        }
-        else if (strpos($property->dbtype, 'set') === 0)
+        } else if (strpos($property->dbtype, 'set') === 0)
         {
             // see http://docs.doctrine-project.org/en/latest/cookbook/mysql-enums.html
             if (!empty($this->dbtypemap[$property->type]))

src/mapping/classmetadata.php

Spacing +1 added lines, -2 removed lines

@@ -10,8 +10,7 @@
 
 class classmetadata extends base_metadata
 {
-    public $midgard = array
-    (
+    public $midgard = array(
         'parent' => null,
         'parentfield' => null,
         'upfield' => null,