diff options
| author | Côme Chilliet <91878298+come-nc@users.noreply.github.com> | 2022-03-29 10:39:38 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-29 10:39:38 +0300 |
| commit | 765999f454c0c5ebd8f2aa693d123f62d104d37a (patch) | |
| tree | ee986c4dcb0edac3babb7ee87e5afc159087e2e0 /core | |
| parent | 4a4f250a2b733f915e8b465bc995ea8ac18a8fbc (diff) | |
| parent | 6d354595f71f15f3d15bce70683b4bc013a6bfaf (diff) | |
Merge pull request #31609 from nextcloud/fix/migrate-away-from-ilogger
Migrate from ILogger to LoggerInterface in lib/private
Diffstat (limited to 'core')
| -rw-r--r-- | core/Command/Db/ConvertMysqlToMB4.php | 18 | ||||
| -rw-r--r-- | core/register_command.php | 2 |
2 files changed, 9 insertions, 11 deletions
diff --git a/core/Command/Db/ConvertMysqlToMB4.php b/core/Command/Db/ConvertMysqlToMB4.php index 7abd600b3b9..28f7ae6b2fa 100644 --- a/core/Command/Db/ConvertMysqlToMB4.php +++ b/core/Command/Db/ConvertMysqlToMB4.php @@ -30,8 +30,8 @@ use OC\Migration\ConsoleOutput; use OC\Repair\Collation; use OCP\IConfig; use OCP\IDBConnection; -use OCP\ILogger; use OCP\IURLGenerator; +use Psr\Log\LoggerInterface; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; @@ -46,16 +46,14 @@ class ConvertMysqlToMB4 extends Command { /** @var IURLGenerator */ private $urlGenerator; - /** @var ILogger */ - private $logger; + private LoggerInterface $logger; - /** - * @param IConfig $config - * @param IDBConnection $connection - * @param IURLGenerator $urlGenerator - * @param ILogger $logger - */ - public function __construct(IConfig $config, IDBConnection $connection, IURLGenerator $urlGenerator, ILogger $logger) { + public function __construct( + IConfig $config, + IDBConnection $connection, + IURLGenerator $urlGenerator, + LoggerInterface $logger + ) { $this->config = $config; $this->connection = $connection; $this->urlGenerator = $urlGenerator; diff --git a/core/register_command.php b/core/register_command.php index 5a708510568..6d7831edc0e 100644 --- a/core/register_command.php +++ b/core/register_command.php @@ -104,7 +104,7 @@ if (\OC::$server->getConfig()->getSystemValue('installed', false)) { $application->add(new OC\Core\Command\Config\System\SetConfig(\OC::$server->getSystemConfig())); $application->add(new OC\Core\Command\Db\ConvertType(\OC::$server->getConfig(), new \OC\DB\ConnectionFactory(\OC::$server->getSystemConfig()))); - $application->add(new OC\Core\Command\Db\ConvertMysqlToMB4(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection(), \OC::$server->getURLGenerator(), \OC::$server->getLogger())); + $application->add(new OC\Core\Command\Db\ConvertMysqlToMB4(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection(), \OC::$server->getURLGenerator(), \OC::$server->get(LoggerInterface::class))); $application->add(new OC\Core\Command\Db\ConvertFilecacheBigInt(\OC::$server->get(\OC\DB\Connection::class))); $application->add(new OC\Core\Command\Db\AddMissingIndices(\OC::$server->get(\OC\DB\Connection::class), \OC::$server->getEventDispatcher())); $application->add(new OC\Core\Command\Db\AddMissingColumns(\OC::$server->get(\OC\DB\Connection::class), \OC::$server->getEventDispatcher())); |