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

Fixed some problems caused by the visibility changes.

Browse source
This commit is contained in:
Juan Basso 2011-08-21 01:04:55 -04:00
parent a1a049c700
commit 689c7ffd45
4 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/Cake/Console/Command/SchemaShell.php
View file

@ -37,6 +37,13 @@ class SchemaShell extends Shell {
*/
public $Schema;
/**
* is this a dry run?
*
* @var boolean
*/
protected $_dry = null;
/**
* Override initialize
*

4
lib/Cake/Controller/Component/RequestHandlerComponent.php
View file

@ -91,7 +91,7 @@ class RequestHandlerComponent extends Component {
* @param array $settings Array of settings.
*/
public function __construct(ComponentCollection $collection, $settings = array()) {
$this->addInputType('xml', array(array($this, '_convertXml')));
$this->addInputType('xml', array(array($this, 'convertXml')));
parent::__construct($collection, $settings);
}
@ -175,7 +175,7 @@ class RequestHandlerComponent extends Component {
* @param string $xml
* @return array Xml array data
*/
protected function _convertXml($xml) {
public function convertXml($xml) {
try {
$xml = Xml::build($xml);
if (isset($xml->data)) {

6
lib/Cake/Test/Case/Console/Command/TestsuiteShellTest.php
View file

@ -34,7 +34,7 @@ class TestsuiteShellTest extends CakeTestCase {
$this->Shell = $this->getMock(
'TestsuiteShell',
array('in', 'out', 'hr', 'help', 'error', 'err', '_stop', 'initialize', 'run', 'clear'),
array('in', 'out', 'hr', 'help', 'error', 'err', '_stop', 'initialize', '_run', 'clear'),
array($out, $out, $in)
);
$this->Shell->OptionParser = $this->getMock('ConsoleOptionParser', array(), array(null, false));
@ -80,7 +80,7 @@ class TestsuiteShellTest extends CakeTestCase {
->with(__d('cake_console', 'What test case would you like to run?'), null, 'q')
->will($this->returnValue('1'));
$this->Shell->expects($this->once())->method('run');
$this->Shell->expects($this->once())->method('_run');
$this->Shell->available();
$this->assertEquals($this->Shell->args, array('core', 'AllBehaviors'));
}
@ -95,7 +95,7 @@ class TestsuiteShellTest extends CakeTestCase {
$this->Shell->args = array('core', 'Basics');
$this->Shell->params = array('filter' => 'myFilter', 'colors' => true, 'verbose' => true);
$this->Shell->expects($this->once())->method('run')
$this->Shell->expects($this->once())->method('_run')
->with(
array('app' => false, 'plugin' => null, 'core' => true, 'output' => 'text', 'case' => 'Basics'),
array('--filter', 'myFilter', '--colors', '--verbose')