Refactor test namespaces. Remove redundant array_first/array_last usage in First and Last operations.

Makefile

@@ -23,7 +23,7 @@ test: ## Run all tests with coverage
 	@${DOCKER_RUN} composer tests
 
 .PHONY: test-file
-test-file: ## Run tests for a specific file (usage: make test-file FILE=path/to/file)
+test-file: ## Run tests for a specific file (usage: make test-file FILE=ClassNameTest)
 	@${DOCKER_RUN} composer test-file ${FILE}
 
 .PHONY: test-no-coverage

README.md

@@ -107,7 +107,7 @@ These methods enable adding, removing, and modifying elements in the Collection.
     - **With a filter**: Removes only the elements that match the provided filter.
 
       ```php
-      $collection->removeAll(filter: fn(Amount $amount): bool => $amount->value > 10.0);
+      $collection->removeAll(filter: static fn(Amount $amount): bool => $amount->value > 10.0);
       ```
 
     - **Without a filter**: Removes all elements from the Collection.
@@ -130,7 +130,7 @@ These methods enable filtering elements in the Collection based on specific cond
     - **With predicates**: Filter elements are based on the provided predicates.
 
       ```php
-      $collection->filter(predicates: fn(Amount $amount): bool => $amount->value > 100);
+      $collection->filter(predicates: static fn(Amount $amount): bool => $amount->value > 100);
       ```
 
     - **Without predicates**: Removes all empty or false values (e.g., `null`, `false`, empty arrays).
@@ -170,7 +170,7 @@ These methods enable sorting elements in the Collection based on the specified o
   ```php
   use TinyBlocks\Collection\Order;
 
-  $collection->sort(order: Order::ASCENDING_VALUE, predicate: fn(Amount $amount): float => $amount->value);
+  $collection->sort(order: Order::ASCENDING_VALUE, predicate: static fn(Amount $amount): float => $amount->value);
   ``` 
 
 <div id='retrieving'></div>

composer.json

@@ -40,18 +40,19 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "TinyBlocks\\Collection\\": "tests/"
+            "Test\\TinyBlocks\\Collection\\": "tests/"
         }
     },
     "require": {
         "php": "^8.5",
-        "tiny-blocks/mapper": "1.2.*"
+        "tiny-blocks/mapper": "1.4.*"
     },
     "require-dev": {
         "phpunit/phpunit": "^11.5",
         "phpstan/phpstan": "^2.1",
         "infection/infection": "^0.32",
-        "squizlabs/php_codesniffer": "^3.13"
+        "tiny-blocks/currency": "^2.3",
+        "squizlabs/php_codesniffer": "^4.0"
     },
     "scripts": {
         "test": "php -d memory_limit=2G ./vendor/bin/phpunit --configuration phpunit.xml tests",

src/Internal/Operations/Order/Sort.php

@@ -22,10 +22,12 @@ public static function from(Order $order, ?Closure $predicate = null): Sort
 
     public function apply(iterable $elements): Generator
     {
-        $temporaryElements = [];
+        $temporaryElements = is_array($elements) ? $elements : [];
 
-        foreach ($elements as $key => $value) {
-            $temporaryElements[$key] = $value;
+        if (!is_array($elements)) {
+            foreach ($elements as $key => $value) {
+                $temporaryElements[$key] = $value;
+            }
         }
 
         $predicate = is_null($this->predicate)

src/Internal/Operations/Retrieve/First.php

@@ -19,10 +19,6 @@ public static function from(iterable $elements): First
 
     public function element(mixed $defaultValueIfNotFound = null): mixed
     {
-        if (is_array($this->elements)) {
-            return array_first($this->elements) ?? $defaultValueIfNotFound;
-        }
-
         foreach ($this->elements as $element) {
             return $element;
         }

src/Internal/Operations/Retrieve/Last.php

@@ -19,10 +19,6 @@ public static function from(iterable $elements): Last
 
     public function element(mixed $defaultValueIfNotFound = null): mixed
     {
-        if (is_array($this->elements)) {
-            return array_last($this->elements) ?? $defaultValueIfNotFound;
-        }
-
         $lastElement = $defaultValueIfNotFound;
 
         foreach ($this->elements as $element) {

src/Internal/Operations/Transform/Each.php

@@ -23,14 +23,10 @@ public static function from(Closure ...$actions): Each
 
     public function execute(iterable $elements): void
     {
-        $runActions = static function (iterable $actions) use ($elements): void {
-            foreach ($elements as $key => $value) {
-                foreach ($actions as $action) {
-                    $action($value, $key);
-                }
+        foreach ($elements as $key => $value) {
+            foreach ($this->actions as $action) {
+                $action($value, $key);
             }
-        };
-
-        $runActions($this->actions);
+        }
     }
 }

tests/CollectionIteratorTest.php

@@ -2,9 +2,10 @@
 
 declare(strict_types=1);
 
-namespace TinyBlocks\Collection;
+namespace Test\TinyBlocks\Collection;
 
 use PHPUnit\Framework\TestCase;
+use TinyBlocks\Collection\Collection;
 
 final class CollectionIteratorTest extends TestCase
 {

tests/CollectionPerformanceTest.php

@@ -2,12 +2,14 @@
 
 declare(strict_types=1);
 
-namespace TinyBlocks\Collection;
+namespace Test\TinyBlocks\Collection;
 
 use Generator;
 use PHPUnit\Framework\TestCase;
-use TinyBlocks\Collection\Models\Amount;
-use TinyBlocks\Collection\Models\Currency;
+use Test\TinyBlocks\Collection\Models\Amount;
+use TinyBlocks\Collection\Collection;
+use TinyBlocks\Collection\Order;
+use TinyBlocks\Currency\Currency;
 
 final class CollectionPerformanceTest extends TestCase
 {

tests/CollectionTest.php

@@ -2,11 +2,13 @@
 
 declare(strict_types=1);
 
-namespace TinyBlocks\Collection;
+namespace Test\TinyBlocks\Collection;
 
 use PHPUnit\Framework\TestCase;
-use TinyBlocks\Collection\Models\Amount;
-use TinyBlocks\Collection\Models\Currency;
+use Test\TinyBlocks\Collection\Models\Amount;
+use TinyBlocks\Collection\Collection;
+use TinyBlocks\Collection\Order;
+use TinyBlocks\Currency\Currency;
 
 final class CollectionTest extends TestCase
 {

tests/Models/Amount.php

@@ -2,7 +2,9 @@
 
 declare(strict_types=1);
 
-namespace TinyBlocks\Collection\Models;
+namespace Test\TinyBlocks\Collection\Models;
+
+use TinyBlocks\Currency\Currency;
 
 final class Amount
 {

tests/Models/CryptoCurrency.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace TinyBlocks\Collection\Models;
+namespace Test\TinyBlocks\Collection\Models;
 
 use TinyBlocks\Mapper\ObjectMappability;
 use TinyBlocks\Mapper\ObjectMapper;

tests/Models/Dragon.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace TinyBlocks\Collection\Models;
+namespace Test\TinyBlocks\Collection\Models;
 
 final readonly class Dragon
 {

tests/Models/Invoice.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace TinyBlocks\Collection\Models;
+namespace Test\TinyBlocks\Collection\Models;
 
 final class Invoice
 {

tests/Models/InvoiceSummaries.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace TinyBlocks\Collection\Models;
+namespace Test\TinyBlocks\Collection\Models;
 
 use TinyBlocks\Collection\Collection;
 

tests/Models/InvoiceSummary.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace TinyBlocks\Collection\Models;
+namespace Test\TinyBlocks\Collection\Models;
 
 final class InvoiceSummary
 {

tests/Models/Invoices.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace TinyBlocks\Collection\Models;
+namespace Test\TinyBlocks\Collection\Models;
 
 use TinyBlocks\Collection\Collection;
 

tests/Models/Order.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace TinyBlocks\Collection\Models;
+namespace Test\TinyBlocks\Collection\Models;
 
 final readonly class Order
 {

tests/Models/Product.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace TinyBlocks\Collection\Models;
+namespace Test\TinyBlocks\Collection\Models;
 
 use TinyBlocks\Mapper\ObjectMappability;
 use TinyBlocks\Mapper\ObjectMapper;

tests/Models/Products.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace TinyBlocks\Collection\Models;
+namespace Test\TinyBlocks\Collection\Models;
 
 use ArrayIterator;
 use IteratorAggregate;

tests/Models/Status.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace TinyBlocks\Collection\Models;
+namespace Test\TinyBlocks\Collection\Models;
 
 enum Status: int
 {

tests/Operations/Aggregate/CollectionReduceOperationTest.php

@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace TinyBlocks\Collection\Operations\Aggregate;
+namespace Test\TinyBlocks\Collection\Operations\Aggregate;
 
 use PHPUnit\Framework\TestCase;
-use TinyBlocks\Collection\Models\InvoiceSummaries;
-use TinyBlocks\Collection\Models\InvoiceSummary;
+use Test\TinyBlocks\Collection\Models\InvoiceSummaries;
+use Test\TinyBlocks\Collection\Models\InvoiceSummary;
 
 final class CollectionReduceOperationTest extends TestCase
 {

tests/Operations/Compare/CollectionContainsOperationTest.php

@@ -2,13 +2,13 @@
 
 declare(strict_types=1);
 
-namespace TinyBlocks\Collection\Operations\Compare;
+namespace Test\TinyBlocks\Collection\Operations\Compare;
 
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use stdClass;
+use Test\TinyBlocks\Collection\Models\CryptoCurrency;
 use TinyBlocks\Collection\Collection;
-use TinyBlocks\Collection\Models\CryptoCurrency;
 
 final class CollectionContainsOperationTest extends TestCase
 {

tests/Operations/Compare/CollectionEqualsOperationTest.php

@@ -2,13 +2,13 @@
 
 declare(strict_types=1);
 
-namespace TinyBlocks\Collection\Operations\Compare;
+namespace Test\TinyBlocks\Collection\Operations\Compare;
 
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use stdClass;
+use Test\TinyBlocks\Collection\Models\CryptoCurrency;
 use TinyBlocks\Collection\Collection;
-use TinyBlocks\Collection\Models\CryptoCurrency;
 
 final class CollectionEqualsOperationTest extends TestCase
 {

tests/Operations/Filter/CollectionFilterOperationTest.php

@@ -2,12 +2,12 @@
 
 declare(strict_types=1);
 
-namespace TinyBlocks\Collection\Operations\Filter;
+namespace Test\TinyBlocks\Collection\Operations\Filter;
 
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
+use Test\TinyBlocks\Collection\Models\CryptoCurrency;
 use TinyBlocks\Collection\Collection;
-use TinyBlocks\Collection\Models\CryptoCurrency;
 use TinyBlocks\Mapper\KeyPreservation;
 
 final class CollectionFilterOperationTest extends TestCase

tests/Operations/Order/CollectionSortOperationTest.php

@@ -2,14 +2,14 @@
 
 declare(strict_types=1);
 
-namespace TinyBlocks\Collection\Operations\Order;
+namespace Test\TinyBlocks\Collection\Operations\Order;
 
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
+use Test\TinyBlocks\Collection\Models\Amount;
 use TinyBlocks\Collection\Collection;
-use TinyBlocks\Collection\Models\Amount;
-use TinyBlocks\Collection\Models\Currency;
 use TinyBlocks\Collection\Order;
+use TinyBlocks\Currency\Currency;
 
 final class CollectionSortOperationTest extends TestCase
 {

tests/Operations/Retrieve/CollectionFindOperationTest.php

@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace TinyBlocks\Collection\Operations\Retrieve;
+namespace Test\TinyBlocks\Collection\Operations\Retrieve;
 
 use PHPUnit\Framework\TestCase;
+use Test\TinyBlocks\Collection\Models\CryptoCurrency;
 use TinyBlocks\Collection\Collection;
-use TinyBlocks\Collection\Models\CryptoCurrency;
 
 final class CollectionFindOperationTest extends TestCase
 {