test - flush pseudoconstant on case test, comments

diff --git a/CRM/Case/PseudoConstant.php b/CRM/Case/PseudoConstant.php
index e79e099378c225585cdab613dc57081455c2b821..8bade1c581dd26ed13b213c00f2e20cfdd2b1e4e 100644 (file)
--- a/CRM/Case/PseudoConstant.php
+++ b/CRM/Case/PseudoConstant.php
@@ -79,6 +79,11 @@ class CRM_Case_PseudoConstant extends CRM_Core_PseudoConstant {
    *
    * @access public
    *
+   * @param string $column
+   * @param bool $onlyActive
+   * @param null $condition
+   * @param bool $fresh
+   *
    * @return array - array reference of all case statues
    * @static
    */
@@ -103,6 +108,8 @@ class CRM_Case_PseudoConstant extends CRM_Core_PseudoConstant {
    *
    * @access public
    *
+   * @param null $filter
+   *
    * @return array - array reference of all redaction rules
    * @static
    */
@@ -250,8 +257,7 @@ class CRM_Case_PseudoConstant extends CRM_Core_PseudoConstant {
    * @access public
    * @static
    *
-   * @param boolean $name pseudoconstant to be flushed
-   *
+   * @param bool|string $name pseudoconstant to be flushed
    */
   public static function flush($name = 'cache') {
    if (isset(self::$$name)) {

diff --git a/CRM/Core/PseudoConstant.php b/CRM/Core/PseudoConstant.php
index 0213b7ce7def2740382c4d6de561fd88277f5ff5..f0df9aac3757f7cf1488cc5d71ed769c4250e293 100644 (file)
--- a/CRM/Core/PseudoConstant.php
+++ b/CRM/Core/PseudoConstant.php
@@ -531,12 +531,16 @@ class CRM_Core_PseudoConstant {
    *
    * Note: any database errors will be trapped by the DAO.
    *
-   * @param array   $var        the associative array we will fill
-   * @param string  $name       the name of the DAO
-   * @param boolean $all        get all objects. default is to get only active ones.
-   * @param string  $retrieve   the field that we are interested in (normally name, differs in some objects)
-   * @param string  $filter     the field that we want to filter the result set with
-   * @param string  $condition  the condition that gets passed to the final query as the WHERE clause
+   * @param array $var the associative array we will fill
+   * @param string $name the name of the DAO
+   * @param boolean $all get all objects. default is to get only active ones.
+   * @param string $retrieve the field that we are interested in (normally name, differs in some objects)
+   * @param string $filter the field that we want to filter the result set with
+   * @param string $condition the condition that gets passed to the final query as the WHERE clause
+   *
+   * @param null $orderby
+   * @param string $key
+   * @param null $force
    *
    * @return void
    * @access public

diff --git a/tests/phpunit/CRM/Case/PseudoConstantTest.php b/tests/phpunit/CRM/Case/PseudoConstantTest.php
index c57f364b828641e084ced7dd8a511aab8c70362d..7e3c6058347e657d6e81de2f5a8ed17da9896bc3 100644 (file)
--- a/tests/phpunit/CRM/Case/PseudoConstantTest.php
+++ b/tests/phpunit/CRM/Case/PseudoConstantTest.php
@@ -19,6 +19,7 @@ class CRM_Case_PseudoConstantTest extends CiviUnitTestCase {
   }
 
   function testCaseType() {
+    CRM_Core_PseudoConstant::flush();
     $caseTypes = CRM_Case_PseudoConstant::caseType();
     $expectedTypes = array(
         1 => 'Housing Support',