Merge pull request #346 from W0rma/php81

metaregistrar · web-flow · commit f8057586b0f2 · 2023-07-11T10:17:22.000+02:00
Fix deprecation warnings in PHP 8.1
diff --git a/Protocols/EPP/eppData/eppContact.php b/Protocols/EPP/eppData/eppContact.php
@@ -163,7 +163,7 @@ public function setEmail($email) {
 
     /**
      * Gets the email address
-     * @return string
+     * @return string|null
      */
     public function getEmail() {
         return $this->email;
@@ -205,7 +205,7 @@ public function setVoice($voice) {
 
     /**
      * Gets the phone number
-     * @return string
+     * @return string|null
      */
     public function getVoice() {
         return $this->voice;
diff --git a/Protocols/EPP/eppData/eppContactPostalInfo.php b/Protocols/EPP/eppData/eppContactPostalInfo.php
@@ -33,7 +33,9 @@ class eppContactPostalInfo {
      * @param string $type POSTAL_TYPE_LOC or POSTAL_TYPE_INT
      */
     public function __construct($name = null, $city = null, $countrycode = null, $organisationName = null, $street = null, $province = null, $zipcode = null, $type = eppContact::TYPE_AUTO) {
-        $this->setName($name);
+        if (null !== $name) {
+            $this->setName($name);
+        }
         #
         # Street can be an array of max 3 streets, or a string with an address
         #
@@ -190,7 +192,7 @@ public function setProvince($province) {
 
     /**
      * Gets the province
-     * @return string
+     * @return string|null
      */
     public function getProvince() {
         return $this->province;
diff --git a/Protocols/EPP/eppData/eppDomain.php b/Protocols/EPP/eppData/eppDomain.php
@@ -336,7 +336,7 @@ public function setAuthorisationCode($authorisationCode) {
 
     /**
      *
-     * @return string
+     * @return string|null
      */
     public function getAuthorisationCode() {
         return $this->authorisationCode;
diff --git a/Protocols/EPP/eppData/eppHost.php b/Protocols/EPP/eppData/eppHost.php
@@ -56,7 +56,7 @@ public function  __construct($hostname, $ipaddress = null, $hoststatus = null) {
                 }
             }
         } else {
-            if (strlen($ipaddress)) {
+            if (is_string($ipaddress) && strlen($ipaddress)) {
                 $this->setIpAddress($ipaddress);
             }
         }
@@ -67,7 +67,7 @@ public function  __construct($hostname, $ipaddress = null, $hoststatus = null) {
                 }
             }
         } else {
-            if (strlen($hoststatus)) {
+            if (is_string($hoststatus) && strlen($hoststatus)) {
                 $this->setHostStatus($hoststatus);
             }
         }
diff --git a/Protocols/EPP/eppRequests/eppCreateDomainRequest.php b/Protocols/EPP/eppRequests/eppCreateDomainRequest.php
@@ -122,7 +122,7 @@ public function setDomain(eppDomain $domain) {
                 }
             }
         }
-        if (strlen($domain->getAuthorisationCode())) {
+        if (is_string($domain->getAuthorisationCode()) && strlen($domain->getAuthorisationCode())) {
             $authinfo = $this->createElement('domain:authInfo');
             if ($this->useCdata()) {
                 $pw = $authinfo->appendChild($this->createElement('domain:pw'));
diff --git a/Protocols/EPP/eppRequests/eppTransferRequest.php b/Protocols/EPP/eppRequests/eppTransferRequest.php
@@ -152,7 +152,7 @@ public function setDomainCancel(eppDomain $domain) {
      * @param eppDomain $domain
      */
     private function addAuthcode($domain) {
-        if (strlen($domain->getAuthorisationCode())>0) {
+        if (is_string($domain->getAuthorisationCode()) && strlen($domain->getAuthorisationCode())>0) {
             $authinfo = $this->createElement('domain:authInfo');
             if ($this->useCdata()) {
                 $pw = $authinfo->appendChild($this->createElement('domain:pw'));
@@ -190,7 +190,7 @@ public function setDomainRequest(eppDomain $domain) {
             $domainperiod->setAttribute('unit', eppDomain::DOMAIN_PERIOD_UNIT_Y);
             $this->domainobject->appendChild($domainperiod);
         }
-        if (strlen($domain->getAuthorisationCode())) {
+        if (is_string($domain->getAuthorisationCode()) && strlen($domain->getAuthorisationCode())) {
             $authinfo = $this->createElement('domain:authInfo');
             if ($this->useCdata()) {
                 $pw = $authinfo->appendChild($this->createElement('domain:pw'));
diff --git a/Protocols/EPP/eppRequests/eppUpdateContactRequest.php b/Protocols/EPP/eppRequests/eppUpdateContactRequest.php
@@ -115,7 +115,7 @@ private function addContactChanges($element, eppContact $contact) {
                 if (strlen($postal->getCity())) {
                     $postaladdr->appendChild($this->createElement('contact:city', $postal->getCity()));
                 }
-                if (strlen($postal->getProvince())) {
+                if (is_string($postal->getProvince()) && strlen($postal->getProvince())) {
                     $postaladdr->appendChild($this->createElement('contact:sp', $postal->getProvince()));
                 }
                 if (strlen($postal->getZipcode())) {
@@ -129,15 +129,15 @@ private function addContactChanges($element, eppContact $contact) {
             $element->appendChild($postalinfo);
         }
         // Mandatory field
-        if (strlen($contact->getVoice())) {
+        if (is_string($contact->getVoice()) && strlen($contact->getVoice())) {
             $element->appendChild($this->createElement('contact:voice', $contact->getVoice()));
         }
         // Optional field, may be empty
         if (!is_null($contact->getFax())) {
             $element->appendChild($this->createElement('contact:fax', $contact->getFax()));
         }
         // Mandatory field
-        if (strlen($contact->getEmail())) {
+        if (is_string($contact->getEmail()) && strlen($contact->getEmail())) {
             $element->appendChild($this->createElement('contact:email', $contact->getEmail()));
         }
         // Optional field, may be empty
diff --git a/Protocols/EPP/eppRequests/eppUpdateDomainRequest.php b/Protocols/EPP/eppRequests/eppUpdateDomainRequest.php
@@ -95,14 +95,15 @@ protected function addDomainChanges($element, eppDomain $domain) {
                 $this->addDomainStatus($element, $status);
             }
         }
-        if (strlen($domain->getAuthorisationCode())) {
+        $authcode = $domain->getAuthorisationCode();
+        if (is_string($authcode) && strlen($authcode)) {
             $authinfo = $this->createElement('domain:authInfo');
             if ($this->useCdata()) {
                 $pw = $this->createElement('domain:pw');
-                $pw->appendChild($this->createCDATASection($domain->getAuthorisationCode()));
+                $pw->appendChild($this->createCDATASection($authcode));
             }
             else {
-                $pw = $this->createElement('domain:pw',$domain->getAuthorisationCode());
+                $pw = $this->createElement('domain:pw',$authcode);
             }
             $authinfo->appendChild($pw);
             $element->appendChild($authinfo);
diff --git a/Protocols/EPP/eppResponses/eppResponse.php b/Protocols/EPP/eppResponses/eppResponse.php
@@ -109,6 +109,7 @@ public function findNamespace($namespace) {
         return false;
     }
 
+    #[\ReturnTypeWillChange]
     public function saveXML(\DOMNode $node = NULL, $options = NULL) {
         return str_replace("\t", '  ', parent::saveXML($node, LIBXML_NOEMPTYTAG));
     }
@@ -202,7 +203,7 @@ public function Success() {
                 $errorstring .= '; ' . $id;
             }
             $resultreason = $this->getResultReason();
-            if (strlen($resultreason)) {
+            if (is_string($resultreason) && strlen($resultreason)) {
                 $errorstring .= ' (' . $resultreason . ')';
             }
             if ((is_array($this->exceptions)) && (count($this->exceptions)>0)) {
diff --git a/Protocols/TMCH/tmchData/tmchClaimData.php b/Protocols/TMCH/tmchData/tmchClaimData.php
@@ -167,6 +167,7 @@ public function __destruct() {
      * @param null $options
      * @return mixed
      */
+    #[\ReturnTypeWillChange]
     public function saveXML(\DOMNode $node = null, $options = null) {
         return str_replace("\t", '  ', parent::saveXML($node, LIBXML_NOEMPTYTAG));
     }

Original file line number	Diff line number	Diff line change
`@@ -336,7 +336,7 @@ public function setAuthorisationCode($authorisationCode) {`
`336`	`336`
`337`	`337`	`/**`
`338`	`338`	`*`
`339`		`- * @return string`
	`339`	`+ * @return string\|null`
`340`	`340`	`*/`
`341`	`341`	`public function getAuthorisationCode() {`
`342`	`342`	`return $this->authorisationCode;`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public function __construct($hostname, $ipaddress = null, $hoststatus = null) {`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`	`} else {`
`59`		`- if (strlen($ipaddress)) {`
	`59`	`+ if (is_string($ipaddress) && strlen($ipaddress)) {`
`60`	`60`	`$this->setIpAddress($ipaddress);`
`61`	`61`	`}`
`62`	`62`	`}`
`@@ -67,7 +67,7 @@ public function __construct($hostname, $ipaddress = null, $hoststatus = null) {`
`67`	`67`	`}`
`68`	`68`	`}`
`69`	`69`	`} else {`
`70`		`- if (strlen($hoststatus)) {`
	`70`	`+ if (is_string($hoststatus) && strlen($hoststatus)) {`
`71`	`71`	`$this->setHostStatus($hoststatus);`
`72`	`72`	`}`
`73`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ public function setDomain(eppDomain $domain) {`
`122`	`122`	`}`
`123`	`123`	`}`
`124`	`124`	`}`
`125`		`- if (strlen($domain->getAuthorisationCode())) {`
	`125`	`+ if (is_string($domain->getAuthorisationCode()) && strlen($domain->getAuthorisationCode())) {`
`126`	`126`	`$authinfo = $this->createElement('domain:authInfo');`
`127`	`127`	`if ($this->useCdata()) {`
`128`	`128`	`$pw = $authinfo->appendChild($this->createElement('domain:pw'));`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ private function addContactChanges($element, eppContact $contact) {`
`115`	`115`	`if (strlen($postal->getCity())) {`
`116`	`116`	`$postaladdr->appendChild($this->createElement('contact:city', $postal->getCity()));`
`117`	`117`	`}`
`118`		`- if (strlen($postal->getProvince())) {`
	`118`	`+ if (is_string($postal->getProvince()) && strlen($postal->getProvince())) {`
`119`	`119`	`$postaladdr->appendChild($this->createElement('contact:sp', $postal->getProvince()));`
`120`	`120`	`}`
`121`	`121`	`if (strlen($postal->getZipcode())) {`
`@@ -129,15 +129,15 @@ private function addContactChanges($element, eppContact $contact) {`
`129`	`129`	`$element->appendChild($postalinfo);`
`130`	`130`	`}`
`131`	`131`	`// Mandatory field`
`132`		`- if (strlen($contact->getVoice())) {`
	`132`	`+ if (is_string($contact->getVoice()) && strlen($contact->getVoice())) {`
`133`	`133`	`$element->appendChild($this->createElement('contact:voice', $contact->getVoice()));`
`134`	`134`	`}`
`135`	`135`	`// Optional field, may be empty`
`136`	`136`	`if (!is_null($contact->getFax())) {`
`137`	`137`	`$element->appendChild($this->createElement('contact:fax', $contact->getFax()));`
`138`	`138`	`}`
`139`	`139`	`// Mandatory field`
`140`		`- if (strlen($contact->getEmail())) {`
	`140`	`+ if (is_string($contact->getEmail()) && strlen($contact->getEmail())) {`
`141`	`141`	`$element->appendChild($this->createElement('contact:email', $contact->getEmail()));`
`142`	`142`	`}`
`143`	`143`	`// Optional field, may be empty`
Original file line number	Diff line number	Diff line change
`@@ -95,14 +95,15 @@ protected function addDomainChanges($element, eppDomain $domain) {`
`95`	`95`	`$this->addDomainStatus($element, $status);`
`96`	`96`	`}`
`97`	`97`	`}`
`98`		`- if (strlen($domain->getAuthorisationCode())) {`
	`98`	`+ $authcode = $domain->getAuthorisationCode();`
	`99`	`+ if (is_string($authcode) && strlen($authcode)) {`
`99`	`100`	`$authinfo = $this->createElement('domain:authInfo');`
`100`	`101`	`if ($this->useCdata()) {`
`101`	`102`	`$pw = $this->createElement('domain:pw');`
`102`		`- $pw->appendChild($this->createCDATASection($domain->getAuthorisationCode()));`
	`103`	`+ $pw->appendChild($this->createCDATASection($authcode));`
`103`	`104`	`}`
`104`	`105`	`else {`
`105`		`- $pw = $this->createElement('domain:pw',$domain->getAuthorisationCode());`
	`106`	`+ $pw = $this->createElement('domain:pw',$authcode);`
`106`	`107`	`}`
`107`	`108`	`$authinfo->appendChild($pw);`
`108`	`109`	`$element->appendChild($authinfo);`
Original file line number	Diff line number	Diff line change
`@@ -109,6 +109,7 @@ public function findNamespace($namespace) {`
`109`	`109`	`return false;`
`110`	`110`	`}`
`111`	`111`
	`112`	`+ #[\ReturnTypeWillChange]`
`112`	`113`	`public function saveXML(\DOMNode $node = NULL, $options = NULL) {`
`113`	`114`	`return str_replace("\t", ' ', parent::saveXML($node, LIBXML_NOEMPTYTAG));`
`114`	`115`	`}`
`@@ -202,7 +203,7 @@ public function Success() {`
`202`	`203`	`$errorstring .= '; ' . $id;`
`203`	`204`	`}`
`204`	`205`	`$resultreason = $this->getResultReason();`
`205`		`- if (strlen($resultreason)) {`
	`206`	`+ if (is_string($resultreason) && strlen($resultreason)) {`
`206`	`207`	`$errorstring .= ' (' . $resultreason . ')';`
`207`	`208`	`}`
`208`	`209`	`if ((is_array($this->exceptions)) && (count($this->exceptions)>0)) {`
Original file line number	Diff line number	Diff line change
`@@ -167,6 +167,7 @@ public function __destruct() {`
`167`	`167`	`* @param null $options`
`168`	`168`	`* @return mixed`
`169`	`169`	`*/`
	`170`	`+ #[\ReturnTypeWillChange]`
`170`	`171`	`public function saveXML(\DOMNode $node = null, $options = null) {`
`171`	`172`	`return str_replace("\t", ' ', parent::saveXML($node, LIBXML_NOEMPTYTAG));`
`172`	`173`	`}`