(NFC) Update to pass new phpcs

diff --git a/api/v3/Contribution.php b/api/v3/Contribution.php
index 870ee7b17af8c051791637b50fcfea695888ef5d..717c6709befe31a53162e6844ecbeee451c647fd 100644 (file)
--- a/api/v3/Contribution.php
+++ b/api/v3/Contribution.php
@@ -725,8 +725,8 @@ function _ipn_process_transaction(&$params, $contribution, $input, $ids, $firstC
   $input['card_type_id'] = CRM_Utils_Array::value('card_type_id', $params);
   $input['pan_truncation'] = CRM_Utils_Array::value('pan_truncation', $params);
   $transaction = new CRM_Core_Transaction();
-  return CRM_Contribute_BAO_Contribution::completeOrder($input, $ids, $objects, $transaction, !empty
-  ($contribution->contribution_recur_id), $contribution);
+  return CRM_Contribute_BAO_Contribution::completeOrder($input, $ids, $objects, $transaction,
+    !empty($contribution->contribution_recur_id), $contribution);
 }
 
 /**

diff --git a/api/v3/System.php b/api/v3/System.php
index 258afb3445dea5fb0d410846beda3ce867660343..baf4fe197bc7d9349d3517d0a3c88440f32731dc 100644 (file)
--- a/api/v3/System.php
+++ b/api/v3/System.php
@@ -254,11 +254,7 @@ function civicrm_api3_system_get($params) {
         'version' => CRM_Utils_System::version(),
         'dev' => (bool) CRM_Utils_System::isDevelopment(),
         'components' => array_keys(CRM_Core_Component::getEnabledComponents()),
-        'extensions' => preg_grep(
-          '/^uninstalled$/',
-          CRM_Extension_System::singleton()->getManager()->getStatuses(),
-          PREG_GREP_INVERT
-        ),
+        'extensions' => preg_grep('/^uninstalled$/', CRM_Extension_System::singleton()->getManager()->getStatuses(), PREG_GREP_INVERT),
         'multidomain' => CRM_Core_DAO::singleValueQuery('SELECT count(*) FROM civicrm_domain') > 1,
         'settings' => _civicrm_api3_system_get_redacted_settings(),
         'exampleUrl' => CRM_Utils_System::url('civicrm/example', NULL, TRUE, NULL, FALSE),

diff --git a/tests/phpunit/CRM/Core/DAO/AllCoreTablesTest.php b/tests/phpunit/CRM/Core/DAO/AllCoreTablesTest.php
index 2ad560ec98e24b91dbd62e9b515f9f8c44bba20f..6029a0c91e7a94920b428399edd5be8d0e7cb1d8 100644 (file)
--- a/tests/phpunit/CRM/Core/DAO/AllCoreTablesTest.php
+++ b/tests/phpunit/CRM/Core/DAO/AllCoreTablesTest.php
@@ -38,7 +38,7 @@ class CRM_Core_DAO_AllCoreTablesTest extends CiviUnitTestCase {
   /**
    * Implements hook_civicrm_entityTypes().
    *
-   * @param array $entityTypes
+   * @see CRM_Utils_Hook::entityTypes()
    */
   public function _hook_civicrm_entityTypes(&$entityTypes) {
     $entityTypes['CRM_Core_DAO_Email']['fields_callback'][] = function ($class, &$fields) {

diff --git a/tests/phpunit/CRM/Price/Form/OptionTest.php b/tests/phpunit/CRM/Price/Form/OptionTest.php
index 4d297b86c42e95faf47168b3611d32dcdb1a5972..faf6c0b720ac10e391cfb9fb151b59429885d030 100644 (file)
--- a/tests/phpunit/CRM/Price/Form/OptionTest.php
+++ b/tests/phpunit/CRM/Price/Form/OptionTest.php
@@ -1,92 +1,92 @@
-<?php\r
-\r
-class CRM_Price_Form_OptionTest extends CiviUnitTestCase {\r
-\r
-  protected $priceFieldValues;\r
-  protected $visibilityOptionsKeys;\r
-  protected $visibilityOptions;\r
-  protected $publicValue;\r
-  protected $adminValue;\r
-\r
-  public function setUp() {\r
-    parent::setUp();\r
-\r
-    $this->visibilityOptions = CRM_Price_BAO_PriceFieldValue::buildOptions('visibility_id', NULL, array(\r
-      'labelColumn' => 'name',\r
-    ));\r
-    $this->visibilityOptionsKeys = CRM_Price_BAO_PriceFieldValue::buildOptions('visibility_id', NULL, array(\r
-      'labelColumn' => 'name',\r
-      'flip' => TRUE,\r
-    ));\r
-  }\r
-\r
-  public function testChangingUniquePublicOptionOnPublicFieldIsNotAllowed() {\r
-    $this->setUpPriceSet(array(\r
-      'html_type' => 'Select',\r
-      'visibility_id' => $this->visibilityOptionsKeys['public'],\r
-      'option_label' => array('1' => 'Price Field 1', '2' => 'Price Field 2'),\r
-      'option_value' => array('1' => 100, '2' => 200),\r
-      'option_name' => array('1' => 'Price Field 1', '2' => 'Price Field 2'),\r
-      'option_weight' => array('1' => 1, '2' => 2),\r
-      'option_amount' => array('1' => 100, '2' => 200),\r
-      'option_visibility_id' => array(1 => $this->visibilityOptionsKeys['public'], 2 => $this->visibilityOptionsKeys['admin']),\r
-    ));\r
-\r
-    $params = array(\r
-      'fieldId' => $this->publicValue['price_field_id'],\r
-      'optionId' => $this->publicValue['id'],\r
-      'visibility_id' => $this->visibilityOptionsKeys['admin'],\r
-    );\r
-\r
-    $form = new CRM_Price_Form_Option();\r
-    $form->_action = CRM_Core_Action::ADD;\r
-    $files = array();\r
-\r
-    $validationResult = $form->formRule($params, $files, $form);\r
-    $this->assertType('array', $validationResult);\r
-    $this->assertTrue(array_key_exists('visibility_id', $validationResult));\r
-  }\r
-\r
-  public function testAddingPublicOptionToAdminFieldIsNotAllowed() {\r
-    $this->setUpPriceSet(array(\r
-      'html_type' => 'Select',\r
-      'visibility_id' => $this->visibilityOptionsKeys['admin'],\r
-      'option_label' => array('1' => 'Price Field 1', '2' => 'Price Field 2'),\r
-      'option_value' => array('1' => 100, '2' => 200),\r
-      'option_name' => array('1' => 'Price Field 1', '2' => 'Price Field 2'),\r
-      'option_weight' => array('1' => 1, '2' => 2),\r
-      'option_amount' => array('1' => 100, '2' => 200),\r
-      'option_visibility_id' => array(1 => $this->visibilityOptionsKeys['admin'], 2 => $this->visibilityOptionsKeys['admin']),\r
-    ));\r
-\r
-    $params = array(\r
-      'fieldId' => $this->adminValue['price_field_id'],\r
-      'optionId' => $this->adminValue['id'],\r
-      'visibility_id' => $this->visibilityOptionsKeys['public'],\r
-    );\r
-\r
-    $form = new CRM_Price_Form_Option();\r
-    $form->_action = CRM_Core_Action::ADD;\r
-    $files = array();\r
-\r
-    $validationResult = $form->formRule($params, $files, $form);\r
-    $this->assertType('array', $validationResult);\r
-    $this->assertTrue(array_key_exists('visibility_id', $validationResult));\r
-  }\r
-\r
-  private function setUpPriceSet($params) {\r
-    $priceSetCreateResult = $this->createPriceSet('contribution_page', NULL, $params);\r
-\r
-    $this->priceFieldValues = $priceSetCreateResult['values'];\r
-\r
-    foreach ($this->priceFieldValues as $currentField) {\r
-      if ($this->visibilityOptions[$currentField['visibility_id']] == 'public') {\r
-        $this->publicValue = $currentField;\r
-      }\r
-      else {\r
-        $this->adminValue = $currentField;\r
-      }\r
-    }\r
-  }\r
-\r
-}\r
+<?php
+
+class CRM_Price_Form_OptionTest extends CiviUnitTestCase {
+
+  protected $priceFieldValues;
+  protected $visibilityOptionsKeys;
+  protected $visibilityOptions;
+  protected $publicValue;
+  protected $adminValue;
+
+  public function setUp() {
+    parent::setUp();
+
+    $this->visibilityOptions = CRM_Price_BAO_PriceFieldValue::buildOptions('visibility_id', NULL, array(
+      'labelColumn' => 'name',
+    ));
+    $this->visibilityOptionsKeys = CRM_Price_BAO_PriceFieldValue::buildOptions('visibility_id', NULL, array(
+      'labelColumn' => 'name',
+      'flip' => TRUE,
+    ));
+  }
+
+  public function testChangingUniquePublicOptionOnPublicFieldIsNotAllowed() {
+    $this->setUpPriceSet(array(
+      'html_type' => 'Select',
+      'visibility_id' => $this->visibilityOptionsKeys['public'],
+      'option_label' => array('1' => 'Price Field 1', '2' => 'Price Field 2'),
+      'option_value' => array('1' => 100, '2' => 200),
+      'option_name' => array('1' => 'Price Field 1', '2' => 'Price Field 2'),
+      'option_weight' => array('1' => 1, '2' => 2),
+      'option_amount' => array('1' => 100, '2' => 200),
+      'option_visibility_id' => array(1 => $this->visibilityOptionsKeys['public'], 2 => $this->visibilityOptionsKeys['admin']),
+    ));
+
+    $params = array(
+      'fieldId' => $this->publicValue['price_field_id'],
+      'optionId' => $this->publicValue['id'],
+      'visibility_id' => $this->visibilityOptionsKeys['admin'],
+    );
+
+    $form = new CRM_Price_Form_Option();
+    $form->_action = CRM_Core_Action::ADD;
+    $files = array();
+
+    $validationResult = $form->formRule($params, $files, $form);
+    $this->assertType('array', $validationResult);
+    $this->assertTrue(array_key_exists('visibility_id', $validationResult));
+  }
+
+  public function testAddingPublicOptionToAdminFieldIsNotAllowed() {
+    $this->setUpPriceSet(array(
+      'html_type' => 'Select',
+      'visibility_id' => $this->visibilityOptionsKeys['admin'],
+      'option_label' => array('1' => 'Price Field 1', '2' => 'Price Field 2'),
+      'option_value' => array('1' => 100, '2' => 200),
+      'option_name' => array('1' => 'Price Field 1', '2' => 'Price Field 2'),
+      'option_weight' => array('1' => 1, '2' => 2),
+      'option_amount' => array('1' => 100, '2' => 200),
+      'option_visibility_id' => array(1 => $this->visibilityOptionsKeys['admin'], 2 => $this->visibilityOptionsKeys['admin']),
+    ));
+
+    $params = array(
+      'fieldId' => $this->adminValue['price_field_id'],
+      'optionId' => $this->adminValue['id'],
+      'visibility_id' => $this->visibilityOptionsKeys['public'],
+    );
+
+    $form = new CRM_Price_Form_Option();
+    $form->_action = CRM_Core_Action::ADD;
+    $files = array();
+
+    $validationResult = $form->formRule($params, $files, $form);
+    $this->assertType('array', $validationResult);
+    $this->assertTrue(array_key_exists('visibility_id', $validationResult));
+  }
+
+  private function setUpPriceSet($params) {
+    $priceSetCreateResult = $this->createPriceSet('contribution_page', NULL, $params);
+
+    $this->priceFieldValues = $priceSetCreateResult['values'];
+
+    foreach ($this->priceFieldValues as $currentField) {
+      if ($this->visibilityOptions[$currentField['visibility_id']] == 'public') {
+        $this->publicValue = $currentField;
+      }
+      else {
+        $this->adminValue = $currentField;
+      }
+    }
+  }
+
+}