Remove NameTrait from TrackableTrait

docs/initializer.rst

@@ -15,9 +15,9 @@ Declare a object class in your framework::
 
     class FormField {
         use AppScopeTrait;
-        use TrackableTrait;
         use InitializerTrait;
-
+        use NameTrait;
+        use TrackableTrait;
     }
 
     class FormField_Input extends FormField {
@@ -51,10 +51,11 @@ class::
 
     class FormField {
         use AppScopeTrait;
-        use TrackableTrait;
         use InitializerTrait {
             init as _init
         }
+        use TrackableTrait;
+        use NameTrait;
 
         public $value = null;
 

src/CollectionTrait.php

@@ -55,7 +55,7 @@ public function _addIntoCollection(string $name, object $item, string $collectio
         if (TraitUtil::hasTrackableTrait($item)) {
             $item->short_name = $name;
             $item->setOwner($this);
-            if (TraitUtil::hasTrackableTrait($this)) {
+            if (TraitUtil::hasTrackableTrait($this) && TraitUtil::hasNameTrait($this) && TraitUtil::hasNameTrait($item)) {
                 $item->name = $this->_shorten_ml($this->name . '-' . $collection, $item->short_name, $item->name);
             }
         }

src/ContainerTrait.php

@@ -119,7 +119,7 @@ protected function _add_Container(object $element, $args = []): object
 
         $element->setOwner($this);
         $element->short_name = $args[0];
-        if (TraitUtil::hasNameTrait($this)) {
+        if (TraitUtil::hasTrackableTrait($this) && TraitUtil::hasNameTrait($this) && TraitUtil::hasNameTrait($element)) {
             $element->name = $this->_shorten((string) $this->name, $element->short_name, $element->name);
         }
         $this->elements[$element->short_name] = $element;

src/TrackableTrait.php

@@ -11,8 +11,6 @@
  */
 trait TrackableTrait
 {
-    use NameTrait;
-
     /** @var object|null Link to (parent) object into which we added this object. */
     private $_owner;
 

tests/CollectionTraitTest.php

@@ -142,11 +142,9 @@ public function testClone(): void
     }
 }
 
-/**
- * Adds support for apptrait and trackable.
- */
 class CollectionMockWithApp extends CollectionMock
 {
     use Core\AppScopeTrait;
+    use Core\NameTrait;
     use Core\TrackableTrait;
 }

tests/ContainerTraitTest.php

@@ -117,6 +117,8 @@ public function testPreservePresetNames(): void
 
         $createTrackableMockFx = function (string $name, bool $isLongName = false) {
             return new class($name, $isLongName) extends TrackableMock {
+                use Core\NameTrait;
+
                 public function __construct(string $name, bool $isLongName)
                 {
                     if ($isLongName) {
@@ -155,6 +157,7 @@ public function testArgs(): void
         $m = new ContainerMock();
         $m2 = $m->add(new class() extends TrackableMock {
             use Core\DiContainerTrait;
+            use Core\NameTrait;
         }, ['name' => 'foo']);
         $this->assertTrue($m->hasElement('foo'));
         $this->assertSame('foo', $m2->short_name);
@@ -233,6 +236,7 @@ class ContainerAppMock
 {
     use Core\AppScopeTrait;
     use Core\ContainerTrait;
+    use Core\NameTrait;
     use Core\TrackableTrait;
 
     public function getElementCount(): int

tests/FieldMockCustom.php

@@ -6,6 +6,7 @@
 
 use Atk4\Core\AppScopeTrait;
 use Atk4\Core\InitializerTrait;
+use Atk4\Core\NameTrait;
 use Atk4\Core\TrackableTrait;
 
 class FieldMockCustom extends FieldMock
@@ -14,6 +15,7 @@ class FieldMockCustom extends FieldMock
     use InitializerTrait {
         init as private _init;
     }
+    use NameTrait;
     use TrackableTrait;
 
     /** @var bool verifying if init was called */