Strict types declaration, several fixes

galette · May 17, 2024 · a9c0075 · a9c0075
1 parent 0ef2f8e
commit a9c0075
Show file tree

Hide file tree

Showing 27 changed files with 101 additions and 52 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('AUTO_PREFIX', 'auto_');
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 Auto',                         //Name
     'Plugin to manage Automobile clubs',    //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 GaletteAuto\Controllers\Controller;
 use GaletteAuto\Controllers\Crud\PropertiesController;
 use GaletteAuto\Controllers\Crud\ModelsController;

diff --git a/lib/GaletteAuto/AbstractObject.php b/lib/GaletteAuto/AbstractObject.php
@@ -19,6 +19,8 @@
  * along with Galette. If not, see <http://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace GaletteAuto;
 
 use Analog\Analog;
@@ -45,7 +47,7 @@ abstract class AbstractObject
 
     protected Db $zdb;
     protected ?int $id;
-    protected string $value;
+    protected ?string $value;
     protected ?PropertiesList $filters = null;
 
     private int $count;
@@ -168,7 +170,7 @@ public function store(bool $new = false): bool
         } catch (\Exception $e) {
             Analog::log(
                 '[' . get_class($this) . '] Cannot store ' . $this->name .
-                ' values `' . $this->id . '`, `' . $this->value . '` | ' .
+                ' values `' . ($this->id ?? '') . '`, `' . $this->value . '` | ' .
                 $e->getMessage(),
                 Analog::WARNING
             );
@@ -236,14 +238,14 @@ abstract public function getRouteName(): string;
      */
     public function __get(string $name): mixed
     {
-        if (isset($this->$name)) {
-            return $this->$name;
+        if (property_exists($this, $name)) {
+            return $this->$name ?? null;
         } else {
             Analog::log(
                 '[' . get_class($this) . '] Unable to retrieve `' . $name . '`',
                 Analog::INFO
             );
-            return false;
+            throw new \RuntimeException('Unable to retrieve `' . $name . '`');
         }
     }
 

diff --git a/lib/GaletteAuto/Auto.php b/lib/GaletteAuto/Auto.php
@@ -19,6 +19,8 @@
  * along with Galette. If not, see <http://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace GaletteAuto;
 
 use ArrayObject;
@@ -53,7 +55,8 @@
  * @property Transmission $transmission
  * @property Finition $finition
  * @property Model $model
- * @property Adherent|int $owner
+ * @property int $owner_id
+ * @property Adherent $owner
  * @property Picture $picture
  * @property History $history
  */
@@ -125,6 +128,7 @@ class Auto
     private Body $body;
     private History $history;
     private State $state;
+    private int $owner_id;
     private Adherent $owner;
 
     public const FUEL_PETROL = 1;
@@ -271,7 +275,8 @@ private function loadFromRS(ArrayObject $r): void
         $bpk = Body::PK;
         $this->body->load((int)$r->$bpk);
         $opk = Adherent::PK;
-        $this->owner->load((int)$r->$opk);
+        $this->owner_id = (int)$r->$opk;
+        $this->owner->load($this->owner_id);
         $spk = State::PK;
         $this->state->load((int)$r->$spk);
         $this->history->load((int)$this->id);
@@ -345,7 +350,7 @@ public function store(bool $new = false): bool
                         switch ($v) {
                             case 'string':
                             case 'date':
-                                $values[$k] = $this->$propName;
+                                $values[$k] = $this->$propName ?? null;
                                 break;
                             case 'integer':
                                 $values[$k] = (
@@ -501,7 +506,8 @@ public function hasPicture(): bool
      */
     public function appropriateCar(Login $login): void
     {
-        $this->owner->load($login->id);
+        $this->owner_id = $login->id;
+        $this->owner->load($this->owner_id);
     }
 
     /**
@@ -545,7 +551,7 @@ public function __get(string $name): mixed
                 case 'first_registration_date':
                 case 'first_circulation_date':
                 case 'creation_date':
-                    if ($this->$name != '') {
+                    if (isset($this->$name)) {
                         try {
                             $d = new \DateTime($this->$name);
                             return $d->format(_T("Y-m-d"));
@@ -559,12 +565,11 @@ public function __get(string $name): mixed
                             return $this->$name;
                         }
                     }
-                    break;
+                    return null;
                 case 'picture':
                     return $this->picture;
                 default:
-                    return $this->$name;
-                    break;
+                    return $this->$name ?? '';
             }
         }
 
@@ -604,8 +609,9 @@ public function __set(string $name, mixed $value): void
                 case 'body':
                     $this->body->load((int)$value);
                     break;
-                case 'owner':
-                    $this->owner->load((int)$value);
+                case 'owner_id':
+                    $this->owner_id = (int)$value;
+                    $this->owner->load($this->owner_id);
                     break;
                 case 'state':
                     $this->state->load((int)$value);
@@ -739,7 +745,7 @@ public function check(array $post): bool
                 //constants
                 case 'fuel':
                     if (in_array($value, array_keys($this->listFuels()))) {
-                        $this->fuel = $value;
+                        $this->fuel = (int)$value;
                     } else {
                         $this->errors[] = _T("- You must choose a fuel in the list", "auto");
                     }
@@ -752,7 +758,7 @@ public function check(array $post): bool
                 case 'body':
                 case 'state':
                     if ($value > 0) {
-                        $this->$prop->load($value);
+                        $this->$prop->load((int)$value);
                     } else {
                         $class = 'GaletteAuto\\' . ucwords($prop);
                         $name = $class::FIELD;
@@ -763,11 +769,12 @@ public function check(array $post): bool
                         );
                     }
                     break;
-                case 'owner':
+                case 'owner_id':
                     if (isset($post['change_owner']) || !isset($this->id)) {
                         $value = (int)$value;
                         if ($value > 0) {
-                            $this->$prop->load($value);
+                            $this->owner_id = $value;
+                            $this->owner->load($value);
                         } else {
                             $this->errors[] = _T("- you must attach an owner to this car", "auto");
                         }

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

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

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

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

diff --git a/lib/GaletteAuto/Controllers/Controller.php b/lib/GaletteAuto/Controllers/Controller.php
@@ -19,6 +19,8 @@
  * along with Galette. If not, see <http://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace GaletteAuto\Controllers;
 
 use ArrayObject;
@@ -299,7 +301,7 @@ public function showAddEditVehicle(Request $request, Response $response, string
                 isset($get['id_adh'])
                 && ($this->login->isAdmin() || $this->login->isStaff())
             ) {
-                $auto->owner = (int)$get['id_adh'];
+                $auto->owner_id = (int)$get['id_adh'];
             } else {
                 $auto->appropriateCar($this->login);
             }
@@ -328,7 +330,7 @@ public function showAddEditVehicle(Request $request, Response $response, string
             'require_calendar'  => true,
             'require_dialog'    => true,
             'car'               => $auto,
-            'models'            => $models->getList($auto->model->brand->id),
+            'models'            => $models->getList($auto->model->brand->id ?? null),
             'js_init_models'    => !isset($auto->model->brand),
             'brands'            => $auto->model->brand->getList(),
             'colors'            => $auto->color->getList(),
@@ -361,6 +363,7 @@ public function showAddEditVehicle(Request $request, Response $response, string
         if (count($members)) {
             $params['members']['list'] = $members;
         }
+        $params['autocomplete'] = true;
 
         // display page
         $this->view->render(
@@ -412,7 +415,7 @@ public function doAddEditVehicle(Request $request, Response $response, string $a
     {
         $post = $request->getParsedBody();
 
-        $is_new = ($action === 'add');
+        $is_new = ($action === 'add' || $action === 'new');
 
         // initialize warnings
         $error_detected = array();
@@ -424,7 +427,7 @@ public function doAddEditVehicle(Request $request, Response $response, string $a
 
         $auto = new Auto($this->plugins, $this->zdb);
         if (!$is_new) {
-            $auto->load($post[Auto::PK]);
+            $auto->load((int)$post[Auto::PK]);
         }
 
         $res = $auto->check($post);
@@ -488,14 +491,15 @@ public function doAddEditVehicle(Request $request, Response $response, string $a
      */
     public function vehicleHistory(Request $request, Response $response, int $id): Response
     {
+        $apk = Auto::PK;
         $history = new History($this->zdb, $id);
-        $auto = new Auto($this->plugins, $this->zdb, $history->{Auto::PK});
+        $auto = new Auto($this->plugins, $this->zdb);
+        $auto->load($history->$apk);
         $this->checkAclsFor($response, $auto->owner->id);
 
-        $apk = Auto::PK;
         $params = [
             'entries'       => $history->getEntries(),
-            'page_title'    => str_replace('%d', $history->$apk, _T("History of car #%d", "auto")),
+            'page_title'    => str_replace('%d', (string)$history->$apk, _T("History of car #%d", "auto")),
             'mode'          => $request->getHeaderLine('X-Requested-With') === 'XMLHttpRequest' ? 'ajax' : ''
         ];
 

diff --git a/lib/GaletteAuto/Controllers/Crud/ModelsController.php b/lib/GaletteAuto/Controllers/Crud/ModelsController.php
@@ -19,6 +19,8 @@
  * along with Galette. If not, see <http://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace GaletteAuto\Controllers\Crud;
 
 use DI\Attribute\Inject;
@@ -185,9 +187,9 @@ public function edit(Request $request, Response $response, int $id = null, strin
     {
         $model = new Model($this->zdb);
 
-        if ($this->session->automodel !== null) {
+        if ($this->session->auto_model !== null) {
             $model->check($this->session->auto_model);
-            $this->session->automodel = null;
+            unset($this->session->auto_model);
         }
 
         $model_id = null;

diff --git a/lib/GaletteAuto/Controllers/Crud/PropertiesController.php b/lib/GaletteAuto/Controllers/Crud/PropertiesController.php
@@ -19,6 +19,8 @@
  * along with Galette. If not, see <http://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace GaletteAuto\Controllers\Crud;
 
 use DI\Attribute\Inject;
@@ -406,7 +408,7 @@ public function doPropertyEdit(
 
         if (!$is_new) {
             if (isset($post[$object->pk])) {
-                $object->load($post[$object->pk]);
+                $object->load((int)$post[$object->pk]);
             } else {
                 $error_detected[]
                     = _T("- No id provided for modifying this record! (internal)", "auto");

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

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

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

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

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