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

Turning __get() back into methods. There were so few properties being accessed that it didn't make sense to have __get(), over a handful of methods.

Browse source 
Tests updated.
This commit is contained in:
mark_story 2010-11-12 23:57:55 -05:00
parent f9b7cbcb96
commit 6c8c7ca4a5
6 changed files with 30 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cake/console/libs/console_input_argument.php
View file

@ -51,16 +51,12 @@ class ConsoleInputArgument {
}
/**
* Protected attribute accessor.
* Get the value of the name attribute.
*
* @param string $name Name of attribute to read.
* @return mixed.
* @return string Value of this->_name.
*/
public function __get($name) {
if (isset($this->{'_' . $name})) {
return $this->{'_' . $name};
}
return null;
public function name() {
return $this->_name;
}
/**

21
cake/console/libs/console_input_option.php
View file

@ -56,16 +56,21 @@ class ConsoleInputOption {
}
/**
* Protected attribute accessor.
* Get the value of the name attribute.
*
* @param string $name Name of attribute to read.
* @return mixed.
* @return string Value of this->_name.
*/
public function __get($name) {
if (isset($this->{'_' . $name})) {
return $this->{'_' . $name};
}
return null;
public function name() {
return $this->_name;
}
/**
* Get the value of the short attribute.
*
* @return string Value of this->_short.
*/
public function short() {
return $this->_short;
}
/**

12
cake/console/libs/console_input_subcommand.php
View file

@ -54,16 +54,12 @@ class ConsoleInputSubcommand {
}
/**
* Protected attribute accessor.
* Get the value of the name attribute.
*
* @param string $name Name of attribute to read.
* @return mixed.
* @return string Value of this->_name.
*/
public function __get($name) {
if (isset($this->{'_' . $name})) {
return $this->{'_' . $name};
}
return null;
public function name() {
return $this->_name;
}
/**

12
cake/console/libs/console_option_parser.php
View file

@ -267,7 +267,7 @@ class ConsoleOptionParser {
public function addOption($name, $params = array()) {
if (is_object($name) && $name instanceof ConsoleInputOption) {
$option = $name;
$name = $option->name;
$name = $option->name();
} else {
$defaults = array(
'name' => $name,
@ -281,8 +281,8 @@ class ConsoleOptionParser {
$option = new ConsoleInputOption($options);
}
$this->_options[$name] = $option;
if ($option->short !== null) {
$this->_shortOptions[$option->short] = $name;
if ($option->short() !== null) {
$this->_shortOptions[$option->short()] = $name;
}
return $this;
}
@ -374,7 +374,7 @@ class ConsoleOptionParser {
public function addSubcommand($name, $params = array()) {
if (is_object($name) && $name instanceof ConsoleInputSubcommand) {
$command = $name;
$name = $command->name;
$name = $command->name();
} else {
$defaults = array(
'name' => $name,
@ -458,12 +458,12 @@ class ConsoleOptionParser {
foreach ($this->_args as $i => $arg) {
if ($arg->isRequired() && !isset($args[$i]) && empty($params['help'])) {
throw new RuntimeException(
sprintf(__('Missing required arguments. %s is required.'), $arg->name)
sprintf(__('Missing required arguments. %s is required.'), $arg->name())
);
}
}
foreach ($this->_options as $option) {
$name = $option->name;
$name = $option->name();
$isBoolean = $option->isBoolean();
$default = $option->defaultValue();

2
cake/console/libs/help_formatter.php
View file

@ -141,7 +141,7 @@ class HelpFormatter {
protected function _getMaxLength($collection) {
$max = 0;
foreach ($collection as $item) {
$max = (strlen($item->name) > $max) ? strlen($item->name) : $max;
$max = (strlen($item->name()) > $max) ? strlen($item->name()) : $max;
}
return $max;
}

4
cake/tests/cases/console/libs/console_option_parser.test.php
View file

@ -277,7 +277,7 @@ class ConsoleOptionParserTest extends CakeTestCase {
$parser->addArgument(new ConsoleInputArgument('test'));
$result = $parser->arguments();
$this->assertEquals(1, count($result));
$this->assertEquals('test', $result[0]->name);
$this->assertEquals('test', $result[0]->name());
}
/**
@ -385,7 +385,7 @@ class ConsoleOptionParserTest extends CakeTestCase {
$parser->addSubcommand(new ConsoleInputSubcommand('test'));
$result = $parser->subcommands();
$this->assertEquals(1, count($result));
$this->assertEquals('test', $result['test']->name);
$this->assertEquals('test', $result['test']->name());
}
/**