v1.1.0

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024 Anton Petrenko
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

Makefile

@@ -13,10 +13,6 @@ inside:
 	docker exec -it ${CONTAINER_NAME} /bin/bash
 .PHONY: inside
 
-up80:
-	docker-compose -f docker/docker-compose-php80.yml up -d
-.PHONY: up80
-
 up81:
 	docker-compose -f docker/docker-compose-php81.yml up -d
 .PHONY: up81

README.md

@@ -60,7 +60,7 @@ All getters are provided using the `__call()` magic method.
 
 ### Exceptions
 
-Main library exception is [DtoException](./src/Exception/DtoException.php). 
+Main library exception is [DtoException](./src/Exception/DtoException.php).
 
 There are [3 groups of exceptions](./src/Exception/DtoException): InitDtoException, SetupDtoException and 
 HandleDtoException
@@ -73,7 +73,7 @@ HandleDtoException
 | 104  | Dto: %s | Property: %s | Err: Unsupported object property type declaration                          | ObjectDeclarationException        | InitDtoException   |
 | 105  | Dto: %s | Property: %s | Err: Class must implement DtoInterface                                     | NotDtoClassDeclarationException   | InitDtoException   |
 | 106  | Dto: %s | Property: %s | Err: No backing value for enum                                             | EnumNoBackingValueException       | InitDtoException   |
-| 107  | DtoCollection: %s &#124 Err: Invalid constructor declaration                                                  | DtoCollectionConstructorException | InitDtoException   |
+| 107  | DtoCollection: %s | Err: Invalid constructor declaration                                                 | DtoCollectionConstructorException | InitDtoException   |
 | 201  | DtoCollection: %s | Expected Dto: %s | Given Dto: %s                                                | AddDtoException                   | SetupDtoException  |
 | 202  | Dto: %s | Property: %s | Err: No data                                                               | InputDataException                | SetupDtoException  |
 | 203  | Dto: %s | Property: %s | Expected type: %s | Given type: %s | Value: %s                   | SetValueException                 | SetupDtoException  |
@@ -112,7 +112,7 @@ class ProductDto extends Dto
     protected bool $available;
 }
 
-// Array or instance of Arrayable interface:
+// Array or instance of Arrayable interface
 $info = [
     'key' => 'value',
 ];
@@ -336,8 +336,7 @@ composer check-all
 
 ## License
 
-The [php-dto](https://github.com/PetrenkoAnton/php-dto/) library is open-sourced software licensed under the 
-[MIT license](https://opensource.org/licenses/MIT).
+The [php-dto](https://github.com/PetrenkoAnton/php-dto/) library is open-sourced software licensed under the [MIT license](./LICENSE).
 
 ## Related projects
 

VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

src/Dto.php

@@ -6,6 +6,7 @@
 
 use Collection\Arrayable;
 use Collection\Collectable;
+use Collection\Helper;
 use Dto\Exception\DtoException;
 use Dto\Exception\DtoException\HandleDtoException\GetValueException;
 use Dto\Exception\DtoException\InitDtoException\DeclarationException;
@@ -83,7 +84,7 @@ public function __construct(array $data)
                 );
             } catch (EnumNoBackingValueException $e) {
                 throw $e;
-            } catch (Throwable) {
+            } catch (Throwable $e) {
                 throw new SetValueException(
                     dto: $this::class,
                     property: $name,
@@ -247,9 +248,6 @@ private function setBuiltinType(string $typeName, string $propertyName, mixed $v
         $this->{$propertyName} = $value;
     }
 
-    /**
-     * @throws ReflectionException
-     */
     private function setDtoCollectionType(string $typeName, string $propertyName, array $values): void
     {
         $collection = new $typeName();

src/DtoCollection.php

@@ -6,10 +6,12 @@
 
 use Collection\Collectable;
 use Collection\Collection;
-use Collection\Exception\CollectionException;
-use Collection\Exception\CollectionException\InvalidItemTypeCollectionException;
+use Collection\Exception\CollectionException\InvalidConstructorDeclarationException;
+use Collection\Exception\CollectionException\InvalidItemTypeException;
+use Collection\Helper;
+use Dto\Exception\DtoException;
+use Dto\Exception\DtoException\InitDtoException\DtoCollectionConstructorException;
 use Dto\Exception\DtoException\SetupDtoException\AddDtoException;
-use ReflectionException;
 
 abstract class DtoCollection extends Collection
 {
@@ -19,18 +21,16 @@ public function __construct(Dto ...$items)
     }
 
     /**
-     * @throws CollectionException
-     * @throws AddDtoException
-     * @throws ReflectionException
+     * @throws DtoException
      */
     public function add(Collectable $item): void
     {
         try {
             parent::add($item);
-        } catch (InvalidItemTypeCollectionException) {
-            $expectedDto = Helper::getConstructorFirstParameterClassName($this);
-
-            throw new AddDtoException($this::class, $expectedDto, $item::class);
+        } catch (InvalidItemTypeException) {
+            throw new AddDtoException($this::class, Helper::getConstructorFirstParameterClassName($this), $item::class);
+        } catch (InvalidConstructorDeclarationException) {
+            throw new DtoCollectionConstructorException($this::class);
         }
     }
 }

tests/DtoCollectionTest.php

@@ -5,13 +5,16 @@
 namespace Test;
 
 use Collection\Exception\CollectionException;
-use Collection\Exception\CollectionException\InvalidKeyCollectionException;
+use Collection\Exception\CollectionException\InvalidKeyException;
 use Dto\Exception\DtoException;
+use Dto\Exception\DtoException\InitDtoException\DtoCollectionConstructorException;
 use Dto\Exception\DtoException\SetupDtoException;
 use PHPUnit\Framework\TestCase;
 use Tests\Fixtures\PersonDto;
 use Tests\Fixtures\PersonDtoCollection;
 use Tests\Fixtures\ProductDto;
+use Tests\Fixtures\Unsupported\EmptyClassDto;
+use Tests\Fixtures\Unsupported\InvalidContructorDtoCollection;
 
 class DtoCollectionTest extends TestCase
 {
@@ -107,7 +110,7 @@ public function testAddMethodSuccess(): void
      */
     public function testGetMethodThrowsInvalidKeyCollectionException(int $key): void
     {
-        $this->expectException(InvalidKeyCollectionException::class);
+        $this->expectException(InvalidKeyException::class);
         $this->expectExceptionMessage("Collection: Tests\Fixtures\PersonDtoCollection | Invalid key: $key");
         $this->expectExceptionCode(200);
         $this->dtoCollection->getItem($key);
@@ -127,7 +130,6 @@ public function dpInvalidKeys(): array
 
     /**
      * @throws DtoException
-     * @throws CollectionException
      *
      * @group ok
      */
@@ -153,4 +155,20 @@ public function testAddMethodThrowsSetupDtoException(): void
         $this->expectExceptionCode(201);
         $dtoCollection->add($productDto);
     }
+
+    /**
+     * @throws DtoCollectionConstructorException
+     *
+     * @group ok
+     */
+    public function testAddMethodThrowsDtoCollectionConstructorException(): void
+    {
+        $this->expectException(DtoCollectionConstructorException::class);
+        // phpcs:ignore
+        $this->expectExceptionMessage('DtoCollection: Tests\Fixtures\Unsupported\InvalidContructorDtoCollection | Err: Invalid constructor declaration');
+        $this->expectExceptionCode(107);
+
+        $dtoCollection = new InvalidContructorDtoCollection(1);
+        $dtoCollection->add(new EmptyClassDto([]));
+    }
 }

tests/Fixtures/Unsupported/EmptyClassDto.php

@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Fixtures\Unsupported;
+
+use Dto\Dto;
+
+class EmptyClassDto extends Dto
+{
+}

tests/Fixtures/Unsupported/InvalidContructorDtoCollection.php

@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Fixtures\Unsupported;
+
+use Dto\DtoCollection;
+
+class InvalidContructorDtoCollection extends DtoCollection
+{
+    /**
+     * @psalm-suppress UnusedProperty
+     */
+    private int $id;
+
+    // Invalid constructor declaration
+    public function __construct(int $id)
+    {
+        $this->id = $id;
+    }
+}