AHN-2781: fix rdap structure

src/Domain/Constant/EventAction.php

@@ -36,6 +36,7 @@ final class EventAction extends Enum
     public const REREGISTRATION               = 'reregistration';
     public const LAST_CHANGED                 = 'last changed';
     public const EXPIRATION                   = 'expiration';
+    public const REGISTRAR_EXPIRATION         = 'registrar expiration';
     public const DELETION                     = 'deletion';
     public const REINSTANTIATION              = 'reinstantiation';
     public const TRANSFER                     = 'transfer';

src/Domain/Entity/Common.php

@@ -21,14 +21,6 @@
 
 abstract class Common
 {
-    public const DEFAULT_RDAP_CONFORMANCE = 'rdap_level_0';
-
-    /**
-     * @var string[] The data structure named "rdapConformance" is an array of strings,
-     * each providing a hint as to the specifications used in the construction of the response.
-     * This data structure appears only in the topmost JSON object of a response.
-     */
-    private $rdapConformance = [self::DEFAULT_RDAP_CONFORMANCE];
 
     /**
      * @var ObjectClassName
@@ -76,14 +68,6 @@ public function __construct(ObjectClassName $objectClassName)
         $this->objectClassName = $objectClassName;
     }
 
-    /**
-     * @return string[]
-     */
-    public function getRdapConformance(): array
-    {
-        return $this->rdapConformance;
-    }
-
     /**
      * @return Link[]|null
      */
@@ -143,22 +127,11 @@ public function getPort43(): ?DomainName
     /**
      * @return Status[]|null
      */
-    public function getStatuses(): ?array
+    public function getStatus(): ?array
     {
         return $this->status;
     }
 
-    /**
-     * @param string $rdapConformance
-     * @return Common
-     */
-    public function addRdapConformance(string $rdapConformance): Common
-    {
-        $this->rdapConformance[] = $rdapConformance;
-
-        return $this;
-    }
-
     /**
      * @param Link $link
      * @return Common

src/Domain/Entity/Domain.php

@@ -18,6 +18,8 @@
 
 final class Domain extends Common
 {
+    use TopMostEntityTrait;
+
     /**
      * @var DomainName
      */
@@ -58,11 +60,16 @@ final class Domain extends Common
      */
     private $network;
 
+    /** @var  array */
+    private $redacted;
+
     public function __construct(DomainName $ldhName)
     {
         parent::__construct(ObjectClassName::DOMAIN());
 
         $this->ldhName = $ldhName->toLDH();
+
+        $this->secureDNS = new SecureDNS();
     }
 
     /**
@@ -123,7 +130,11 @@ public function getSecureDNS(): ?SecureDNS
      */
     public function getEntities(): ?array
     {
-        return $this->entities;
+        if (empty($this->entities['entities'])) {
+            return $this->entities ?? [];
+        }
+
+        return $this->entities['entities'];
     }
 
     /**
@@ -207,6 +218,7 @@ public function addEntity(Entity $entity): Domain
         if ($this->entities === null) {
             $this->entities = [];
         }
+
         $this->entities[] = $entity;
 
         return $this;
@@ -222,4 +234,34 @@ public function setNetwork(IPNetwork $network): Domain
 
         return $this;
     }
+
+    public function getRedacted(): array
+    {
+        if (empty($this->redacted)) {
+            $this->setDefaultRedactedRules();
+        }
+
+        return $this->redacted;
+    }
+
+    private function setDefaultRedactedRules(): void
+    {
+        $this->redacted = [];
+        foreach (($this->getEntities() ?? []) as $k => $v) {
+            if ($v->getHandle() !== null) {
+                continue;
+            }
+            $this->redacted[] = [
+                'name' => [
+                    'type' => 'Registry registrant ID',
+                ],
+                'prePath' => "$.entities[{$k}].handle",
+                'pathLang' => "jsonpath",
+                'method' => 'removal',
+                'reason' => [
+                    'description' => 'Server policy',
+                ]
+            ];
+        }
+    }
 }

src/Domain/Entity/Entity.php

@@ -91,19 +91,20 @@ public function setHandle(?string $handle): void
     /**
      * @return VCard[]|null
      */
-    public function getVcardArray(): ?array
+    public function getVcardArray()
     {
         return $this->vcardArray;
     }
 
     /**
      * @param VCard $vcard
      */
-    public function addVcard(VCard $vcard): void
+    public function addVcard( $vcard): void
     {
         if (empty($this->vcardArray)) {
-            $this->vcardArray = [];
+            $this->vcardArray = ['vcard'];
         }
+
         $this->vcardArray[] = $vcard;
     }
 

src/Domain/Entity/TopMostEntityTrait.php

@@ -0,0 +1,48 @@
+<?php
+declare(strict_types=1);
+
+namespace hiqdev\rdap\core\Domain\Entity;
+
+/**
+ * Trait TopMostEntityTrait
+ *
+ * @author Dmytro Naumenko <d.naumenko.a@gmail.com>
+ */
+trait TopMostEntityTrait
+{
+    /**
+     * @var string[] The data structure named "rdapConformance" is an array of strings,
+     * each providing a hint as to the specifications used in the construction of the response.
+     * This data structure appears only in the topmost JSON object of a response.
+     */
+    private $rdapConformance = [
+        'rdap_level_0',
+        'icann_rdap_technical_implementation_guide_1',
+        'icann_rdap_response_profile_1',
+        'redacted'
+    ];
+
+    /**
+     * @return string[]
+     */
+    public function getRdapConformance(): array
+    {
+        return $this->rdapConformance;
+    }
+
+    /**
+     * @param string[] $rdapConformance
+     */
+    public function setRdapConformance(array $rdapConformance): void
+    {
+        $this->rdapConformance = $rdapConformance;
+    }
+
+    /**
+     * @param string $rdapConformance
+     */
+    public function addRdapConformance(string $rdapConformance): void
+    {
+        $this->rdapConformance[] = $rdapConformance;
+    }
+}

src/Domain/Entity/VCard.php

@@ -0,0 +1,130 @@
+<?php
+
+namespace hiqdev\rdap\core\Domain\Entity;
+
+final class VCard implements \JsonSerializable
+{
+    const VERSION = '4.0';
+
+    /** @var array */
+    private $availableProperties = [
+        'version' => 'text',
+        'fn' => 'text',
+        'n' => 'text',
+        'tel' => 'text',
+        'email' => 'text',
+        'org' => 'text',
+        'adr' => 'text',
+        'url'  => 'uri',
+    ];
+
+    /** @var array  */
+    private $vCard;
+
+    public function __construct(array $vCard = [])
+    {
+        $this->setVersion(self::VERSION);
+        array_merge($this->vCard, $vCard);
+    }
+
+    public function jsonSerialize()
+    {
+        return array_values($this->vCard);
+    }
+
+    public function setVersion(string $version): VCard
+    {
+        return $this->setPropery('version', $version);
+    }
+
+    public function setFullName(string $name, array $properties = []): VCard
+    {
+        return $this->setPropery('fn', $name, $properties);
+    }
+
+    public function setName(string $name, array $properties = []): VCard
+    {
+        return $this->setPropery('n', $name, $properties);
+    }
+
+    public function setEmail(string $email, array $properties = []): VCard
+    {
+        return $this->setPropery('email', $email, $properties);
+    }
+
+    public function setOrg(?string $org = null, array $properties = []): VCard
+    {
+        if (empty($org)) {
+            return $this;
+        }
+
+        return $this->setPropery('org', $org, $properties);
+    }
+
+    public function setCompany(?string $company = null, array $properties = []): VCard
+    {
+        return $this->setOrg($company, $properties);
+    }
+
+    public function setUrl(string $url, array $properties = []): VCard
+    {
+        return $this->setPropery('url', $url, $properties);
+    }
+
+    public function setTel(string $tel, array $properties = []): VCard
+    {
+        if (empty($properties) || empty($properties['type'])) {
+            $properties['type'] = 'voice';
+        }
+
+        return $this->setPropery('tel', $tel, $properties);
+    }
+
+    public function setAddress(
+        string $street,
+        string $city,
+        ?string $state = '',
+        string $zip,
+        ?string $country = null,
+        string $ext = '',
+        string $name = '',
+        array $properties = []
+    ): VCard {
+        $properties['cc'] = strtoupper($properties['cc'] ?? $country);
+
+        $this->vCard['adr'] = [
+            'adr',
+            $properties,
+            $this->availableProperties['adr'],
+            [
+                $name,
+                $ext,
+                $street,
+                $city,
+                $state,
+                $zip,
+                '',
+            ],
+        ];
+        return $this;
+    }
+
+    /**
+     * @return array
+     */
+    public function getVCard(): array
+    {
+        return $this->vCard;
+    }
+
+    protected function setPropery(string $property, string $value, array $properties = [], string $type = 'text'): VCard
+    {
+        $this->vCard[$property] = [
+            $property,
+            empty($properties) ? new \stdClass() : $properties,
+            $this->availableProperties[$property] ?? $type,
+            $value
+        ];
+        return $this;
+    }
+}

src/Domain/ValueObject/Event.php

@@ -33,7 +33,7 @@ final class Event
     /**
      * @var Link[]
      */
-    private $links = [];
+    private $links;
 
     private function __construct(EventAction $eventAction, DateTimeImmutable $eventDate)
     {
@@ -88,8 +88,8 @@ public function getEventDate(): DateTimeImmutable
     /**
      * @return Link[]
      */
-    public function getLinks(): array
+    public function getLinks(): ?array
     {
-        return $this->links;
+        return $this->links ?? null;
     }
 }

src/Domain/ValueObject/Link.php

@@ -86,7 +86,7 @@ public function setType(string $type): void
      */
     public function getType(): ?string
     {
-        return $this->type;
+        return $this->type ?? 'text/html';
     }
 
     /**
@@ -148,7 +148,7 @@ public function setTitle(string $title): void
      */
     public function getValue(): ?string
     {
-        return $this->value;
+        return $this->value ?? $this->getHref();
     }
 
     /**