Fix/add minor fixes

lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineFormFilter/default/template/sfDoctrineFormFilterGeneratedTemplate.php

@@ -14,7 +14,7 @@ public function setup()
   {
     $this->setWidgets(array(
 <?php foreach ($this->getColumns() as $column): ?>
-<?php if ($column->isPrimaryKey()) continue ?>
+<?php if ($column->isPrimaryKey()) continue; ?>
       '<?php echo $column->getFieldName() ?>'<?php echo str_repeat(' ', $this->getColumnNameMaxLength() - strlen($column->getFieldName())) ?> => new <?php echo $this->getWidgetClassForColumn($column) ?>(<?php echo $this->getWidgetOptionsForColumn($column) ?>),
 <?php endforeach; ?>
 <?php foreach ($this->getManyToManyRelations() as $relation): ?>
@@ -24,7 +24,7 @@ public function setup()
 
     $this->setValidators(array(
 <?php foreach ($this->getColumns() as $column): ?>
-<?php if ($column->isPrimaryKey()) continue ?>
+<?php if ($column->isPrimaryKey()) continue; ?>
       '<?php echo $column->getFieldName() ?>'<?php echo str_repeat(' ', $this->getColumnNameMaxLength() - strlen($column->getFieldName())) ?> => <?php echo $this->getValidatorForColumn($column) ?>,
 <?php endforeach; ?>
 <?php foreach ($this->getManyToManyRelations() as $relation): ?>

lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineModule/default/template/templates/_form.php

@@ -38,7 +38,7 @@
       [?php echo $form ?]
 <?php else: ?>
       [?php echo $form->renderGlobalErrors() ?]
-<?php foreach ($form as $name => $field): if ($field->isHidden()) continue ?>
+<?php foreach ($form as $name => $field): if ($field->isHidden()) continue; ?>
       <tr>
         <th>[?php echo $form['<?php echo $name ?>']->renderLabel() ?]</th>
         <td>

lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Parser/sfYaml/sfYamlParser.php

@@ -168,7 +168,7 @@ public function parse($value)
             else
             {
               // Associative array, merge
-              $merged = array_merge($merge, $parsed);
+              $merged = array_merge($merged, $parsed);
             }
 
             $isProcessed = $merged;

lib/plugins/sfPropelPlugin/data/generator/sfPropelFormFilter/default/template/sfPropelFormFilterGeneratedTemplate.php

@@ -13,7 +13,7 @@ public function setup()
   {
     $this->setWidgets(array(
 <?php foreach ($this->table->getColumns() as $column): ?>
-<?php if ($column->isPrimaryKey()) continue ?>
+<?php if ($column->isPrimaryKey()) continue; ?>
       '<?php echo $this->translateColumnName($column) ?>'<?php echo str_repeat(' ', $this->getColumnNameMaxLength() - strlen($column->getName())) ?> => new <?php echo $this->getWidgetClassForColumn($column) ?>(<?php echo $this->getWidgetOptionsForColumn($column) ?>),
 <?php endforeach; ?>
 <?php foreach ($this->getManyToManyTables() as $tables): ?>
@@ -23,7 +23,7 @@ public function setup()
 
     $this->setValidators(array(
 <?php foreach ($this->table->getColumns() as $column): ?>
-<?php if ($column->isPrimaryKey()) continue ?>
+<?php if ($column->isPrimaryKey()) continue; ?>
       '<?php echo $this->translateColumnName($column) ?>'<?php echo str_repeat(' ', $this->getColumnNameMaxLength() - strlen($column->getName())) ?> => <?php echo $this->getValidatorForColumn($column) ?>,
 <?php endforeach; ?>
 <?php foreach ($this->getManyToManyTables() as $tables): ?>

lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/template/templates/_form.php

@@ -38,7 +38,7 @@
       [?php echo $form ?]
 <?php else: ?>
       [?php echo $form->renderGlobalErrors() ?]
-<?php foreach ($form as $name => $field): if ($field->isHidden()) continue ?>
+<?php foreach ($form as $name => $field): if ($field->isHidden()) continue; ?>
       <tr>
         <th>[?php echo $form['<?php echo $name ?>']->renderLabel() ?]</th>
         <td>