brmlab/brmsklad
4
0
Fork 0
mirror of https://github.com/brmlab/brmsklad.git synced 2025-08-03 22:53:58 +02:00
Code Issues Projects Releases Packages Wiki Activity

Upgrade CakePHP from 2.2.5 to 2.9.5

Browse source
This commit is contained in:
Brm Ko 2017-02-26 15:29:44 +01:00
parent 5a580df460
commit 235a541597
793 changed files with 60746 additions and 23753 deletions
Download patch file Download diff file Expand all files Collapse all files

21
lib/Cake/Log/Engine/BaseLog.php
View file

@ -2,19 +2,18 @@
/**
* Base Log Engine class
*
* PHP 5
*
* CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
* Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
* Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
*
* Licensed under The MIT License
* For full copyright and license information, please see the LICENSE.txt
* Redistributions of files must retain the above copyright notice.
*
* @copyright Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
* @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
* @package Cake.Log.Engine
* @since CakePHP(tm) v 2.2
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
* @license http://www.opensource.org/licenses/mit-license.php MIT License
*/
App::uses('CakeLogInterface', 'Log');
@ -34,16 +33,16 @@ abstract class BaseLog implements CakeLogInterface {
protected $_config = array();
/**
* __construct method
* Constructor
*
* @return void
* @param array $config Configuration array
*/
public function __construct($config = array()) {
$this->config($config);
}
/**
* Sets instance config. When $config is null, returns config array
* Sets instance config. When $config is null, returns config array
*
* Config
*
@ -55,8 +54,10 @@ abstract class BaseLog implements CakeLogInterface {
*/
public function config($config = array()) {
if (!empty($config)) {
if (isset($config['types']) && is_string($config['types'])) {
$config['types'] = array($config['types']);
foreach (array('types', 'scopes') as $option) {
if (isset($config[$option]) && is_string($config[$option])) {
$config[$option] = array($config[$option]);
}
}
$this->_config = $config;
}