Bläddra i källkod

#1259 Make unit tests to run on PHP 7.2

Alex Trofimov 8 år sedan
förälder
incheckning
4e6892ee7a
2 ändrade filer med 4 tillägg och 4 borttagningar
  1. 2 2
      tests/bootstrap.php
  2. 2 2
      tests/units/inc/UtilTest.php

+ 2 - 2
tests/bootstrap.php

@@ -9,7 +9,7 @@ if (!file_exists($sHeaderPath))
 
 require_once($sHeaderPath);
 
-class BxDolTestCase extends PHPUnit_Framework_TestCase
+class BxDolTestCase extends \PHPUnit\Framework\TestCase
 {
 
     function bxMockGet ($sClass, $aModule = array(), $bDisableContructor = false)
@@ -24,7 +24,7 @@ class BxDolTestCase extends PHPUnit_Framework_TestCase
                 ->disableOriginalConstructor()
                 ->getMock();
         } else {
-            $GLOBALS['bxDolClasses'][$sClass] = $this->getMock($sClass);
+            $GLOBALS['bxDolClasses'][$sClass] = $this->createMock($sClass);
         }
 
         return $GLOBALS['bxDolClasses'][$sClass];

+ 2 - 2
tests/units/inc/UtilTest.php

@@ -3,7 +3,7 @@
 /**
  * Test util functions
  */
-class UtilTest extends PHPUnit_Framework_TestCase
+class UtilTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @see clear_xss
@@ -27,7 +27,7 @@ class UtilTest extends PHPUnit_Framework_TestCase
     {
         // create mock object instance of HTMLPurifier class
         require_once(BX_DIRECTORY_PATH_PLUGINS . 'htmlpurifier/HTMLPurifier.standalone.php');
-        $GLOBALS['oHtmlPurifier'] = $this->getMock('HTMLPurifier');
+        $GLOBALS['oHtmlPurifier'] = $this->createMock('HTMLPurifier');
 
         // set admin or not admin user
         $GLOBALS['logged']['admin'] = $isAdmin;