Merge pull request #4971 from kurund/batch-16

[civicrm-core.git] / tests / phpunit / CiviTest / CiviTestSuite.php

diff --git a/tests/phpunit/CiviTest/CiviTestSuite.php b/tests/phpunit/CiviTest/CiviTestSuite.php
index e6ad1433023b5450de9d962d40660a81e7040935..5c073aa057ef786c939b686143b132be02bca664 100644 (file)
--- a/tests/phpunit/CiviTest/CiviTestSuite.php
+++ b/tests/phpunit/CiviTest/CiviTestSuite.php
@@ -40,8 +40,10 @@ class CiviTestSuite extends PHPUnit_Framework_TestSuite {
 
   /**
    * Simple name based constructor
+   * @param string $theClass
+   * @param string $name
    */
-  function __construct($theClass = '', $name = '') {
+  public function __construct($theClass = '', $name = '') {
     if (empty($name)) {
       $name = str_replace('_',
         ' ',
@@ -76,11 +78,12 @@ class CiviTestSuite extends PHPUnit_Framework_TestSuite {
    *  suppress failed test error issued by phpunit when it finds
    *  a test suite with no tests
    */
-  function testNothing() {
+  public function testNothing() {
   }
 
   /**
-   *
+   * @param $myfile
+   * @return \PHPUnit_Framework_TestSuite
    */
   protected function implSuite($myfile) {
     $name = str_replace('_',
@@ -101,12 +104,17 @@ class CiviTestSuite extends PHPUnit_Framework_TestSuite {
   /**
    *  Add all test classes *Test and all test suites *Tests in subdirectories
    *
-   * @param  &object Test suite object to add tests to
-   * @param  object  Directory to scan
-   * @return Test suite has been updated
+   * @param PHPUnit_Framework_TestSuite $suite
+   *   Test suite object to add tests to
+   * @param $myfile
+   * @param SplFileInfo $dirInfo
+   *   object to scan
+   *
+   * @return void
    */
-  protected function addAllTests(PHPUnit_Framework_TestSuite & $suite,
-                                 $myfile, SplFileInfo $dirInfo
+  protected function addAllTests(
+    PHPUnit_Framework_TestSuite &$suite,
+    $myfile, SplFileInfo $dirInfo
   ) {
     //echo get_class($this)."::addAllTests($myfile,".$dirInfo->getRealPath().")\n";
     if (!$dirInfo->isReadable()