adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-19 02:56:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

keeping methods BC, load() now returns false again when configname not default and not configured

Browse source
This commit is contained in:
Ceeram 2012-07-03 12:43:33 +02:00
parent 19ba09286d
commit 18b860ed1a
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -262,6 +262,9 @@ class Configure {
*/ */
public static function load($key, $config = 'default', $merge = true) { public static function load($key, $config = 'default', $merge = true) {
$reader = self::_getReader($config); $reader = self::_getReader($config);
if (!$reader) {
return false;
}
$values = $reader->read($key); $values = $reader->read($key);
if ($merge) { if ($merge) {
@ -303,6 +306,9 @@ class Configure {
*/ */
public static function dump($key, $config = 'default', $keys = array()) { public static function dump($key, $config = 'default', $keys = array()) {
$reader = self::_getReader($config); $reader = self::_getReader($config);
if (!$reader) {
throw new ConfigureException(__d('cake', 'There is no "%s" adapter.', $config));
}
if (!method_exists($reader, 'dump')) { if (!method_exists($reader, 'dump')) {
throw new ConfigureException(__d('cake', 'The "%s" adapter, does not have a dump() method.', $config)); throw new ConfigureException(__d('cake', 'The "%s" adapter, does not have a dump() method.', $config));
} }
@ -318,13 +324,12 @@ class Configure {
* Will create new PhpReader for default if not configured yet. * Will create new PhpReader for default if not configured yet.
* *
* @param string $config The name of the configured adapter * @param string $config The name of the configured adapter
* @return boolean success * @return mixed Reader instance or false
* @throws ConfigureException if the adapter is not configured
*/ */
protected static function _getReader($config) { protected static function _getReader($config) {
if (!isset(self::$_readers[$config])) { if (!isset(self::$_readers[$config])) {
if ($config !== 'default') { if ($config !== 'default') {
throw new ConfigureException(__d('cake', 'There is no "%s" adapter.', $config)); return false;
} }
App::uses('PhpReader', 'Configure'); App::uses('PhpReader', 'Configure');
self::config($config, new PhpReader()); self::config($config, new PhpReader());