Add typehint to isInteger(), fix tests

willdurand · willdurand · commit 86ab4b345af4 · 2012-12-05T21:47:05.000+01:00
diff --git a/src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php b/src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php
@@ -347,8 +347,8 @@ private function load()
      * 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 @@ private function getIdentifierValues($model)
     /**
      * 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
@@ -31,7 +31,7 @@ public function getTableMap()
 
     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
@@ -22,7 +22,7 @@ public function getTableMap()
 
     public function getPrimaryKeys()
     {
-        $cm = new ColumnMap('id', $this);
+        $cm = new \ColumnMap('id', new \TableMap());
         $cm->setType('INTEGER');
 
         return array('id' => $cm);

Original file line number	Diff line number	Diff line change
`@@ -347,8 +347,8 @@ private function load()`
`347`	`347`	`* be persisted or added to the idmodel map before. Otherwise an`
`348`	`348`	`* exception is thrown.`
`349`	`349`	`*`
`350`		`- * @param object $model The model for which to get the identifier`
`351`		`- * @throws FormException If the model does not exist`
	`350`	`+ * @param object $model The model for which to get the identifier`
	`351`	`+ * @throws FormException If the model does not exist`
`352`	`352`	`*/`
`353`	`353`	`private function getIdentifierValues($model)`
`354`	`354`	`{`
`@@ -367,10 +367,12 @@ private function getIdentifierValues($model)`
`367`	`367`	`/**`
`368`	`368`	`* Whether this column in an integer`
`369`	`369`	`*`
	`370`	`+ * @param ColumnMap $column`
	`371`	`+ *`
`370`	`372`	`* @return boolean`
`371`	`373`	`*/`
`372`		`- private function isInteger($col)`
	`374`	`+ private function isInteger(\ColumnMap $column)`
`373`	`375`	`{`
`374`		`- return $col->getPdoType() === \PDO::PARAM_INT;`
	`376`	`+ return $column->getPdoType() === \PDO::PARAM_INT;`
`375`	`377`	`}`
`376`	`378`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public function getTableMap()`
`31`	`31`
`32`	`32`	`public function getPrimaryKeys()`
`33`	`33`	`{`
`34`		`- $cm = new ColumnMap('id', $this);`
	`34`	`+ $cm = new \ColumnMap('id', new \TableMap());`
`35`	`35`	`$cm->setType('INTEGER');`
`36`	`36`
`37`	`37`	`return array('id' => 877C $cm);`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public function getTableMap()`
`22`	`22`
`23`	`23`	`public function getPrimaryKeys()`
`24`	`24`	`{`
`25`		`- $cm = new ColumnMap('id', $this);`
	`25`	`+ $cm = new \ColumnMap('id', new \TableMap());`
`26`	`26`	`$cm->setType('INTEGER');`
`27`	`27`
`28`	`28`	`return array('id' => $cm);`