Remove deprecated code

[friendica.git] / src / Database / DBStructure.php

diff --git a/src/Database/DBStructure.php b/src/Database/DBStructure.php
index 0c775377e493c7a2353538c0e7262d39c4b36711..686f0582c98a06df9b6cc2127ac4feccf88719f2 100644 (file)
--- a/src/Database/DBStructure.php
+++ b/src/Database/DBStructure.php
@@ -6,17 +6,14 @@
 namespace Friendica\Database;
 
 use Exception;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
+use Friendica\DI;
 use Friendica\Util\DateTimeFormat;
 
 require_once __DIR__ . '/../../include/dba.php';
 
 /**
- * @brief This class contain functions for the database management
- *
  * This class contains functions that doesn't need to know if pdo, mysqli or whatever is used.
  */
 class DBStructure
@@ -35,7 +32,7 @@ class DBStructure
         */
        private static $definition = [];
 
-       /*
+       /**
         * Converts all tables from MyISAM to InnoDB
         */
        public static function convertToInnoDB()
@@ -47,12 +44,12 @@ class DBStructure
                );
 
                if (!DBA::isResult($tables)) {
-                       echo L10n::t('There are no tables on MyISAM.') . "\n";
+                       echo DI::l10n()->t('There are no tables on MyISAM.') . "\n";
                        return;
                }
 
                foreach ($tables AS $table) {
-                       $sql = "ALTER TABLE " . DBA::quoteIdentifier($table['TABLE_NAME']) . " engine=InnoDB;";
+                       $sql = "ALTER TABLE " . DBA::quoteIdentifier($table['table_name']) . " engine=InnoDB;";
                        echo $sql . "\n";
 
                        $result = DBA::e($sql);
@@ -63,7 +60,7 @@ class DBStructure
        }
 
        /**
-        * @brief Print out database error messages
+        * Print out database error messages
         *
         * @param string $message Message to be added to the error message
         *
@@ -71,10 +68,10 @@ class DBStructure
         */
        private static function printUpdateError($message)
        {
-               echo L10n::t("\nError %d occurred during database update:\n%s\n",
+               echo DI::l10n()->t("\nError %d occurred during database update:\n%s\n",
                        DBA::errorNo(), DBA::errorMessage());
 
-               return L10n::t('Errors encountered performing database changes: ') . $message . EOL;
+               return DI::l10n()->t('Errors encountered performing database changes: ') . $message . EOL;
        }
 
        public static function printStructure($basePath)
@@ -262,8 +259,8 @@ class DBStructure
        public static function update($basePath, $verbose, $action, $install = false, array $tables = null, array $definition = null)
        {
                if ($action && !$install) {
-                       Config::set('system', 'maintenance', 1);
-                       Config::set('system', 'maintenance_reason', L10n::t('%s: Database update', DateTimeFormat::utcNow() . ' ' . date('e')));
+                       DI::config()->set('system', 'maintenance', 1);
+                       DI::config()->set('system', 'maintenance_reason', DI::l10n()->t('%s: Database update', DateTimeFormat::utcNow() . ' ' . date('e')));
                }
 
                $errors = '';
@@ -524,7 +521,7 @@ class DBStructure
 
                                if ($action) {
                                        if (!$install) {
-                                               Config::set('system', 'maintenance_reason', L10n::t('%s: updating %s table.', DateTimeFormat::utcNow() . ' ' . date('e'), $name));
+                                               DI::config()->set('system', 'maintenance_reason', DI::l10n()->t('%s: updating %s table.', DateTimeFormat::utcNow() . ' ' . date('e'), $name));
                                        }
 
                                        // Ensure index conversion to unique removes duplicates
@@ -576,13 +573,13 @@ class DBStructure
                }
 
                if ($action && !$install) {
-                       Config::set('system', 'maintenance', 0);
-                       Config::set('system', 'maintenance_reason', '');
+                       DI::config()->set('system', 'maintenance', 0);
+                       DI::config()->set('system', 'maintenance_reason', '');
 
                        if ($errors) {
-                               Config::set('system', 'dbupdate', self::UPDATE_FAILED);
+                               DI::config()->set('system', 'dbupdate', self::UPDATE_FAILED);
                        } else {
-                               Config::set('system', 'dbupdate', self::UPDATE_SUCCESSFUL);
+                               DI::config()->set('system', 'dbupdate', self::UPDATE_SUCCESSFUL);
                        }
                }
 
@@ -717,8 +714,8 @@ class DBStructure
         * @todo You cannot rename a primary key if "auto increment" is set
         *
         * @param string $table            Table name
-        * @param array  $columns          Columns Syntax for Rename: [ $old1 => [ $new1, $type1 ], $old2 => [ $new2, $type2 ], ... ] )
-        *                                 Syntax for Primary Key: [ $col1, $col2, ...] )
+        * @param array  $columns          Columns Syntax for Rename: [ $old1 => [ $new1, $type1 ], $old2 => [ $new2, $type2 ], ... ]
+        *                                 Syntax for Primary Key: [ $col1, $col2, ...]
         * @param int    $type             The type of renaming (Default is Column)
         *
         * @return boolean Was the renaming successful?