Merge branch 'master' of https://github.com/metaregistrar/php-epp-client

Author: metaregistrar

Protocols/EPP/eppException.php

@@ -14,6 +14,10 @@ class eppException extends \Exception {
      * @var string
      */
     private $lastcommand = null;
+    /**
+     * @var $response
+     */
+    private $response = null;
 
     /**
      * eppException constructor.
@@ -23,8 +27,9 @@ class eppException extends \Exception {
      * @param string $reason
      * @param int $id
      * @param string $command
+     * @param \Metaregistrar\EPP\eppResponse|null $response
      */
-    public function __construct($message = "", $code = 0, \Exception $previous = null, $reason = null, $command = null) {
+    public function __construct($message = "", $code = 0, \Exception $previous = null, $reason = null, $command = null, $response = null) {
         $this->reason = $reason;
         $trace = $this->getTrace();
         $this->class = null;
@@ -35,6 +40,7 @@ public function __construct($message = "", $code = 0, \Exception $previous = nul
             /* @var $class \Metaregistrar\EPP\eppRequest */
             $this->lastcommand = $command;
         }
+        $this->response = $response;
         parent::__construct($message, $code, $previous);
     }
 
@@ -58,5 +64,12 @@ public function getClass() {
     public function getReason() {
         return $this->reason;
     }
+
+    /**
+     * @return \Metaregistrar\EPP\eppResponse|null
+     */
+    public function getResponse() {
+        return $this->response;
+    }
 }
 

Protocols/EPP/eppExtensions/no-ext-domain-1.1/eppData/noridEppDomain.php

@@ -8,7 +8,7 @@ class noridEppDomain extends eppDomain {
     private $extNotifyEmail = null;
     private $extDeleteFromDNS = null;
     private $extDeleteFromRegistry = null;
-    private $extApplicantDatasetVersionNumber = '2.0';
+    private $extApplicantDatasetVersionNumber = '3.0';
     private $extApplicantDatasetAcceptName = null;
     private $extApplicantDatasetAcceptDate = null;
 

Protocols/EPP/eppExtensions/no-ext-domain-1.1/eppRequests/noridEppTransferRequest.php

@@ -13,11 +13,11 @@ class noridEppTransferRequest extends eppTransferRequest {
 
     function __construct($operation, $object) {
         parent::__construct($operation, $object);
-        $remove = $this->getElementsByTagName('command');
-        foreach ($remove as $node) {
-            $node->parentNode->removeChild($node);
-        }
         if ($operation == self::OPERATION_EXECUTE) {
+            $remove = $this->getElementsByTagName('command');
+            foreach ($remove as $node) {
+                $node->parentNode->removeChild($node);
+            }
             if ($object instanceof noridEppDomain) {
                 $this->setExtDomainExecute($object);
             } else {

Protocols/EPP/eppExtensions/no-ext-domain-1.1/eppRequests/noridEppUpdateDomainRequest.php

@@ -7,9 +7,23 @@ class noridEppUpdateDomainRequest extends eppDnssecUpdateDomainRequest {
 
     use noridEppDomainRequestTrait;
 
-    function __construct(noridEppDomain $domain, $addinfo = null, $removeinfo = null, $updateinfo = null, $forcehostattr = false, $namespacesinroot = true) {
-        parent::__construct($domain, $addinfo, $removeinfo, $updateinfo, $forcehostattr, $namespacesinroot);
-        $this->setExtDomain($domain);
+    function __construct($objectname, $addinfo = null, $removeinfo = null, $updateinfo = null, $forcehostattr = false, $namespacesinroot = true) {
+        if ($objectname instanceof eppDomain) {
+            $domainname = $objectname->getDomainName();
+        } else {
+            $domainname = $objectname;
+        }
+        if ($updateinfo === null) {
+            $updateinfo = new noridEppDomain($domainname);
+        }
+        if ($objectname instanceof noridEppDomain) {
+            $dataset = $objectname->getExtApplicantDataset();
+            if ($dataset['versionNumber'] !== null && $dataset['acceptName'] !== null && $dataset['acceptDate'] !== null) {
+                $updateinfo->setExtApplicantDataset($dataset['versionNumber'], $dataset['acceptName'], $dataset['acceptDate']);
+            }
+        }
+        parent::__construct($domainname, $addinfo, $removeinfo, $updateinfo, $forcehostattr, $namespacesinroot);
+        $this->setExtDomain($updateinfo);
         $this->addSessionId();
     }
 
@@ -20,8 +34,12 @@ public function setExtDomain(noridEppDomain $domain) {
 
     private function addDomainExtApplicantDataset(noridEppDomain $domain) {
         $dataset = $domain->getExtApplicantDataset();
-        if ($domain->getRegistrant() && (is_null($dataset['versionNumber']) || is_null($dataset['acceptName']) || is_null($dataset['acceptDate']))) {
-            throw new eppException('A valid applicant dataset is required to perform an owner change on a domain in the Norid registry');
+        if ($dataset['versionNumber'] === null || $dataset['acceptName'] === null || $dataset['acceptDate'] === null) {
+            if ($domain->getRegistrant()) {
+                throw new eppException('A valid applicant dataset is required to perform an owner change on a domain in the Norid registry');
+            } else {
+                return;
+            }
         }
         $datasetElement = $this->createElement('no-ext-domain:applicantDataset');
         $datasetElement->appendChild($this->createElement('no-ext-domain:versionNumber', $dataset['versionNumber']));

Protocols/EPP/eppExtensions/nsgroup-1.0/eppResponses/dnsbeEppInfoNsgroupResponse.php

@@ -48,10 +48,10 @@ public function getNsgroupHosts() {
         $xpath = $this->xPath();
         $result = $xpath->query('/epp:epp/epp:response/epp:resData/nsgroup:infData/nsgroup:ns');
         if ($result->length > 0) {
-            foreach ($result->item as $item) {
+            foreach ($result as $item) {
                 $return[] = $item->nodeValue;
             }
         }
         return $return;
     }
-}
+}

Protocols/EPP/eppResponses/eppResponse.php

@@ -182,10 +182,10 @@ public function Success() {
             }
             if ((is_array($this->exceptions)) && (count($this->exceptions)>0)) {
                 foreach ($this->exceptions as $exceptionhandler) {
-                    throw new $exceptionhandler($errorstring, $resultcode, null, $resultreason, $this->saveXML());
+                    throw new $exceptionhandler($errorstring, $resultcode, null, $resultreason, $this->saveXML(), $this);
                 }
             } else {
-                throw new eppException($errorstring, $resultcode, null, $resultreason, $this->saveXML());
+                throw new eppException($errorstring, $resultcode, null, $resultreason, $this->saveXML(), $this);
             }
 
         } else {