diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add typehint to isInteger(), fix tests

Browse Source
This commit is contained in:
William DURAND 2012-12-05 21:47:05 +01:00
parent a26a6904d8
commit 86ab4b345a
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php
View File

@ -347,8 +347,8 @@ class ModelChoiceList extends ObjectChoiceList
* be persisted or added to the idmodel map before. Otherwise an * be persisted or added to the idmodel map before. Otherwise an
* exception is thrown. * exception is thrown.
* *
* @param object $model The model for which to get the identifier * @param object $model The model for which to get the identifier
* @throws FormException If the model does not exist * @throws FormException If the model does not exist
*/ */
private function getIdentifierValues($model) private function getIdentifierValues($model)
{ {
@ -367,10 +367,12 @@ class ModelChoiceList extends ObjectChoiceList
/** /**
* Whether this column in an integer * Whether this column in an integer
* *
* @param ColumnMap $column
*
* @return boolean * @return boolean
*/ */
private function isInteger($col) private function isInteger(\ColumnMap $column)
{ {
return $col->getPdoType() === \PDO::PARAM_INT; return $column->getPdoType() === \PDO::PARAM_INT;
} }
} }

2
src/Symfony/Bridge/Propel1/Tests/Fixtures/ItemQuery.php
View File

@ -31,7 +31,7 @@ class ItemQuery
public function getPrimaryKeys() public function getPrimaryKeys()
{ {
$cm = new ColumnMap('id', $this); $cm = new \ColumnMap('id', new \TableMap());
$cm->setType('INTEGER'); $cm->setType('INTEGER');
return array('id' => $cm); return array('id' => $cm);

2
src/Symfony/Bridge/Propel1/Tests/Fixtures/ReadOnlyItemQuery.php
View File

@ -22,7 +22,7 @@ class ReadOnlyItemQuery
public function getPrimaryKeys() public function getPrimaryKeys()
{ {
$cm = new ColumnMap('id', $this); $cm = new \ColumnMap('id', new \TableMap());
$cm->setType('INTEGER'); $cm->setType('INTEGER');
return array('id' => $cm); return array('id' => $cm);