From: Jan Schneider Date: Tue, 13 Jan 2009 17:29:00 +0000 (+0100) Subject: CamelCasing class names. X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=5aa6aa77ec39cd0cdb1ac795db397385b0701a2e;p=horde.git CamelCasing class names. --- diff --git a/chora/lib/Chora.php b/chora/lib/Chora.php index 955f644ba..9b91f1088 100644 --- a/chora/lib/Chora.php +++ b/chora/lib/Chora.php @@ -120,7 +120,7 @@ class Chora { $sourceroot = $acts['rt']; $conf['paths']['temp'] = Horde::getTempDir(); - $GLOBALS['VC'] = Horde_Vcs::factory($sourcerootopts['type'], + $GLOBALS['VC'] = Horde_Vcs::factory(String::ucfirst($sourcerootopts['type']), array('sourceroot' => $sourcerootopts['location'], 'paths' => $conf['paths'], 'username' => isset($sourcerootopts['username']) ? $sourcerootopts['username'] : '', diff --git a/framework/Vcs/lib/Horde/Vcs/Cvs.php b/framework/Vcs/lib/Horde/Vcs/Cvs.php index 5f929bf5c..9b05cf363 100644 --- a/framework/Vcs/lib/Horde/Vcs/Cvs.php +++ b/framework/Vcs/lib/Horde/Vcs/Cvs.php @@ -10,7 +10,7 @@ * @author Anil Madhavapeddy * @package Horde_Vcs */ -class Horde_Vcs_cvs extends Horde_Vcs_rcs +class Horde_Vcs_Cvs extends Horde_Vcs_Rcs { /** * Does driver support deleted files? @@ -79,7 +79,7 @@ class Horde_Vcs_cvs extends Horde_Vcs_rcs */ public function getAnnotateObject($filename) { - return new Horde_Vcs_Annotate_cvs($this, $filename); + return new Horde_Vcs_Annotate_Cvs($this, $filename); } /** @@ -92,14 +92,14 @@ class Horde_Vcs_cvs extends Horde_Vcs_rcs } /** - * Horde_Vcs_cvs annotate class. + * Horde_Vcs_Cvs annotate class. * * Anil Madhavapeddy, * * @author Anil Madhavapeddy * @package Horde_Vcs */ -class Horde_Vcs_Annotate_cvs extends Horde_Vcs_Annotate +class Horde_Vcs_Annotate_Cvs extends Horde_Vcs_Annotate { /** * Temporary filename. @@ -207,13 +207,13 @@ class Horde_Vcs_Annotate_cvs extends Horde_Vcs_Annotate * @author Anil Madhavapeddy * @package Horde_Vcs */ -class Horde_Vcs_Checkout_cvs extends Horde_Vcs_Checkout +class Horde_Vcs_Checkout_Cvs extends Horde_Vcs_Checkout { /** * Static function which returns a file pointing to the head of the * requested revision of an RCS file. * - * @param Horde_Vcs_cvs $rep A repository object + * @param Horde_Vcs_Cvs $rep A repository object * @param string $fullname Fully qualified pathname of the desired file * to checkout * @param string $rev Revision number to check out @@ -262,14 +262,14 @@ class Horde_Vcs_Checkout_cvs extends Horde_Vcs_Checkout } /** - * Horde_Vcs_cvs diff class. + * Horde_Vcs_Cvs diff class. * * Copyright Anil Madhavapeddy, * * @author Anil Madhavapeddy * @package Horde_Vcs */ -class Horde_Vcs_Diff_cvs extends Horde_Vcs_Diff +class Horde_Vcs_Diff_Cvs extends Horde_Vcs_Diff { /** * Obtain the differences between two revisions of a file. @@ -345,14 +345,14 @@ class Horde_Vcs_Diff_cvs extends Horde_Vcs_Diff } /** - * Horde_Vcs_cvs directory class. + * Horde_Vcs_Cvs directory class. * * Copyright Anil Madhavapeddy, * * @author Anil Madhavapeddy * @package Horde_Vcs */ -class Horde_Vcs_Directory_cvs extends Horde_Vcs_Directory +class Horde_Vcs_Directory_Cvs extends Horde_Vcs_Directory { /** * Creates a CVS Directory object to store information @@ -417,7 +417,7 @@ class Horde_Vcs_Directory_cvs extends Horde_Vcs_Directory /* If we want to merge the attic, add it in here. */ if ($showattic) { - $atticDir = new Horde_Vcs_Directory_cvs($this->_rep, $this->_moduleName . '/Attic', $this); + $atticDir = new Horde_Vcs_Directory_Cvs($this->_rep, $this->_moduleName . '/Attic', $this); if (!is_a($atticDir->browseDir($cache, $quicklog), 'PEAR_Error')) { $this->_atticFiles = $atticDir->queryFileList(); $this->_mergedFiles = array_merge($this->_files, $this->_atticFiles); @@ -430,14 +430,14 @@ class Horde_Vcs_Directory_cvs extends Horde_Vcs_Directory } /** - * Horde_Vcs_cvs file class. + * Horde_Vcs_Cvs file class. * * Copyright Anil Madhavapeddy, * * @author Anil Madhavapeddy * @package Horde_Vcs */ -class Horde_Vcs_File_cvs extends Horde_Vcs_File +class Horde_Vcs_File_Cvs extends Horde_Vcs_File { /** * Create a repository file object, and give it information about @@ -476,7 +476,7 @@ class Horde_Vcs_File_cvs extends Horde_Vcs_File $fileOb = unserialize($this->cache->get($cacheId, $ctime)); $fileOb->setRepository($this->rep); } else { - $fileOb = new Horde_Vcs_File_cvs($this->rep, $filename . ',v', $this->cache, $this->quicklog); + $fileOb = new Horde_Vcs_File_Cvs($this->rep, $filename . ',v', $this->cache, $this->quicklog); $fileOb->setRepository($this->rep); if (is_a(($result = $fileOb->getBrowseInfo()), 'PEAR_Error')) { return $result; @@ -596,9 +596,9 @@ class Horde_Vcs_File_cvs extends Horde_Vcs_File strcmp('----------------------------', $line)) { $accum[] = $line; } elseif (count($accum)) { - // spawn a new Horde_Vcs_log object and add it to the logs + // spawn a new Horde_Vcs_Log object and add it to the logs // hash - $log = new Horde_Vcs_Log_cvs($this); + $log = new Horde_Vcs_Log_Cvs($this); $err = $log->processLog($accum); // TODO: error checks - avsm $this->logs[$log->queryRevision()] = $log; @@ -663,12 +663,12 @@ class Horde_Vcs_File_cvs extends Horde_Vcs_File } /** - * Horde_Vcs_cvs log class. + * Horde_Vcs_cvs Log class. * * @author Anil Madhavapeddy * @package Horde_Vcs */ -class Horde_Vcs_Log_cvs extends Horde_Vcs_Log +class Horde_Vcs_Log_Cvs extends Horde_Vcs_Log { public function processLog($raw) { @@ -729,14 +729,14 @@ class Horde_Vcs_Log_cvs extends Horde_Vcs_Log } /** - * Horde_Vcs_cvs Patchset class. + * Horde_Vcs_Cvs Patchset class. * * Copyright Anil Madhavapeddy, * * @author Anil Madhavapeddy * @package Horde_Vcs */ -class Horde_Vcs_Patchset_cvs extends Horde_Vcs_Patchset +class Horde_Vcs_Patchset_Cvs extends Horde_Vcs_Patchset { protected $_dir; protected $_name; @@ -868,4 +868,4 @@ class Horde_Vcs_Patchset_cvs extends Horde_Vcs_Patchset } -class Horde_Vcs_Revision_cvs extends Horde_Vcs_Revision_rcs {} +class Horde_Vcs_Revision_Cvs extends Horde_Vcs_Revision_Rcs {} diff --git a/framework/Vcs/lib/Horde/Vcs/Git.php b/framework/Vcs/lib/Horde/Vcs/Git.php index 9983146cc..2c3d5dc39 100644 --- a/framework/Vcs/lib/Horde/Vcs/Git.php +++ b/framework/Vcs/lib/Horde/Vcs/Git.php @@ -1,6 +1,6 @@ * @package Horde_Vcs */ -class Horde_Vcs_git extends Horde_Vcs +class Horde_Vcs_Git extends Horde_Vcs { /** * Constructor. @@ -38,7 +38,7 @@ class Horde_Vcs_git extends Horde_Vcs public function getCheckout($file, $rev) { if (!isset($this->_cache['co'])) { - $this->_cache['co'] = new 'Horde_Vcs_Checkout_git'; + $this->_cache['co'] = new 'Horde_Vcs_Checkout_Git'; } return $this->_cache['co']->get($this, $file->queryModulePath(), $rev); } @@ -46,14 +46,14 @@ class Horde_Vcs_git extends Horde_Vcs } /** - * Horde_Vcs_git annotate class. + * Horde_Vcs_Git annotate class. * * Chuck Hagenbuch * * @author Chuck Hagenbuch * @package Horde_Vcs */ -class Horde_Vcs_Annotate_git extends Horde_Vcs_Annotate +class Horde_Vcs_Annotate_Git extends Horde_Vcs_Annotate { public function __construct($rep, $file) { @@ -119,14 +119,14 @@ class Horde_Vcs_Annotate_git extends Horde_Vcs_Annotate } /** - * Horde_Vcs_git checkout class. + * Horde_Vcs_Git checkout class. * * Chuck Hagenbuch * * @author Chuck Hagenbuch * @package Horde_Vcs */ -class Horde_Vcs_Checkout_git extends Horde_Vcs_Checkout +class Horde_Vcs_Checkout_Git extends Horde_Vcs_Checkout { /** * Function which returns a file pointing to the head of the requested @@ -154,14 +154,14 @@ class Horde_Vcs_Checkout_git extends Horde_Vcs_Checkout } /** - * Horde_Vcs_git diff class. + * Horde_Vcs_Git diff class. * * Copyright Chuck Hagenbuch * * @author Chuck Hagenbuch * @package Horde_Vcs */ -class Horde_Vcs_Diff_git extends Horde_Vcs_Diff +class Horde_Vcs_Diff_Git extends Horde_Vcs_Diff { /** * The available diff types. @@ -260,14 +260,14 @@ class Horde_Vcs_Diff_git extends Horde_Vcs_Diff } /** - * Horde_Vcs_git directory class. + * Horde_Vcs_Git directory class. * * Copyright Chuck Hagenbuch * * @author Chuck Hagenbuch * @package Horde_Vcs */ -class Horde_Vcs_Directory_git extends Horde_Vcs_Directory +class Horde_Vcs_Directory_Git extends Horde_Vcs_Directory { /** * Tell the object to open and browse its current directory, and @@ -320,14 +320,14 @@ class Horde_Vcs_Directory_git extends Horde_Vcs_Directory } /** - * Horde_Vcs_git file class. + * Horde_Vcs_Git file class. * * Copyright Chuck Hagenbuch * * @author Chuck Hagenbuch * @package Horde_Vcs */ -class Horde_Vcs_File_git extends Horde_Vcs_File +class Horde_Vcs_File_Git extends Horde_Vcs_File { /** * Create a repository file object, and give it information about @@ -401,7 +401,7 @@ class Horde_Vcs_File_git extends Horde_Vcs_File $this->revs = explode("\n", trim($revisions)); foreach ($this->revs as $rev) { - $this->logs[$rev] = Horde_Vcs_Log_git::factory($this->rep, $this, $rev); + $this->logs[$rev] = Horde_Vcs_Log_Git::factory($this->rep, $this, $rev); if ($this->quicklog) { break; } @@ -423,14 +423,14 @@ class Horde_Vcs_File_git extends Horde_Vcs_File } /** - * Horde_Vcs_git log class. + * Horde_Vcs_Git log class. * * Chuck Hagenbuch * * @author Chuck Hagenbuch * @package Horde_Vcs */ -class Horde_Vcs_Log_git { +class Horde_Vcs_Log_Git { public $err; public $files = array(); @@ -449,7 +449,7 @@ class Horde_Vcs_Log_git { $logOb = unserialize($rep->cache->get($cacheId, 0)); $logOb->setRepository($rep); } else { - $logOb = new Horde_Vcs_Log_git($rep, $file, $rev); + $logOb = new Horde_Vcs_Log_Git($rep, $file, $rev); if ($rep->cache) { $rep->cache->set($cacheId, serialize($logOb)); @@ -545,14 +545,14 @@ class Horde_Vcs_Log_git { } /** - * Horde_Vcs_git Patchset class. + * Horde_Vcs_Git Patchset class. * * Copyright Chuck Hagenbuch * * @author Chuck Hagenbuch * @package Horde_Vcs */ -class Horde_Vcs_Patchset_git extends Horde_Vcs_Patchset +class Horde_Vcs_Patchset_Git extends Horde_Vcs_Patchset { /** * Populate the object with information about the patchsets that @@ -562,7 +562,7 @@ class Horde_Vcs_Patchset_git extends Horde_Vcs_Patchset */ function getPatchsets() { - $fileOb = new Horde_Vcs_File_git($this->_rep, $this->_file); + $fileOb = new Horde_Vcs_File_Git($this->_rep, $this->_file); if (is_a(($result = $fileOb->getBrowseInfo()), 'PEAR_Error')) { return $result; } @@ -604,7 +604,7 @@ class Horde_Vcs_Patchset_git extends Horde_Vcs_Patchset } -class Horde_Vcs_Revision_git extends Horde_Vcs_Revision +class Horde_Vcs_Revision_Git extends Horde_Vcs_Revision { /** * Validation function to ensure that a revision number is of the right diff --git a/framework/Vcs/lib/Horde/Vcs/Rcs.php b/framework/Vcs/lib/Horde/Vcs/Rcs.php index d3ec34c1c..8ee3e5da9 100644 --- a/framework/Vcs/lib/Horde/Vcs/Rcs.php +++ b/framework/Vcs/lib/Horde/Vcs/Rcs.php @@ -1,6 +1,6 @@ * @@ -8,7 +8,7 @@ * @author Chuck Hagenbuch * @package Horde_Vcs */ -class Horde_Vcs_rcs extends Horde_Vcs +class Horde_Vcs_Rcs extends Horde_Vcs { /** * Checks an RCS file in with a specified change log. @@ -232,7 +232,7 @@ class Horde_Vcs_rcs extends Horde_Vcs } -class Horde_Vcs_Revision_rcs extends Horde_Vcs_Revision +class Horde_Vcs_Revision_Rcs extends Horde_Vcs_Revision { /** * Validation function to ensure that a revision number is of the right diff --git a/framework/Vcs/lib/Horde/Vcs/Svn.php b/framework/Vcs/lib/Horde/Vcs/Svn.php index be11af4af..ea4f937cc 100644 --- a/framework/Vcs/lib/Horde/Vcs/Svn.php +++ b/framework/Vcs/lib/Horde/Vcs/Svn.php @@ -3,7 +3,7 @@ require_once dirname(__FILE__) . '/rcs.php'; /** - * Horde_Vcs_svn implementation. + * Horde_Vcs_Svn implementation. * * Copyright 2000-2009 The Horde Project (http://www.horde.org/) * @@ -13,7 +13,7 @@ require_once dirname(__FILE__) . '/rcs.php'; * @author Anil Madhavapeddy * @package Horde_Vcs */ -class Horde_Vcs_svn extends Horde_Vcs +class Horde_Vcs_Svn extends Horde_Vcs { /** * SVN username. @@ -86,14 +86,14 @@ class Horde_Vcs_svn extends Horde_Vcs } /** - * Horde_Vcs_svn annotate class. + * Horde_Vcs_Svn annotate class. * * Anil Madhavapeddy, * * @author Anil Madhavapeddy * @package Horde_Vcs */ -class Horde_Vcs_Annotate_svn extends Horde_Vcs_Annotate +class Horde_Vcs_Annotate_Svn extends Horde_Vcs_Annotate { /** * TODO @@ -134,14 +134,14 @@ class Horde_Vcs_Annotate_svn extends Horde_Vcs_Annotate } /** - * Horde_Vcs_svn checkout class. + * Horde_Vcs_Svn checkout class. * * Anil Madhavapeddy, * * @author Anil Madhavapeddy * @package Horde_Vcs */ -class Horde_Vcs_Checkout_svn extends Horde_Vcs_Checkout +class Horde_Vcs_Checkout_Svn extends Horde_Vcs_Checkout { /** * Function which returns a file pointing to the head of the requested @@ -169,14 +169,14 @@ class Horde_Vcs_Checkout_svn extends Horde_Vcs_Checkout } /** - * Horde_Vcs_svn diff class. + * Horde_Vcs_Svn diff class. * * Copyright Anil Madhavapeddy, * * @author Anil Madhavapeddy * @package Horde_Vcs */ -class Horde_Vcs_Diff_svn extends Horde_Vcs_Diff +class Horde_Vcs_Diff_Svn extends Horde_Vcs_Diff { /** * Obtain the differences between two revisions of a file. @@ -241,14 +241,14 @@ class Horde_Vcs_Diff_svn extends Horde_Vcs_Diff } /** - * Horde_Vcs_svn directory class. + * Horde_Vcs_Svn directory class. * * Copyright Anil Madhavapeddy, * * @author Anil Madhavapeddy * @package Horde_Vcs */ -class Horde_Vcs_Directory_svn extends Horde_Vcs_Directory +class Horde_Vcs_Directory_Svn extends Horde_Vcs_Directory { /** * Tell the object to open and browse its current directory, and @@ -300,14 +300,14 @@ class Horde_Vcs_Directory_svn extends Horde_Vcs_Directory } /** - * Horde_Vcs_svn file class. + * Horde_Vcs_Svn file class. * * Copyright Anil Madhavapeddy, * * @author Anil Madhavapeddy * @package Horde_Vcs */ -class Horde_Vcs_File_svn extends Horde_Vcs_File { +class Horde_Vcs_File_Svn extends Horde_Vcs_File { /** * Create a repository file object, and give it information about @@ -342,7 +342,7 @@ class Horde_Vcs_File_svn extends Horde_Vcs_File { $fileOb = unserialize($this->cache->get($cacheId, 3600)); $fileOb->setRepository($rep); } else { - $fileOb = new Horde_Vcs_File_svn($rep, $this->filename, $this->cache, $this->quicklog); + $fileOb = new Horde_Vcs_File_Svn($rep, $this->filename, $this->cache, $this->quicklog); $fileOb->setRepository($rep); if (is_a(($result = $fileOb->getBrowseInfo()), 'PEAR_Error')) { return $result; @@ -395,7 +395,7 @@ class Horde_Vcs_File_svn extends Horde_Vcs_File { } while (!feof($pipe)) { - $log = new Horde_Vcs_Log_svn($this->rep, $this); + $log = new Horde_Vcs_Log_Svn($this->rep, $this); $err = $log->processLog($pipe); if ($err) { $rev = $log->queryRevision(); @@ -415,14 +415,14 @@ class Horde_Vcs_File_svn extends Horde_Vcs_File { } /** - * Horde_Vcs_svn log class. + * Horde_Vcs_Svn log class. * * Anil Madhavapeddy, * * @author Anil Madhavapeddy * @package Horde_Vcs */ -class Horde_Vcs_Log_svn extends Horde_Vcs_Log +class Horde_Vcs_Log_Svn extends Horde_Vcs_Log { public $err; public $files; @@ -465,14 +465,14 @@ class Horde_Vcs_Log_svn extends Horde_Vcs_Log } /** - * Horde_Vcs_svn Patchset class. + * Horde_Vcs_Svn Patchset class. * * Copyright Anil Madhavapeddy, * * @author Anil Madhavapeddy * @package Horde_Vcs */ -class Horde_Vcs_Patchset_svn extends Horde_Vcs_Patchset +class Horde_Vcs_Patchset_Svn extends Horde_Vcs_Patchset { /** * Populate the object with information about the patchsets that @@ -482,7 +482,7 @@ class Horde_Vcs_Patchset_svn extends Horde_Vcs_Patchset */ function getPatchsets() { - $fileOb = new Horde_Vcs_File_svn($this->_rep, $this->_file); + $fileOb = new Horde_Vcs_File_Svn($this->_rep, $this->_file); if (is_a(($result = $fileOb->getBrowseInfo()), 'PEAR_Error')) { return $result; } @@ -522,7 +522,7 @@ class Horde_Vcs_Patchset_svn extends Horde_Vcs_Patchset } -class Horde_Vcs_Revision_svn extends Horde_Vcs_Revision_rcs +class Horde_Vcs_Revision_Svn extends Horde_Vcs_Revision_Rcs { /** * Validation function to ensure that a revision number is of the right