Merge branch 'fixphpnotices' into 'master'

Fix PHP notices and typos

See merge request !44

CRM/Contact/Selector/DataProcessorContactSearch.php

@@ -5,6 +5,7 @@
  */
 
 class CRM_Contact_Selector_DataProcessorContactSearch {
+
   /**
    * @var \Civi\DataProcessor\ProcessorType\AbstractProcessorType;
    */
@@ -21,7 +22,7 @@ class CRM_Contact_Selector_DataProcessorContactSearch {
   protected $dataProcessor;
 
   /**
-   * @var \CRM_Dataprocessor_BAO_Output
+   * @var \CRM_Dataprocessor_BAO_DataProcessorOutput
    */
   protected $dataProcessorOutput;
 

CRM/Dataprocessor/Form/FilterValue.php

@@ -95,7 +95,6 @@ class CRM_Dataprocessor_Form_FilterValue extends CRM_Core_Form {
   }
 
   public function postProcess() {
-    $session = CRM_Core_Session::singleton();
     $redirectUrl = CRM_Utils_System::url('civicrm/dataprocessor/form/edit', array('reset' => 1, 'action' => 'update', 'id' => $this->dataProcessorId));
     $values = $this->exportValues();
     $default_filter_value = $this->filterTypeClass->processSubmittedValues($values);

CRM/Dataprocessor/Form/Output/AbstractUIOutputForm.php

@@ -25,7 +25,7 @@ abstract class CRM_Dataprocessor_Form_Output_AbstractUIOutputForm extends CRM_Co
   protected $dataProcessorId;
 
   /**
-   * @var \CRM_Dataprocessor_BAO_Output
+   * @var \CRM_Dataprocessor_BAO_DataProcessorOutput
    */
   protected $dataProcessorOutput;
 

CRM/DataprocessorSearch/Form/AbstractSearch.php

@@ -60,6 +60,13 @@ abstract class CRM_DataprocessorSearch_Form_AbstractSearch extends CRM_Dataproce
    */
   protected $entityIDs;
 
+  /**
+   * Name of action button
+   *
+   * @var string
+   */
+  protected $_searchButtonName;
+
   /**
    * Returns the name of the ID field in the dataset.
    *
@@ -446,8 +453,8 @@ abstract class CRM_DataprocessorSearch_Form_AbstractSearch extends CRM_Dataproce
     $this->assign('other_outputs', $otherOutputs);
   }
 
-  public function buildQuickform() {
-    parent::buildQuickform();
+  public function buildQuickForm() {
+    parent::buildQuickForm();
 
     $this->buildCriteriaForm();
 
@@ -472,7 +479,6 @@ abstract class CRM_DataprocessorSearch_Form_AbstractSearch extends CRM_Dataproce
   }
 
   public function postProcess() {
-    $values = $this->exportValues();
     if ($this->_done) {
       return;
     }
@@ -481,7 +487,7 @@ abstract class CRM_DataprocessorSearch_Form_AbstractSearch extends CRM_Dataproce
     //for prev/next pagination
     $crmPID = CRM_Utils_Request::retrieve('crmPID', 'Integer');
 
-    if (array_key_exists($this->_searchButtonName, $_POST) ||
+    if (($this->_searchButtonName && array_key_exists($this->_searchButtonName, $_POST)) ||
       ($this->_force && !$crmPID)
     ) {
       //reset the cache table for new search

Civi/DataProcessor/FilterHandler/ContactInGroupFilter.php

@@ -175,7 +175,7 @@ class ContactInGroupFilter extends AbstractFieldFilterHandler {
   /**
    * Process the submitted values and create a configuration array
    *
-   * @param $submittedValues
+   * @param array $submittedValues
    * @return array
    */
   public function processConfiguration($submittedValues) {