Merge pull request #9 from inceptphp/0.1

cleaner php9 update

Author: cblanquera

composer.json

@@ -7,13 +7,13 @@
   ],
   "license": "LGPL-2.1-or-later",
   "require-dev": {
+    "php-coveralls/php-coveralls": "2.5.2",
     "phpunit/phpunit": "9.5.21",
-    "squizlabs/php_codesniffer": "3.7.1",
-    "php-coveralls/php-coveralls": "2.5.2"
+    "squizlabs/php_codesniffer": "3.7.1"
   },
   "require": {
-    "phpugph/components": "1.0.5",
-    "phpugph/handlebars": "1.0.3"
+    "phpugph/components": "1.0.6",
+    "phpugph/handlebars": "1.0.4"
   },
   "autoload": {
     "psr-4": {

src/Field/Input.php

@@ -98,7 +98,7 @@ public function render(
     $input->setAttribute('class', 'form-control system-form-control');
 
     foreach ($this->attributes as $key => $attribute) {
-      $input->setAttribute($key, $attribute);
+      $input->setAttribute($key, (string) $attribute);
     }
 
     if (static::INPUT_TYPE) {

src/Field/Updated.php

@@ -50,8 +50,8 @@ class Updated extends Created
    */
   public function prepare($value = null, string $name = null, array $row = [])
   {
-    if (strtotime($value) !== false) {
-      return date('Y-m-d H:i:s', strtotime($value));
+    if (strtotime($value ?? '') !== false) {
+      return date('Y-m-d H:i:s', strtotime($value ?? ''));
     }
 
     return date('Y-m-d H:i:s');

src/Package/Config/ConfigPackage.php

@@ -52,7 +52,7 @@ public function __construct()
    */
   public function exists(string $file, ...$path): bool
   {
-    if (!is_dir((string) $this->path)) {
+    if (!is_dir($this->path)) {
       throw ConfigException::forFolderNotSet();
     }
 
@@ -80,7 +80,7 @@ public function exists(string $file, ...$path): bool
    */
   public function get(string $file, ...$path)
   {
-    if (!is_dir((string) $this->path)) {
+    if (!is_dir($this->path)) {
       throw ConfigException::forFolderNotSet();
     }
 
@@ -139,7 +139,7 @@ public function purge()
    */
   public function set(string $file, ...$path): ConfigPackage
   {
-    if (!is_dir((string) $this->path)) {
+    if (!is_dir($this->path)) {
       throw ConfigException::forFolderNotSet();
     }
 

src/Package/System/SystemPackage.php

@@ -184,7 +184,7 @@ public function deflateRow(Schema $schema, array $row): array
         continue;
       }
 
-      $row[$key] = json_decode($row[$key], true);
+      $row[$key] = json_decode($row[$key] ?? '', true);
     }
 
     return $row;

test/Fieldset.php

@@ -149,11 +149,11 @@ public function testGetFolder()
   public function testGetForm()
   {
     $form = $this->object->getForm();
-    $this->assertTrue(!!trim((string) $form['foo_title']));
-    $this->assertTrue(!trim((string) $form['foo_formula']));
-    $this->assertTrue(!trim((string) $form['foo_active']));
-    $this->assertTrue(!trim((string) $form['foo_created']));
-    $this->assertTrue(!trim((string) $form['foo_updated']));
+    $this->assertTrue(!!trim($form['foo_title']));
+    $this->assertTrue(!trim($form['foo_formula']));
+    $this->assertTrue(!trim($form['foo_active']));
+    $this->assertTrue(!trim($form['foo_created']));
+    $this->assertTrue(!trim($form['foo_updated']));
   }
 
   /**