Revertendo commit 1.27.4

Author: thiagogomesverissimo

.gitignore

@@ -33,6 +33,4 @@ php.ini
 # DDEV
 /.ddev
 core.*
-
-#netbeans
-/nbproject
+composer.lock

composer.json

@@ -30,6 +30,7 @@
         "php": "^7 || ^8",
         "ext-pdo_dblib": "*",
         "monolog/monolog": "^2 || ^3",
+        "uspdev/cache": "^1",
         "illuminate/collections": "^8 || ^9 || ^10 || ^11 || ^12 || ^13"
     }
 }

src/Cache.php

@@ -5,6 +5,7 @@
 use PDO;
 use SplFileInfo;
 use Throwable;
+use Uspdev\Cache\Cache;
 use Uspdev\Replicado\Replicado as Config;
 
 class DB
@@ -15,8 +16,10 @@ class DB
      */
     private static $instance;
 
-    private function __construct() {}
-    private function __clone() {}
+    private function __construct()
+    {}
+    private function __clone()
+    {}
 
     /**
      * Retorna uma instância do pdo - cria ou reaproveita se for o caso
@@ -26,12 +29,12 @@ private function __clone() {}
     protected static function getInstance()
     {
         $config = Config::getInstance();
-        if (!self::$instance) {
+        if (!SELF::$instance) {
             try {
                 $dsn = "dblib:host={$config->host}:{$config->port};dbname={$config->database}";
-                // self::$instance = new PDO($dsn, $config->username, $config->password, [PDO::ATTR_TIMEOUT => 10]);
-                self::$instance = new PDO($dsn, $config->username, $config->password);
-                self::$instance->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+                // SELF::$instance = new PDO($dsn, $config->username, $config->password, [PDO::ATTR_TIMEOUT => 10]);
+                SELF::$instance = new PDO($dsn, $config->username, $config->password);
+                SELF::$instance->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
             } catch (Throwable $t) {
                 $config->log('Erro na conexão ', $t->getMessage());
                 if ($config->debug) {
@@ -41,7 +44,7 @@ protected static function getInstance()
                 }
             }
         }
-        return self::$instance;
+        return SELF::$instance;
     }
 
     /**
@@ -53,7 +56,13 @@ protected static function getInstance()
      */
     public static function fetch(string $query, array $param = [])
     {
-        return self::overrideFetch('fetch', $query, $param);
+        $config = Config::getInstance();
+        if ($config->usarCache) {
+            $cache = $config->getCacheInstance();
+            return $cache->getCached('Uspdev\Replicado\DB::overrideFetch', ['fetch', $query, $param]);
+        } else {
+            return SELF::overrideFetch('fetch', $query, $param);
+        }
     }
 
     /**
@@ -65,7 +74,13 @@ public static function fetch(string $query, array $param = [])
      */
     public static function fetchAll(string $query, array $param = [])
     {
-        return self::overrideFetch('fetchAll', $query, $param);
+        $config = Config::getInstance();
+        if ($config->usarCache) {
+            $cache = $config->getCacheInstance();
+            return $cache->getCached('Uspdev\Replicado\DB::overrideFetch', ['fetchAll', $query, $param]);
+        } else {
+            return SELF::overrideFetch('fetchAll', $query, $param);
+        }
     }
 
     /**
@@ -82,12 +97,10 @@ public static function fetchAll(string $query, array $param = [])
     public static function overrideFetch(string $fetchType, string $query, array $param = [])
     {
         $config = Config::getInstance();
-        $query = self::automaticReplaces($query);
-        $stmt = self::getInstance()->prepare($query);
+        $query = SELF::automaticReplaces($query);
+        $stmt = SELF::getInstance()->prepare($query);
         foreach ($param as $campo => $valor) {
-            $valor = $config->sybase
-                ? mb_convert_encoding($valor, 'ISO-8859-1', 'UTF-8')
-                : $valor;
+            $valor = $config->sybase ? utf8_decode($valor) : $valor;
             $stmt->bindValue(":$campo", $valor);
             if ($config->debugLevel >= 2) {
                 $queryLog = str_replace(":$campo", $valor, $queryLog ?? $query);
@@ -136,9 +149,10 @@ public static function overrideFetch(string $fetchType, string $query, array $pa
      *
      * @return bool
      */
-    public static function test()
+    public static function test($config = [])
     {
-        return self::getInstance() instanceof PDO;
+        $config = Config::getInstance($config);
+        return SELF::getInstance() ? true : false;
     }
 
     /**

src/DB.php

@@ -239,7 +239,7 @@ protected static function _retornarDataUltimaAtualizacao(int $codpes)
      * @param Array $array
      * @return Array
      */
-    protected static function _listarAutores($array)
+    protected static function listarAutores($array)
     {
         $aux_autores = [];
         if ($array) {
@@ -277,7 +277,7 @@ protected static function _listarAutores($array)
      * @param Integer $i
      * @return Bool
      */
-    protected static function _verificarFiltro($tipo, $ano, $limit_ini, $limit_fim, $i)
+    protected static function verificarFiltro($tipo, $ano, $limit_ini, $limit_fim, $i)
     {
         if ($limit_ini == -1) {
             return true;
@@ -2194,7 +2194,7 @@ protected static function _listarProjetosPesquisa($codpes, $lattes_array = null,
      * @return Array
      * @author Masakik, em 20/4/2023
      */
-    protected static function _listarRegistrosPorChaveOrdenado($lattes_array, $chave, $chaveOrdenacao = null, $ordem = -1)
+    protected static function listarRegistrosPorChaveOrdenado($lattes_array, $chave, $chaveOrdenacao = null, $ordem = -1)
     {
         $registros = Arr::get($lattes_array, $chave, []);
 
@@ -2216,7 +2216,7 @@ protected static function _listarRegistrosPorChaveOrdenado($lattes_array, $chave
      * @param Int $ordem Se -1 é decrescente, se 1, é crescente
      * @author Masakik, em 20/4/2023
      */
-    protected static function _ordenarRegistros($registros, $chaveOrdenacao, $ordem = -1)
+    protected static function ordenarRegistros($registros, $chaveOrdenacao, $ordem = -1)
     {
         usort($registros, function ($a, $b) use ($chaveOrdenacao) {
             if (Arr::get($b, $chaveOrdenacao, false) == false) {
@@ -2666,7 +2666,7 @@ protected static function _listarOrientacoesEmAndamentoIC($codpes, $lattes_array
      * @param Array $array
      * @return Array
      */
-    protected static function _listarFinanciadores($array) {
+    protected static function listarFinanciadores($array) {
         $aux_financiadores = [];
         if ($array) {
             foreach ($array as $financiador) {