php 8.3 update

VitexSoftware · Nov 26, 2024 · 00aeb4a · 00aeb4a
1 parent 4453f48
commit 00aeb4a
Show file tree

Hide file tree

Showing 12 changed files with 106 additions and 102 deletions.
diff --git a/composer.json b/composer.json
@@ -10,6 +10,7 @@
     "license": "MIT",
     "minimum-stability": "stable",
     "require": {
+        "php": ">=7.4",
         "vitexsoftware/ease-core": ">=1.45",
         "fpdo/fluentpdo": ">=2.1"
     },

diff --git a/debian/changelog b/debian/changelog
@@ -1,8 +1,14 @@
-php-vitexsoftware-ease-fluentpdo (1.3.0) UNRELEASED; urgency=medium
+php-vitexsoftware-ease-fluentpdo (1.4.0) UNRELEASED; urgency=medium
+
+  * php 8.3 ready
+
+ -- vitex <info@vitexsoftware.cz>  Tue, 26 Nov 2024 14:10:21 +0100
+
+php-vitexsoftware-ease-fluentpdo (1.3.0) main; urgency=medium
 
   * semantic versioning ready
 
- -- vitex <info@vitexsoftware.cz>  Sun, 17 Nov 2024 19:17:13 +0100
+ -- vitex <info@vitexsoftware.cz>  Tue, 26 Nov 2024 14:10:07 +0100
 
 php-vitexsoftware-ease-fluentpdo (1.2.1) main; urgency=medium
 

diff --git a/nbproject/project.properties b/nbproject/project.properties
@@ -17,7 +17,7 @@ file.reference.php-vitexsoftware-ease-fluentpdo-debian=debian
 ignore.path=\
     ${file.reference.php-vitexsoftware-ease-fluentpdo-debian}
 include.path=${php.global.include.path}
-php.version=PHP_74
+php.version=PHP_83
 selenium.src.dir=tests
 source.encoding=UTF-8
 src.dir=.

diff --git a/src/Ease/SQL/Engine.php b/src/Ease/SQL/Engine.php
@@ -52,6 +52,23 @@ public function __construct($identifier = null, $options = [])
         }
     }
 
+    /**
+     * Properties to keep.
+     *
+     * @return array<string>
+     */
+    public function __sleep(): array
+    {
+        return [
+            'myTable',
+            'keyColumn',
+            'nameColumn',
+            'createColumn',
+            'lastModifiedColumn',
+            'data',
+        ];
+    }
+
     /**
      * Use Given value as identifier.
      *
@@ -242,7 +259,8 @@ public function getAll()
 
     /**
      * Set/override object properties.
-     * @param array<string,string> $properties
+     *
+     * @param array<string, string> $properties
      */
     public function setProperties(array $properties = []): void
     {

diff --git a/src/Ease/SQL/Orm.php b/src/Ease/SQL/Orm.php
@@ -38,7 +38,7 @@ trait Orm
     /**
      * Database to connect by default.
      */
-    public ?string $database = null;
+    public string $database = '';
 
     /**
      * Database port.
@@ -50,30 +50,31 @@ trait Orm
      *
      * @var string mysql|pgsql|..
      */
-    public string $dbType;
+    public string $dbType = '';
 
     /**
      * Default connection settings.
      *
-     * @var array<string,string>|string
+     * @var array<string, string>|string
      */
     public $dbSettings = [];
 
     /**
      * Default connection setup.
-     * @var array<string,string> $connectionSetup
+     *
+     * @var array<string, string>
      */
     public array $connectionSetup = [];
 
     /**
      * PDO Driver object.
      */
-    public ?PDO $pdo = null;
+    public ?\PDO $pdo = null;
 
     /**
      * Fluent Query.
      */
-    public \Envms\FluentPDO\Query $fluent = null;
+    public ?\Envms\FluentPDO\Query $fluent;
 
     /**
      * Poslední Chybová zpráva obdržená od SQL serveru.
@@ -83,7 +84,7 @@ trait Orm
     /**
      * Kod SQL chyby.
      */
-    protected int $errorNumber = 0;
+    protected int $errorNumber;
 
     /**
      * Only one rows returned ?
@@ -93,7 +94,7 @@ trait Orm
     /**
      * SetUp database connections.
      *
-     * @param array<string,string> $options
+     * @param array<string, string> $options
      */
     public function setUp(array $options = []): bool
     {
@@ -105,8 +106,8 @@ public function setUp(array $options = []): bool
     /**
      * SetUp Object to be ready for connect.
      *
-     * @param array<string,string> $options Object Options (dbType,server,username,password,database,
-     *                                      port,connectionSettings,myTable,debug)
+     * @param array<string, string> $options Object Options (dbType,server,username,password,database,
+     *                                       port,connectionSettings,myTable,debug)
      */
     public function setUpDb($options = []): void
     {
@@ -130,7 +131,7 @@ public function setUpDb($options = []): void
      *
      * @return \PDO SQL connector
      */
-    public function pdoConnect($options = []): PDO
+    public function pdoConnect($options = []): \PDO
     {
         $result = false;
         $this->setUp($options);
@@ -231,7 +232,7 @@ public function getPdo($propeties = [])
      */
     public function getFluentPDO(bool $read = false, bool $write = false)
     {
-        if (!$this->fluent instanceof \Envms\FluentPDO\Query) {
+        if (!isset($this->fluent) || !($this->fluent instanceof \Envms\FluentPDO\Query)) {
             $this->fluent = new \Envms\FluentPDO\Query($this->getPdo());
             $this->fluent->exceptionOnError = true;
             $this->fluent->debug = $this->debug ? function ($fluent): void {
@@ -248,23 +249,20 @@ public function getFluentPDO(bool $read = false, bool $write = false)
 
     /**
      * Basic Query to return all.
-     *
-     * @return \Envms\FluentPDO\Queries\Select
      */
-    public function listingQuery(): Select
+    public function listingQuery(): \Envms\FluentPDO\Queries\Select
     {
         return $this->getFluentPDO(true)->from($this->getMyTable());
     }
 
     /**
-     * Vrací z databáze sloupečky podle podmínek.
+     * Get database columns values by conditions.
      *
-     * @param array            $columnsList seznam položek
-     * @param array|int|string $conditions  pole podmínek nebo ID záznamu
-     * @param array|string     $orderBy     třídit dle
-     * @param string           $indexBy     klice vysledku naplnit hodnotou ze
-     *                                      sloupečku
-     * @param int              $limit       maximální počet vrácených záznamů
+     * @param array<string>    $columnsList column names listing
+     * @param array|int|string $conditions  conditions or ID
+     * @param array|string     $orderBy     sort by
+     * @param string           $indexBy     result keys by row keys
+     * @param int              $limit       maximum number of results
      *
      * @return array
      */
@@ -297,7 +295,7 @@ public function getColumnsFromSQL(
     }
 
     /**
-     * Load actual's $ItemID SQL data.
+     * Load actual $ItemID SQL data.
      *
      * @param int $itemID record key
      *
@@ -309,9 +307,9 @@ public function getDataFromSQL($itemID = null, array $columnsList = ['*'])
     }
 
     /**
-     * Načte z SQL data k aktuálnímu $ItemID a použije je v objektu.
+     * Retrieves data from SQL for the current $ItemID and uses it in the object.
      *
-     * @param array|int $itemID klíč záznamu
+     * @param array|int $itemID Record key
      *
      * @return array Results
      */

diff --git a/src/Ease/SQL/PDO.php b/src/Ease/SQL/PDO.php
@@ -30,7 +30,7 @@ class PDO extends SQL
     /**
      * SQLLink result.
      */
-    public \PDOStatement $result = null;
+    public \PDOStatement $result;
 
     /**
      * Connected state ?
@@ -53,52 +53,41 @@ class PDO extends SQL
     public bool $debug = false;
 
     /**
-     * KeyColumn used for postgresql insert id.
+     * KeyColumn used row key.
      */
-    public string $keyColumn = null;
+    public string $keyColumn = '';
 
     /**
-     * Table used for postgresql insert id.
+     * Table name we used.
      */
-    public string $myTable = null;
-    public $data;
+    public string $myTable = '';
     public $charset = 'utf8';
     public $collate = 'utf8_czech_ci';
 
     /**
-     * Povolit Explain každého dotazu do logu ?
+     * Allow Explain of each command to log logu ?
+     *
+     * @deprecated since version 1.4
      */
     public bool $explainMode = false;
 
     /**
-     * Database Type: mysql|sqlite|etc ...
+     * Database Type: mysql|sqlite|sqlsrv etc ...
      */
-    public string $dbType = null;
+    public string $dbType = '';
 
     /**
-     * Saves obejct instace (singleton...).
+     * Saves object instance (singleton...).
      */
     private static $_instance;
-
     private string $errorText;
 
     /**
-     * Virtuální funkce.
+     * cleanup.
      */
     public function __destruct()
     {
         $this->pdo = null;
-        $this->result = null;
-    }
-
-    /**
-     * You cannot serialize or unserialize PDO instance.
-     *
-     * @return array fields to serialize
-     */
-    public function __sleep()
-    {
-        return parent::__sleep();
     }
 
     public function __wakeup(): void
@@ -141,14 +130,11 @@ public function setKeyColumn($column = null)
     }
 
     /**
-     * Set Table used for PGSQL indertid.
+     * Set Table we work with.
      */
-    public function setTableName(string $tablename = ''): bool
+    public function setTableName(string $tablename): bool
     {
-        if (!empty($tablename)) {
-            $this->myTable = $tablename;
-        }
-
+        $this->myTable = $tablename;
         return true;
     }