adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into 2.5

Browse source
This commit is contained in:
mark_story 2014-02-17 10:51:32 -05:00
commit a965903777
1 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -531,6 +531,7 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
* @param mixed $result
* @param mixed $expected
* @param string $message the text to display if the assertion is not correct
* @deprecated This is a compatiblity wrapper for 1.x. It will be removed in 3.0
* @return void
*/
protected static function assertEqual($result, $expected, $message = '') {
@ -543,6 +544,7 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
* @param mixed $result
* @param mixed $expected
* @param string $message the text to display if the assertion is not correct
* @deprecated This is a compatiblity wrapper for 1.x. It will be removed in 3.0
* @return void
*/
protected static function assertNotEqual($result, $expected, $message = '') {
@ -555,6 +557,7 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
* @param mixed $pattern a regular expression
* @param string $string the text to be matched
* @param string $message the text to display if the assertion is not correct
* @deprecated This is a compatiblity wrapper for 1.x. It will be removed in 3.0
* @return void
*/
protected static function assertPattern($pattern, $string, $message = '') {
@ -567,6 +570,7 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
* @param mixed $actual
* @param mixed $expected
* @param string $message the text to display if the assertion is not correct
* @deprecated This is a compatiblity wrapper for 1.x. It will be removed in 3.0
* @return void
*/
protected static function assertIdentical($actual, $expected, $message = '') {
@ -579,6 +583,7 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
* @param mixed $actual
* @param mixed $expected
* @param string $message the text to display if the assertion is not correct
* @deprecated This is a compatiblity wrapper for 1.x. It will be removed in 3.0
* @return void
*/
protected static function assertNotIdentical($actual, $expected, $message = '') {
@ -591,6 +596,7 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
* @param mixed $pattern a regular expression
* @param string $string the text to be matched
* @param string $message the text to display if the assertion is not correct
* @deprecated This is a compatiblity wrapper for 1.x. It will be removed in 3.0
* @return void
*/
protected static function assertNoPattern($pattern, $string, $message = '') {
@ -599,6 +605,9 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
/**
* assert no errors
*
* @deprecated This is a compatiblity wrapper for 1.x. It will be removed in 3.0
* @return void
*/
protected function assertNoErrors() {
}
@ -608,6 +617,7 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
*
* @param mixed $expected the name of the Exception or error
* @param string $message the text to display if the assertion is not correct
* @deprecated This is a compatiblity wrapper for 1.x. It will be removed in 3.0
* @return void
*/
protected function expectError($expected = false, $message = '') {
@ -622,6 +632,7 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
*
* @param mixed $expected the name of the Exception
* @param string $message the text to display if the assertion is not correct
* @deprecated This is a compatiblity wrapper for 1.x. It will be removed in 3.0
* @return void
*/
protected function expectException($name = 'Exception', $message = '') {
@ -634,6 +645,7 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
* @param mixed $first
* @param mixed $second
* @param string $message the text to display if the assertion is not correct
* @deprecated This is a compatiblity wrapper for 1.x. It will be removed in 3.0
* @return void
*/
protected static function assertReference(&$first, &$second, $message = '') {
@ -646,6 +658,7 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
* @param string $object
* @param string $type
* @param string $message
* @deprecated This is a compatiblity wrapper for 1.x. It will be removed in 3.0
* @return void
*/
protected static function assertIsA($object, $type, $message = '') {