Skip to content

Commit

Permalink
CS fixes to make builds pass
Browse files Browse the repository at this point in the history
  • Loading branch information
Ocramius committed Apr 18, 2013
1 parent 27512bb commit f5f3e38
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 11 deletions.
2 changes: 1 addition & 1 deletion library/Zend/Db/Adapter/Adapter.php
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ protected function createDriver($parameters)

/**
* @param Driver\DriverInterface $driver
* @return Platform\PlatformInterface
* @return Platform\PlatformInterface
*/
protected function createPlatform($parameters)
{
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Db/Sql/Platform/Oracle/SelectDecorator.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ protected function renderTable($table, $alias = null)
return $table . ' ' . $alias;
}

/**
/**
* @param AdapterInterface $adapter
* @param StatementContainerInterface $statementContainer
*/
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Paginator/Adapter/DbSelect.php
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public function count()
foreach ($joins as $join) {
$select->join($join['name'], $join['on'], array(), $join['type']);
}

$select->columns(array('c' => new Expression('COUNT(1)')));

$statement = $this->sql->prepareStatementForSqlObject($select);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,4 @@ public function testQuoteValueWithPdoPgsql()
$this->assertEquals('\'value\'', $value);
}

}
}
2 changes: 1 addition & 1 deletion tests/ZendTest/Db/IntegrationTestListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -139,4 +139,4 @@ public function endTest(PHPUnit_Framework_Test $test, $time)
}
}
}
}
}
8 changes: 4 additions & 4 deletions tests/ZendTest/Db/Sql/SqlTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class TableGatewayTest extends \PHPUnit_Framework_TestCase
{

protected $mockAdapter = null;

/**
* Sql object
* @var Sql
Expand Down Expand Up @@ -115,14 +115,14 @@ public function testDelete()
$this->sql->delete('bar');

}

/**
* @covers Zend\Db\Sql\Sql::prepareStatementForSqlObject
*/
public function testPrepareStatementForSqlObject()
{
{
$insert = $this->sql->insert()->columns(array('foo'));
$stmt = $this->sql->prepareStatementForSqlObject($insert);
$stmt = $this->sql->prepareStatementForSqlObject($insert);
$this->assertInstanceOf('Zend\Db\Adapter\Driver\StatementInterface', $stmt);
}
}
2 changes: 1 addition & 1 deletion tests/ZendTest/Db/TestAsset/TrustingSql92Platform.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ public function quoteValue($value)
{
return $this->quoteTrustedValue($value);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,3 @@ public function __construct()
{
}
}

0 comments on commit f5f3e38

Please sign in to comment.