Browse Source

Fix config() deprecations in Log/

Mark Story 8 years ago
parent
commit
253f47a9f8

+ 1 - 1
tests/TestCase/Log/Engine/ConsoleLogTest.php

@@ -82,7 +82,7 @@ class ConsoleLogTest extends TestCase
         $log = new ConsoleLog([
             'stream' => $output,
         ]);
-        $config = $log->config();
+        $config = $log->getConfig();
         $this->assertEquals($expected, $config['outputAs']);
     }
 }

+ 1 - 1
tests/TestCase/Log/Engine/SyslogLogTest.php

@@ -38,7 +38,7 @@ class SyslogLogTest extends TestCase
         $log = $this->getMockBuilder('Cake\Log\Engine\SyslogLog')
             ->setMethods(['_open', '_write'])
             ->getMock();
-        $log->config([
+        $log->setConfig([
             'prefix' => 'thing',
             'flag' => LOG_NDELAY,
             'facility' => LOG_MAIL,

+ 29 - 29
tests/TestCase/Log/LogTest.php

@@ -46,10 +46,10 @@ class LogTest extends TestCase
         static::setAppNamespace();
         Plugin::load('TestPlugin');
 
-        Log::config('libtest', [
+        Log::setConfig('libtest', [
             'engine' => 'TestApp'
         ]);
-        Log::config('plugintest', [
+        Log::setConfig('plugintest', [
             'engine' => 'TestPlugin.TestPlugin'
         ]);
 
@@ -75,7 +75,7 @@ class LogTest extends TestCase
      */
     public function testImportingLoggerFailure()
     {
-        Log::config('fail', []);
+        Log::setConfig('fail', []);
         Log::engine('fail');
     }
 
@@ -86,7 +86,7 @@ class LogTest extends TestCase
      */
     public function testValidKeyName()
     {
-        Log::config('valid', ['engine' => 'File']);
+        Log::setConfig('valid', ['engine' => 'File']);
         $stream = Log::engine('valid');
         $this->assertInstanceOf('Cake\Log\Engine\FileLog', $stream);
     }
@@ -99,7 +99,7 @@ class LogTest extends TestCase
      */
     public function testNotImplementingInterface()
     {
-        Log::config('fail', ['engine' => '\stdClass']);
+        Log::setConfig('fail', ['engine' => '\stdClass']);
         Log::engine('fail');
     }
 
@@ -110,7 +110,7 @@ class LogTest extends TestCase
      */
     public function testDrop()
     {
-        Log::config('file', [
+        Log::setConfig('file', [
             'engine' => 'File',
             'path' => LOGS
         ]);
@@ -132,7 +132,7 @@ class LogTest extends TestCase
      */
     public function testInvalidLevel()
     {
-        Log::config('myengine', ['engine' => 'File']);
+        Log::setConfig('myengine', ['engine' => 'File']);
         Log::write('invalid', 'This will not be logged');
     }
 
@@ -164,7 +164,7 @@ class LogTest extends TestCase
      */
     public function testConfigVariants($settings)
     {
-        Log::config('test', $settings);
+        Log::setConfig('test', $settings);
         $this->assertContains('test', Log::configured());
         $this->assertInstanceOf('Cake\Log\Engine\FileLog', Log::engine('test'));
         Log::drop('test');
@@ -193,7 +193,7 @@ class LogTest extends TestCase
      */
     public function testConfigInjectErrorOnWrongType()
     {
-        Log::config('test', new \StdClass);
+        Log::setConfig('test', new \StdClass);
         Log::info('testing');
     }
 
@@ -221,12 +221,12 @@ class LogTest extends TestCase
             'engine' => 'File',
             'path' => LOGS
         ];
-        Log::config('tests', $config);
+        Log::setConfig('tests', $config);
 
         $expected = $config;
         $expected['className'] = $config['engine'];
         unset($expected['engine']);
-        $this->assertSame($expected, Log::config('tests'));
+        $this->assertSame($expected, Log::getConfig('tests'));
     }
 
     /**
@@ -237,8 +237,8 @@ class LogTest extends TestCase
      */
     public function testConfigErrorOnReconfigure()
     {
-        Log::config('tests', ['engine' => 'File', 'path' => TMP]);
-        Log::config('tests', ['engine' => 'Apc']);
+        Log::setConfig('tests', ['engine' => 'File', 'path' => TMP]);
+        Log::setConfig('tests', ['engine' => 'Apc']);
     }
 
     /**
@@ -278,13 +278,13 @@ class LogTest extends TestCase
         if (file_exists(LOGS . 'eggs.log')) {
             unlink(LOGS . 'eggs.log');
         }
-        Log::config('spam', [
+        Log::setConfig('spam', [
             'engine' => 'File',
             'path' => LOGS,
             'levels' => 'debug',
             'file' => 'spam',
         ]);
-        Log::config('eggs', [
+        Log::setConfig('eggs', [
             'engine' => 'File',
             'path' => LOGS,
             'levels' => ['eggs', 'debug', 'error', 'warning'],
@@ -326,13 +326,13 @@ class LogTest extends TestCase
         if (file_exists(LOGS . 'eggs.log')) {
             unlink(LOGS . 'eggs.log');
         }
-        Log::config('spam', [
+        Log::setConfig('spam', [
             'engine' => 'File',
             'path' => LOGS,
             'types' => 'debug',
             'file' => 'spam',
         ]);
-        Log::config('eggs', [
+        Log::setConfig('eggs', [
             'engine' => 'File',
             'path' => LOGS,
             'types' => ['eggs', 'debug', 'error', 'warning'],
@@ -363,13 +363,13 @@ class LogTest extends TestCase
 
     protected function _resetLogConfig()
     {
-        Log::config('debug', [
+        Log::setConfig('debug', [
             'engine' => 'File',
             'path' => LOGS,
             'levels' => ['notice', 'info', 'debug'],
             'file' => 'debug',
         ]);
-        Log::config('error', [
+        Log::setConfig('error', [
             'engine' => 'File',
             'path' => LOGS,
             'levels' => ['warning', 'error', 'critical', 'alert', 'emergency'],
@@ -408,7 +408,7 @@ class LogTest extends TestCase
     {
         $this->_deleteLogs();
         $this->_resetLogConfig();
-        Log::config('shops', [
+        Log::setConfig('shops', [
             'engine' => 'File',
             'path' => LOGS,
             'levels' => ['info', 'debug', 'warning'],
@@ -449,14 +449,14 @@ class LogTest extends TestCase
     {
         $this->_deleteLogs();
 
-        Log::config('debug', [
+        Log::setConfig('debug', [
             'engine' => 'File',
             'path' => LOGS,
             'levels' => ['notice', 'info', 'debug'],
             'file' => 'debug',
             'scopes' => false
         ]);
-        Log::config('shops', [
+        Log::setConfig('shops', [
             'engine' => 'File',
             'path' => LOGS,
             'levels' => ['info', 'debug', 'warning'],
@@ -495,7 +495,7 @@ class LogTest extends TestCase
         }
 
         $this->_resetLogConfig();
-        Log::config('shops', [
+        Log::setConfig('shops', [
             'engine' => 'File',
             'path' => LOGS,
             'levels' => ['info', 'debug', 'notice', 'warning'],
@@ -536,14 +536,14 @@ class LogTest extends TestCase
     {
         $this->_deleteLogs();
 
-        Log::config('shops', [
+        Log::setConfig('shops', [
             'engine' => 'File',
             'path' => LOGS,
             'levels' => ['debug', 'notice', 'warning'],
             'scopes' => ['transactions', 'orders'],
             'file' => 'shops.log',
         ]);
-        Log::config('eggs', [
+        Log::setConfig('eggs', [
             'engine' => 'File',
             'path' => LOGS,
             'levels' => ['debug', 'notice', 'warning'],
@@ -571,7 +571,7 @@ class LogTest extends TestCase
 
         Log::reset();
 
-        Log::config('scope_test', [
+        Log::setConfig('scope_test', [
             'engine' => 'TestApp',
             'path' => LOGS,
             'levels' => ['notice', 'info', 'debug'],
@@ -598,13 +598,13 @@ class LogTest extends TestCase
     {
         $this->_deleteLogs();
 
-        Log::config('debug', [
+        Log::setConfig('debug', [
             'engine' => 'File',
             'path' => LOGS,
             'levels' => ['notice', 'info', 'debug'],
             'file' => 'debug',
         ]);
-        Log::config('error', [
+        Log::setConfig('error', [
             'engine' => 'File',
             'path' => LOGS,
             'levels' => ['emergency', 'alert', 'critical', 'error', 'warning'],
@@ -690,7 +690,7 @@ class LogTest extends TestCase
     public function testCreateLoggerWithCallable()
     {
         $instance = new FileLog;
-        Log::config('default', function ($alias) use ($instance) {
+        Log::setConfig('default', function ($alias) use ($instance) {
             $this->assertEquals('default', $alias);
 
             return $instance;

+ 1 - 1
tests/TestCase/Log/LogTraitTest.php

@@ -44,7 +44,7 @@ class LogTraitTest extends TestCase
             ->method('log')
             ->with('debug', [1, 2]);
 
-        Log::config('trait_test', ['engine' => $mock]);
+        Log::setConfig('trait_test', ['engine' => $mock]);
         $subject = $this->getObjectForTrait('Cake\Log\LogTrait');
 
         $subject->log('Testing');