Merge pull request #7936 from JakubOnderka/app-model-cleanup

chg: [internal] App model cleanup

app/Model/AppModel.php

@@ -23,11 +23,11 @@
 App::uses('Model', 'Model');
 App::uses('LogableBehavior', 'Assets.models/behaviors');
 App::uses('RandomTool', 'Tools');
+App::uses('FileAccessTool', 'Tools');
+App::uses('JsonTool', 'Tools');
 
 class AppModel extends Model
 {
-    public $name;
-
     /** @var PubSubTool */
     private static $loadedPubSubTool;
 
@@ -39,7 +39,7 @@ class AppModel extends Model
 
     private $__profiler = array();
 
-    public $elasticSearchClient = false;
+    public $elasticSearchClient;
 
     /** @var AttachmentTool|null */
     private $attachmentTool;
@@ -47,8 +47,6 @@ class AppModel extends Model
     public function __construct($id = false, $table = null, $ds = null)
     {
         parent::__construct($id, $table, $ds);
-
-        $this->name = get_class($this);
         $this->findMethods['column'] = true;
     }
 
@@ -1991,7 +1989,8 @@ class AppModel extends Model
     }
 
     // Try to create a table with a BIGINT(20)
-    public function seenOnAttributeAndObjectPreUpdate() {
+    public function seenOnAttributeAndObjectPreUpdate()
+    {
         $sqlArray[] = "CREATE TABLE IF NOT EXISTS testtable (
             `testfield` BIGINT(6) NULL DEFAULT NULL
         ) ENGINE=InnoDB DEFAULT CHARSET=utf8;";
@@ -2009,10 +2008,6 @@ class AppModel extends Model
         }
     }
 
-    public function failingPreUpdate() {
-        throw new Exception('Yolo fail');
-    }
-
     public function runUpdates($verbose = false, $useWorker = true, $processId = false)
     {
         $this->AdminSetting = ClassRegistry::init('AdminSetting');
@@ -2379,6 +2374,10 @@ class AppModel extends Model
         }
     }
 
+    /**
+     * @param string $db_version
+     * @return array
+     */
     protected function findUpgrades($db_version)
     {
         $updates = array();
@@ -2502,13 +2501,6 @@ class AppModel extends Model
     public function getKafkaPubTool()
     {
         if (!$this->loadedKafkaPubTool) {
-            $this->loadKafkaPubTool();
-        }
-        return $this->loadedKafkaPubTool;
-    }
-
-    public function loadKafkaPubTool()
-    {
             App::uses('KafkaPubTool', 'Tools');
             $kafkaPubTool = new KafkaPubTool();
             $rdkafkaIni = Configure::read('Plugin.Kafka_rdkafka_config');
@@ -2519,7 +2511,8 @@ class AppModel extends Model
             $brokers = Configure::read('Plugin.Kafka_brokers');
             $kafkaPubTool->initTool($brokers, $kafkaConf);
             $this->loadedKafkaPubTool = $kafkaPubTool;
-        return true;
+        }
+        return $this->loadedKafkaPubTool;
     }
 
     public function publishKafkaNotification($topicName, $data, $action = false)
@@ -2649,15 +2642,6 @@ class AppModel extends Model
         }
     }
 
-    public function getRowCount($table = false)
-    {
-        if (empty($table)) {
-            $table = $this->table;
-        }
-        $table_data = $this->query("show table status like '" . $table . "'");
-        return $table_data[0]['TABLES']['Rows'];
-    }
-
     public function benchmarkCustomAdd($valueToAdd = 0, $name = 'default', $customName = 'custom')
     {
         if (empty($this->__profiler[$name]['custom'][$customName])) {
@@ -2720,9 +2704,8 @@ class AppModel extends Model
     {
         static $versionArray;
         if ($versionArray === null) {
-            $file = new File(ROOT . DS . 'VERSION.json');
-            $versionArray = $this->jsonDecode($file->read());
-            $file->close();
+            $content = FileAccessTool::readFromFile(ROOT . DS . 'VERSION.json');
+            $versionArray = JsonTool::decode($content);
         }
         return $versionArray;
     }
@@ -3088,10 +3071,7 @@ class AppModel extends Model
         $message .= "\n";
 
         do {
-            $message .= sprintf("[%s] %s",
-                get_class($exception),
-                $exception->getMessage()
-            );
+            $message .= sprintf("[%s] %s", get_class($exception), $exception->getMessage());
             $message .= "\nStack Trace:\n" . $exception->getTraceAsString();
             $exception = $exception->getPrevious();
         } while ($exception !== null);

app/Model/Event.php

@@ -1,9 +1,7 @@
 <?php
 App::uses('AppModel', 'Model');
 App::uses('CakeEmail', 'Network/Email');
-App::uses('FileAccessTool', 'Tools');
 App::uses('AttachmentTool', 'Tools');
-App::uses('JsonTool', 'Tools');
 App::uses('TmpFileTool', 'Tools');
 App::uses('SendEmailTemplate', 'Tools');
 

app/Model/Feed.php

@@ -2,7 +2,6 @@
 App::uses('AppModel', 'Model');
 App::uses('RandomTool', 'Tools');
 App::uses('TmpFileTool', 'Tools');
-App::uses('FileAccessTool', 'Tools');
 App::uses('AttributeValidationTool', 'Tools');
 
 class Feed extends AppModel

app/Model/Server.php

@@ -2,8 +2,6 @@
 App::uses('AppModel', 'Model');
 App::uses('GpgTool', 'Tools');
 App::uses('ServerSyncTool', 'Tools');
-App::uses('FileAccessTool', 'Tools');
-App::uses('JsonTool', 'Tools');
 App::uses('SystemSetting', 'Model');
 
 /**

app/Model/Template.php

@@ -72,9 +72,4 @@ class Template extends AppModel
             return false;
         }
     }
-
-    public function generateRandomFileName()
-    {
-        return (new RandomTool())->random_str(false, 12);
-    }
 }