Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

PHP 8.4: Refactor implicitly nullable parameter types #386

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

PHP 8.4: Refactor implicitly nullable parameter types #386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cdf43a9
Drop support for PHP 7.0 to be able to use nullable types
W0rma May 17, 2024
7c46100
Make parameters nullable explicitly
W0rma May 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Protocols/EPP/eppException.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class eppException extends \Exception {
* @param string $command
* @param \Metaregistrar\EPP\eppResponse|null $response
*/
public function __construct($message = "", $code = 0, \Exception $previous = null, $reason = null, $command = null, $response = 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;
Expand Down
2 changes: 1 addition & 1 deletion Protocols/EPP/eppExtensions/at-ext-epp-1.0/eppExtensions/atEppCreateContactExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class atEppCreateContactExtension extends atEppExtensionChain
{
protected $atEppContact=null;

function __construct(atEppContact $atEppContact, atEppExtensionChain $additionalEppExtension=null) {
function __construct(atEppContact $atEppContact, ?atEppExtensionChain $additionalEppExtension=null) {
if(!is_null($additionalEppExtension)) {
parent::__construct($additionalEppExtension);
}
Expand Down
2 changes: 1 addition & 1 deletion Protocols/EPP/eppExtensions/at-ext-epp-1.0/eppExtensions/atEppDomainDeleteExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class atEppDomainDeleteExtension extends atEppExtensionChain
* @param array $domainExtArguments
* @param atEppExtensionChain|null $additionalEppExtension
*/
public function __construct(array $domainExtArguments=[], atEppExtensionChain $additionalEppExtension = null)
public function __construct(array $domainExtArguments=[], ?atEppExtensionChain $additionalEppExtension = null)
{
$this->validateExtensionChain($domainExtArguments);
if (!is_null($additionalEppExtension))
Expand Down
2 changes: 1 addition & 1 deletion Protocols/EPP/eppExtensions/at-ext-epp-1.0/eppExtensions/atEppExtensionChain.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ abstract class atEppExtensionChain
{
protected $additionalEppExtension=null;

function __construct(atEppExtensionChain $additionalEppExtension=null) {
function __construct(?atEppExtensionChain $additionalEppExtension=null) {

$this->additionalEppExtension = $additionalEppExtension;
}
Expand Down
2 changes: 1 addition & 1 deletion Protocols/EPP/eppExtensions/at-ext-epp-1.0/eppExtensions/atEppUpdateContactExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class atEppUpdateContactExtension extends atEppExtensionChain
{
protected $atEppContact=null;

function __construct(atEppContact $atEppContact, atEppExtensionChain $additionalEppExtension=null) {
function __construct(atEppContact $atEppContact, ?atEppExtensionChain $additionalEppExtension=null) {
if(!is_null($additionalEppExtension)) {
parent::__construct($additionalEppExtension);
}
Expand Down
2 changes: 1 addition & 1 deletion Protocols/EPP/eppExtensions/at-ext-epp-1.0/eppRequests/atEppCreateContactRequest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class atEppCreateContactRequest extends eppCreateContactRequest {

protected $atEppExtensionChain = null;

function __construct($createinfo,atEppExtensionChain $atEppExtensionChain=null) {
function __construct($createinfo,?atEppExtensionChain $atEppExtensionChain=null) {
$this->atEppExtensionChain = $atEppExtensionChain;
parent::__construct($createinfo);
$this->addSessionId();
Expand Down
2 changes: 1 addition & 1 deletion Protocols/EPP/eppExtensions/at-ext-epp-1.0/eppRequests/atEppCreateDomainRequest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class atEppCreateDomainRequest extends eppCreateDomainRequest

protected $atEppExtensionChain = null;

function __construct($createinfo,atEppExtensionChain $atEppExtensionChain=null, $forcehostattr = true) {
function __construct($createinfo,?atEppExtensionChain $atEppExtensionChain=null, $forcehostattr = true) {
$this->atEppExtensionChain = $atEppExtensionChain;
parent::__construct($createinfo,$forcehostattr);
}
Expand Down
2 changes: 1 addition & 1 deletion Protocols/EPP/eppExtensions/at-ext-epp-1.0/eppRequests/atEppDeleteDomainRequest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class atEppDeleteDomainRequest extends eppDeleteDomainRequest
const SCHEDULE_DELETE_NOW = "now";
const SCHEDULE_DELETE_EXPIRATION = "expiration";

function __construct(eppDomain $deleteinfo, $namespacesinroot = true, $scheduledate = self::SCHEDULE_DELETE_NOW, atEppExtensionChain $atEppExtensionChain=null) {
function __construct(eppDomain $deleteinfo, $namespacesinroot = true, $scheduledate = self::SCHEDULE_DELETE_NOW, ?atEppExtensionChain $atEppExtensionChain=null) {
$this->atEppExtensionChain = $atEppExtensionChain;
parent::__construct($deleteinfo, $namespacesinroot);
$this->addATScheduledateExtension($scheduledate);
Expand Down
2 changes: 1 addition & 1 deletion Protocols/EPP/eppExtensions/at-ext-epp-1.0/eppRequests/atEppDeleteRequest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class atEppDeleteRequest extends eppDeleteRequest

protected $atEppExtensionChain = null;

function __construct($deleteinfo, atEppExtensionChain $atEppExtensionChain = null) {
function __construct($deleteinfo, ?atEppExtensionChain $atEppExtensionChain = null) {
$this->atEppExtensionChain = $atEppExtensionChain;

parent::__construct($deleteinfo);
Expand Down
2 changes: 1 addition & 1 deletion Protocols/EPP/eppExtensions/at-ext-epp-1.0/eppRequests/atEppPollRequest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class atEppPollRequest extends eppPollRequest

protected $atEppExtensionChain = null;

function __construct($polltype, $messageid = null, $services = null, atEppExtensionChain $atEppExtensionChain=null)
function __construct($polltype, $messageid = null, $services = null, ?atEppExtensionChain $atEppExtensionChain=null)
{
$this->atEppExtensionChain = $atEppExtensionChain;
parent::__construct($polltype, $messageid, $services);
Expand Down
2 changes: 1 addition & 1 deletion Protocols/EPP/eppExtensions/at-ext-epp-1.0/eppRequests/atEppTransferRequest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class atEppTransferRequest extends eppTransferRequest

protected $atEppExtensionChain = null;

function __construct($operation, $object,atEppExtensionChain $atEppExtensionChain=null)
function __construct($operation, $object,?atEppExtensionChain $atEppExtensionChain=null)
{
$this->atEppExtensionChain = $atEppExtensionChain;
parent::__construct($operation, $object);
Expand Down
2 changes: 1 addition & 1 deletion Protocols/EPP/eppExtensions/at-ext-epp-1.0/eppRequests/atEppUndeleteRequest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class atEppUndeleteRequest extends eppDomainRequest
* @param eppDomain $domain
* @param atEppExtensionChain|null $atEppExtensionChain
*/
function __construct(eppDomain $domain, atEppExtensionChain $atEppExtensionChain = null) {
function __construct(eppDomain $domain, ?atEppExtensionChain $atEppExtensionChain = null) {
$this->atEppExtensionChain = $atEppExtensionChain;

parent::__construct(eppRequest::TYPE_UPDATE);
Expand Down
2 changes: 1 addition & 1 deletion Protocols/EPP/eppExtensions/at-ext-epp-1.0/eppRequests/atEppUpdateContactRequest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class atEppUpdateContactRequest extends eppUpdateContactRequest
use atEppCommandTrait;
protected $atEppExtensionChain = null;

function __construct($objectname, atEppContact $addinfo = null, atEppContact $removeinfo = null,atEppContact $updateinfo = null,atEppExtensionChain $atEppExtensionChain=null) {
function __construct($objectname, ?atEppContact $addinfo = null, ?atEppContact $removeinfo = null,?atEppContact $updateinfo = null,?atEppExtensionChain $atEppExtensionChain=null) {
$this->atEppExtensionChain = $atEppExtensionChain;
parent::__construct($objectname, $addinfo , $removeinfo , $updateinfo);
$this->addSessionId();
Expand Down
2 changes: 1 addition & 1 deletion Protocols/EPP/eppExtensions/at-ext-epp-1.0/eppRequests/atEppUpdateDomainRequest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class atEppUpdateDomainRequest extends eppUpdateDomainRequest

protected $atEppExtensionChain = null;

function __construct($objectname, $addinfo = null, $removeinfo = null, $updateinfo = null, $forcehostattr=false,atEppExtensionChain $atEppExtensionChain=null)
function __construct($objectname, $addinfo = null, $removeinfo = null, $updateinfo = null, $forcehostattr=false,?atEppExtensionChain $atEppExtensionChain=null)
{
$this->atEppExtensionChain = $atEppExtensionChain;
parent::__construct($objectname, $addinfo, $removeinfo, $updateinfo, $forcehostattr);
Expand Down
2 changes: 1 addition & 1 deletion Protocols/EPP/eppExtensions/domain-ext-2.5/eppRequests/euridEppDeleteDomainRequest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
*/

class euridEppDeleteDomainRequest extends eppDeleteDomainRequest {
function __construct(eppDomain $deleteinfo, $namespacesinroot = true, \DateTime $deleteDate = null) {
function __construct(eppDomain $deleteinfo, $namespacesinroot = true, ?\DateTime $deleteDate = null) {
parent::__construct($deleteinfo, $namespacesinroot);
if($deleteDate !== null) {
$this->addEURIDExtension($deleteDate->format('Y-m-d\TH:i:s\.\0\Z'));
Expand Down
2 changes: 1 addition & 1 deletion Protocols/EPP/eppExtensions/ficora/eppRequests/ficoraEppUpdateDomainRequest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
class ficoraEppUpdateDomainRequest extends eppUpdateDomainRequest {

// Note: default value for $namespacesinroot differs from parent
public function __construct($objectname, ficoraEppDomain $addinfo = null, ficoraEppDomain $removeinfo = null, ficoraEppDomain $updateinfo = null, $forcehostattr=false, $namespacesinroot=false)
public function __construct($objectname, ?ficoraEppDomain $addinfo = null, ?ficoraEppDomain $removeinfo = null, ?ficoraEppDomain $updateinfo = null, $forcehostattr=false, $namespacesinroot=false)
{
parent::__construct($objectname, $addinfo, $removeinfo, $updateinfo, $forcehostattr, $namespacesinroot);
}
Expand Down
2 changes: 1 addition & 1 deletion Protocols/EPP/eppExtensions/sidn-ext-epp-1.0/eppExceptions/sidnEppException.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class sidnEppException extends eppException {
*/
private $eppresponse;

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) {
if ($command) {
$this->eppresponse = new eppResponse();
$this->eppresponse->loadXML($command);
Expand Down
2 changes: 1 addition & 1 deletion Protocols/EPP/eppExtensions/teleinfo/eppData/eppRealName.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class eppRealName{
* @param array $documents
* @param string $authorisationCode
*/
public function __construct(string $role=self::NAME_ROLE_PERSON, string $name='', string $number='', string $proof=self::NAME_PROOF_CITIZEN, array $documents=[], string $authorisationCode=null){
public function __construct(string $role=self::NAME_ROLE_PERSON, string $name='', string $number='', string $proof=self::NAME_PROOF_CITIZEN, array $documents=[], ?string $authorisationCode=null){
!empty($role) && $this->setRole($role);
!empty($name) && $this->setName($name);
!empty($number) && $this->setNumber($number);
Expand Down
2 changes: 1 addition & 1 deletion Protocols/EPP/eppExtensions/teleinfo/eppRequests/teleinfoEppInfoNameRequest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

class teleinfoEppInfoNameRequest extends teleinfoEppNameRequest {

function __construct(string $type, string $code, string $password=null) {
function __construct(string $type, string $code, ?string $password=null) {
$this->setNamespacesinroot(false);
parent::__construct(eppRequest::TYPE_INFO);
if ($type!='signedCode' && $type!='input'){
Expand Down
2 changes: 1 addition & 1 deletion Protocols/EPP/eppExtensions/verisign/eppRequests/verisignEppCreateDomainRequest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class verisignEppCreateDomainRequest extends eppCreateDomainRequest {
*
* @param eppDomain $domain
*/
public function __construct(eppDomain $domain, string $rnvc=null, string $dnvc=null, string $lang=null) {
public function __construct(eppDomain $domain, ?string $rnvc=null, ?string $dnvc=null, ?string $lang=null) {
parent::__construct($domain);
//add namestore extension
$this->addNamestore($domain);
Expand Down
4 changes: 2 additions & 2 deletions Protocols/EPP/eppExtensions/verisign/eppRequests/verisignEppExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ trait verisignEppExtension{
* @param eppDomain $domain
* @author:Jansen <jansen.shi@qq.com>
*/
public function addNamestore(eppDomain $domain=null){
public function addNamestore(?eppDomain $domain=null){
if ($domain instanceof eppDomain){
$tld = substr(strrchr($domain->getDomainname(), '.'), 1);
}else{
Expand All @@ -40,7 +40,7 @@ public function addIdnLang(string $lang='ENG'){
* @param string $dnvc domain name verification code
* @author:Jansen <jansen.shi@qq.com>
*/
public function addVerificationCode(string $rnvc=null, string $dnvc=null){
public function addVerificationCode(?string $rnvc=null, ?string $dnvc=null){
//添加实名认证拓展
$verifyExt = $this->createElement('verificationCode:encodedSignedCode');
$verifyExt->setAttribute('xmlns:verificationCode', 'urn:ietf:params:xml:ns:verificationCode-1.0');
Expand Down
2 changes: 1 addition & 1 deletion Protocols/EPP/eppExtensions/verisign/eppRequests/verisignEppRealNameDomainRequest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class verisignEppRealNameDomainRequest extends eppDomainRequest {
* @param string $rnvc
* @param string|null $dnvc
*/
public function __construct(eppDomain $domain, string $rnvc, string $dnvc=null) {
public function __construct(eppDomain $domain, string $rnvc, ?string $dnvc=null) {
$this->setNamespacesinroot(true);
$this->setForcehostattr(false);
parent::__construct(eppRequest::TYPE_UPDATE);
Expand Down
2 changes: 1 addition & 1 deletion Protocols/EPP/eppExtensions/verisign/eppRequests/verisignEppRestoreDomainRequest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class verisignEppRestoreDomainRequest extends eppUpdateDomainRequest {
* @param string $reason 赎回原因
* @throws eppException
*/
public function __construct(string $op, eppDomain $domain, string $expire=null, string $reason=null){
public function __construct(string $op, eppDomain $domain, ?string $expire=null, ?string $reason=null){
if (!in_array($op, [self::TYPE_REQUEST,self::TYPE_REPORT])){
throw new eppException('The op attribute is invalid,only request or report is allow.');
}
Expand Down
2 changes: 1 addition & 1 deletion Protocols/EPP/eppExtensions/verisign/eppRequests/verisignEppTransferDomainRequest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class verisignEppTransferDomainRequest extends eppTransferRequest {
* @param string|null $lang
* @throws eppException
*/
public function __construct(string $op, eppDomain $domain, string $rnvc=null, string $dnvc=null, string $lang=null) {
public function __construct(string $op, eppDomain $domain, ?string $rnvc=null, ?string $dnvc=null, ?string $lang=null) {
parent::__construct($op, $domain);
//add namestore extension
$this->addNamestore($domain);
Expand Down
2 changes: 1 addition & 1 deletion Protocols/EPP/eppResponses/eppResponse.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ public function findNamespace($namespace) {
}

#[\ReturnTypeWillChange]
public function saveXML(\DOMNode $node = NULL, $options = NULL) {
public function saveXML(?\DOMNode $node = NULL, $options = NULL) {
return str_replace("\t", ' ', parent::saveXML($node, LIBXML_NOEMPTYTAG));
}

Expand Down
2 changes: 1 addition & 1 deletion Protocols/TMCH/tmchData/tmchClaimData.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ public function __destruct() {
* @return mixed
*/
#[\ReturnTypeWillChange]
public function saveXML(\DOMNode $node = null, $options = null) {
public function saveXML(?\DOMNode $node = null, $options = null) {
return str_replace("\t", ' ', parent::saveXML($node, LIBXML_NOEMPTYTAG));
}

Expand Down
2 changes: 1 addition & 1 deletion Protocols/TMCH/tmchException.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ class tmchException extends \Exception {
private $reason;
private $id;

public function __construct($message = "", $code = 0, \Exception $previous = null, $reason = null, $id = null) {
public function __construct($message = "", $code = 0, ?\Exception $previous = null, $reason = null, $id = null) {
$this->reason = $reason;
$this->id = $id;
parent::__construct($message, $code, $previous);
Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
}
],
"require": {
"php": "^7|^8.0",
"php": "^7.1|^8.0",
"ext-dom": "*",
"ext-libxml": "*"
},
Expand Down