Merge pull request #16 from PhantPHP/version-4

Version 4

.gitignore

@@ -4,8 +4,9 @@ vendor/*
 
 # Test
 .phpunit*
-public/code-coverage
+.public
 
 # Dev
 .DS_Store
 .nova/*
+.php-cs-fixer.cache

README.md

@@ -12,10 +12,8 @@ PHP >= 8.0
 
 ## Abstract
 
-- Aggregate
 - Collection
-- Entity
-- Enum
+- CollectionPaginated
 - Value
 	- Boolean
 	- Decimal
@@ -38,6 +36,12 @@ PHP >= 8.0
 
 - GpsCoordinates
 
+### Fr
+
+- CodeCommune
+- CodePostal
+- NumeroDepartement
+
 
 ## Id
 
@@ -52,16 +56,16 @@ PHP >= 8.0
 
 ## Number
 
-- Note
+- Grade
 - Rate
 
 
 ## Person
 
+- Birthday
 - Firstname
 - Gender
 - Lastname
-- Person
 
 
 ## Time

component/Abstract/Collection.php

@@ -1,55 +1,56 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Phant\DataStructure\Abstract;
 
 abstract class Collection
 {
-	protected array $items;
-
-	public function __construct()
-	{
-		$this->items = [];
-	}
-
-	protected function addItem(mixed $item): self
-	{
-		if (array_search($item, $this->items) == false) {
-			$this->items[] = $item;
-		}
-
-		return $this;
-	}
-
-	protected function removeItem(mixed $item): self
-	{
-		if (($key = array_search($item, $this->items)) !== false) {
-			unset($this->items[ $key ]);
-			$this->items = array_values($this->items);
-		}
-
-		return $this;
-	}
-
-	public function itemsIterator(): \Generator
-	{
-		foreach ($this->items as $item) {
-			yield $item;
-		}
-	}
-
-	public function isEmpty(): bool
-	{
-		return empty($this->items);
-	}
-
-	public function getNbItems(): int
-	{
-		return count($this->items);
-	}
-
-	public function getByKey(int $key): mixed
-	{
-		return $this->items[ $key ] ?? null;
-	}
+    protected array $items;
+
+    public function __construct()
+    {
+        $this->items = [];
+    }
+
+    protected function addItem(mixed $item): self
+    {
+        if (array_search($item, $this->items) == false) {
+            $this->items[] = $item;
+        }
+
+        return $this;
+    }
+
+    protected function removeItem(mixed $item): self
+    {
+        if (($key = array_search($item, $this->items)) !== false) {
+            unset($this->items[ $key ]);
+            $this->items = array_values($this->items);
+        }
+
+        return $this;
+    }
+
+    public function itemsIterator(): \Generator
+    {
+        foreach ($this->items as $item) {
+            yield $item;
+        }
+    }
+
+    public function isEmpty(): bool
+    {
+        return empty($this->items);
+    }
+
+    public function getNbItems(): int
+    {
+        return count($this->items);
+    }
+
+    public function getByKey(int $key): mixed
+    {
+        return $this->items[ $key ] ?? null;
+    }
 }

component/Abstract/CollectionPaginated.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Phant\DataStructure\Abstract;
@@ -7,89 +8,88 @@
 
 abstract class CollectionPaginated extends Collection
 {
-	private ?int $itemPage;
-	private ?int $itemByPage;
-	private ?int $itemTotal;
-
-	private ?int $pageCurrent;
-	private ?int $pageTotal;
-
-	public function __construct(
-		?int $pageCurrent = null,
-		?int $itemByPage = null,
-		?int $itemTotal = null
-	)
-	{
-		$this->itemByPage = $itemByPage;
-		$this->itemTotal = $itemTotal;
-		$this->itemPage = null;
-
-		$this->pageCurrent = $pageCurrent;
-		$this->pageTotal = null;
-
-		parent::__construct();
-	}
-
-	public function getItemByPage(): ?int
-	{
-		return $this->itemByPage;
-	}
-
-	public function getItemTotal(): ?int
-	{
-		return $this->itemTotal;
-	}
-
-	public function getItemPage(): ?int
-	{
-		return $this->itemPage;
-	}
-
-	public function getPageCurrent(): ?int
-	{
-		return $this->pageCurrent;
-	}
-
-	public function getPageTotal(): ?int
-	{
-		return $this->pageTotal;
-	}
-
-	protected function addItem(mixed $item): self
-	{
-		parent::addItem($item);
-
-		$this->paginationCalculation();
-
-		return $this;
-	}
-
-	protected function removeItem(mixed $item): self
-	{
-		parent::removeItem($item);
-
-		$this->paginationCalculation();
-
-		return $this;
-	}
-
-	protected function paginationCalculation(): void
-	{
-		$this->itemPageCalculation();
-		$this->pageTotalCalculation();
-	}
-
-	private function itemPageCalculation(): void
-	{
-		$this->itemPage = $this->getNbItems();
-	}
-
-	private function pageTotalCalculation(): void
-	{
-		$this->pageTotal = 0;
-
-		if ($this->itemTotal && $this->itemByPage) {
-			$this->pageTotal = (int)ceil($this->itemTotal / $this->itemByPage);
-		}
-	}
+    private ?int $itemPage;
+    private ?int $itemByPage;
+    private ?int $itemTotal;
+
+    private ?int $pageCurrent;
+    private ?int $pageTotal;
+
+    public function __construct(
+        ?int $pageCurrent = null,
+        ?int $itemByPage = null,
+        ?int $itemTotal = null
+    ) {
+        $this->itemByPage = $itemByPage;
+        $this->itemTotal = $itemTotal;
+        $this->itemPage = null;
+
+        $this->pageCurrent = $pageCurrent;
+        $this->pageTotal = null;
+
+        parent::__construct();
+    }
+
+    public function getItemByPage(): ?int
+    {
+        return $this->itemByPage;
+    }
+
+    public function getItemTotal(): ?int
+    {
+        return $this->itemTotal;
+    }
+
+    public function getItemPage(): ?int
+    {
+        return $this->itemPage;
+    }
+
+    public function getPageCurrent(): ?int
+    {
+        return $this->pageCurrent;
+    }
+
+    public function getPageTotal(): ?int
+    {
+        return $this->pageTotal;
+    }
+
+    protected function addItem(mixed $item): self
+    {
+        parent::addItem($item);
+
+        $this->paginationCalculation();
+
+        return $this;
+    }
+
+    protected function removeItem(mixed $item): self
+    {
+        parent::removeItem($item);
+
+        $this->paginationCalculation();
+
+        return $this;
+    }
+
+    protected function paginationCalculation(): void
+    {
+        $this->itemPageCalculation();
+        $this->pageTotalCalculation();
+    }
+
+    private function itemPageCalculation(): void
+    {
+        $this->itemPage = $this->getNbItems();
+    }
+
+    private function pageTotalCalculation(): void
+    {
+        $this->pageTotal = 0;
+
+        if ($this->itemTotal && $this->itemByPage) {
+            $this->pageTotal = (int)ceil($this->itemTotal / $this->itemByPage);
+        }
+    }
 }