From 91d49caed332075154788bea398d08452cb08ff2 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <eileen@fuzion.co.nz>
Date: Sat, 24 May 2014 16:59:17 +1200
Subject: [PATCH] spelling fix

---
 CRM/Activity/BAO/ActivityAssignment.php                  | 2 +-
 CRM/Core/Error.php                                       | 2 +-
 tests/phpunit/CiviTest/CiviSeleniumTestCase.php          | 8 ++++----
 tests/phpunit/WebTest/Contact/MergeContactsTest.php      | 2 +-
 tests/phpunit/WebTest/Contribute/ConfirmOptionalTest.php | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/CRM/Activity/BAO/ActivityAssignment.php b/CRM/Activity/BAO/ActivityAssignment.php
index 9d93c74652..df8d5d7126 100644
--- a/CRM/Activity/BAO/ActivityAssignment.php
+++ b/CRM/Activity/BAO/ActivityAssignment.php
@@ -74,7 +74,7 @@ class CRM_Activity_BAO_ActivityAssignment extends CRM_Activity_DAO_ActivityConta
    *
    * @internal param int $id ID of the activity
    *
-   * @return void
+   * @return array
    *
    * @access public
    */
diff --git a/CRM/Core/Error.php b/CRM/Core/Error.php
index 05ec54b787..56ea895cea 100644
--- a/CRM/Core/Error.php
+++ b/CRM/Core/Error.php
@@ -121,7 +121,7 @@ class CRM_Core_Error extends PEAR_ErrorStack {
   }
 
   /**
-   * construcor
+   * constructor
    */
   function __construct() {
     parent::__construct('CiviCRM');
diff --git a/tests/phpunit/CiviTest/CiviSeleniumTestCase.php b/tests/phpunit/CiviTest/CiviSeleniumTestCase.php
index dbf4add63e..647517a8fe 100644
--- a/tests/phpunit/CiviTest/CiviSeleniumTestCase.php
+++ b/tests/phpunit/CiviTest/CiviSeleniumTestCase.php
@@ -875,7 +875,7 @@ class CiviSeleniumTestCase extends PHPUnit_Extensions_SeleniumTestCase {
    * @param bool $isPcpApprovalNeeded
    * @param bool $isSeparatePayment
    * @param bool $honoreeSection
-   * @param bool $allowOtherAmmount
+   * @param bool $allowOtherAmount
    * @param bool $isConfirmEnabled
    * @param string $financialType
    * @param bool $fixedAmount
@@ -905,7 +905,7 @@ class CiviSeleniumTestCase extends PHPUnit_Extensions_SeleniumTestCase {
                                       $isPcpApprovalNeeded = FALSE,
                                       $isSeparatePayment = FALSE,
                                       $honoreeSection = TRUE,
-                                      $allowOtherAmmount = TRUE,
+                                      $allowOtherAmount = TRUE,
                                       $isConfirmEnabled = TRUE,
                                       $financialType = 'Donation',
                                       $fixedAmount = TRUE,
@@ -1009,7 +1009,7 @@ class CiviSeleniumTestCase extends PHPUnit_Extensions_SeleniumTestCase {
         $this->click("is_recur_interval");
         $this->click("is_recur_installments");
       }
-      if ($allowOtherAmmount) {
+      if ($allowOtherAmount) {
 
         $this->click('is_allow_other_amount');
 
@@ -1017,7 +1017,7 @@ class CiviSeleniumTestCase extends PHPUnit_Extensions_SeleniumTestCase {
         //$this->type('min_amount', $rand / 2);
         //$this->type('max_amount', $rand * 10);
       }
-      if ($fixedAmount || !$allowOtherAmmount) {
+      if ($fixedAmount || !$allowOtherAmount) {
         $this->type('label_1', "Label $hash");
         $this->type('value_1', "$rand");
       }
diff --git a/tests/phpunit/WebTest/Contact/MergeContactsTest.php b/tests/phpunit/WebTest/Contact/MergeContactsTest.php
index 1154421b8a..7e2247fa58 100644
--- a/tests/phpunit/WebTest/Contact/MergeContactsTest.php
+++ b/tests/phpunit/WebTest/Contact/MergeContactsTest.php
@@ -677,7 +677,7 @@ class WebTest_Contact_MergeContactsTest extends CiviSeleniumTestCase {
 
   /**
    * Helper FN
-   * to create new membershiptype
+   * to create new membership type
    */
   function addMembershipType($membershipOrganization) {
     $this->openCiviPage("admin/member/membershipType", "reset=1&action=browse");
diff --git a/tests/phpunit/WebTest/Contribute/ConfirmOptionalTest.php b/tests/phpunit/WebTest/Contribute/ConfirmOptionalTest.php
index 40a085d119..8781657f6e 100644
--- a/tests/phpunit/WebTest/Contribute/ConfirmOptionalTest.php
+++ b/tests/phpunit/WebTest/Contribute/ConfirmOptionalTest.php
@@ -91,7 +91,7 @@ class WebTest_Contribute_ConfirmOptionalTest extends CiviSeleniumTestCase {
       $isPcpApprovalNeeded = FALSE,
       $isSeparatePayment = FALSE,
       $honoreeSection = FALSE,
-      $allowOtherAmmount = TRUE,
+      $allowOtherAmount = TRUE,
       $isConfirmEnabled = $isConfirmEnabled
     );
   }
-- 
2.25.1