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

Backport Configure::consume() to 2.x

Browse source
This commit is contained in:
euromark 2014-12-23 03:26:03 +01:00
parent 839ef73d43
commit 515302528d
2 changed files with 44 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
lib/Cake/Core/Configure.php
View file

@ -190,6 +190,30 @@ class Configure {
return Hash::get(self::$_values, $var);
}
/**
* Used to read and delete a variable from Configure.
*
* This is primarily used during bootstrapping to move configuration data
* out of configure into the various other classes in CakePHP.
*
* @param string $var The key to read and remove.
* @return array|null
*/
public static function consume($var) {
$simple = strpos($var, '.') === false;
if ($simple && !isset(self::$_values[$var])) {
return null;
}
if ($simple) {
$value = self::$_values[$var];
unset(self::$_values[$var]);
return $value;
}
$value = Hash::get(self::$_values, $var);
self::$_values = Hash::remove(self::$_values, $var);
return $value;
}
/**
* Returns true if given variable is set in Configure.
*

20
lib/Cake/Test/Case/Core/ConfigureTest.php
View file

@ -148,6 +148,26 @@ class ConfigureTest extends CakeTestCase {
$this->assertEquals('4', $result);
}
/**
* Test the consume method.
*
* @return void
*/
public function testConsume() {
$this->assertNull(Configure::consume('DoesNotExist'), 'Should be null on empty value');
Configure::write('Test', ['key' => 'value', 'key2' => 'value2']);
$result = Configure::consume('Test.key');
$this->assertEquals('value', $result);
$result = Configure::read('Test.key2');
$this->assertEquals('value2', $result, 'Other values should remain.');
$result = Configure::consume('Test');
$expected = ['key2' => 'value2'];
$this->assertEquals($expected, $result);
}
/**
* test setting display_errors with debug.
*