Skip to content

PHP PSR-2 Shift #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
php-shift wants to merge 2 commits into
base: master
Choose a base branch
from
Open

PHP PSR-2 Shift #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9777c4
Format to PSR-2 coding style
php-shift Apr 8, 2016
0fb3650
Split classes into separate files
php-shift Apr 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
374 changes: 187 additions & 187 deletions lib/Gitlab/Api/MergeRequests.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,187 +1,187 @@
<?php namespace Gitlab\Api;
class MergeRequests extends AbstractApi
{
const STATE_ALL = 'all';
const STATE_MERGED = 'merged';
const STATE_OPENED = 'opened';
const STATE_CLOSED = 'closed';
const ORDER_BY = 'created_at';
const SORT = 'asc';
/**
* @param int $project_id
* @param string $state
* @param int $page
* @param int $per_page
* @param string $order_by
* @param string $sort
* @return mixed
*/
public function getList($project_id, $state = self::STATE_ALL, $page = 1, $per_page = self::PER_PAGE, $order_by = self::ORDER_BY, $sort = self::SORT)
{
return $this->get($this->getProjectPath($project_id, 'merge_requests'), array(
'page' => $page,
'per_page' => $per_page,
'state' => $state,
'order_by' => $order_by,
'sort' => $sort
));
}
/**
* @param int $project_id
* @param int $page
* @param int $per_page
* @param string $order_by
* @param string $sort
* @return mixed
*/
public function all($project_id, $page = 1, $per_page = self::PER_PAGE, $order_by = self::ORDER_BY, $sort = self::SORT)
{
return $this->getList($project_id, self::STATE_ALL, $page, $per_page, $order_by, $sort);
}
/**
* @param int $project_id
* @param int $page
* @param int $per_page
* @param string $order_by
* @param string $sort
* @return mixed
*/
public function merged($project_id, $page = 1, $per_page = self::PER_PAGE, $order_by = self::ORDER_BY, $sort = self::SORT)
{
return $this->getList($project_id, self::STATE_MERGED, $page, $per_page, $order_by, $sort);
}
/**
* @param int $project_id
* @param int $page
* @param int $per_page
* @param string $order_by
* @param string $sort
* @return mixed
*/
public function opened($project_id, $page = 1, $per_page = self::PER_PAGE, $order_by = self::ORDER_BY, $sort = self::SORT)
{
return $this->getList($project_id, self::STATE_OPENED, $page, $per_page, $order_by, $sort);
}
/**
* @param int $project_id
* @param int $page
* @param int $per_page
* @param string $order_by
* @param string $sort
* @return mixed
*/
public function closed($project_id, $page = 1, $per_page = self::PER_PAGE, $order_by = self::ORDER_BY, $sort = self::SORT)
{
return $this->getList($project_id, self::STATE_CLOSED, $page, $per_page, $order_by, $sort);
}
/**
* @param int $project_id
* @param int $mr_id
* @return mixed
*/
public function show($project_id, $mr_id)
{
return $this->get($this->getProjectPath($project_id, 'merge_request/'.$this->encodePath($mr_id)));
}
/**
* @param int $project_id
* @param string $source
* @param string $target
* @param string $title
* @param int $assignee
* @param int $target_project_id
* @param string $description
* @return mixed
*/
public function create($project_id, $source, $target, $title, $assignee = null, $target_project_id = null, $description = null)
{
return $this->post($this->getProjectPath($project_id, 'merge_requests'), array(
'source_branch' => $source,
'target_branch' => $target,
'title' => $title,
'assignee_id' => $assignee,
'target_project_id' => $target_project_id,
'description' => $description
));
}
/**
* @param int $project_id
* @param int $mr_id
* @param array $params
* @return mixed
*/
public function update($project_id, $mr_id, array $params)
{
return $this->put($this->getProjectPath($project_id, 'merge_request/'.$this->encodePath($mr_id)), $params);
}
/**
* @param int $project_id
* @param int $mr_id
* @param string $message
* @return mixed
*/
public function merge($project_id, $mr_id, $message = null)
{
if (is_array($message)) {
$params = $message;
} else {
$params = array('merge_commit_message' => $message);
}
return $this->put($this->getProjectPath($project_id, 'merge_request/'.$this->encodePath($mr_id).'/merge'), $params);
}
/**
* @param int $project_id
* @param int $mr_id
* @return mixed
*/
public function showComments($project_id, $mr_id)
{
return $this->get($this->getProjectPath($project_id, 'merge_request/'.$this->encodePath($mr_id).'/comments'));
}
/**
* @param int $project_id
* @param int $mr_id
* @param int $note
* @return mixed
*/
public function addComment($project_id, $mr_id, $note)
{
return $this->post($this->getProjectPath($project_id, 'merge_request/'.$this->encodePath($mr_id).'/comments'), array(
'note' => $note
));
}
/**
* @param int $project_id
* @param int $mr_id
* @return mixed
*/
public function changes($project_id, $mr_id)
{
return $this->get($this->getProjectPath($project_id, 'merge_request/'.$this->encodePath($mr_id).'/changes'));
}
/**
* @param $project_id
* @param $mr_iid
* @return mixed
*/
public function getByIid($project_id, $mr_iid)
{
return $this->get($this->getProjectPath($project_id, 'merge_requests'), array('iid' => $mr_iid));
}
}
<?php namespace Gitlab\Api;

class MergeRequests extends AbstractApi
{
const STATE_ALL = 'all';
const STATE_MERGED = 'merged';
const STATE_OPENED = 'opened';
const STATE_CLOSED = 'closed';

const ORDER_BY = 'created_at';
const SORT = 'asc';

/**
* @param int $project_id
* @param string $state
* @param int $page
* @param int $per_page
* @param string $order_by
* @param string $sort
* @return mixed
*/
public function getList($project_id, $state = self::STATE_ALL, $page = 1, $per_page = self::PER_PAGE, $order_by = self::ORDER_BY, $sort = self::SORT)
{
return $this->get($this->getProjectPath($project_id, 'merge_requests'), array(
'page' => $page,
'per_page' => $per_page,
'state' => $state,
'order_by' => $order_by,
'sort' => $sort
));
}

/**
* @param int $project_id
* @param int $page
* @param int $per_page
* @param string $order_by
* @param string $sort
* @return mixed
*/
public function all($project_id, $page = 1, $per_page = self::PER_PAGE, $order_by = self::ORDER_BY, $sort = self::SORT)
{
return $this->getList($project_id, self::STATE_ALL, $page, $per_page, $order_by, $sort);
}

/**
* @param int $project_id
* @param int $page
* @param int $per_page
* @param string $order_by
* @param string $sort
* @return mixed
*/
public function merged($project_id, $page = 1, $per_page = self::PER_PAGE, $order_by = self::ORDER_BY, $sort = self::SORT)
{
return $this->getList($project_id, self::STATE_MERGED, $page, $per_page, $order_by, $sort);
}

/**
* @param int $project_id
* @param int $page
* @param int $per_page
* @param string $order_by
* @param string $sort
* @return mixed
*/
public function opened($project_id, $page = 1, $per_page = self::PER_PAGE, $order_by = self::ORDER_BY, $sort = self::SORT)
{
return $this->getList($project_id, self::STATE_OPENED, $page, $per_page, $order_by, $sort);
}

/**
* @param int $project_id
* @param int $page
* @param int $per_page
* @param string $order_by
* @param string $sort
* @return mixed
*/
public function closed($project_id, $page = 1, $per_page = self::PER_PAGE, $order_by = self::ORDER_BY, $sort = self::SORT)
{
return $this->getList($project_id, self::STATE_CLOSED, $page, $per_page, $order_by, $sort);
}

/**
* @param int $project_id
* @param int $mr_id
* @return mixed
*/
public function show($project_id, $mr_id)
{
return $this->get($this->getProjectPath($project_id, 'merge_request/'.$this->encodePath($mr_id)));
}

/**
* @param int $project_id
* @param string $source
* @param string $target
* @param string $title
* @param int $assignee
* @param int $target_project_id
* @param string $description
* @return mixed
*/
public function create($project_id, $source, $target, $title, $assignee = null, $target_project_id = null, $description = null)
{
return $this->post($this->getProjectPath($project_id, 'merge_requests'), array(
'source_branch' => $source,
'target_branch' => $target,
'title' => $title,
'assignee_id' => $assignee,
'target_project_id' => $target_project_id,
'description' => $description
));
}

/**
* @param int $project_id
* @param int $mr_id
* @param array $params
* @return mixed
*/
public function update($project_id, $mr_id, array $params)
{
return $this->put($this->getProjectPath($project_id, 'merge_request/'.$this->encodePath($mr_id)), $params);
}

/**
* @param int $project_id
* @param int $mr_id
* @param string $message
* @return mixed
*/
public function merge($project_id, $mr_id, $message = null)
{
if (is_array($message)) {
$params = $message;
} else {
$params = array('merge_commit_message' => $message);
}

return $this->put($this->getProjectPath($project_id, 'merge_request/'.$this->encodePath($mr_id).'/merge'), $params);
}

/**
* @param int $project_id
* @param int $mr_id
* @return mixed
*/
public function showComments($project_id, $mr_id)
{
return $this->get($this->getProjectPath($project_id, 'merge_request/'.$this->encodePath($mr_id).'/comments'));
}

/**
* @param int $project_id
* @param int $mr_id
* @param int $note
* @return mixed
*/
public function addComment($project_id, $mr_id, $note)
{
return $this->post($this->getProjectPath($project_id, 'merge_request/'.$this->encodePath($mr_id).'/comments'), array(
'note' => $note
));
}

/**
* @param int $project_id
* @param int $mr_id
* @return mixed
*/
public function changes($project_id, $mr_id)
{
return $this->get($this->getProjectPath($project_id, 'merge_request/'.$this->encodePath($mr_id).'/changes'));
}

/**
* @param $project_id
* @param $mr_iid
* @return mixed
*/
public function getByIid($project_id, $mr_iid)
{
return $this->get($this->getProjectPath($project_id, 'merge_requests'), array('iid' => $mr_iid));
}
}
3 changes: 2 additions & 1 deletion lib/Gitlab/Model/AbstractModel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,8 @@ public function __get($property)
if (!in_array($property, static::$properties)) {
throw new RuntimeException(sprintf(
'Property "%s" does not exist for %s object',
$property, get_called_class()
$property,
get_called_class()
));
}

Expand Down
Loading