Strict types declaration

Types fixes
galette · May 19, 2024 · 282d0de · 282d0de
1 parent f78d410
commit 282d0de
Show file tree

Hide file tree

Showing 29 changed files with 94 additions and 36 deletions.
diff --git a/.composer-require-checker.config.json b/.composer-require-checker.config.json
@@ -30,6 +30,7 @@
     "GALETTE_CARD_ROWS",
     "GALETTE_CARD_WIDTH",
     "GALETTE_COMPAT_VERSION",
+    "GALETTE_SYSCONFIG_PATH",
     "GALETTE_CONFIG_PATH",
     "GALETTE_DATA_PATH",
     "GALETTE_DB_VERSION",

diff --git a/_config.inc.php b/_config.inc.php
@@ -19,4 +19,6 @@
  * along with Galette. If not, see <http://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 define('LEND_PREFIX', 'lend_');
diff --git a/_define.php b/_define.php
@@ -19,6 +19,8 @@
  * along with Galette. If not, see <http://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 $this->register(
     'Galette Objects Lend',             //Name
     'Manage rent/lend of object',       //Short description

diff --git a/_routes.php b/_routes.php
@@ -19,6 +19,8 @@
  * along with Galette. If not, see <http://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 use Analog\Analog;
 use Galette\Entity\ContributionsTypes;
 use Galette\Entity\Adherent;

diff --git a/lib/GaletteObjectsLend/Controllers/Crud/CategoriesController.php b/lib/GaletteObjectsLend/Controllers/Crud/CategoriesController.php
@@ -19,6 +19,8 @@
  * along with Galette. If not, see <http://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace GaletteObjectsLend\Controllers\Crud;
 
 use Analog\Analog;
@@ -240,7 +242,7 @@ public function doEdit(Request $request, Response $response, int $id = null, str
         $error_detected = [];
 
         $category->name = $post['name'];
-        $category->is_active = $post['is_active'] == true;
+        $category->is_active = ($post['is_active'] ?? false) == true;
         if ($category->store()) {
             // picture upload
             if (isset($_FILES['picture'])) {

diff --git a/lib/GaletteObjectsLend/Controllers/Crud/ObjectsController.php b/lib/GaletteObjectsLend/Controllers/Crud/ObjectsController.php
@@ -19,6 +19,8 @@
  * along with Galette. If not, see <http://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace GaletteObjectsLend\Controllers\Crud;
 
 use Analog\Analog;
@@ -541,7 +543,7 @@ public function doClone(Request $request, Response $response, int $id): Response
                 'success_detected',
                 str_replace(
                     '%id',
-                    $id,
+                    (string)$id,
                     _T('Successfully cloned from #%id.<br/>You can now edit it.', 'objectslend')
                 )
             );
@@ -1003,7 +1005,7 @@ public function formUri(array $args): string
     protected function getIdsToRemove(array &$args, ?array $post): array|int|null
     {
         if (isset($args['id'])) {
-            return $args['id'];
+            return (int)$args['id'];
         } else {
             $filters = $this->session->objectslend_filter_objects;
             return $filters->selected;

diff --git a/lib/GaletteObjectsLend/Controllers/Crud/StatusController.php b/lib/GaletteObjectsLend/Controllers/Crud/StatusController.php
@@ -19,6 +19,8 @@
  * along with Galette. If not, see <http://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace GaletteObjectsLend\Controllers\Crud;
 
 use DI\Attribute\Inject;

diff --git a/lib/GaletteObjectsLend/Controllers/ImagesController.php b/lib/GaletteObjectsLend/Controllers/ImagesController.php
@@ -19,6 +19,8 @@
  * along with Galette. If not, see <http://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace GaletteObjectsLend\Controllers;
 
 use Galette\Controllers\ImagesController as GImagesController;

diff --git a/lib/GaletteObjectsLend/Controllers/MainController.php b/lib/GaletteObjectsLend/Controllers/MainController.php
@@ -19,6 +19,8 @@
  * along with Galette. If not, see <http://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace GaletteObjectsLend\Controllers;
 
 use DI\Attribute\Inject;

diff --git a/lib/GaletteObjectsLend/Controllers/PdfController.php b/lib/GaletteObjectsLend/Controllers/PdfController.php
@@ -19,6 +19,8 @@
  * along with Galette. If not, see <http://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace GaletteObjectsLend\Controllers;
 
 use Galette\Controllers\PdfController as GPdfController;

diff --git a/lib/GaletteObjectsLend/Entity/CategoryPicture.php b/lib/GaletteObjectsLend/Entity/CategoryPicture.php
@@ -19,6 +19,8 @@
  * along with Galette. If not, see <http://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace GaletteObjectsLend\Entity;
 
 use Analog\Analog;

diff --git a/lib/GaletteObjectsLend/Entity/LendCategory.php b/lib/GaletteObjectsLend/Entity/LendCategory.php
@@ -19,6 +19,8 @@
  * along with Galette. If not, see <http://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace GaletteObjectsLend\Entity;
 
 use Analog\Analog;
@@ -128,7 +130,7 @@ private function loadFromRS(ArrayObject $r): void
         }
 
         if (property_exists($r, 'objects_price_sum')) {
-            $this->objects_price_sum = $r->objects_price_sum;
+            $this->objects_price_sum = $r->objects_price_sum ?? 0.0;
         }
 
 
@@ -152,7 +154,7 @@ public function store(): bool
                     //Handle booleans for postgres ; bugs #18899 and #19354
                     $values[$k] = $this->zdb->isPostgres() ? 'false' : 0;
                 } else {
-                    $values[$k] = $this->$k;
+                    $values[$k] = $this->$k ?? null;
                 }
             }
 
@@ -164,11 +166,11 @@ public function store(): bool
                 if ($result->count() > 0) {
                     if ($this->zdb->isPostgres()) {
                         /** @phpstan-ignore-next-line */
-                        $this->category_id = $this->zdb->driver->getLastGeneratedValue(
+                        $this->category_id = (int)$this->zdb->driver->getLastGeneratedValue(
                             PREFIX_DB . 'lend_category_id_seq'
                         );
                     } else {
-                        $this->category_id = $this->zdb->driver->getLastGeneratedValue();
+                        $this->category_id = (int)$this->zdb->driver->getLastGeneratedValue();
                     }
                 } else {
                     throw new \RuntimeException('Unable to add category!');
@@ -266,11 +268,11 @@ public function __get(string $name): mixed
      * Global setter method
      *
      * @param string $name  name of the property we want to assign a value to
-     * @param object $value a relevant value for the property
+     * @param mixed  $value a relevant value for the property
      *
      * @return void
      */
-    public function __set(string $name, object $value): void
+    public function __set(string $name, mixed $value): void
     {
         $this->$name = $value;
     }

diff --git a/lib/GaletteObjectsLend/Entity/LendObject.php b/lib/GaletteObjectsLend/Entity/LendObject.php
@@ -19,6 +19,8 @@
  * along with Galette. If not, see <http://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace GaletteObjectsLend\Entity;
 
 use Analog\Analog;
@@ -335,11 +337,11 @@ public function store(): bool
                 if ($result->count() > 0) {
                     if ($this->zdb->isPostgres()) {
                         /** @phpstan-ignore-next-line */
-                        $this->object_id = $this->zdb->driver->getLastGeneratedValue(
+                        $this->object_id = (int)$this->zdb->driver->getLastGeneratedValue(
                             PREFIX_DB . 'lend_objects_id_seq'
                         );
                     } else {
-                        $this->object_id = $this->zdb->driver->getLastGeneratedValue();
+                        $this->object_id = (int)$this->zdb->driver->getLastGeneratedValue();
                     }
 
                     if ($this->deps['picture'] === true) {

diff --git a/lib/GaletteObjectsLend/Entity/LendPDF.php b/lib/GaletteObjectsLend/Entity/LendPDF.php
@@ -19,6 +19,8 @@
  * along with Galette. If not, see <http://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace GaletteObjectsLend\Entity;
 
 use Galette\Core\Preferences as CorePreferences;

diff --git a/lib/GaletteObjectsLend/Entity/LendRent.php b/lib/GaletteObjectsLend/Entity/LendRent.php
@@ -19,6 +19,8 @@
  * along with Galette. If not, see <http://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace GaletteObjectsLend\Entity;
 
 use Analog\Analog;
@@ -68,7 +70,7 @@ class LendRent
     private string $date_begin;
     private ?string $date_forecast;
     private ?string $date_end;
-    private int $status_id;
+    private ?int $status_id;
     private ?int $adherent_id;
     private string $comments = '';
     private bool $in_stock;
@@ -155,11 +157,11 @@ public function store(): bool
                 $result = $zdb->execute($insert);
                 if ($result->count() > 0) {
                     if ($zdb->isPostgres()) {
-                        $this->rent_id = $zdb->driver->getLastGeneratedValue(
+                        $this->rent_id = (int)$zdb->driver->getLastGeneratedValue(
                             PREFIX_DB . 'lend_rents_id_seq'
                         );
                     } else {
-                        $this->rent_id = $zdb->driver->getLastGeneratedValue();
+                        $this->rent_id = (int)$zdb->driver->getLastGeneratedValue();
                     }
                     Analog::log(
                         'Rent #' . $this->rent_id . ' added.',
@@ -196,7 +198,7 @@ public function store(): bool
     }
 
     /**
-     * Get rent histroy for a given object sorted
+     * Get rent history for a given object sorted
      *
      * @param integer $object_id Object ID
      * @param boolean $only_last Only retrieve last rent (for list display)
@@ -371,6 +373,11 @@ public function __set(string $name, mixed $value): void
                     $this->$name = null;
                 }
                 break;
+            case 'status_id':
+                if ((int)$value > 0) {
+                    $this->$name = (int)$value;
+                }
+                break;
             case 'date_forecast':
             case 'date_begin':
             case 'date_end':

diff --git a/lib/GaletteObjectsLend/Entity/LendStatus.php b/lib/GaletteObjectsLend/Entity/LendStatus.php
@@ -19,6 +19,8 @@
  * along with Galette. If not, see <http://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace GaletteObjectsLend\Entity;
 
 use Analog\Analog;
@@ -122,7 +124,7 @@ public function store(): bool
                     //Handle booleans for postgres ; bugs #18899 and #19354
                     $values[$k] = $this->zdb->isPostgres() ? 'false' : 0;
                 } else {
-                    $values[$k] = $this->$k;
+                    $values[$k] = $this->$k ?? null;
                 }
             }
 
@@ -134,11 +136,11 @@ public function store(): bool
                 if ($result->count() > 0) {
                     if ($this->zdb->isPostgres()) {
                         /** @phpstan-ignore-next-line */
-                        $this->status_id = $this->zdb->driver->getLastGeneratedValue(
+                        $this->status_id = (int)$this->zdb->driver->getLastGeneratedValue(
                             PREFIX_DB . 'lend_status_id_seq'
                         );
                     } else {
-                        $this->status_id = $this->zdb->driver->getLastGeneratedValue();
+                        $this->status_id = (int)$this->zdb->driver->getLastGeneratedValue();
                     }
                 } else {
                     throw new \Exception(_T("Status has not been added :(", "objectslend"));
@@ -283,11 +285,11 @@ public function __get(string $name): mixed
      * Global setter method
      *
      * @param string $name  name of the property we want to assign a value to
-     * @param object $value a relevant value for the property
+     * @param mixed  $value a relevant value for the property
      *
      * @return void
      */
-    public function __set(string $name, object $value): void
+    public function __set(string $name, mixed $value): void
     {
         $this->$name = $value;
     }

diff --git a/lib/GaletteObjectsLend/Entity/ObjectPicture.php b/lib/GaletteObjectsLend/Entity/ObjectPicture.php
@@ -19,6 +19,8 @@
  * along with Galette. If not, see <http://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace GaletteObjectsLend\Entity;
 
 use Analog\Analog;

diff --git a/lib/GaletteObjectsLend/Entity/Picture.php b/lib/GaletteObjectsLend/Entity/Picture.php
@@ -19,6 +19,8 @@
  * along with Galette. If not, see <http://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace GaletteObjectsLend\Entity;
 
 use Analog\Analog;
@@ -237,8 +239,8 @@ private function createThumb(string $source, string $ext, string $dest = null):
     public function delete(bool $transaction = true): bool
     {
         //find and delete any thumb
-        $ext = strlen(pathinfo($this->file_path, PATHINFO_EXTENSION)) + 1;
-        $filename = substr($this->file_path, 0, strlen($this->file_path) - strlen($ext));
+        $ext = pathinfo($this->file_path, PATHINFO_EXTENSION);
+        $filename = substr($this->file_path, 0, strlen($this->file_path) - strlen($ext) - 1);
 
         $thumb = $filename . '_th.' . $ext;
 
@@ -260,8 +262,8 @@ public function delete(bool $transaction = true): bool
      */
     public function store(array $file, bool $ajax = false, array $cropping = null): bool|int
     {
-        $ext = strlen(pathinfo($this->file_path, PATHINFO_EXTENSION)) + 1;
-        $filename = substr($this->file_path, 0, strlen($this->file_path) - strlen($ext));
+        $ext = pathinfo($this->file_path, PATHINFO_EXTENSION);
+        $filename = substr($this->file_path, 0, strlen($this->file_path) - strlen($ext) - 1);
         $thumb = $filename . '_th.' . $ext;
 
         if (is_file($thumb)) {