Skip to content

Commit

Permalink
Fixed CS
Browse files Browse the repository at this point in the history
  • Loading branch information
willdurand committed Mar 6, 2012
1 parent c1ec205 commit 61619df
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions lib/generator/sfPropelFormGenerator.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ public function getWidgetOptionsForColumn(ColumnMap $column)
$valueSet = $column->getValueSet();
$choices = array_merge(array(''=>''), array_combine($valueSet, $valueSet));

$options[] = sprintf("'choices' => %s", preg_replace('/[\n\r]+/', '', var_export($choices, true)));
$options[] = sprintf("'choices' => %s", preg_replace('/[\n\r]+/', '', var_export($choices, true)));
}

return count($options) ? sprintf('array(%s)', implode(', ', $options)) : '';
Expand Down Expand Up @@ -407,7 +407,7 @@ public function getValidatorOptionsForColumn(ColumnMap $column)
break;
case PropelColumnTypes::ENUM:
$valueSet = $column->getValueSet();
$options[] = sprintf("'choices' => %s", preg_replace('/[\n\r]+/', '', var_export($valueSet, true)));
$options[] = sprintf("'choices' => %s", preg_replace('/[\n\r]+/', '', var_export($valueSet, true)));
break;
}
}
Expand Down
6 changes: 3 additions & 3 deletions test/functional/fixtures/config/schema.xml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
<reference local="id" foreign="id"/>
</foreign-key>
</table>

<!-- model and data for testing SfPropelBehaviorI18n (part of sfPropelORMPlugin - symfony_i18n - historical integration ) -->
<table name="movie" isI18N="true" i18nTable="movie_i18n">
<column name="id" type="integer" required="true" primaryKey="true" autoincrement="true" />
Expand Down Expand Up @@ -144,9 +144,9 @@
<reference local="article_id" foreign="id" onDelete="setnull" />
</foreign-key>
</table>

<table name="enum_sample">
<column name="id" type="integer" required="true" primaryKey="true" autoincrement="true" />
<column name="enum_values" type="enum" valueSet="one, two, three space" />
<column name="enum_values" type="enum" valueSet="one, two, three space" />
</table>
</database>

0 comments on commit 61619df

Please sign in to comment.