Browse Source

Merge pull request #519 from shama/patch-vis-convention

Correct convention with public visibility
Mark Story 14 years ago
parent
commit
1ddc8f6489

+ 2 - 2
lib/Cake/Test/Case/Network/CakeRequestTest.php

@@ -808,7 +808,7 @@ class CakeRequestTest extends CakeTestCase {
 		$_SERVER['HTTP_USER_AGENT'] = 'iPhone 3.0';
 		$this->assertTrue($request->isMobile());
 
-		$request->addDetector('callme', array('env' => 'TEST_VAR', 'callback' => array($this, '_detectCallback')));
+		$request->addDetector('callme', array('env' => 'TEST_VAR', 'callback' => array($this, 'detectCallback')));
 
 		$request->addDetector('index', array('param' => 'action', 'value' => 'index'));
 		$request->params['action'] = 'index';
@@ -829,7 +829,7 @@ class CakeRequestTest extends CakeTestCase {
  *
  * @return void
  */
-	public function _detectCallback($request) {
+	public function detectCallback($request) {
 		return $request->return == true;
 	}
 

+ 3 - 3
lib/Cake/Test/Case/TestSuite/CakeTestFixtureTest.php

@@ -400,7 +400,7 @@ class CakeTestFixtureTest extends CakeTestCase {
 		$Fixture = new CakeTestFixtureTestFixture();
 		$this->criticDb->expects($this->atLeastOnce())
 			->method('insertMulti')
-			->will($this->returnCallback(array($this, '_insertCallback')));
+			->will($this->returnCallback(array($this, 'insertCallback')));
 
 		$return = $Fixture->insert($this->criticDb);
 		$this->assertTrue(!empty($this->insertMulti));
@@ -424,7 +424,7 @@ class CakeTestFixtureTest extends CakeTestCase {
  * @param string $values
  * @return boolean true
  */
-	public function _insertCallback($table, $fields, $values) {
+	public function insertCallback($table, $fields, $values) {
 		$this->insertMulti['table'] = $table;
 		$this->insertMulti['fields'] = $fields;
 		$this->insertMulti['values'] = $values;
@@ -440,7 +440,7 @@ class CakeTestFixtureTest extends CakeTestCase {
 		$Fixture = new StringsTestFixture();
 		$this->criticDb->expects($this->atLeastOnce())
 			->method('insertMulti')
-			->will($this->returnCallback(array($this, '_insertCallback')));
+			->will($this->returnCallback(array($this, 'insertCallback')));
 
 		$return = $Fixture->insert($this->criticDb);
 		$this->assertTrue($this->criticDb->fullDebug);