Commit: 017e87d850745e11b68228f1a11e5bb46543494e
Author: Peter Kokot <[email protected]> Mon, 3 Dec 2018 00:02:21
+0100
Parents: 4efd3c3c47d44e0bcb6e29f2a9ab86347ee895ee
Branches: master
Link:
http://git.php.net/?p=web/bugs.git;a=commitdiff;h=017e87d850745e11b68228f1a11e5bb46543494e
Log:
Add methods and properties visibility
Changed paths:
M include/classes/bug_diff_renderer.php
M include/classes/bug_ghpulltracker.php
M include/classes/bug_patchtracker.php
diff --git a/include/classes/bug_diff_renderer.php
b/include/classes/bug_diff_renderer.php
index aec6809..9fb0b3c 100644
--- a/include/classes/bug_diff_renderer.php
+++ b/include/classes/bug_diff_renderer.php
@@ -16,18 +16,18 @@ require_once 'Text/Diff/Renderer.php';
class Bug_Diff_Renderer extends Text_Diff_Renderer
{
// Number of leading context "lines" to preserve.
- var $_leading_context_lines = 4;
+ public $_leading_context_lines = 4;
// Number of trailing context "lines" to preserve.
- var $_trailing_context_lines = 4;
+ public $_trailing_context_lines = 4;
- function __construct($d)
+ public function __construct($d)
{
$this->diff = $d;
parent::__construct();
}
- function _blockHeader($xbeg, $xlen, $ybeg, $ylen)
+ public function _blockHeader($xbeg, $xlen, $ybeg, $ylen)
{
$removed = $xlen - $ylen;
if ($removed > 0) {
@@ -35,30 +35,30 @@ class Bug_Diff_Renderer extends Text_Diff_Renderer
}
}
- function _added($lines)
+ public function _added($lines)
{
array_walk($lines, create_function('&$a,$b',
'$a=htmlspecialchars($a);'));
return '<span class="newdiff"> ' . implode("</span>\n<span
class='newdiff'> ", $lines) . '</span>';
}
- function _context($lines)
+ public function _context($lines)
{
array_walk($lines, create_function('&$a,$b',
'$a=htmlspecialchars($a);'));
return "\n" . parent::_context($lines);
}
- function _deleted($lines)
+ public function _deleted($lines)
{
array_walk($lines, create_function('&$a,$b',
'$a=htmlspecialchars($a);'));
return '<span class="olddiff"> ' . implode("</span>\n<span
class='olddiff'> ", $lines) . '</span>';
}
- function _changed($orig, $final)
+ public function _changed($orig, $final)
{
return $this->_deleted($orig) . "\n" . $this->_added($final);
}
- function render($diff)
+ public function render($diff)
{
return parent::render($this->diff);
}
diff --git a/include/classes/bug_ghpulltracker.php
b/include/classes/bug_ghpulltracker.php
index 3ad968c..5e7cbee 100644
--- a/include/classes/bug_ghpulltracker.php
+++ b/include/classes/bug_ghpulltracker.php
@@ -2,13 +2,12 @@
class Bug_Pulltracker
{
- var $_dbh;
+ private $dbh;
private $userAgent = 'bugs.php.net Pulltracker';
-
- function __construct()
+ public function __construct()
{
- $this->_dbh = $GLOBALS['dbh'];
+ $this->dbh = $GLOBALS['dbh'];
}
private function getDataFromGithub($repo, $pull_id)
@@ -29,14 +28,14 @@ class Bug_Pulltracker
/**
* Attach a pull request to this bug
*/
- function attach($bugid, $repo, $pull_id, $developer)
+ public function attach($bugid, $repo, $pull_id, $developer)
{
$data = $this->getDataFromGithub($repo, $pull_id);
if (!$data) {
return PEAR::raiseError('Failed to retrieve pull
request from GitHub');
}
PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
- $e = $this->_dbh->prepare('INSERT INTO bugdb_pulls
+ $e = $this->dbh->prepare('INSERT INTO bugdb_pulls
(bugdb_id, github_repo, github_pull_id, github_title,
github_html_url, developer) VALUES (?, ?, ?, ?, ?, ?)')->execute(
[$bugid, $repo, $pull_id, $data->title,
$data->html_url, $developer]);
PEAR::popErrorHandling();
@@ -50,9 +49,9 @@ class Bug_Pulltracker
/**
* Remove a pull request from this bug
*/
- function detach($bugid, $repo, $pull_id)
+ public function detach($bugid, $repo, $pull_id)
{
- $this->_dbh->prepare('DELETE FROM bugdb_pulls
+ $this->dbh->prepare('DELETE FROM bugdb_pulls
WHERE bugdb_id = ? and github_repo = ? and
github_pull_id = ?')->execute(
[$bugid, $repo, $pull_id]);
}
@@ -63,7 +62,7 @@ class Bug_Pulltracker
* @param int $bugid
* @return array
*/
- function listPulls($bugid)
+ public function listPulls($bugid)
{
$query = '
SELECT github_repo, github_pull_id, github_title,
github_html_url, developer
@@ -72,6 +71,6 @@ class Bug_Pulltracker
ORDER BY github_repo, github_pull_id DESC
';
- return
$this->_dbh->prepare($query)->execute([$bugid])->fetchAll(PDO::FETCH_ASSOC);
+ return
$this->dbh->prepare($query)->execute([$bugid])->fetchAll(PDO::FETCH_ASSOC);
}
}
diff --git a/include/classes/bug_patchtracker.php
b/include/classes/bug_patchtracker.php
index a66f49a..2ec645c 100644
--- a/include/classes/bug_patchtracker.php
+++ b/include/classes/bug_patchtracker.php
@@ -4,21 +4,20 @@ require_once 'HTTP/Upload.php';
class Bug_Patchtracker
{
- var $_upload;
- var $_patchdir;
- var $_dbh;
+ private $uploader;
+ private $dbh;
- function __construct()
+ public function __construct()
{
if (!file_exists(BUG_PATCHTRACKER_TMPDIR)) {
if (!@mkdir(BUG_PATCHTRACKER_TMPDIR)) {
- $this->_upload = false;
- $this->_dbh = $GLOBALS['dbh'];
+ $this->uploader = false;
+ $this->dbh = $GLOBALS['dbh'];
return;
}
}
- $this->_upload = new HTTP_Upload('en');
- $this->_dbh = $GLOBALS['dbh'];
+ $this->uploader = new HTTP_Upload('en');
+ $this->dbh = $GLOBALS['dbh'];
}
/**
@@ -28,7 +27,7 @@ class Bug_Patchtracker
* @param string $name name of this patch line
* @return string
*/
- function patchDir($bugid, $name)
+ private function patchDir($bugid, $name)
{
return BUG_PATCHTRACKER_TMPDIR . '/p' . $bugid . '/' . $name;
}
@@ -37,7 +36,7 @@ class Bug_Patchtracker
*
* @param int $bugid
*/
- function setupPatchDir($bugid, $name)
+ private function setupPatchDir($bugid, $name)
{
if (file_exists($this->patchDir($bugid, $name))) {
if (!is_dir($this->patchDir($bugid, $name))) {
@@ -70,17 +69,17 @@ class Bug_Patchtracker
* @param string $patch
* @return array array(revision, patch file name)
*/
- function newPatchFileName($bugid, $patch, $handle)
+ private function newPatchFileName($bugid, $patch, $handle)
{
$id = time();
PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
- $e = $this->_dbh->prepare('INSERT INTO bugdb_patchtracker
+ $e = $this->dbh->prepare('INSERT INTO bugdb_patchtracker
(bugdb_id, patch, revision, developer) VALUES(?, ?, ?,
?)')->execute(
[$bugid, $patch, $id, $handle]);
if (PEAR::isError($e)) {
// try with another timestamp
$id++;
- $e = $this->_dbh->prepare('INSERT INTO
bugdb_patchtracker
+ $e = $this->dbh->prepare('INSERT INTO bugdb_patchtracker
(bugdb_id, patch, revision, developer)
VALUES(?, ?, ?, ?)')->execute(
[$bugid, $patch, $id, $handle]);
}
@@ -97,7 +96,7 @@ class Bug_Patchtracker
* @param int $id revision ID
* @return string
*/
- function getPatchFileName($id)
+ private function getPatchFileName($id)
{
return 'p' . $id . '.patch.txt';
}
@@ -110,7 +109,7 @@ class Bug_Patchtracker
* @param int $revision
* @return string
*/
- function getPatchFullpath($bugid, $name, $revision)
+ public function getPatchFullpath($bugid, $name, $revision)
{
return $this->patchDir($bugid, $name) .
DIRECTORY_SEPARATOR .
$this->getPatchFileName($revision);
@@ -126,9 +125,9 @@ class Bug_Patchtracker
* @param array $obsoletes obsoleted patches
* @return int patch revision
*/
- function attach($bugid, $patch, $name, $handle, $obsoletes)
+ public function attach($bugid, $patch, $name, $handle, $obsoletes)
{
- if (!$this->_upload) {
+ if (!$this->uploader) {
return PEAR::raiseError('Upload directory for patches
could not be initialized');
}
if (!preg_match('/^[\w\-\.]+\z/', $name) || strlen($name) > 80)
{
@@ -138,7 +137,7 @@ class Bug_Patchtracker
return PEAR::raiseError('Invalid obsoleted patches');
}
- $file = $this->_upload->getFiles($patch);
+ $file = $this->uploader->getFiles($patch);
if (PEAR::isError($file)) {
return $file;
}
@@ -195,7 +194,7 @@ class Bug_Patchtracker
$mime = 'text/plain';
}
if (!in_array($mime, $allowed_mime_types)) {
- $this->_dbh->prepare('DELETE FROM
bugdb_patchtracker
+ $this->dbh->prepare('DELETE FROM
bugdb_patchtracker
WHERE bugdb_id = ? and patch = ? and
revision = ?')->execute(
[$bugid, $name, $id]);
return PEAR::raiseError('Error: uploaded patch
file must be text'
@@ -205,7 +204,7 @@ class Bug_Patchtracker
}
$tmpfile = $file->moveTo($this->patchDir($bugid,
$name));
if (PEAR::isError($tmpfile)) {
- $this->_dbh->prepare('DELETE FROM
bugdb_patchtracker
+ $this->dbh->prepare('DELETE FROM
bugdb_patchtracker
WHERE bugdb_id = ? and patch = ? and
revision = ?')->execute(
[$bugid, $name, $id]);
return $tmpfile;
@@ -237,9 +236,9 @@ class Bug_Patchtracker
* @param string $name
* @param int $revision
*/
- function detach($bugid, $name, $revision)
+ public function detach($bugid, $name, $revision)
{
- $this->_dbh->prepare('DELETE FROM bugdb_patchtracker
+ $this->dbh->prepare('DELETE FROM bugdb_patchtracker
WHERE bugdb_id = ? and patch = ? and revision =
?')->execute(
[$bugid, $name, $revision]);
@unlink($this->patchDir($bugid, $name) . DIRECTORY_SEPARATOR .
@@ -254,9 +253,9 @@ class Bug_Patchtracker
* @param int $revision
* @return string
*/
- function getPatch($bugid, $name, $revision)
+ public function getPatch($bugid, $name, $revision)
{
- if ($this->_dbh->prepare('
+ if ($this->dbh->prepare('
SELECT bugdb_id
FROM bugdb_patchtracker
WHERE bugdb_id = ? AND patch = ? AND revision =
?')->execute([$bugid, $name, $revision])->fetchOne()
@@ -276,7 +275,7 @@ class Bug_Patchtracker
* @param int $bugid
* @return array
*/
- function listPatches($bugid)
+ public function listPatches($bugid)
{
$query = '
SELECT patch, revision, developer
@@ -285,7 +284,7 @@ class Bug_Patchtracker
ORDER BY revision DESC
';
- return
$this->_dbh->prepare($query)->execute([$bugid])->fetchAll(PDO::FETCH_NUM, true,
false, true);
+ return
$this->dbh->prepare($query)->execute([$bugid])->fetchAll(PDO::FETCH_NUM, true,
false, true);
}
/**
@@ -295,14 +294,14 @@ class Bug_Patchtracker
* @param string $patch
* @return array
*/
- function listRevisions($bugid, $patch)
+ public function listRevisions($bugid, $patch)
{
$query = '
SELECT revision FROM bugdb_patchtracker
WHERE bugdb_id = ? AND patch = ?
ORDER BY revision DESC
';
- return $this->_dbh->prepare($query)->execute([$bugid,
$patch])->fetchAll(PDO::FETCH_NUM);
+ return $this->dbh->prepare($query)->execute([$bugid,
$patch])->fetchAll(PDO::FETCH_NUM);
}
/**
@@ -313,34 +312,34 @@ class Bug_Patchtracker
* @param int $revision
* @return string|array array if no revision is selected
*/
- function getDeveloper($bugid, $patch, $revision = false)
+ public function getDeveloper($bugid, $patch, $revision = false)
{
if ($revision) {
- return $this->_dbh->prepare('
+ return $this->dbh->prepare('
SELECT developer
FROM bugdb_patchtracker
WHERE bugdb_id = ? AND patch = ? AND revision =
?
')->execute([$bugid, $patch, $revision])->fetchOne();
}
- return $this->_dbh->prepare('
+ return $this->dbh->prepare('
SELECT developer, revision
FROM bugdb_patchtracker
WHERE bugdb_id = ? AND patch = ? ORDER BY revision DESC
')->execute([$bugid, $patch])->fetchAll(PDO::FETCH_ASSOC);
}
- function getObsoletingPatches($bugid, $patch, $revision)
+ public function getObsoletingPatches($bugid, $patch, $revision)
{
- return $this->_dbh->prepare('
+ return $this->dbh->prepare('
SELECT bugdb_id, patch, revision
FROM bugdb_obsoletes_patches
WHERE bugdb_id = ? AND obsolete_patch = ? AND
obsolete_revision = ?
')->execute([$bugid, $patch,
$revision])->fetchAll(PDO::FETCH_ASSOC);
}
- function getObsoletePatches($bugid, $patch, $revision)
+ public function getObsoletePatches($bugid, $patch, $revision)
{
- return $this->_dbh->prepare('
+ return $this->dbh->prepare('
SELECT bugdb_id, obsolete_patch, obsolete_revision
FROM bugdb_obsoletes_patches
WHERE bugdb_id = ? AND patch = ? AND revision = ?
@@ -356,9 +355,9 @@ class Bug_Patchtracker
* @param string $obsoletename
* @param int $obsoleterevision
*/
- function obsoletePatch($bugid, $name, $revision, $obsoletename,
$obsoleterevision)
+ private function obsoletePatch($bugid, $name, $revision, $obsoletename,
$obsoleterevision)
{
- $this->_dbh->prepare('
+ $this->dbh->prepare('
INSERT INTO bugdb_obsoletes_patches
VALUES(?, ?, ?, ?, ?)
')->execute([$bugid, $name, $revision, $obsoletename,
$obsoleterevision]);
--
PHP Webmaster List Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
