Merge pull request #4865 from eileenmcnaughton/my-first-factory

[civicrm-core.git] / CRM / Custom / Form / ChangeFieldType.php

diff --git a/CRM/Custom/Form/ChangeFieldType.php b/CRM/Custom/Form/ChangeFieldType.php
index 08eb50c2bd42689a98576a28501c2a440def3dd6..d6f45443742edf51e8ec79b8d483e4631eb3146f 100644 (file)
--- a/CRM/Custom/Form/ChangeFieldType.php
+++ b/CRM/Custom/Form/ChangeFieldType.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
@@ -42,7 +42,6 @@ class CRM_Custom_Form_ChangeFieldType extends CRM_Core_Form {
    * The field id
    *
    * @var int
-   * @access protected
    */
   protected $_id;
 
@@ -62,7 +61,7 @@ class CRM_Custom_Form_ChangeFieldType extends CRM_Core_Form {
    * @return void
    * @acess protected
    */
-  function preProcess() {
+  public function preProcess() {
     $this->_id = CRM_Utils_Request::retrieve('id', 'Positive',
       $this, TRUE
     );
@@ -94,7 +93,6 @@ class CRM_Custom_Form_ChangeFieldType extends CRM_Core_Form {
    * Build the form object
    *
    * @return void
-   * @access public
    */
   public function buildQuickForm() {
 
@@ -137,7 +135,6 @@ class CRM_Custom_Form_ChangeFieldType extends CRM_Core_Form {
    * Process the form when submitted
    *
    * @return void
-   * @access public
    */
   public function postProcess() {
     $params = $this->controller->exportValues($this->_name);
@@ -201,7 +198,7 @@ class CRM_Custom_Form_ChangeFieldType extends CRM_Core_Form {
    *
    * @return array|null
    */
-  static function fieldTypeTransitions($dataType, $htmlType) {
+  public static function fieldTypeTransitions($dataType, $htmlType) {
     // Text field is single value field,
     // can not be change to other single value option which contains option group
     if ($htmlType == 'Text') {
@@ -275,7 +272,8 @@ class CRM_Custom_Form_ChangeFieldType extends CRM_Core_Form {
         continue;
       }
       $value = CRM_Core_DAO::VALUE_SEPARATOR . $dao->{$column} . CRM_Core_DAO::VALUE_SEPARATOR;
-      $params = array(1 => array((string)$value, 'String'),
+      $params = array(
+      1 => array((string) $value, 'String'),
         2 => array($dao->id, 'Integer'),
       );
       CRM_Core_DAO::executeQuery($updateSql, $params);
@@ -292,7 +290,8 @@ class CRM_Custom_Form_ChangeFieldType extends CRM_Core_Form {
     $dao       = CRM_Core_DAO::executeQuery($selectSql);
     while ($dao->fetch()) {
       $values = self::explode($dao->{$column});
-      $params = array(1 => array((string)array_shift($values), 'String'),
+      $params = array(
+      1 => array((string) array_shift($values), 'String'),
         2 => array($dao->id, 'Integer'),
       );
       CRM_Core_DAO::executeQuery($updateSql, $params);
@@ -304,7 +303,7 @@ class CRM_Custom_Form_ChangeFieldType extends CRM_Core_Form {
    *
    * @return array
    */
-  static function explode($str) {
+  public static function explode($str) {
     if (empty($str) || $str == CRM_Core_DAO::VALUE_SEPARATOR . CRM_Core_DAO::VALUE_SEPARATOR) {
       return array();
     }
@@ -313,4 +312,3 @@ class CRM_Custom_Form_ChangeFieldType extends CRM_Core_Form {
     }
   }
 }
-