Move CV data to a dedicated namespace

Author: Mopolo

src/DataBuilder.php

@@ -5,8 +5,8 @@
 
 use CuyZ\Valinor\Mapper\Source\Source;
 use CuyZ\Valinor\MapperBuilder;
-use Mopolo\Cv\Definition\Data;
-use Mopolo\Cv\Definition\Image;
+use Mopolo\Cv\Definition\Cv\Data;
+use Mopolo\Cv\Definition\Cv\Image;
 use SplFileObject;
 
 final class DataBuilder

src/Definition/Contact.php renamed to src/Definition/Cv/Contact.php

@@ -1,20 +1,19 @@
 <?php
 declare(strict_types=1);
 
-namespace Mopolo\Cv\Definition;
+namespace Mopolo\Cv\Definition\Cv;
 
 use Mopolo\Cv\Support\Str;
-
 use function base64_decode;
 use function base64_encode;
 
-final class Contact
+final readonly class Contact
 {
-    public readonly string $email;
-    public readonly string $linkedin;
-    public readonly string $twitter;
+    public string $email;
+    public string $linkedin;
+    public string $twitter;
 
-    public readonly Mastodon $mastodon;
+    public Mastodon $mastodon;
 
     public function __construct(
         string $email,

src/Definition/Cv/Data.php

@@ -0,0 +1,24 @@
+<?php
+declare(strict_types=1);
+
+namespace Mopolo\Cv\Definition\Cv;
+
+final readonly class Data
+{
+    /**
+     * @param array<Skill> $skills
+     * @param array<Work> $work
+     * @param array<Project> $projects
+     * @param array<School> $studies
+     */
+    public function __construct(
+        public Site    $site,
+        public Contact $contact,
+        public Links   $links,
+        public array   $skills,
+        public array   $work,
+        public array   $projects,
+        public array   $studies,
+    ) {
+    }
+}

src/Definition/Image.php renamed to src/Definition/Cv/Image.php

@@ -1,17 +1,17 @@
 <?php
 declare(strict_types=1);
 
-namespace Mopolo\Cv\Definition;
+namespace Mopolo\Cv\Definition\Cv;
 
 use function substr;
 
-final class Image
+final readonly class Image
 {
     /** @psalm-pure */
     public function __construct(
-        public readonly string $id,
-        public readonly string $url,
-        public readonly string $thumbnail,
+        public string $id,
+        public string $url,
+        public string $thumbnail,
     ) {
     }
 

src/Definition/Links.php renamed to src/Definition/Cv/Links.php

@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Mopolo\Cv\Definition;
+namespace Mopolo\Cv\Definition\Cv;
 
 final class Links
 {

src/Definition/Cv/Mastodon.php

@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Mopolo\Cv\Definition\Cv;
+
+final readonly class Mastodon
+{
+    public function __construct(
+        public string $url,
+        public string $username,
+    ) {
+    }
+}

src/Definition/Cv/Project.php

@@ -0,0 +1,23 @@
+<?php
+declare(strict_types=1);
+
+namespace Mopolo\Cv\Definition\Cv;
+
+final readonly class Project
+{
+    /**
+     * @param array<string> $tags
+     * @param array<Image> $images
+     * @param array<Section> $sections
+     */
+    public function __construct(
+        public string  $name,
+        public array   $tags = [],
+        public array   $images = [],
+        public ?string $highlights = null,
+        public array   $sections = [],
+        public ?string $url = null,
+        public ?string $summary = null,
+    ) {
+    }
+}

src/Definition/Cv/School.php

@@ -0,0 +1,14 @@
+<?php
+declare(strict_types=1);
+
+namespace Mopolo\Cv\Definition\Cv;
+
+final readonly class School
+{
+    public function __construct(
+        public int    $year,
+        public string $name,
+        public string $place,
+    ) {
+    }
+}

src/Definition/Cv/Section.php

@@ -0,0 +1,13 @@
+<?php
+declare(strict_types=1);
+
+namespace Mopolo\Cv\Definition\Cv;
+
+final readonly class Section
+{
+    public function __construct(
+        public string $name,
+        public string $highlights,
+    ) {
+    }
+}

src/Definition/Site.php renamed to src/Definition/Cv/Site.php

@@ -2,17 +2,17 @@
 
 declare(strict_types=1);
 
-namespace Mopolo\Cv\Definition;
+namespace Mopolo\Cv\Definition\Cv;
 
-use Mopolo\Cv\Definition\Site\Page;
+use Mopolo\Cv\Definition\Cv\Site\Page;
 
-final class Site
+final readonly class Site
 {
     /**
      * @param array<Page> $pages
      */
     public function __construct(
-        public readonly array $pages,
+        public array $pages,
     ) {
     }
 }