deblan/phpci
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

PHPCI/Store PSR2 compliance. Issue #18

Browse source
This commit is contained in:
Dan Cryer 2013-05-16 16:03:34 +01:00
parent 674cf716c8
commit 645936f309
7 changed files with 158 additions and 183 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
PHPCI/Controller/ProjectController.php
View file

@ -78,8 +78,9 @@ class ProjectController extends b8\Controller
protected function getLatestBuildsHtml($projectId, $start = 0)
{
$criteria = array('project_id' => $projectId), 10, $start, array(), array('id' => 'DESC');
$builds = $this->_buildStore->getWhere($criteria);
$criteria = array('project_id' => $projectId);
$order = array('id' => 'DESC');
$builds = $this->_buildStore->getWhere($criteria, 10, $start, array(), $order);
$view = new b8\View('BuildsTable');
$view->builds = $builds['items'];
@ -131,7 +132,7 @@ class ProjectController extends b8\Controller
if (!is_null($code)) {
$http = new \b8\HttpClient();
$url = 'https://github.com/login/oauth/access_token';
$params = array('client_id' => $gh['id'], 'client_secret' => $gh['secret'], 'code' => $code)
$params = array('client_id' => $gh['id'], 'client_secret' => $gh['secret'], 'code' => $code);
$resp = $http->post($url, $params);
if ($resp['success']) {

188
PHPCI/Store/Base/BuildStoreBase.php
View file

@ -5,6 +5,7 @@
*/
namespace PHPCI\Store\Base;
use b8\Store;
/**
@ -12,130 +13,115 @@ use b8\Store;
*/
class BuildStoreBase extends Store
{
protected $_tableName = 'build';
protected $_modelName = '\PHPCI\Model\Build';
protected $_primaryKey = 'id';
protected $tableName = 'build';
protected $modelName = '\PHPCI\Model\Build';
protected $primaryKey = 'id';
public function getByPrimaryKey($value, $useConnection = 'read')
{
return $this->getById($value, $useConnection);
}
public function getByPrimaryKey($value, $useConnection = 'read')
{
return $this->getById($value, $useConnection);
}
public function getById($value, $useConnection = 'read')
{
if(is_null($value))
{
throw new \b8\Exception\HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.');
}
public function getById($value, $useConnection = 'read')
{
if (is_null($value)) {
throw new \b8\Exception\HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.');
}
$stmt = \b8\Database::getConnection($useConnection)->prepare('SELECT * FROM build WHERE id = :id LIMIT 1');
$stmt->bindValue(':id', $value);
$query = 'SELECT * FROM build WHERE id = :id LIMIT 1';
$stmt = \b8\Database::getConnection($useConnection)->prepare($query);
$stmt->bindValue(':id', $value);
if($stmt->execute())
{
if($data = $stmt->fetch(\PDO::FETCH_ASSOC))
{
return new \PHPCI\Model\Build($data);
}
}
if ($stmt->execute()) {
if ($data = $stmt->fetch(\PDO::FETCH_ASSOC)) {
return new \PHPCI\Model\Build($data);
}
}
return null;
}
return null;
}
public function getByProjectId($value, $limit = null, $useConnection = 'read')
{
if(is_null($value))
{
throw new \b8\Exception\HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.');
}
public function getByProjectId($value, $limit = null, $useConnection = 'read')
{
if (is_null($value)) {
throw new \b8\Exception\HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.');
}
$add = '';
$add = '';
if($limit)
{
$add .= ' LIMIT ' . $limit;
}
if ($limit) {
$add .= ' LIMIT ' . $limit;
}
$stmt = \b8\Database::getConnection($useConnection)->prepare('SELECT COUNT(*) AS cnt FROM build WHERE project_id = :project_id' . $add);
$stmt->bindValue(':project_id', $value);
$query = 'SELECT COUNT(*) AS cnt FROM build WHERE project_id = :project_id' . $add;
$stmt = \b8\Database::getConnection($useConnection)->prepare($query);
$stmt->bindValue(':project_id', $value);
if($stmt->execute())
{
$res = $stmt->fetch(\PDO::FETCH_ASSOC);
$count = (int)$res['cnt'];
}
else
{
$count = 0;
}
if ($stmt->execute()) {
$res = $stmt->fetch(\PDO::FETCH_ASSOC);
$count = (int)$res['cnt'];
} else {
$count = 0;
}
$stmt = \b8\Database::getConnection('read')->prepare('SELECT * FROM build WHERE project_id = :project_id' . $add);
$stmt->bindValue(':project_id', $value);
$query = 'SELECT * FROM build WHERE project_id = :project_id' . $add;
$stmt = \b8\Database::getConnection('read')->prepare($query);
$stmt->bindValue(':project_id', $value);
if($stmt->execute())
{
$res = $stmt->fetchAll(\PDO::FETCH_ASSOC);
if ($stmt->execute()) {
$res = $stmt->fetchAll(\PDO::FETCH_ASSOC);
$rtn = array_map(function($item)
{
return new \PHPCI\Model\Build($item);
}, $res);
$map = function ($item) {
return new \PHPCI\Model\Build($item);
};
$rtn = array_map($map, $res);
return array('items' => $rtn, 'count' => $count);
}
else
{
return array('items' => array(), 'count' => 0);
}
}
return array('items' => $rtn, 'count' => $count);
} else {
return array('items' => array(), 'count' => 0);
}
}
public function getByStatus($value, $limit = null, $useConnection = 'read')
{
if(is_null($value))
{
throw new \b8\Exception\HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.');
}
public function getByStatus($value, $limit = null, $useConnection = 'read')
{
if (is_null($value)) {
throw new \b8\Exception\HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.');
}
$add = '';
$add = '';
if($limit)
{
$add .= ' LIMIT ' . $limit;
}
if ($limit) {
$add .= ' LIMIT ' . $limit;
}
$stmt = \b8\Database::getConnection($useConnection)->prepare('SELECT COUNT(*) AS cnt FROM build WHERE status = :status' . $add);
$stmt->bindValue(':status', $value);
$query = 'SELECT COUNT(*) AS cnt FROM build WHERE status = :status' . $add;
$stmt = \b8\Database::getConnection($useConnection)->prepare($query);
$stmt->bindValue(':status', $value);
if($stmt->execute())
{
$res = $stmt->fetch(\PDO::FETCH_ASSOC);
$count = (int)$res['cnt'];
}
else
{
$count = 0;
}
if ($stmt->execute()) {
$res = $stmt->fetch(\PDO::FETCH_ASSOC);
$count = (int)$res['cnt'];
} else {
$count = 0;
}
$stmt = \b8\Database::getConnection('read')->prepare('SELECT * FROM build WHERE status = :status' . $add);
$stmt->bindValue(':status', $value);
$query = 'SELECT * FROM build WHERE status = :status' . $add;
$stmt = \b8\Database::getConnection('read')->prepare($query);
$stmt->bindValue(':status', $value);
if($stmt->execute())
{
$res = $stmt->fetchAll(\PDO::FETCH_ASSOC);
if ($stmt->execute()) {
$res = $stmt->fetchAll(\PDO::FETCH_ASSOC);
$rtn = array_map(function($item)
{
return new \PHPCI\Model\Build($item);
}, $res);
return array('items' => $rtn, 'count' => $count);
}
else
{
return array('items' => array(), 'count' => 0);
}
}
$map = function ($item) {
return new \PHPCI\Model\Build($item);
};
$rtn = array_map($map, $res);
return array('items' => $rtn, 'count' => $count);
} else {
return array('items' => array(), 'count' => 0);
}
}
}

48
PHPCI/Store/Base/ProjectStoreBase.php
View file

@ -5,6 +5,7 @@
*/
namespace PHPCI\Store\Base;
use b8\Store;
/**
@ -12,36 +13,33 @@ use b8\Store;
*/
class ProjectStoreBase extends Store
{
protected $_tableName = 'project';
protected $_modelName = '\PHPCI\Model\Project';
protected $_primaryKey = 'id';
protected $tableName = 'project';
protected $modelName = '\PHPCI\Model\Project';
protected $primaryKey = 'id';
public function getByPrimaryKey($value, $useConnection = 'read')
{
return $this->getById($value, $useConnection);
}
public function getByPrimaryKey($value, $useConnection = 'read')
{
return $this->getById($value, $useConnection);
}
public function getById($value, $useConnection = 'read')
{
if(is_null($value))
{
throw new \b8\Exception\HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.');
}
public function getById($value, $useConnection = 'read')
{
if (is_null($value)) {
throw new \b8\Exception\HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.');
}
$stmt = \b8\Database::getConnection($useConnection)->prepare('SELECT * FROM project WHERE id = :id LIMIT 1');
$stmt->bindValue(':id', $value);
$query = 'SELECT * FROM project WHERE id = :id LIMIT 1';
$stmt = \b8\Database::getConnection($useConnection)->prepare($query);
$stmt->bindValue(':id', $value);
if($stmt->execute())
{
if($data = $stmt->fetch(\PDO::FETCH_ASSOC))
{
return new \PHPCI\Model\Project($data);
}
}
return null;
}
if ($stmt->execute()) {
if ($data = $stmt->fetch(\PDO::FETCH_ASSOC)) {
return new \PHPCI\Model\Project($data);
}
}
return null;
}
}

80
PHPCI/Store/Base/UserStoreBase.php
View file

@ -5,6 +5,7 @@
*/
namespace PHPCI\Store\Base;
use b8\Store;
/**
@ -12,57 +13,52 @@ use b8\Store;
*/
class UserStoreBase extends Store
{
protected $_tableName = 'user';
protected $_modelName = '\PHPCI\Model\User';
protected $_primaryKey = 'id';
protected $tableName = 'user';
protected $modelName = '\PHPCI\Model\User';
protected $primaryKey = 'id';
public function getByPrimaryKey($value, $useConnection = 'read')
{
return $this->getById($value, $useConnection);
}
public function getByPrimaryKey($value, $useConnection = 'read')
{
return $this->getById($value, $useConnection);
}
public function getById($value, $useConnection = 'read')
{
if(is_null($value))
{
throw new \b8\Exception\HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.');
}
public function getById($value, $useConnection = 'read')
{
if (is_null($value)) {
throw new \b8\Exception\HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.');
}
$stmt = \b8\Database::getConnection($useConnection)->prepare('SELECT * FROM user WHERE id = :id LIMIT 1');
$stmt->bindValue(':id', $value);
$query = 'SELECT * FROM user WHERE id = :id LIMIT 1';
$stmt = \b8\Database::getConnection($useConnection)->prepare($query);
$stmt->bindValue(':id', $value);
if($stmt->execute())
{
if($data = $stmt->fetch(\PDO::FETCH_ASSOC))
{
return new \PHPCI\Model\User($data);
}
}
if ($stmt->execute()) {
if ($data = $stmt->fetch(\PDO::FETCH_ASSOC)) {
return new \PHPCI\Model\User($data);
}
}
return null;
}
return null;
}
public function getByEmail($value, $useConnection = 'read')
{
if(is_null($value))
{
throw new \b8\Exception\HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.');
}
public function getByEmail($value, $useConnection = 'read')
{
if (is_null($value)) {
throw new \b8\Exception\HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.');
}
$stmt = \b8\Database::getConnection($useConnection)->prepare('SELECT * FROM user WHERE email = :email LIMIT 1');
$stmt->bindValue(':email', $value);
$query = 'SELECT * FROM user WHERE email = :email LIMIT 1';
$stmt = \b8\Database::getConnection($useConnection)->prepare($query);
$stmt->bindValue(':email', $value);
if($stmt->execute())
{
if($data = $stmt->fetch(\PDO::FETCH_ASSOC))
{
return new \PHPCI\Model\User($data);
}
}
return null;
}
if ($stmt->execute()) {
if ($data = $stmt->fetch(\PDO::FETCH_ASSOC)) {
return new \PHPCI\Model\User($data);
}
}
return null;
}
}

6
PHPCI/Store/BuildStore.php
View file

@ -9,8 +9,6 @@
namespace PHPCI\Store;
require_once(APPLICATION_PATH . 'PHPCI/Store/Base/BuildStoreBase.php');
use PHPCI\Store\Base\BuildStoreBase;
/**
@ -21,5 +19,5 @@ use PHPCI\Store\Base\BuildStoreBase;
*/
class BuildStore extends BuildStoreBase
{
// This class has been left blank so that you can modify it - changes in this file will not be overwritten.
}
// This class has been left blank so that you can modify it - changes in this file will not be overwritten.
}

6
PHPCI/Store/ProjectStore.php
View file

@ -9,8 +9,6 @@
namespace PHPCI\Store;
require_once(APPLICATION_PATH . 'PHPCI/Store/Base/ProjectStoreBase.php');
use PHPCI\Store\Base\ProjectStoreBase;
/**
@ -21,5 +19,5 @@ use PHPCI\Store\Base\ProjectStoreBase;
*/
class ProjectStore extends ProjectStoreBase
{
// This class has been left blank so that you can modify it - changes in this file will not be overwritten.
}
// This class has been left blank so that you can modify it - changes in this file will not be overwritten.
}

6
PHPCI/Store/UserStore.php
View file

@ -9,8 +9,6 @@
namespace PHPCI\Store;
require_once(APPLICATION_PATH . 'PHPCI/Store/Base/UserStoreBase.php');
use PHPCI\Store\Base\UserStoreBase;
/**
@ -21,5 +19,5 @@ use PHPCI\Store\Base\UserStoreBase;
*/
class UserStore extends UserStoreBase
{
// This class has been left blank so that you can modify it - changes in this file will not be overwritten.
}
// This class has been left blank so that you can modify it - changes in this file will not be overwritten.
}