Merge pull request #24721 from owncloud/public_psr4

Move \OCP to PSR-4
This commit is contained in:
Vincent Petry 2016-05-19 15:53:03 +02:00
commit 65eae43ab1
62 changed files with 4 additions and 4 deletions

View File

@ -53,7 +53,7 @@
* *
*/ */
require_once 'public/constants.php'; require_once 'public/Constants.php';
/** /**
* Class that is a namespace for all global OC variables * Class that is a namespace for all global OC variables

View File

@ -33,7 +33,7 @@ use Doctrine\Common\EventManager;
use OC\DB\QueryBuilder\QueryBuilder; use OC\DB\QueryBuilder\QueryBuilder;
use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\IDBConnection; use OCP\IDBConnection;
use OCP\PreconditionNotMetException; use OCP\PreConditionNotMetException;
class Connection extends \Doctrine\DBAL\Connection implements IDBConnection { class Connection extends \Doctrine\DBAL\Connection implements IDBConnection {
/** /**
@ -262,7 +262,7 @@ class Connection extends \Doctrine\DBAL\Connection implements IDBConnection {
* @param array $updatePreconditionValues ensure values match preconditions (column name => value) * @param array $updatePreconditionValues ensure values match preconditions (column name => value)
* @return int number of new rows * @return int number of new rows
* @throws \Doctrine\DBAL\DBALException * @throws \Doctrine\DBAL\DBALException
* @throws PreconditionNotMetException * @throws PreConditionNotMetException
*/ */
public function setValues($table, array $keys, array $values, array $updatePreconditionValues = []) { public function setValues($table, array $keys, array $values, array $updatePreconditionValues = []) {
try { try {
@ -294,7 +294,7 @@ class Connection extends \Doctrine\DBAL\Connection implements IDBConnection {
$affected = $updateQb->execute(); $affected = $updateQb->execute();
if ($affected === 0 && !empty($updatePreconditionValues)) { if ($affected === 0 && !empty($updatePreconditionValues)) {
throw new PreconditionNotMetException(); throw new PreConditionNotMetException();
} }
return 0; return 0;