diff --git a/src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php b/src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php
index 8f00c6596e..5d94040622 100644
--- a/src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php
+++ b/src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php
@@ -347,8 +347,8 @@ class ModelChoiceList extends ObjectChoiceList
      * be persisted or added to the idmodel map before. Otherwise an
      * exception is thrown.
      *
-     * @param object $model The model for which to get the identifier
-     * @throws FormException   If the model does not exist
+     * @param  object        $model The model for which to get the identifier
+     * @throws FormException If the model does not exist
      */
     private function getIdentifierValues($model)
     {
@@ -367,10 +367,12 @@ class ModelChoiceList extends ObjectChoiceList
     /**
      * Whether this column in an integer
      *
+     * @param ColumnMap $column
+     *
      * @return boolean
      */
-    private function isInteger($col)
+    private function isInteger(\ColumnMap $column)
     {
-        return $col->getPdoType() === \PDO::PARAM_INT;
+        return $column->getPdoType() === \PDO::PARAM_INT;
     }
 }
diff --git a/src/Symfony/Bridge/Propel1/Tests/Fixtures/ItemQuery.php b/src/Symfony/Bridge/Propel1/Tests/Fixtures/ItemQuery.php
index 20c52d63e5..fe2d03e05f 100644
--- a/src/Symfony/Bridge/Propel1/Tests/Fixtures/ItemQuery.php
+++ b/src/Symfony/Bridge/Propel1/Tests/Fixtures/ItemQuery.php
@@ -31,7 +31,7 @@ class ItemQuery
 
     public function getPrimaryKeys()
     {
-        $cm = new ColumnMap('id', $this);
+        $cm = new \ColumnMap('id', new \TableMap());
         $cm->setType('INTEGER');
 
         return array('id' => $cm);
diff --git a/src/Symfony/Bridge/Propel1/Tests/Fixtures/ReadOnlyItemQuery.php b/src/Symfony/Bridge/Propel1/Tests/Fixtures/ReadOnlyItemQuery.php
index a356837e29..0e77c26fcf 100644
--- a/src/Symfony/Bridge/Propel1/Tests/Fixtures/ReadOnlyItemQuery.php
+++ b/src/Symfony/Bridge/Propel1/Tests/Fixtures/ReadOnlyItemQuery.php
@@ -22,7 +22,7 @@ class ReadOnlyItemQuery
 
     public function getPrimaryKeys()
     {
-        $cm = new ColumnMap('id', $this);
+        $cm = new \ColumnMap('id', new \TableMap());
         $cm->setType('INTEGER');
 
         return array('id' => $cm);