Skip to content

#637 symfony 5 support added #638

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

Merged
merged 1 commit into from
Jan 17, 2020
Merged

#637 symfony 5 support added #638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"guzzlehttp/psr7": "^1.2",
"monolog/monolog": "^1.17.1 || ^2.0.0",
"phpdocumentor/reflection-docblock": "^4.0.0 || ^3.0.3",
"symfony/serializer": "^4.4.0"
"symfony/serializer": "^4.4.0 || ^5.0.0"
},
"require-dev": {
"phpunit/phpunit": "^7.5",
Expand Down
5 changes: 3 additions & 2 deletions src/Google/AdsApi/AdWords/AdWordsNormalizer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ final class AdWordsNormalizer extends GetSetMethodNormalizer
{

private $docBlockFactory;
protected $callbacks = []; // not private for symfony 4 compatibility

/**
* @see GetSetMethodNormalizer::__construct()
Expand Down Expand Up @@ -110,7 +111,7 @@ public function normalize($object, $format = null, array $context = [])
$attributeValue = $reflMethod->invoke($object);

if ($attributeValue !== null) {
if (array_key_exists('normalize', $this->callbacks)) {
if (isset($this->callbacks['normalize'])) {
$attributeValue = call_user_func(
$this->callbacks['normalize'],
$attributeValue,
Expand Down Expand Up @@ -207,7 +208,7 @@ public function denormalize(
$this->docBlockFactory->create($getter->getDocComment())
);

if (array_key_exists('denormalize', $this->callbacks)) {
if (isset($this->callbacks['denormalize'])) {
$value = call_user_func(
$this->callbacks['denormalize'],
$value,
Expand Down
2 changes: 1 addition & 1 deletion src/Google/AdsApi/AdWords/BatchJobs/v201809/BatchJobsDelegate.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ public function __construct(
);
$this->batchJobSerializer = new Serializer(
[$adWordsNormalizer, new ArrayDenormalizer()],
[new XmlEncoder('ns1:mutate')]
[new XmlEncoder([XmlEncoder::ROOT_NODE_NAME => 'ns1:mutate'])]
);
}

Expand Down