Strong type NameTrait::$name and TrackableTrait::$shortName properties

docs/container.md

@@ -69,7 +69,7 @@ class Form
 {
     use CollectionTrait;
 
-    protected $fields = [];
+    protected array $fields = [];
 
     public function addField(string $name, $seed = [])
     {

docs/index.md

@@ -32,7 +32,7 @@ using containers:
 The natural solution to the problem is to create array like this:
 
 ```
-public $fields = [];
+public array $fields = [];
 ```
 
 After that you would need to create code for adding objects into container, removing,
@@ -46,7 +46,7 @@ class Form
 {
     use CollectionTrait;
 
-    public $fields = [];
+    public array $fields = [];
 
     public function addField(string $name, $seed = [])
     {

docs/initializer.md

@@ -25,7 +25,7 @@ class FormField
 
 class FormField_Input extends FormField
 {
-    public $value = null;
+    public string $value;
 
     protected function init(): void
     {
@@ -64,7 +64,7 @@ class FormField
     use TrackableTrait;
     use NameTrait;
 
-    public $value = null;
+    public string $value;
 
     protected function init(): void
     {

src/CollectionTrait.php

@@ -58,7 +58,7 @@ protected function _addIntoCollection(string $name, object $item, string $collec
             $item->shortName = $name;
             $item->setOwner($this);
             if (TraitUtil::hasTrackableTrait($this) && TraitUtil::hasNameTrait($this) && TraitUtil::hasNameTrait($item)) {
-                $item->name = $this->_shortenMl($this->name . '-' . $collection, $item->shortName, $item->name); // @phpstan-ignore-line
+                $item->name = $this->_shortenMl(($this->name ?? '') . '-' . $collection, $item->shortName, $item->name ?? null); // @phpstan-ignore-line
             }
         }
 

src/ContainerTrait.php

@@ -19,7 +19,7 @@ trait ContainerTrait
     public array $elements = [];
 
     /** @var array<string, int> */
-    private $_elementNameCounts = [];
+    private array $_elementNameCounts = [];
 
     /**
      * Returns unique element name based on desired name.
@@ -86,7 +86,7 @@ protected function _addContainer(object $element, array $args): void
         } elseif (isset($args['name'])) {
             $name = $args['name'];
             unset($args['name']);
-        } elseif ($element->shortName !== null) {
+        } elseif (($element->shortName ?? null) !== null) {
             $name = $this->_uniqueElementName($element->shortName);
         } else {
             $desiredName = $element->getDesiredName();
@@ -110,7 +110,7 @@ protected function _addContainer(object $element, array $args): void
         $element->setOwner($this);
         $element->shortName = $name;
         if (TraitUtil::hasTrackableTrait($this) && TraitUtil::hasNameTrait($this) && TraitUtil::hasNameTrait($element)) {
-            $element->name = $this->_shorten($this->name ?: '', $element->shortName, $element->name); // @phpstan-ignore-line
+            $element->name = $this->_shorten($this->name ?? '', $element->shortName, $element->name ?? null); // @phpstan-ignore-line
         }
 
         $this->elements[$element->shortName] = $element;

src/InitializerTrait.php

@@ -10,8 +10,7 @@
  */
 trait InitializerTrait
 {
-    /** @var bool */
-    private $_initialized = false;
+    private bool $_initialized = false;
 
     /**
      * Initialize object. Always call parent::init(). Do not call directly.

src/NameTrait.php

@@ -9,6 +9,6 @@
  */
 trait NameTrait
 {
-    /** @var string Unique object name. */
-    public $name;
+    /** @var non-falsy-string Unique object name. */
+    public string $name;
 }

src/TrackableTrait.php

@@ -14,8 +14,8 @@ trait TrackableTrait
     /** @var QuietObjectWrapper<object>|null Link to (owner) object into which we added this object. */
     private ?QuietObjectWrapper $_owner = null;
 
-    /** @var string Name of the object in owner's element array. */
-    public $shortName;
+    /** @var non-falsy-string Name of the object in owner's element array. */
+    public string $shortName;
 
     public function issetOwner(): bool
     {

tests/CollectionMock.php

@@ -12,7 +12,7 @@ class CollectionMock
     use CollectionTrait;
 
     /** @var array<string, FieldMock> */
-    protected $fields = [];
+    protected array $fields = [];
 
     /**
      * @param array<mixed>|FieldMock|null $seed

tests/CollectionTraitTest.php

@@ -35,12 +35,11 @@ public function testBasicWithApp(): void
     {
         $m = new CollectionMockWithApp();
         $m->setApp(new class() {
-            /** @var string */
-            public $name = 'app';
-            /** @var int */
-            public $maxNameLength = 40;
+            public string $name = 'app';
+
+            public int $maxNameLength = 40;
             /** @var array<string, string> */
-            public $uniqueNameHashes = [];
+            public array $uniqueNameHashes = [];
         });
         $m->name = 'form';
 

tests/ConfigTraitTest.php

@@ -10,8 +10,7 @@
 
 class ConfigTraitTest extends TestCase
 {
-    /** @var string */
-    public $dir = __DIR__ . '/config_test';
+    public string $dir = __DIR__ . '/config_test';
 
     public function testFileRead(): void
     {

tests/FieldMock.php

@@ -10,6 +10,5 @@ class FieldMock
 {
     use DiContainerTrait;
 
-    /** @var string */
-    public $name;
+    public string $name;
 }