adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-31 09:06:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Inheritance fix for CakeTestCase

Browse source 
Fix overriden methods to be static like other methods in
PHPUnit_Framework_Assert.
Fixes #2170

Signed-off-by: mark_story <mark@mark-story.com>
This commit is contained in:
m 2011-10-26 14:39:04 +02:00 • committed by mark_story
parent 1244656595
commit 010abd9e18
1 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
lib/Cake/TestSuite/CakeTestCase.php
View file

@ -387,8 +387,8 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
* @param string $message the text to display if the assertion is not correct * @param string $message the text to display if the assertion is not correct
* @return void * @return void
*/ */
protected function assertEqual($result, $expected, $message = '') { protected static function assertEqual($result, $expected, $message = '') {
return $this->assertEquals($expected, $result, $message); return self::assertEquals($expected, $result, $message);
} }
/** /**
@ -399,8 +399,8 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
* @param string $message the text to display if the assertion is not correct * @param string $message the text to display if the assertion is not correct
* @return void * @return void
*/ */
protected function assertNotEqual($result, $expected, $message = '') { protected static function assertNotEqual($result, $expected, $message = '') {
return $this->assertNotEquals($expected, $result, $message); return self::assertNotEquals($expected, $result, $message);
} }
/** /**
@ -411,8 +411,8 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
* @param string $message the text to display if the assertion is not correct * @param string $message the text to display if the assertion is not correct
* @return void * @return void
*/ */
protected function assertPattern($pattern, $string, $message = '') { protected static function assertPattern($pattern, $string, $message = '') {
return $this->assertRegExp($pattern, $string, $message); return self::assertRegExp($pattern, $string, $message);
} }
/** /**
@ -423,8 +423,8 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
* @param string $message the text to display if the assertion is not correct * @param string $message the text to display if the assertion is not correct
* @return void * @return void
*/ */
protected function assertIdentical($actual, $expected, $message = '') { protected static function assertIdentical($actual, $expected, $message = '') {
return $this->assertSame($expected, $actual, $message); return self::assertSame($expected, $actual, $message);
} }
/** /**
@ -435,8 +435,8 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
* @param string $message the text to display if the assertion is not correct * @param string $message the text to display if the assertion is not correct
* @return void * @return void
*/ */
protected function assertNotIdentical($actual, $expected, $message = '') { protected static function assertNotIdentical($actual, $expected, $message = '') {
return $this->assertNotSame($expected, $actual, $message); return self::assertNotSame($expected, $actual, $message);
} }
/** /**
@ -447,8 +447,8 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
* @param string $message the text to display if the assertion is not correct * @param string $message the text to display if the assertion is not correct
* @return void * @return void
*/ */
protected function assertNoPattern($pattern, $string, $message = '') { protected static function assertNoPattern($pattern, $string, $message = '') {
return $this->assertNotRegExp($pattern, $string, $message); return self::assertNotRegExp($pattern, $string, $message);
} }
protected function assertNoErrors() { protected function assertNoErrors() {
@ -487,8 +487,8 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
* @param string $message the text to display if the assertion is not correct * @param string $message the text to display if the assertion is not correct
* @return void * @return void
*/ */
protected function assertReference(&$first, &$second, $message = '') { protected static function assertReference(&$first, &$second, $message = '') {
return $this->assertSame($first, $second, $message); return self::assertSame($first, $second, $message);
} }
/** /**
@ -499,8 +499,8 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
* @param string $message * @param string $message
* @return void * @return void
*/ */
protected function assertIsA($object, $type, $message = '') { protected static function assertIsA($object, $type, $message = '') {
return $this->assertInstanceOf($type, $object, $message); return self::assertInstanceOf($type, $object, $message);
} }
/** /**
@ -512,10 +512,10 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
* @param string $message the text to display if the assertion is not correct * @param string $message the text to display if the assertion is not correct
* @return void * @return void
*/ */
protected function assertWithinMargin($result, $expected, $margin, $message = '') { protected static function assertWithinMargin($result, $expected, $margin, $message = '') {
$upper = $result + $margin; $upper = $result + $margin;
$lower = $result - $margin; $lower = $result - $margin;
$this->assertTrue((($expected <= $upper) && ($expected >= $lower)), $message); return self::assertTrue((($expected <= $upper) && ($expected >= $lower)), $message);
} }
/** /**