Skip to content

Commit

Permalink
Mark compatibility shims as deprecated.
Browse files Browse the repository at this point in the history
Fixes #2845
  • Loading branch information
markstory committed Feb 17, 2014
1 parent 4f42400 commit 070b165
Showing 1 changed file with 13 additions and 0 deletions.
13 changes: 13 additions & 0 deletions lib/Cake/TestSuite/CakeTestCase.php
Expand Up @@ -531,6 +531,7 @@ protected function _arrayPermute($items, $perms = array()) {
* @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 = '') {
Expand All @@ -543,6 +544,7 @@ protected static function assertEqual($result, $expected, $message = '') {
* @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 = '') {
Expand All @@ -555,6 +557,7 @@ protected static function assertNotEqual($result, $expected, $message = '') {
* @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 = '') {
Expand All @@ -567,6 +570,7 @@ protected static function assertPattern($pattern, $string, $message = '') {
* @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 = '') {
Expand All @@ -579,6 +583,7 @@ protected static function assertIdentical($actual, $expected, $message = '') {
* @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 = '') {
Expand All @@ -591,6 +596,7 @@ protected static function assertNotIdentical($actual, $expected, $message = '')
* @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 = '') {
Expand All @@ -599,6 +605,9 @@ protected static function assertNoPattern($pattern, $string, $message = '') {

/**
* assert no errors
*
* @deprecated This is a compatiblity wrapper for 1.x. It will be removed in 3.0
* @return void
*/
protected function assertNoErrors() {
}
Expand All @@ -608,6 +617,7 @@ protected function assertNoErrors() {
*
* @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 = '') {
Expand All @@ -622,6 +632,7 @@ protected function expectError($expected = false, $message = '') {
*
* @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 = '') {
Expand All @@ -634,6 +645,7 @@ protected function expectException($name = 'Exception', $message = '') {
* @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 = '') {
Expand All @@ -646,6 +658,7 @@ protected static function assertReference(&$first, &$second, $message = '') {
* @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 = '') {
Expand Down

0 comments on commit 070b165

Please sign in to comment.