Browse files

fix CS

  • Loading branch information...
1 parent 901cc87 commit 8f63014d06eb55d68be83c4d3de9406de91ad7ac @willdurand willdurand committed Jul 30, 2012
View
14 src/Propel/Runtime/Adapter/Pdo/PdoAdapter.php
@@ -322,10 +322,10 @@ public function useQuoteIdentifier()
/**
* Allows manipulation of the query string before StatementPdo is instantiated.
*
- * @param string $sql The sql statement
- * @param array $params array('column' => ..., 'table' => ..., 'value' => ...)
- * @param Propel\Runtime\ActiveQuery\Criteria $values
- * @param Propel\Runtime\Map\DatabaseMap $dbMap
+ * @param string $sql The sql statement
+ * @param array $params array('column' => ..., 'table' => ..., 'value' => ...)
+ * @param Propel\Runtime\ActiveQuery\Criteria $values
+ * @param Propel\Runtime\Map\DatabaseMap $dbMap
*/
public function cleanupSQL(&$sql, array &$params, Criteria $values, DatabaseMap $dbMap)
{
@@ -335,7 +335,7 @@ public function cleanupSQL(&$sql, array &$params, Criteria $values, DatabaseMap
* Returns the "DELETE FROM <table> [AS <alias>]" part of DELETE query.
*
* @param Propel\Runtime\ActiveQuery\Criteria $criteria
- * @param string $tableName
+ * @param string $tableName
*
* @return string
*/
@@ -367,8 +367,8 @@ public function getDeleteFromClause(Criteria $criteria, $tableName)
* Move from BasePeer to PdoAdapter and turn from static to non static
*
* @param Propel\Runtime\ActiveQuery\Criteria $criteria
- * @param array $fromClause
- * @param boolean $aliasAll
+ * @param array $fromClause
+ * @param boolean $aliasAll
*
* @return string
*/
View
2 src/Propel/Runtime/Adapter/Pdo/PgsqlAdapter.php
@@ -145,7 +145,7 @@ public function random($seed=NULL)
* @see PdoAdapter::getDeleteFromClause()
*
* @param Propel\Runtime\ActiveQuery\Criteria $criteria
- * @param string $tableName
+ * @param string $tableName
*
* @return string
*/
View
28 tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectWithInterfaceTest.php
@@ -14,23 +14,23 @@
class GeneratedObjectWithInterfaceTest extends \PHPUnit_Framework_TestCase
{
- public function setUp()
- {
- if (!class_exists('Foo\MyClassWithInterface')) {
- $schema = <<<EOF
+ public function setUp()
+ {
+ if (!class_exists('Foo\MyClassWithInterface')) {
+ $schema = <<<EOF
<database name="a-database" namespace="Foo">
- <table name="my_class_with_interface" interface="MyInterface">
- <column name="id" required="true" primaryKey="true" autoIncrement="true" type="INTEGER" />
- <column name="name" type="VARCHAR" />
- </table>
+ <table name="my_class_with_interface" interface="MyInterface">
+ <column name="id" required="true" primaryKey="true" autoIncrement="true" type="INTEGER" />
+ <column name="name" type="VARCHAR" />
+ </table>
</database>
EOF;
QuickBuilder::buildSchema($schema);
- }
- }
+ }
+ }
- public function testClassHasInterface()
- {
- $this->assertInstanceOf('Foo\MyInterface', new \Foo\MyClassWithInterface());
- }
+ public function testClassHasInterface()
+ {
+ $this->assertInstanceOf('Foo\MyInterface', new \Foo\MyClassWithInterface());
+ }
}
View
1 tests/Propel/Tests/Generator/Builder/Om/QueryBuilderInheritanceTest.php
@@ -174,4 +174,3 @@ public function testFindPkSimpleWithAbstractSingleTableInheritanceReturnCorrect
Propel::enableInstancePooling();
}
}
-
View
2 tests/Propel/Tests/Helpers/Bookstore/BookstoreTestBase.php
@@ -46,7 +46,7 @@ protected function setUp()
$propelConfig = Propel::getServiceContainer()->getConnectionManager(BookPeer::DATABASE_NAME)->getConfiguration();
if (('mysql' == $adapterClass) && (isset($propelConfig['settings']['charset']))) {
die('Connection option "charset" cannot be used for MySQL connections in PHP versions older than 5.3.6.
-Please refer to http://www.propelorm.org/ticket/1360 for instructions and details
+Please refer to http://www.propelorm.org/ticket/1360 for instructions and details
about the implications of using a SET NAMES statement in the "queries" setting.');
}
}
View
3 tests/Propel/Tests/Runtime/Adapter/Pdo/MysqlAdapterTest.php
@@ -37,7 +37,8 @@ public static function getConParams()
);
}
- protected function setUp() {
+ protected function setUp()
+ {
parent::setUp();
if (version_compare(PHP_VERSION, '5.3.6', '<')) {
$this->setExpectedException('Propel\Runtime\Exception\PropelException');
View
2 tests/Propel/Tests/Runtime/Util/PropelConditionalProxyTest.php
@@ -76,7 +76,7 @@ public function testHierarchy()
class TestPropelConditionalProxy extends PropelConditionalProxy
{
- function _if($cond)
+ public function _if($cond)
{
return new TestPropelConditionalProxy($this->criteria, $cond, $this);
}

0 comments on commit 8f63014

Please sign in to comment.