Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

PHP 8.2 compatibility error fixes #449

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
116 changes: 56 additions & 60 deletions lib/net/authorize/api/contract/v1/ANetApiRequestType.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,11 @@
/**
* Class representing ANetApiRequestType
*
*
*
* XSD Type: ANetApiRequest
*/
class ANetApiRequestType implements \JsonSerializable
{

/**
* @property \net\authorize\api\contract\v1\MerchantAuthenticationType
* $merchantAuthentication
Expand Down Expand Up @@ -96,25 +95,28 @@ public function setRefId($refId)


// Json Serialize Code
public function jsonSerialize(){
$values = array_filter((array)get_object_vars($this),
function ($val){
return !is_null($val);
});
#[\ReturnTypeWillChange]
public function jsonSerialize()
{
$values = array_filter(
(array)get_object_vars($this),
function ($val) {
return !is_null($val);
}
);
$mapper = \net\authorize\util\Mapper::Instance();
foreach($values as $key => $value){
$classDetails = $mapper->getClass(get_class() , $key);
if (isset($value)){
if ($classDetails->className === 'Date'){
foreach($values as $key => $value) {
$classDetails = $mapper->getClass(get_class(), $key);
if (isset($value)) {
if ($classDetails->className === 'Date') {
$dateTime = $value->format('Y-m-d');
$values[$key] = $dateTime;
}
else if ($classDetails->className === 'DateTime'){
} elseif ($classDetails->className === 'DateTime') {
$dateTime = $value->format('Y-m-d\TH:i:s\Z');
$values[$key] = $dateTime;
}
if (is_array($value)){
if (!$classDetails->isInlineArray){
if (is_array($value)) {
if (!$classDetails->isInlineArray) {
$subKey = $classDetails->arrayEntryname;
$subArray = [$subKey => $value];
$values[$key] = $subArray;
Expand All @@ -124,54 +126,48 @@ function ($val){
}
return $values;
}

// Json Set Code
public function set($data)
{
if(is_array($data) || is_object($data)) {
$mapper = \net\authorize\util\Mapper::Instance();
foreach($data AS $key => $value) {
$classDetails = $mapper->getClass(get_class() , $key);

if($classDetails !== NULL ) {
if ($classDetails->isArray) {
if ($classDetails->isCustomDefined) {
foreach($value AS $keyChild => $valueChild) {
$type = new $classDetails->className;
$type->set($valueChild);
$this->{'addTo' . $key}($type);
}
}
else if ($classDetails->className === 'DateTime' || $classDetails->className === 'Date' ) {
foreach($value AS $keyChild => $valueChild) {
$type = new \DateTime($valueChild);
$this->{'addTo' . $key}($type);
}
}
else {
foreach($value AS $keyChild => $valueChild) {
$this->{'addTo' . $key}($valueChild);
}
}
}
else {
if ($classDetails->isCustomDefined){
$type = new $classDetails->className;
$type->set($value);
$this->{'set' . $key}($type);
}
else if ($classDetails->className === 'DateTime' || $classDetails->className === 'Date' ) {
$type = new \DateTime($value);
$this->{'set' . $key}($type);
}
else {
$this->{'set' . $key}($value);
}
}
}
}
}
$mapper = \net\authorize\util\Mapper::Instance();
foreach($data as $key => $value) {
$classDetails = $mapper->getClass(get_class(), $key);

if($classDetails !== null) {
if ($classDetails->isArray) {
if ($classDetails->isCustomDefined) {
foreach($value as $keyChild => $valueChild) {
$type = new $classDetails->className();
$type->set($valueChild);
$this->{'addTo' . $key}($type);
}
} elseif ($classDetails->className === 'DateTime' || $classDetails->className === 'Date') {
foreach($value as $keyChild => $valueChild) {
$type = new \DateTime($valueChild);
$this->{'addTo' . $key}($type);
}
} else {
foreach($value as $keyChild => $valueChild) {
$this->{'addTo' . $key}($valueChild);
}
}
} else {
if ($classDetails->isCustomDefined) {
$type = new $classDetails->className();
$type->set($value);
$this->{'set' . $key}($type);
} elseif ($classDetails->className === 'DateTime' || $classDetails->className === 'Date') {
$type = new \DateTime($value);
$this->{'set' . $key}($type);
} else {
$this->{'set' . $key}($value);
}
}
}
}
}
}

}

}
116 changes: 56 additions & 60 deletions lib/net/authorize/api/contract/v1/ANetApiResponseType.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,11 @@
/**
* Class representing ANetApiResponseType
*
*
*
* XSD Type: ANetApiResponse
*/
class ANetApiResponseType implements \JsonSerializable
{

/**
* @property string $refId
*/
Expand Down Expand Up @@ -94,25 +93,28 @@ public function setSessionToken($sessionToken)


// Json Serialize Code
public function jsonSerialize(){
$values = array_filter((array)get_object_vars($this),
function ($val){
return !is_null($val);
});
#[\ReturnTypeWillChange]
public function jsonSerialize()
{
$values = array_filter(
(array)get_object_vars($this),
function ($val) {
return !is_null($val);
}
);
$mapper = \net\authorize\util\Mapper::Instance();
foreach($values as $key => $value){
$classDetails = $mapper->getClass(get_class() , $key);
if (isset($value)){
if ($classDetails->className === 'Date'){
foreach($values as $key => $value) {
$classDetails = $mapper->getClass(get_class(), $key);
if (isset($value)) {
if ($classDetails->className === 'Date') {
$dateTime = $value->format('Y-m-d');
$values[$key] = $dateTime;
}
else if ($classDetails->className === 'DateTime'){
} elseif ($classDetails->className === 'DateTime') {
$dateTime = $value->format('Y-m-d\TH:i:s\Z');
$values[$key] = $dateTime;
}
if (is_array($value)){
if (!$classDetails->isInlineArray){
if (is_array($value)) {
if (!$classDetails->isInlineArray) {
$subKey = $classDetails->arrayEntryname;
$subArray = [$subKey => $value];
$values[$key] = $subArray;
Expand All @@ -122,54 +124,48 @@ function ($val){
}
return $values;
}

// Json Set Code
public function set($data)
{
if(is_array($data) || is_object($data)) {
$mapper = \net\authorize\util\Mapper::Instance();
foreach($data AS $key => $value) {
$classDetails = $mapper->getClass(get_class() , $key);

if($classDetails !== NULL ) {
if ($classDetails->isArray) {
if ($classDetails->isCustomDefined) {
foreach($value AS $keyChild => $valueChild) {
$type = new $classDetails->className;
$type->set($valueChild);
$this->{'addTo' . $key}($type);
}
}
else if ($classDetails->className === 'DateTime' || $classDetails->className === 'Date' ) {
foreach($value AS $keyChild => $valueChild) {
$type = new \DateTime($valueChild);
$this->{'addTo' . $key}($type);
}
}
else {
foreach($value AS $keyChild => $valueChild) {
$this->{'addTo' . $key}($valueChild);
}
}
}
else {
if ($classDetails->isCustomDefined){
$type = new $classDetails->className;
$type->set($value);
$this->{'set' . $key}($type);
}
else if ($classDetails->className === 'DateTime' || $classDetails->className === 'Date' ) {
$type = new \DateTime($value);
$this->{'set' . $key}($type);
}
else {
$this->{'set' . $key}($value);
}
}
}
}
}
$mapper = \net\authorize\util\Mapper::Instance();
foreach($data as $key => $value) {
$classDetails = $mapper->getClass(get_class(), $key);

if($classDetails !== null) {
if ($classDetails->isArray) {
if ($classDetails->isCustomDefined) {
foreach($value as $keyChild => $valueChild) {
$type = new $classDetails->className();
$type->set($valueChild);
$this->{'addTo' . $key}($type);
}
} elseif ($classDetails->className === 'DateTime' || $classDetails->className === 'Date') {
foreach($value as $keyChild => $valueChild) {
$type = new \DateTime($valueChild);
$this->{'addTo' . $key}($type);
}
} else {
foreach($value as $keyChild => $valueChild) {
$this->{'addTo' . $key}($valueChild);
}
}
} else {
if ($classDetails->isCustomDefined) {
$type = new $classDetails->className();
$type->set($value);
$this->{'set' . $key}($type);
} elseif ($classDetails->className === 'DateTime' || $classDetails->className === 'Date') {
$type = new \DateTime($value);
$this->{'set' . $key}($type);
} else {
$this->{'set' . $key}($value);
}
}
}
}
}
}

}

}
31 changes: 16 additions & 15 deletions lib/net/authorize/api/contract/v1/ARBCancelSubscriptionRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
*/
class ARBCancelSubscriptionRequest extends ANetApiRequestType
{

/**
* @property string $subscriptionId
*/
Expand Down Expand Up @@ -37,25 +36,28 @@ public function setSubscriptionId($subscriptionId)


// Json Serialize Code
public function jsonSerialize(){
$values = array_filter((array)get_object_vars($this),
function ($val){
return !is_null($val);
});
#[\ReturnTypeWillChange]
public function jsonSerialize()
{
$values = array_filter(
(array)get_object_vars($this),
function ($val) {
return !is_null($val);
}
);
$mapper = \net\authorize\util\Mapper::Instance();
foreach($values as $key => $value){
$classDetails = $mapper->getClass(get_class() , $key);
if (isset($value)){
if ($classDetails->className === 'Date'){
foreach($values as $key => $value) {
$classDetails = $mapper->getClass(get_class(), $key);
if (isset($value)) {
if ($classDetails->className === 'Date') {
$dateTime = $value->format('Y-m-d');
$values[$key] = $dateTime;
}
else if ($classDetails->className === 'DateTime'){
} elseif ($classDetails->className === 'DateTime') {
$dateTime = $value->format('Y-m-d\TH:i:s\Z');
$values[$key] = $dateTime;
}
if (is_array($value)){
if (!$classDetails->isInlineArray){
if (is_array($value)) {
if (!$classDetails->isInlineArray) {
$subKey = $classDetails->arrayEntryname;
$subArray = [$subKey => $value];
$values[$key] = $subArray;
Expand All @@ -67,4 +69,3 @@ function ($val){
}

}

Loading