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.

Sign up for GitHub

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

Reserved Null Class Name #1

Merged
merged 2 commits into from
Jun 24, 2020
Merged

Reserved Null Class Name #1

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
4531bd0
Reserved Null Class Name
vrochereau Jun 24, 2020
a8a9d54
Reserved Null Class Name
vrochereau Jun 24, 2020
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
**Jun 24, 2020

- Fixed `Reserved Null Class Name` for compatibility with PHP 7*

# v1.1.3

**Jul 01, 2016**
Expand Down
2 changes: 2 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# dotMailer API v2 PHP client

Forked from https://github.com/romanpitak/dotMailer-API-v2-PHP-client

[![Latest Stable Version](https://img.shields.io/packagist/v/romanpitak/dotmailer-api-v2-client.svg)](https://packagist.org/packages/romanpitak/dotmailer-api-v2-client)
[![Total Downloads](https://img.shields.io/packagist/dt/romanpitak/dotmailer-api-v2-client.svg)](https://packagist.org/packages/romanpitak/dotmailer-api-v2-client)
[![License](https://img.shields.io/packagist/l/romanpitak/dotmailer-api-v2-client.svg)](https://packagist.org/packages/romanpitak/dotmailer-api-v2-client)
Expand Down
2 changes: 1 addition & 1 deletion src/DataTypes/Null.php → src/DataTypes/DataNull.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

namespace DotMailer\Api\DataTypes;

class Null implements IDataType
class DataNull implements IDataType
{

public function toJson()
Expand Down
2 changes: 1 addition & 1 deletion src/DataTypes/JsonObject.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ protected function convertOffset($offset)
protected function convertValue($value, $offset)
{
if (is_null($value)) {
return new Null();
return new DataNull();
}
$convertedOffset = $this->convertOffset($offset);
$dataClass = $this->classes[$convertedOffset];
Expand Down