Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #1021 from mrobinsonuk/cleanup/spelling-corrections
Corrected a number of minor spelling errors.
  • Loading branch information
Dan Cryer committed Oct 13, 2015
2 parents 1072065 + d2c512d commit 1385379
Show file tree
Hide file tree
Showing 22 changed files with 28 additions and 28 deletions.
2 changes: 1 addition & 1 deletion PHPCI/Controller/WebhookController.php
Expand Up @@ -170,7 +170,7 @@ public function github($projectId)
protected function githubCommitRequest(Project $project, array $payload)
{
// Github sends a payload when you close a pull request with a
// non-existant commit. We don't want this.
// non-existent commit. We don't want this.
if (array_key_exists('after', $payload) && $payload['after'] === '0000000000000000000000000000000000000000') {
return array('status' => 'ignored');
}
Expand Down
6 changes: 3 additions & 3 deletions PHPCI/Helper/AnsiConverter.php
Expand Up @@ -21,7 +21,7 @@ final class AnsiConverter
static private $converter = null;

/**
* Initialize the singletion.
* Initialize the singleton.
*
* @return AnsiToHtmlConverter
*/
Expand All @@ -35,7 +35,7 @@ private static function getInstance()
}

/**
* Convert a text containing ANSI colr sequences into HTML code.
* Convert a text containing ANSI color sequences into HTML code.
*
* @param string $text The text to convert
*
Expand All @@ -47,7 +47,7 @@ public static function convert($text)
}

/**
* Do not instanciate this class.
* Do not instantiate this class.
*/
private function __construct()
{
Expand Down
2 changes: 1 addition & 1 deletion PHPCI/Helper/LoginIsDisabled.php
Expand Up @@ -12,7 +12,7 @@
use b8\Config;

/**
* Login Is Disabled Helper - Checks if login is disalbed in the view
* Login Is Disabled Helper - Checks if login is disabled in the view
* @author Stephen Ball <phpci@stephen.rebelinblue.com>
* @package PHPCI
* @subpackage Web
Expand Down
2 changes: 1 addition & 1 deletion PHPCI/Languages/lang.da.php
Expand Up @@ -204,7 +204,7 @@
'build_finished' => 'Build Afsluttet',
'test_message' => 'Message',
'test_no_message' => 'No message',
'test_success' => 'Succesfull: %d',
'test_success' => 'Successful: %d',
'test_fail' => 'Failures: %d',
'test_skipped' => 'Skipped: %d',
'test_error' => 'Errors: %d',
Expand Down
2 changes: 1 addition & 1 deletion PHPCI/Languages/lang.de.php
Expand Up @@ -211,7 +211,7 @@
'build_finished' => 'Build abgeschlossen',
'test_message' => 'Message',
'test_no_message' => 'No message',
'test_success' => 'Succesfull: %d',
'test_success' => 'Successful: %d',
'test_fail' => 'Failures: %d',
'test_skipped' => 'Skipped: %d',
'test_error' => 'Errors: %d',
Expand Down
2 changes: 1 addition & 1 deletion PHPCI/Languages/lang.el.php
Expand Up @@ -205,7 +205,7 @@
'build_finished' => 'Η κατασκευή ολοκληρώθηκε',
'test_message' => 'Message',
'test_no_message' => 'No message',
'test_success' => 'Succesfull: %d',
'test_success' => 'Successful: %d',
'test_fail' => 'Failures: %d',
'test_skipped' => 'Skipped: %d',
'test_error' => 'Errors: %d',
Expand Down
2 changes: 1 addition & 1 deletion PHPCI/Languages/lang.en.php
Expand Up @@ -214,7 +214,7 @@
'build_finished' => 'Build Finished',
'test_message' => 'Message',
'test_no_message' => 'No message',
'test_success' => 'Succesfull: %d',
'test_success' => 'Successful: %d',
'test_fail' => 'Failures: %d',
'test_skipped' => 'Skipped: %d',
'test_error' => 'Errors: %d',
Expand Down
2 changes: 1 addition & 1 deletion PHPCI/Languages/lang.it.php
Expand Up @@ -207,7 +207,7 @@
'build_finished' => 'Build Terminata',
'test_message' => 'Message',
'test_no_message' => 'No message',
'test_success' => 'Succesfull: %d',
'test_success' => 'Successful: %d',
'test_fail' => 'Failures: %d',
'test_skipped' => 'Skipped: %d',
'test_error' => 'Errors: %d',
Expand Down
2 changes: 1 addition & 1 deletion PHPCI/Languages/lang.nl.php
Expand Up @@ -205,7 +205,7 @@
'build_finished' => 'Build beëindigd',
'test_message' => 'Message',
'test_no_message' => 'No message',
'test_success' => 'Succesfull: %d',
'test_success' => 'Successful: %d',
'test_fail' => 'Failures: %d',
'test_skipped' => 'Skipped: %d',
'test_error' => 'Errors: %d',
Expand Down
2 changes: 1 addition & 1 deletion PHPCI/Languages/lang.pl.php
Expand Up @@ -208,7 +208,7 @@
'build_finished' => 'Budowanie Zakończone',
'test_message' => 'Message',
'test_no_message' => 'No message',
'test_success' => 'Succesfull: %d',
'test_success' => 'Successful: %d',
'test_fail' => 'Failures: %d',
'test_skipped' => 'Skipped: %d',
'test_error' => 'Errors: %d',
Expand Down
2 changes: 1 addition & 1 deletion PHPCI/Languages/lang.ru.php
Expand Up @@ -203,7 +203,7 @@
'build_finished' => 'Сборка окончена',
'test_message' => 'Message',
'test_no_message' => 'No message',
'test_success' => 'Succesfull: %d',
'test_success' => 'Successful: %d',
'test_fail' => 'Failures: %d',
'test_skipped' => 'Skipped: %d',
'test_error' => 'Errors: %d',
Expand Down
2 changes: 1 addition & 1 deletion PHPCI/Languages/lang.uk.php
Expand Up @@ -205,7 +205,7 @@
'build_finished' => 'Збірка завершена',
'test_message' => 'Message',
'test_no_message' => 'No message',
'test_success' => 'Succesfull: %d',
'test_success' => 'Successful: %d',
'test_fail' => 'Failures: %d',
'test_skipped' => 'Skipped: %d',
'test_error' => 'Errors: %d',
Expand Down
2 changes: 1 addition & 1 deletion PHPCI/Plugin/Email.php
Expand Up @@ -134,7 +134,7 @@ protected function sendEmail($toAddress, $ccList, $subject, $body)
* Send an email to a list of specified subjects.
*
* @param array $toAddresses
* List of destinatary of message.
* List of destination addresses for message.
* @param string $subject
* Mail subject
* @param string $body
Expand Down
2 changes: 1 addition & 1 deletion PHPCI/Plugin/PhpCpd.php
Expand Up @@ -28,7 +28,7 @@ class PhpCpd implements \PHPCI\Plugin

/**
* @var string, based on the assumption the root may not hold the code to be
* tested, exteds the base path
* tested, extends the base path
*/
protected $path;

Expand Down
4 changes: 2 additions & 2 deletions PHPCI/Plugin/PhpMessDetector.php
Expand Up @@ -38,7 +38,7 @@ class PhpMessDetector implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin

/**
* @var string, based on the assumption the root may not hold the code to be
* tested, exteds the base path only if the provided path is relative. Absolute
* tested, extends the base path only if the provided path is relative. Absolute
* paths are used verbatim
*/
protected $path;
Expand All @@ -50,7 +50,7 @@ class PhpMessDetector implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin

/**
* Array of PHPMD rules. Can be one of the builtins (codesize, unusedcode, naming, design, controversial)
* or a filenname (detected by checking for a / in it), either absolute or relative to the project root.
* or a filename (detected by checking for a / in it), either absolute or relative to the project root.
* @var array
*/
protected $rules;
Expand Down
4 changes: 2 additions & 2 deletions PHPCI/Plugin/Util/TapParser.php
Expand Up @@ -74,7 +74,7 @@ public function parse()

$line = $this->nextLine();
if ($line === $header) {
throw new Exception("Duplicated TAP log, please check the configration.");
throw new Exception("Duplicated TAP log, please check the configuration.");
}

while ($line !== false && ($this->testCount === false || count($this->results) < $this->testCount)) {
Expand All @@ -97,7 +97,7 @@ public function parse()
*/
protected function findTapLog()
{
// Look for the beggning of the TAP output
// Look for the beginning of the TAP output
do {
$header = $this->nextLine();
} while ($header !== false && substr($header, 0, 12) !== 'TAP version ');
Expand Down
2 changes: 1 addition & 1 deletion PHPCI/ProcessControl/PosixProcessControl.php
Expand Up @@ -31,7 +31,7 @@ public function isRunning($pid)
* Sends a TERMINATE or KILL signal to the process using posix_kill.
*
* @param int $pid
* @param bool $forcefully Whetehr to send TERMINATE (false) or KILL (true).
* @param bool $forcefully Whether to send TERMINATE (false) or KILL (true).
*/
public function kill($pid, $forcefully = false)
{
Expand Down
2 changes: 1 addition & 1 deletion Tests/PHPCI/Command/CreateBuildCommandTest.php
Expand Up @@ -78,7 +78,7 @@ public function testExecute()
/**
* @expectedException \InvalidArgumentException
*/
public function testExecuteWithUnknowProjectId()
public function testExecuteWithUnknownProjectId()
{
$commandTester = $this->getCommandTester();
$commandTester->execute(array('projectId' => 2));
Expand Down
4 changes: 2 additions & 2 deletions Tests/PHPCI/Command/InstallCommandTest.php
Expand Up @@ -175,7 +175,7 @@ public function testDatabaseNameConfig()
$this->assertEquals('testedvalue', $this->config['b8']['database']['name']);
}

public function testDatabaseUserameConfig()
public function testDatabaseUserConfig()
{
$dialog = $this->getDialogHelperMock();

Expand Down Expand Up @@ -243,7 +243,7 @@ public function testAdminEmailConfig()
$this->assertEquals('test@phpci.com', $this->admin['mail']);
}

public function testAdminUserameConfig()
public function testAdminNameConfig()
{
$dialog = $this->getDialogHelperMock();

Expand Down
4 changes: 2 additions & 2 deletions Tests/PHPCI/Plugin/EmailTest.php
Expand Up @@ -236,11 +236,11 @@ public function testExecute_UniqueRecipientsFromWithCommitter()
/**
* @covers PHPUnit::execute
*/
public function testExecute_UniqueRecipientsWithCommiter()
public function testExecute_UniqueRecipientsWithCommitter()
{
$this->loadEmailPluginWithOptions(
array(
'commiter' => true,
'committer' => true,
'addresses' => array('test-receiver@example.com', 'committer@test.com')
)
);
Expand Down
2 changes: 1 addition & 1 deletion Tests/PHPCI/Plugin/Util/FilesPluginInformationTest.php
Expand Up @@ -15,7 +15,7 @@
class FilesPluginInformationTest extends \PHPUnit_Framework_TestCase
{

public function testGetInstalledPlugins_returnsObjectes()
public function testGetInstalledPlugins_returnsObjects()
{
$pluginDirPath = realpath(__DIR__ . "/../../../../PHPCI/Plugin/");
$test = FilesPluginInformation::newFromDir($pluginDirPath);
Expand Down
2 changes: 1 addition & 1 deletion bootstrap.php
Expand Up @@ -65,7 +65,7 @@

/**
* Allow to modify PHPCI configuration without modify versioned code.
* Dameons should be killed to apply changes in the file.
* Daemons should be killed to apply changes in the file.
*
* @ticket 781
*/
Expand Down

0 comments on commit 1385379

Please sign in to comment.