updated components to 8.2. Fixed type errors and deprecation notices 12h

cblanquera · cblanquera · commit fa8f249a6511 · 2023-09-11T11:16:01.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -5,5 +5,6 @@ composer.phar
 /vendor/
 /logs/
 *.db
+.phpunit.cache
 .phpunit.result.cache
 composer.lock
diff --git a/composer.json b/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.6.0",
+    "phpunit/phpunit": "10.3.3",
+    "squizlabs/php_codesniffer": "3.7.2"
   },
   "require": {
-    "phpugph/components": "1.0.7",
-    "phpugph/handlebars": "1.0.5"
+    "phpugph/components": "1.0.8",
+    "phpugph/handlebars": "1.0.6"
   },
   "autoload": {
     "psr-4": {
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,48 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
-  backupGlobals="false"
-  backupStaticAttributes="false"
-  colors="true"
-  convertErrorsToExceptions="true"
-  convertNoticesToExceptions="true"
-  convertWarningsToExceptions="true"
-  processIsolation="false"
-  stopOnFailure="false"
-  bootstrap="test/bootstrap.php"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+  backupGlobals="false" 
+  colors="true" 
+  processIsolation="false" 
+  stopOnFailure="false" 
+  bootstrap="test/bootstrap.php" 
+  xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.3/phpunit.xsd" 
+  cacheDirectory=".phpunit.cache" 
+  backupStaticProperties="false"
 >
   <testsuites>
     <testsuite name="Framework Test Suite">
-      <file>test/Framework.php</file>
-      <file>test/Decorator.php</file>
-      <file>test/Schema.php</file>
-      <file>test/Fieldset.php</file>
-      <file>test/Fieldset/Validator.php</file>
-      <file>test/Field/AbstractField.php</file>
-      <file>test/Field/Active.php</file>
-      <file>test/Field/Created.php</file>
-      <file>test/Field/FieldRegistry.php</file>
-      <file>test/Field/None.php</file>
-      <file>test/Field/Updated.php</file>
-      <file>test/Format/AbstractFormatter.php</file>
-      <file>test/Format/FormatterRegistry.php</file>
-      <file>test/Format/Hide.php</file>
-      <file>test/Format/None.php</file>
-      <file>test/Schema/Validator.php</file>
-      <file>test/Validation/AbstractValidator.php</file>
-      <file>test/Validation/Required.php</file>
-      <file>test/Validation/Unique.php</file>
-      <file>test/Validation/ValidatorRegistry.php</file>
-      <file>test/SystemException.php</file>
-      <file>test/Package/Config/ConfigException.php</file>
-      <file>test/Package/Config/ConfigPackage.php</file>
-      <file>test/Package/Event/EventPackage.php</file>
-      <file>test/Package/Host/HostPackage.php</file>
-      <file>test/Package/Http/HttpPackage.php</file>
-      <file>test/Package/PDO/PDOPackage.php</file>
+      <file>test/FrameworkTest.php</file>
+      <file>test/DecoratorTest.php</file>
+      <file>test/SchemaTest.php</file>
+      <file>test/FieldsetTest.php</file>
+      <file>test/Fieldset/ValidatorTest.php</file>
+      <file>test/Field/AbstractFieldTest.php</file>
+      <file>test/Field/ActiveTest.php</file>
+      <file>test/Field/CreatedTest.php</file>
+      <file>test/Field/FieldRegistryTest.php</file>
+      <file>test/Field/NoneTest.php</file>
+      <file>test/Field/UpdatedTest.php</file>
+      <file>test/Format/AbstractFormatterTest.php</file>
+      <file>test/Format/FormatterRegistryTest.php</file>
+      <file>test/Format/HideTest.php</file>
+      <file>test/Format/NoneTest.php</file>
+      <file>test/Schema/ValidatorTest.php</file>
+      <file>test/Validation/AbstractValidatorTest.php</file>
+      <file>test/Validation/RequiredTest.php</file>
+      <file>test/Validation/UniqueTest.php</file>
+      <file>test/Validation/ValidatorRegistryTest.php</file>
+      <file>test/SystemExceptionTest.php</file>
+      <file>test/Package/Config/ConfigExceptionTest.php</file>
+      <file>test/Package/Config/ConfigPackageTest.php</file>
+      <file>test/Package/Event/EventPackageTest.php</file>
+      <file>test/Package/Host/HostPackageTest.php</file>
+      <file>test/Package/Http/HttpPackageTest.php</file>
+      <file>test/Package/PDO/PDOPackageTest.php</file>
     </testsuite>
   </testsuites>
 
-  <coverage processUncoveredFiles="false" pathCoverage="true">
+  <coverage pathCoverage="true"/>
+  <source>
     <include>
       <directory suffix=".php">./src</directory>
     </include>
@@ -65,5 +66,5 @@
       <file>src/Package/Language/.incept.php</file>
       <file>src/Package/Timezone/.incept.php</file>
     </exclude>
-  </coverage>
+  </source>
 </phpunit>
diff --git a/src/Field/AbstractField.php b/src/Field/AbstractField.php
@@ -124,6 +124,11 @@ abstract class AbstractField
    */
   protected $name = null;
 
+  /**
+   * @var mixed $value The value of the field
+   */
+  protected $value = null;
+
   /**
    * @var array $attributes Hash of attributes to consider when rendering
    */
diff --git a/src/Package/Config/ConfigPackage.php b/src/Package/Config/ConfigPackage.php
@@ -52,7 +52,7 @@ public function __construct()
    */
   public function exists(string $file, ...$path): bool
   {
-    if (!is_dir($this->path)) {
+    if (!is_dir((string) $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($this->path)) {
+    if (!is_dir((string) $this->path)) {
       throw ConfigException::forFolderNotSet();
     }
 
@@ -139,7 +139,7 @@ public function purge()
    */
   public function set(string $file, ...$path): ConfigPackage
   {
-    if (!is_dir($this->path)) {
+    if (!is_dir((string) $this->path)) {
       throw ConfigException::forFolderNotSet();
     }
 
diff --git a/test/DecoratorTest.php b/test/DecoratorTest.php
@@ -11,7 +11,7 @@
 /**
  * Generated by PHPUnit_SkeletonGenerator on 2016-07-27 at 13:49:45.
  */
-class Framework_Decorator_Test extends TestCase
+class DecoratorTest extends TestCase
 {
   /**
    * @var Decorator
diff --git a/test/Field/AbstractFieldTest.php b/test/Field/AbstractFieldTest.php
@@ -15,7 +15,7 @@
 /**
  * Generated by PHPUnit_SkeletonGenerator on 2016-07-27 at 13:49:45.
  */
-class Incept_Field_AbstractField_Test extends TestCase
+class AbstractFieldTest extends TestCase
 {
   /**
    * @var FieldStub
diff --git a/test/Field/ActiveTest.php b/test/Field/ActiveTest.php
@@ -13,7 +13,7 @@
 /**
  * Generated by PHPUnit_SkeletonGenerator on 2016-07-27 at 13:49:45.
  */
-class Incept_Field_Active_Test extends TestCase
+class ActiveTest extends TestCase
 {
   /**
    * @var Active
diff --git a/test/Field/CreatedTest.php b/test/Field/CreatedTest.php
@@ -13,7 +13,7 @@
 /**
  * Generated by PHPUnit_SkeletonGenerator on 2016-07-27 at 13:49:45.
  */
-class Incept_Field_Created_Test extends TestCase
+class CreatedTest extends TestCase
 {
   /**
    * @var Created
diff --git a/test/Field/FieldRegistryTest.php b/test/Field/FieldRegistryTest.php
@@ -13,7 +13,7 @@
 /**
  * Generated by PHPUnit_SkeletonGenerator on 2016-07-27 at 13:49:45.
  */
-class Incept_Field_FieldRegistry_Test extends TestCase
+class FieldRegistryTest extends TestCase
 {
   /**
    * @covers Incept\Framework\Field\FieldRegistry::getField
diff --git a/test/Field/NoneTest.php b/test/Field/NoneTest.php
@@ -18,7 +18,7 @@
 /**
  * Generated by PHPUnit_SkeletonGenerator on 2016-07-27 at 13:49:45.
  */
-class Incept_Field_None_Test extends TestCase
+class NoneTest extends TestCase
 {
   /**
    * @var None
diff --git a/test/Field/UpdatedTest.php b/test/Field/UpdatedTest.php
@@ -13,7 +13,7 @@
 /**
  * Generated by PHPUnit_SkeletonGenerator on 2016-07-27 at 13:49:45.
  */
-class Incept_Field_Updated_Test extends TestCase
+class UpdatedTest extends TestCase
 {
   /**
    * @var Updated
diff --git a/test/Fieldset/ValidatorTest.php b/test/Fieldset/ValidatorTest.php
@@ -13,7 +13,7 @@
 /**
  * Generated by PHPUnit_SkeletonGenerator on 2016-07-27 at 13:49:45.
  */
-class Incept_Fieldset_Validator_Test extends TestCase
+class ValidatorTest extends TestCase
 {
   /**
    * Sets up the fixture, for example, opens a network connection.
diff --git a/test/FieldsetTest.php b/test/FieldsetTest.php
@@ -22,7 +22,7 @@
 /**
  * Generated by PHPUnit_SkeletonGenerator on 2016-07-27 at 13:49:45.
  */
-class Package_System_Fieldset_Test extends TestCase
+class FieldsetTest extends TestCase
 {
   /**
    * @var Package
@@ -149,11 +149,11 @@ public function testGetFolder()
   public function testGetForm()
   {
     $form = $this->object->getForm();
-    $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']));
+    $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']));
   }
 
   /**
diff --git a/test/Format/AbstractFormatterTest.php b/test/Format/AbstractFormatterTest.php
@@ -13,7 +13,7 @@
 /**
  * Generated by PHPUnit_SkeletonGenerator on 2016-07-27 at 13:49:45.
  */
-class Incept_Format_AbstractFormatter_Test extends TestCase
+class AbstractFormatterTest extends TestCase
 {
   /**
    * @var FormatStub
diff --git a/test/Format/FormatterRegistryTest.php b/test/Format/FormatterRegistryTest.php
@@ -13,7 +13,7 @@
 /**
  * Generated by PHPUnit_SkeletonGenerator on 2016-07-27 at 13:49:45.
  */
-class Incept_Format_FormatterRegistry_Test extends TestCase
+class FormatterRegistryTest extends TestCase
 {
   /**
    * Sets up the fixture, for example, opens a network connection.
diff --git a/test/Format/HideTest.php b/test/Format/HideTest.php
@@ -13,7 +13,7 @@
 /**
  * Generated by PHPUnit_SkeletonGenerator on 2016-07-27 at 13:49:45.
  */
-class Incept_Format_Hide_Test extends TestCase
+class HideTest extends TestCase
 {
   /**
    * @var Hide
diff --git a/test/Format/NoneTest.php b/test/Format/NoneTest.php
@@ -13,7 +13,7 @@
 /**
  * Generated by PHPUnit_SkeletonGenerator on 2016-07-27 at 13:49:45.
  */
-class Incept_Format_None_Test extends TestCase
+class NoneTest extends TestCase
 {
   /**
    * @var None
diff --git a/test/FrameworkTest.php b/test/FrameworkTest.php
@@ -9,7 +9,7 @@
 /**
  * Generated by PHPUnit_SkeletonGenerator on 2016-07-27 at 13:49:45.
  */
-class Framework_Framework_Test extends TestCase
+class FrameworkTest extends TestCase
 {
   /**
    * @var Framework
diff --git a/test/Package/Config/ConfigExceptionTest.php b/test/Package/Config/ConfigExceptionTest.php
@@ -7,7 +7,7 @@
 /**
  * Generated by PHPUnit_SkeletonGenerator on 2016-07-28 at 11:36:33.
  */
-class Framework_Config_ConfigException_Test extends TestCase
+class ConfigExceptionTest extends TestCase
 {
   /**
    * @var ConfigException
diff --git a/test/Package/Config/ConfigPackageTest.php b/test/Package/Config/ConfigPackageTest.php
@@ -8,7 +8,7 @@
 /**
  * Generated by PHPUnit_SkeletonGenerator on 2016-07-27 at 13:49:45.
  */
-class Framework_Config_ConfigPackage_Test extends TestCase
+class ConfigPackageTest extends TestCase
 {
   /**
    * @var ConfigPackage
diff --git a/test/Package/Event/EventPackageTest.php b/test/Package/Event/EventPackageTest.php
@@ -10,7 +10,7 @@
 /**
  * Generated by PHPUnit_SkeletonGenerator on 2016-07-27 at 13:49:45.
  */
-class Framework_Event_EventPackage_Test extends TestCase
+class EventPackageTest extends TestCase
 {
   /**
    * @var EventPackage
diff --git a/test/Package/Host/HostPackageTest.php b/test/Package/Host/HostPackageTest.php
@@ -10,7 +10,7 @@
 /**
  * Generated by PHPUnit_SkeletonGenerator on 2016-07-27 at 13:49:45.
  */
-class Framework_Host_HostPackage_Test extends TestCase
+class HostPackageTest extends TestCase
 {
   /**
    * @var EventPackage
diff --git a/test/Package/Http/HttpPackageTest.php b/test/Package/Http/HttpPackageTest.php
@@ -10,7 +10,7 @@
 /**
  * Generated by PHPUnit_SkeletonGenerator on 2016-07-27 at 13:49:45.
  */
-class Framework_Http_HttpPackage_Test extends TestCase
+class HttpPackageTest extends TestCase
 {
   /**
    * @var Framework
diff --git a/test/Package/PDO/PDOPackageTest.php b/test/Package/PDO/PDOPackageTest.php
@@ -13,7 +13,7 @@
 /**
  * Generated by PHPUnit_SkeletonGenerator on 2016-07-27 at 13:49:45.
  */
-class Framework_PDO_PDOPackage_Test extends TestCase
+class PDOPackageTest extends TestCase
 {
   /**
    * @var Framework
diff --git a/test/Package/Resolver/ResolverPackageTest.php b/test/Package/Resolver/ResolverPackageTest.php
@@ -8,7 +8,7 @@
 /**
  * Generated by PHPUnit_SkeletonGenerator on 2016-07-27 at 13:49:45.
  */
-class Framework_Resolver_ResolverPackage_Test extends TestCase
+class ResolverPackageTest extends TestCase
 {
   /**
    * @var ResolverPackage
diff --git a/test/Package/Terminal/TerminalPackageTest.php b/test/Package/Terminal/TerminalPackageTest.php
@@ -8,7 +8,7 @@
 /**
  * Generated by PHPUnit_SkeletonGenerator on 2016-07-27 at 13:49:45.
  */
-class Framework_Terminal_TerminalPackage_Test extends TestCase
+class TerminalPackageTest extends TestCase
 {
   /**
    * @var TerminalPackage
diff --git a/test/Schema/ValidatorTest.php b/test/Schema/ValidatorTest.php
@@ -13,7 +13,7 @@
 /**
  * Generated by PHPUnit_SkeletonGenerator on 2016-07-27 at 13:49:45.
  */
-class Incept_Schema_Validator_Test extends TestCase
+class ValidatorTest extends TestCase
 {
   /**
    * Sets up the fixture, for example, opens a network connection.
diff --git a/test/SchemaTest.php b/test/SchemaTest.php
@@ -9,7 +9,7 @@
 /**
  * Generated by PHPUnit_SkeletonGenerator on 2016-07-27 at 13:49:45.
  */
-class Incept_Framework_Schema_Test extends TestCase
+class SchemaTest extends TestCase
 {
   /**
    * @var Package
diff --git a/test/SystemExceptionTest.php b/test/SystemExceptionTest.php
diff --git a/test/Validation/AbstractValidatorTest.php b/test/Validation/AbstractValidatorTest.php
diff --git a/test/Validation/RequiredTest.php b/test/Validation/RequiredTest.php
diff --git a/test/Validation/UniqueTest.php b/test/Validation/UniqueTest.php
diff --git a/test/Validation/ValidatorRegistryTest.php b/test/Validation/ValidatorRegistryTest.php

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public function __construct()`
`52`	`52`	`*/`
`53`	`53`	`public function exists(string $file, ...$path): bool`
`54`	`54`	`{`
`55`		`- if (!is_dir($this->path)) {`
	`55`	`+ if (!is_dir((string) $this->path)) {`
`56`	`56`	`throw ConfigException::forFolderNotSet();`
`57`	`57`	`}`
`58`	`58`
`@@ -80,7 +80,7 @@ public function exists(string $file, ...$path): bool`
`80`	`80`	`*/`
`81`	`81`	`public function get(string $file, ...$path)`
`82`	`82`	`{`
`83`		`- if (!is_dir($this->path)) {`
	`83`	`+ if (!is_dir((string) $this->path)) {`
`84`	`84`	`throw ConfigException::forFolderNotSet();`
`85`	`85`	`}`
`86`	`86`
`@@ -139,7 +139,7 @@ public function purge()`
`139`	`139`	`*/`
`140`	`140`	`public function set(string $file, ...$path): ConfigPackage`
`141`	`141`	`{`
`142`		`- if (!is_dir($this->path)) {`
	`142`	`+ if (!is_dir((string) $this->path)) {`
`143`	`143`	`throw ConfigException::forFolderNotSet();`
`144`	`144`	`}`
`145`	`145`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`/**`
`12`	`12`	`* Generated by PHPUnit_SkeletonGenerator on 2016-07-27 at 13:49:45.`
`13`	`13`	`*/`
`14`		`-class Framework_Decorator_Test extends TestCase`
	`14`	`+class DecoratorTest extends TestCase`
`15`	`15`	`{`
`16`	`16`	`/**`
`17`	`17`	`* @var Decorator`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`/**`
`16`	`16`	`* Generated by PHPUnit_SkeletonGenerator on 2016-07-27 at 13:49:45.`
`17`	`17`	`*/`
`18`		`-class Incept_Field_AbstractField_Test extends TestCase`
	`18`	`+class AbstractFieldTest extends TestCase`
`19`	`19`	`{`
`20`	`20`	`/**`
`21`	`21`	`* @var FieldStub`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`/**`
`14`	`14`	`* Generated by PHPUnit_SkeletonGenerator on 2016-07-27 at 13:49:45.`
`15`	`15`	`*/`
`16`		`-class Incept_Field_Active_Test extends TestCase`
	`16`	`+class ActiveTest extends TestCase`
`17`	`17`	`{`
`18`	`18`	`/**`
`19`	`19`	`* @var Active`