~mv

Author: alecrabbit

.tools/.report/.deptrac/.deptrac.report

@@ -5,7 +5,7 @@
   Violations           0     
   Skipped violations   0     
   Uncovered            177   
-  Allowed              2933  
+  Allowed              2936  
   Warnings             0     
   Errors               0     
  -------------------- ------ 

.tools/.report/.phploc/.src.phploc.report

@@ -1,12 +1,12 @@
 phploc 7.0.2 by Sebastian Bergmann.
 
-Directories                                         84
+Directories                                         83
 Files                                              429
 
 Size
-  Lines of Code (LOC)                            14212
+  Lines of Code (LOC)                            14211
   Comment Lines of Code (CLOC)                     804 (5.66%)
-  Non-Comment Lines of Code (NCLOC)              13408 (94.34%)
+  Non-Comment Lines of Code (NCLOC)              13407 (94.34%)
   Logical Lines of Code (LLOC)                    1525 (10.73%)
     Classes                                       1424 (93.38%)
       Average Class Length                           3
@@ -44,7 +44,7 @@ Dependencies
     Static                                          82 (9.89%)
 
 Structure
-  Namespaces                                        84
+  Namespaces                                        83
   Interfaces                                       197
   Traits                                             0
   Classes                                          211

.tools/.report/.phploc/.test.phploc.report

@@ -1,6 +1,6 @@
 phploc 7.0.2 by Sebastian Bergmann.
 
-Directories                                         77
+Directories                                         78
 Files                                              281
 
 Size
@@ -44,7 +44,7 @@ Dependencies
     Static                                        3326 (33.10%)
 
 Structure
-  Namespaces                                        77
+  Namespaces                                        78
   Interfaces                                         1
   Traits                                             1
   Classes                                          278

.tools/.report/.psalm/.psalm.report.txt

@@ -1,5 +1,7 @@
 /app/src/Spinner/Core/Config/Solver/A/ASolver.php:27:22:error - InvalidReturnType: The declared return type '(T:fn-alecrabbit\spinner\core\config\solver\a\asolver::extractsettingselement as AlecRabbit\Spinner\Core\Settings\Contract\ISettingsElement)|null' for AlecRabbit\Spinner\Core\Config\Solver\A\ASolver::extractSettingsElement is incorrect, got 'AlecRabbit\Spinner\Core\Settings\Contract\ISettingsElement|null'
 /app/src/Spinner/Core/Config/Solver/A/ASolver.php:31:16:error - InvalidReturnStatement: The inferred type 'AlecRabbit\Spinner\Core\Settings\Contract\ISettingsElement|null' does not match the declared return type '(T:fn-alecrabbit\spinner\core\config\solver\a\asolver::extractsettingselement as AlecRabbit\Spinner\Core\Settings\Contract\ISettingsElement)|null' for AlecRabbit\Spinner\Core\Config\Solver\A\ASolver::extractSettingsElement
-/app/src/Spinner/Core/WidgetContextToIntervalMap.php:30:36:error - InvalidReturnType: The declared return type 'Traversable<TKey:AlecRabbit\Spinner\Core\WidgetContextToIntervalMap as AlecRabbit\Spinner\Core\Widget\Contract\IWidgetContext, TValue:AlecRabbit\Spinner\Core\WidgetContextToIntervalMap as AlecRabbit\Spinner\Contract\IInterval|null>' for AlecRabbit\Spinner\Core\WidgetContextToIntervalMap::getIterator is incorrect, got 'Generator<AlecRabbit\Spinner\Core\Widget\Contract\IWidgetContext, AlecRabbit\Spinner\Contract\IInterval|null, mixed, void>'
-/app/src/Spinner/Core/WidgetContextToIntervalMap.php:55:22:error - InvalidReturnType: The declared return type 'TValue:AlecRabbit\Spinner\Core\WidgetContextToIntervalMap as AlecRabbit\Spinner\Contract\IInterval|null' for AlecRabbit\Spinner\Core\WidgetContextToIntervalMap::offsetGet is incorrect, got 'AlecRabbit\Spinner\Contract\IInterval|null'
-/app/src/Spinner/Core/WidgetContextToIntervalMap.php:68:16:error - InvalidReturnStatement: The inferred type 'AlecRabbit\Spinner\Contract\IInterval|null' does not match the declared return type 'TValue:AlecRabbit\Spinner\Core\WidgetContextToIntervalMap as AlecRabbit\Spinner\Contract\IInterval|null' for AlecRabbit\Spinner\Core\WidgetContextToIntervalMap::offsetGet
+/app/src/Spinner/Extras/Widget/Contract/IWidgetContextToIntervalMap.php:31:22:error - ImplementedReturnTypeMismatch: The inherited return type '(TValue:AlecRabbit\Spinner\Extras\Widget\Contract\IWidgetContextToIntervalMap as AlecRabbit\Spinner\Contract\IInterval|null)|null' for ArrayAccess::offsetGet is different to the implemented return type for AlecRabbit\Spinner\Extras\Widget\Contract\IWidgetContextToIntervalMap::offsetget 'AlecRabbit\Spinner\Contract\IInterval|null'
+/app/src/Spinner/Extras/Widget/WidgetContextToIntervalMap.php:30:36:error - InvalidReturnType: The declared return type 'Traversable<TKey:AlecRabbit\Spinner\Extras\Widget\WidgetContextToIntervalMap as AlecRabbit\Spinner\Core\Widget\Contract\IWidgetContext, TValue:AlecRabbit\Spinner\Extras\Widget\WidgetContextToIntervalMap as AlecRabbit\Spinner\Contract\IInterval|null>' for AlecRabbit\Spinner\Extras\Widget\WidgetContextToIntervalMap::getIterator is incorrect, got 'Generator<AlecRabbit\Spinner\Core\Widget\Contract\IWidgetContext, AlecRabbit\Spinner\Contract\IInterval|null, mixed, void>'
+/app/src/Spinner/Extras/Widget/WidgetContextToIntervalMap.php:55:22:error - ImplementedReturnTypeMismatch: The inherited return type '(TValue:AlecRabbit\Spinner\Extras\Widget\WidgetContextToIntervalMap as AlecRabbit\Spinner\Contract\IInterval|null)|null' for ArrayAccess::offsetGet is different to the implemented return type for AlecRabbit\Spinner\Extras\Widget\WidgetContextToIntervalMap::offsetget 'AlecRabbit\Spinner\Contract\IInterval|null'
+/app/src/Spinner/Extras/Widget/WidgetContextToIntervalMap.php:85:13:error - RedundantConditionGivenDocblockType: Docblock-defined type AlecRabbit\Spinner\Contract\IInterval for $value is never null
+/app/src/Spinner/Extras/Widget/WidgetContextToIntervalMap.php:85:23:error - DocblockTypeContradiction: Cannot resolve types for $value - docblock-defined type AlecRabbit\Spinner\Contract\IInterval does not contain null

src/Spinner/Core/Contract/IWidgetContextToIntervalMap.php renamed to src/Spinner/Extras/Widget/Contract/IWidgetContextToIntervalMap.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace AlecRabbit\Spinner\Core\Contract;
+namespace AlecRabbit\Spinner\Extras\Widget\Contract;
 
 use AlecRabbit\Spinner\Contract\IInterval;
 use AlecRabbit\Spinner\Core\Widget\Contract\IWidgetContext;
@@ -26,25 +26,25 @@ interface IWidgetContextToIntervalMap extends ArrayAccess, Countable, IteratorAg
     public function getIterator(): Traversable;
 
     /**
-     * @psalm-param TKey $offset
+     * @psalm-param IWidgetContext $offset
      *
-     * @psalm-return TValue
+     * @psalm-return IInterval
      */
     public function offsetGet(mixed $offset): ?IInterval;
 
     /**
-     * @psalm-param TKey $offset
+     * @psalm-param IWidgetContext $offset
      */
     public function offsetUnset(mixed $offset): void;
 
     /**
-     * @psalm-param TKey $offset
-     * @psalm-param TValue $value
+     * @psalm-param IWidgetContext $offset
+     * @psalm-param IInterval $value
      */
     public function offsetSet(mixed $offset, mixed $value): void;
 
     /**
-     * @psalm-param TKey $offset
+     * @psalm-param IWidgetContext $offset
      *
      * @psalm-return bool
      */

src/Spinner/Extras/Widget/WidgetCompositeChildrenContainer.php

@@ -11,7 +11,6 @@
 use AlecRabbit\Spinner\Core\Contract\IIntervalComparator;
 use AlecRabbit\Spinner\Core\IntervalComparator;
 use AlecRabbit\Spinner\Core\Widget\Contract\IWidgetContext;
-use AlecRabbit\Spinner\Core\WidgetContextToIntervalMap;
 use AlecRabbit\Spinner\Extras\Widget\Contract\IWidgetCompositeChildrenContainer;
 use ArrayAccess;
 use Countable;

src/Spinner/Core/WidgetContextToIntervalMap.php renamed to src/Spinner/Extras/Widget/WidgetContextToIntervalMap.php

@@ -2,12 +2,12 @@
 
 declare(strict_types=1);
 
-namespace AlecRabbit\Spinner\Core;
+namespace AlecRabbit\Spinner\Extras\Widget;
 
 use AlecRabbit\Spinner\Contract\IInterval;
-use AlecRabbit\Spinner\Core\Contract\IWidgetContextToIntervalMap;
 use AlecRabbit\Spinner\Core\Widget\Contract\IWidgetContext;
 use AlecRabbit\Spinner\Exception\InvalidArgument;
+use AlecRabbit\Spinner\Extras\Widget\Contract\IWidgetContextToIntervalMap;
 use ArrayAccess;
 use Countable;
 use IteratorAggregate;
@@ -50,9 +50,9 @@ public function offsetExists(mixed $offset): bool
     }
 
     /**
-     * @psalm-param TKey $offset
+     * @psalm-param IWidgetContext $offset
      *
-     * @psalm-return TValue
+     * @psalm-return IInterval
      */
     public function offsetGet(mixed $offset): ?IInterval
     {

tests/Spinner/Functional/Core/Widget/WidgetCompositeChildrenContainerTest.php

@@ -9,10 +9,10 @@
 use AlecRabbit\Spinner\Core\Interval;
 use AlecRabbit\Spinner\Core\Widget\Contract\IWidgetRevolver;
 use AlecRabbit\Spinner\Core\Widget\Widget;
-use AlecRabbit\Spinner\Core\WidgetContextToIntervalMap;
 use AlecRabbit\Spinner\Extras\Widget\Contract\IWidgetCompositeChildrenContainer;
 use AlecRabbit\Spinner\Extras\Widget\WidgetCompositeChildrenContainer;
 use AlecRabbit\Spinner\Extras\Widget\WidgetContext;
+use AlecRabbit\Spinner\Extras\Widget\WidgetContextToIntervalMap;
 use AlecRabbit\Tests\TestCase\TestCase;
 use ArrayAccess;
 use Countable;

tests/Spinner/Unit/Core/ConsoleCursorBuilderTest.php renamed to tests/Spinner/Unit/Core/Builder/ConsoleCursorBuilderTest.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace AlecRabbit\Tests\Spinner\Unit\Core;
+namespace AlecRabbit\Tests\Spinner\Unit\Core\Builder;
 
 use AlecRabbit\Spinner\Contract\Mode\CursorVisibilityMode;
 use AlecRabbit\Spinner\Core\Builder\ConsoleCursorBuilder;

tests/Spinner/Unit/Core/AutoStartModeDetectorTest.php renamed to tests/Spinner/Unit/Core/Config/Detector/AutoStartModeDetectorTest.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace AlecRabbit\Tests\Spinner\Unit\Core;
+namespace AlecRabbit\Tests\Spinner\Unit\Core\Config\Detector;
 
 
 use AlecRabbit\Spinner\Contract\Mode\AutoStartMode;

tests/Spinner/Unit/Core/DriverModeDetectorTest.php renamed to tests/Spinner/Unit/Core/Config/Detector/DriverModeDetectorTest.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace AlecRabbit\Tests\Spinner\Unit\Core;
+namespace AlecRabbit\Tests\Spinner\Unit\Core\Config\Detector;
 
 
 use AlecRabbit\Spinner\Contract\Mode\DriverMode;

tests/Spinner/Unit/Core/InitializationModeDetectorTest.php renamed to tests/Spinner/Unit/Core/Config/Detector/InitializationModeDetectorTest.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace AlecRabbit\Tests\Spinner\Unit\Core;
+namespace AlecRabbit\Tests\Spinner\Unit\Core\Config\Detector;
 
 
 use AlecRabbit\Spinner\Contract\Mode\InitializationMode;

tests/Spinner/Unit/Core/LinkerModeDetectorTest.php renamed to tests/Spinner/Unit/Core/Config/Detector/LinkerModeDetectorTest.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace AlecRabbit\Tests\Spinner\Unit\Core;
+namespace AlecRabbit\Tests\Spinner\Unit\Core\Config\Detector;
 
 
 use AlecRabbit\Spinner\Contract\Mode\LinkerMode;

tests/Spinner/Unit/Core/WidgetContextToIntervalMapTest.php renamed to tests/Spinner/Unit/Extras/Widget/WidgetContextToIntervalMapTest.php

@@ -2,13 +2,13 @@
 
 declare(strict_types=1);
 
-namespace AlecRabbit\Tests\Spinner\Unit\Core;
+namespace AlecRabbit\Tests\Spinner\Unit\Extras\Widget;
 
 use AlecRabbit\Spinner\Contract\IInterval;
-use AlecRabbit\Spinner\Core\Contract\IWidgetContextToIntervalMap;
 use AlecRabbit\Spinner\Core\Widget\Contract\IWidgetContext;
-use AlecRabbit\Spinner\Core\WidgetContextToIntervalMap;
 use AlecRabbit\Spinner\Exception\InvalidArgument;
+use AlecRabbit\Spinner\Extras\Widget\Contract\IWidgetContextToIntervalMap;
+use AlecRabbit\Spinner\Extras\Widget\WidgetContextToIntervalMap;
 use AlecRabbit\Tests\TestCase\TestCase;
 use ArrayAccess;
 use Countable;