Skip to content

Commit

Permalink
Changes for release v5_0. (#411)
Browse files Browse the repository at this point in the history 
Co-authored-by: pierrick <[email protected]>
  • Loading branch information
@PierrickVoulet
PierrickVoulet and pierrick authored Sep 1, 2020
1 parent cc94970 commit 098a3c4
Show file tree
Hide file tree
Showing 3,478 changed files with 341,802 additions and 2,412 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ env:
before_script:
- composer install -o -vvv --no-interaction
- pecl install grpc
- pecl install protobuf-3.11.4
- pecl install protobuf
- "sudo echo '{\"type\": \"authorized_user\",\"client_id\": \"\",\"client_secret\": \"\",\"refresh_token\": \"\"}' >> $GOOGLE_APPLICATION_CREDENTIALS"

script:
Expand Down
19 changes: 19 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
## 5.0.0
* Added support for v5 of Google Ads API.
* Upgraded dependencies: `google/protobuf` (^3.13.0), `ulrichsg/getopt-php` (^3.4).
* Fixed instantiation tests and PSR-4 issues.
* Updated all code examples to v5.
* Added code examples:
* AddLogicalUserList
* AddCombinedRuleUserList
* AddExpressionRuleUserList
* AddConversionBasedUserList
* AddBillingSetup
* RejectMerchantCenterLink
* Fixed/improved code examples:
* AddSmartDisplayAd
* UpdateSitelinkCampaignExtensionSetting
* CreateCustomer
* UsePortfolioBiddingStrategy
* ForecastReach

## 4.0.0
* Added support for v4 of Google Ads API.
* Updated code examples to v4.
Expand Down
4 changes: 2 additions & 2 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"require": {
"php": ">=7.2",
"google/gax": "^1.3.0",
"google/protobuf": "~3.11.4",
"ulrichsg/getopt-php": "^3.2.2",
"google/protobuf": "^3.13.0",
"ulrichsg/getopt-php": "^3.4",
"monolog/monolog": "^1.23.0 || ^2.0"
},
"require-dev": {
Expand Down
18 changes: 9 additions & 9 deletions examples/AccountManagement/ApproveMerchantCenterLink.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@
use Google\Ads\GoogleAds\Examples\Utils\ArgumentNames;
use Google\Ads\GoogleAds\Examples\Utils\ArgumentParser;
use Google\Ads\GoogleAds\Lib\OAuth2TokenBuilder;
use Google\Ads\GoogleAds\Lib\V4\GoogleAdsClient;
use Google\Ads\GoogleAds\Lib\V4\GoogleAdsClientBuilder;
use Google\Ads\GoogleAds\Lib\V4\GoogleAdsException;
use Google\Ads\GoogleAds\Lib\V5\GoogleAdsClient;
use Google\Ads\GoogleAds\Lib\V5\GoogleAdsClientBuilder;
use Google\Ads\GoogleAds\Lib\V5\GoogleAdsException;
use Google\Ads\GoogleAds\Util\FieldMasks;
use Google\Ads\GoogleAds\V4\Enums\MerchantCenterLinkStatusEnum\MerchantCenterLinkStatus;
use Google\Ads\GoogleAds\V4\Errors\GoogleAdsError;
use Google\Ads\GoogleAds\V4\Resources\MerchantCenterLink;
use Google\Ads\GoogleAds\V4\Services\MerchantCenterLinkOperation;
use Google\Ads\GoogleAds\V4\Services\MerchantCenterLinkServiceClient;
use Google\Ads\GoogleAds\V5\Enums\MerchantCenterLinkStatusEnum\MerchantCenterLinkStatus;
use Google\Ads\GoogleAds\V5\Errors\GoogleAdsError;
use Google\Ads\GoogleAds\V5\Resources\MerchantCenterLink;
use Google\Ads\GoogleAds\V5\Services\MerchantCenterLinkOperation;
use Google\Ads\GoogleAds\V5\Services\MerchantCenterLinkServiceClient;
use Google\ApiCore\ApiException;

/**
Expand Down Expand Up @@ -133,7 +133,7 @@ public static function runExample(
// Approves a pending link request for a Google Ads account with the specified customer
// ID from a Merchant Center account with the specified Merchant Center account ID.
if (
$merchantCenterLink->getIdUnwrapped() === $merchantCenterAccountId
$merchantCenterLink->getId() === $merchantCenterAccountId
&& $merchantCenterLink->getStatus() === MerchantCenterLinkStatus::PENDING
) {
// Updates the status of Merchant Center link to 'ENABLED' to approve the link.
Expand Down
26 changes: 10 additions & 16 deletions examples/AccountManagement/CreateCustomer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,13 @@
use GetOpt\GetOpt;
use Google\Ads\GoogleAds\Examples\Utils\ArgumentNames;
use Google\Ads\GoogleAds\Examples\Utils\ArgumentParser;
use Google\Ads\GoogleAds\Lib\V4\GoogleAdsClient;
use Google\Ads\GoogleAds\Lib\V4\GoogleAdsClientBuilder;
use Google\Ads\GoogleAds\Lib\V4\GoogleAdsException;
use Google\Ads\GoogleAds\Lib\V5\GoogleAdsClient;
use Google\Ads\GoogleAds\Lib\V5\GoogleAdsClientBuilder;
use Google\Ads\GoogleAds\Lib\V5\GoogleAdsException;
use Google\Ads\GoogleAds\Lib\OAuth2TokenBuilder;
use Google\Ads\GoogleAds\V4\Errors\GoogleAdsError;
use Google\Ads\GoogleAds\V4\Resources\Customer;
use Google\Ads\GoogleAds\V5\Errors\GoogleAdsError;
use Google\Ads\GoogleAds\V5\Resources\Customer;
use Google\ApiCore\ApiException;
use Google\Protobuf\BoolValue;
use Google\Protobuf\StringValue;

/**
* This example illustrates how to create a new customer under a given manager account.
Expand Down Expand Up @@ -102,19 +100,15 @@ public static function main()
public static function runExample(GoogleAdsClient $googleAdsClient, int $managerCustomerId)
{
$customer = new Customer([
'descriptive_name' => new StringValue(
['value' => 'Account created with CustomerService on ' . date('Ymd h:i:s')]
),
'descriptive_name' => 'Account created with CustomerService on ' . date('Ymd h:i:s'),
// For a list of valid currency codes and time zones see this documentation:
// https://developers.google.com/adwords/api/docs/appendix/codes-formats.
'currency_code' => new StringValue(['value' => 'USD']),
'time_zone' => new StringValue(['value' => 'America/New_York']),
'currency_code' => 'USD',
'time_zone' => 'America/New_York',
// The below values are optional. For more information about URL
// options see: https://support.google.com/google-ads/answer/6305348.
'tracking_url_template' => new StringValue(['value' => '{lpurl}?device={device}']),
'final_url_suffix' => new StringValue([
'value' => 'keyword={keyword}&matchtype={matchtype}&adgroupid={adgroupid}'
])
'tracking_url_template' => '{lpurl}?device={device}',
'final_url_suffix' => 'keyword={keyword}&matchtype={matchtype}&adgroupid={adgroupid}'
]);

// Issues a mutate request to create an account
Expand Down
20 changes: 10 additions & 10 deletions examples/AccountManagement/GetAccountChanges.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@
use GetOpt\GetOpt;
use Google\Ads\GoogleAds\Examples\Utils\ArgumentNames;
use Google\Ads\GoogleAds\Examples\Utils\ArgumentParser;
use Google\Ads\GoogleAds\Lib\V4\GoogleAdsClient;
use Google\Ads\GoogleAds\Lib\V4\GoogleAdsClientBuilder;
use Google\Ads\GoogleAds\Lib\V4\GoogleAdsException;
use Google\Ads\GoogleAds\Lib\V5\GoogleAdsClient;
use Google\Ads\GoogleAds\Lib\V5\GoogleAdsClientBuilder;
use Google\Ads\GoogleAds\Lib\V5\GoogleAdsException;
use Google\Ads\GoogleAds\Lib\OAuth2TokenBuilder;
use Google\Ads\GoogleAds\V4\Enums\ChangeStatusOperationEnum\ChangeStatusOperation;
use Google\Ads\GoogleAds\V4\Enums\ChangeStatusResourceTypeEnum\ChangeStatusResourceType;
use Google\Ads\GoogleAds\V4\Errors\GoogleAdsError;
use Google\Ads\GoogleAds\V4\Resources\ChangeStatus;
use Google\Ads\GoogleAds\V4\Services\GoogleAdsRow;
use Google\Ads\GoogleAds\V5\Enums\ChangeStatusOperationEnum\ChangeStatusOperation;
use Google\Ads\GoogleAds\V5\Enums\ChangeStatusResourceTypeEnum\ChangeStatusResourceType;
use Google\Ads\GoogleAds\V5\Errors\GoogleAdsError;
use Google\Ads\GoogleAds\V5\Resources\ChangeStatus;
use Google\Ads\GoogleAds\V5\Services\GoogleAdsRow;
use Google\ApiCore\ApiException;

/**
Expand Down Expand Up @@ -158,7 +158,7 @@ private static function getResourceNameForResourceType(
$resourceName = ''; // Default value for UNSPECIFIED or UNKNOWN resource type.
switch ($resourceType) {
case ChangeStatusResourceType::AD_GROUP:
$resourceName = $changeStatus->getAdGroupUnwrapped();
$resourceName = $changeStatus->getAdGroup();
break;
case ChangeStatusResourceType::AD_GROUP_AD:
$resourceName = $changeStatus->getAdGroupAdUnwrapped();
Expand All @@ -173,7 +173,7 @@ private static function getResourceNameForResourceType(
$resourceName = $changeStatus->getAdGroupFeedUnwrapped();
break;
case ChangeStatusResourceType::CAMPAIGN:
$resourceName = $changeStatus->getCampaignUnwrapped();
$resourceName = $changeStatus->getCampaign();
break;
case ChangeStatusResourceType::CAMPAIGN_CRITERION:
$resourceName = $changeStatus->getCampaignCriterionUnwrapped();
Expand Down
16 changes: 8 additions & 8 deletions examples/AccountManagement/GetAccountHierarchy.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@
use Google\Ads\GoogleAds\Examples\Utils\ArgumentNames;
use Google\Ads\GoogleAds\Examples\Utils\ArgumentParser;
use Google\Ads\GoogleAds\Lib\OAuth2TokenBuilder;
use Google\Ads\GoogleAds\Lib\V4\GoogleAdsClient;
use Google\Ads\GoogleAds\Lib\V4\GoogleAdsClientBuilder;
use Google\Ads\GoogleAds\Lib\V4\GoogleAdsException;
use Google\Ads\GoogleAds\Lib\V4\GoogleAdsServerStreamDecorator;
use Google\Ads\GoogleAds\V4\Errors\GoogleAdsError;
use Google\Ads\GoogleAds\V4\Resources\CustomerClient;
use Google\Ads\GoogleAds\V4\Services\CustomerServiceClient;
use Google\Ads\GoogleAds\V4\Services\GoogleAdsRow;
use Google\Ads\GoogleAds\Lib\V5\GoogleAdsClient;
use Google\Ads\GoogleAds\Lib\V5\GoogleAdsClientBuilder;
use Google\Ads\GoogleAds\Lib\V5\GoogleAdsException;
use Google\Ads\GoogleAds\Lib\V5\GoogleAdsServerStreamDecorator;
use Google\Ads\GoogleAds\V5\Errors\GoogleAdsError;
use Google\Ads\GoogleAds\V5\Resources\CustomerClient;
use Google\Ads\GoogleAds\V5\Services\CustomerServiceClient;
use Google\Ads\GoogleAds\V5\Services\GoogleAdsRow;
use Google\ApiCore\ApiException;

/**
Expand Down
22 changes: 11 additions & 11 deletions examples/AccountManagement/GetAccountInformation.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@
use GetOpt\GetOpt;
use Google\Ads\GoogleAds\Examples\Utils\ArgumentNames;
use Google\Ads\GoogleAds\Examples\Utils\ArgumentParser;
use Google\Ads\GoogleAds\Lib\V4\GoogleAdsClient;
use Google\Ads\GoogleAds\Lib\V4\GoogleAdsClientBuilder;
use Google\Ads\GoogleAds\Lib\V4\GoogleAdsException;
use Google\Ads\GoogleAds\Lib\V5\GoogleAdsClient;
use Google\Ads\GoogleAds\Lib\V5\GoogleAdsClientBuilder;
use Google\Ads\GoogleAds\Lib\V5\GoogleAdsException;
use Google\Ads\GoogleAds\Lib\OAuth2TokenBuilder;
use Google\Ads\GoogleAds\Util\V4\ResourceNames;
use Google\Ads\GoogleAds\V4\Errors\GoogleAdsError;
use Google\Ads\GoogleAds\Util\V5\ResourceNames;
use Google\Ads\GoogleAds\V5\Errors\GoogleAdsError;
use Google\ApiCore\ApiException;

/**
Expand Down Expand Up @@ -104,13 +104,13 @@ public static function runExample(GoogleAdsClient $googleAdsClient, int $custome
printf(
"Customer with ID %d, descriptive name '%s', currency code '%s', timezone '%s', "
. "tracking URL template '%s' and auto tagging enabled '%s' was retrieved.%s",
$customer->getId()->getValue(),
$customer->getDescriptiveName()->getValue(),
$customer->getCurrencyCode()->getValue(),
$customer->getTimeZone()->getValue(),
$customer->getId(),
$customer->getDescriptiveName(),
$customer->getCurrencyCode(),
$customer->getTimeZone(),
is_null($customer->getTrackingUrlTemplate())
? 'N/A' : $customer->getTrackingUrlTemplate()->getValue(),
$customer->getAutoTaggingEnabled()->getValue() ? 'true' : 'false',
? 'N/A' : $customer->getTrackingUrlTemplate(),
$customer->getAutoTaggingEnabled() ? 'true' : 'false',
PHP_EOL
);
}
Expand Down
20 changes: 10 additions & 10 deletions examples/AccountManagement/LinkManagerToClient.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,18 @@
use GetOpt\GetOpt;
use Google\Ads\GoogleAds\Examples\Utils\ArgumentNames;
use Google\Ads\GoogleAds\Examples\Utils\ArgumentParser;
use Google\Ads\GoogleAds\Lib\V4\GoogleAdsClient;
use Google\Ads\GoogleAds\Lib\V4\GoogleAdsClientBuilder;
use Google\Ads\GoogleAds\Lib\V4\GoogleAdsException;
use Google\Ads\GoogleAds\Lib\V5\GoogleAdsClient;
use Google\Ads\GoogleAds\Lib\V5\GoogleAdsClientBuilder;
use Google\Ads\GoogleAds\Lib\V5\GoogleAdsException;
use Google\Ads\GoogleAds\Lib\OAuth2TokenBuilder;
use Google\Ads\GoogleAds\Util\FieldMasks;
use Google\Ads\GoogleAds\Util\V4\ResourceNames;
use Google\Ads\GoogleAds\V4\Enums\ManagerLinkStatusEnum\ManagerLinkStatus;
use Google\Ads\GoogleAds\V4\Errors\GoogleAdsError;
use Google\Ads\GoogleAds\V4\Resources\CustomerClientLink;
use Google\Ads\GoogleAds\V4\Resources\CustomerManagerLink;
use Google\Ads\GoogleAds\V4\Services\CustomerClientLinkOperation;
use Google\Ads\GoogleAds\V4\Services\CustomerManagerLinkOperation;
use Google\Ads\GoogleAds\Util\V5\ResourceNames;
use Google\Ads\GoogleAds\V5\Enums\ManagerLinkStatusEnum\ManagerLinkStatus;
use Google\Ads\GoogleAds\V5\Errors\GoogleAdsError;
use Google\Ads\GoogleAds\V5\Resources\CustomerClientLink;
use Google\Ads\GoogleAds\V5\Resources\CustomerManagerLink;
use Google\Ads\GoogleAds\V5\Services\CustomerClientLinkOperation;
use Google\Ads\GoogleAds\V5\Services\CustomerManagerLinkOperation;
use Google\ApiCore\ApiException;
use Google\Protobuf\StringValue;

Expand Down
8 changes: 4 additions & 4 deletions examples/AccountManagement/ListAccessibleCustomers.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@

require __DIR__ . '/../../vendor/autoload.php';

use Google\Ads\GoogleAds\Lib\V4\GoogleAdsClient;
use Google\Ads\GoogleAds\Lib\V4\GoogleAdsClientBuilder;
use Google\Ads\GoogleAds\Lib\V4\GoogleAdsException;
use Google\Ads\GoogleAds\Lib\V5\GoogleAdsClient;
use Google\Ads\GoogleAds\Lib\V5\GoogleAdsClientBuilder;
use Google\Ads\GoogleAds\Lib\V5\GoogleAdsException;
use Google\Ads\GoogleAds\Lib\OAuth2TokenBuilder;
use Google\Ads\GoogleAds\V4\Errors\GoogleAdsError;
use Google\Ads\GoogleAds\V5\Errors\GoogleAdsError;
use Google\ApiCore\ApiException;

/**
Expand Down
16 changes: 8 additions & 8 deletions examples/AccountManagement/RejectMerchantCenterLink.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@
use Google\Ads\GoogleAds\Examples\Utils\ArgumentNames;
use Google\Ads\GoogleAds\Examples\Utils\ArgumentParser;
use Google\Ads\GoogleAds\Lib\OAuth2TokenBuilder;
use Google\Ads\GoogleAds\Lib\V4\GoogleAdsClient;
use Google\Ads\GoogleAds\Lib\V4\GoogleAdsClientBuilder;
use Google\Ads\GoogleAds\Lib\V4\GoogleAdsException;
use Google\Ads\GoogleAds\V4\Enums\MerchantCenterLinkStatusEnum\MerchantCenterLinkStatus;
use Google\Ads\GoogleAds\V4\Errors\GoogleAdsError;
use Google\Ads\GoogleAds\V4\Resources\MerchantCenterLink;
use Google\Ads\GoogleAds\V4\Services\MerchantCenterLinkOperation;
use Google\Ads\GoogleAds\V4\Services\MerchantCenterLinkServiceClient;
use Google\Ads\GoogleAds\Lib\V5\GoogleAdsClient;
use Google\Ads\GoogleAds\Lib\V5\GoogleAdsClientBuilder;
use Google\Ads\GoogleAds\Lib\V5\GoogleAdsException;
use Google\Ads\GoogleAds\V5\Enums\MerchantCenterLinkStatusEnum\MerchantCenterLinkStatus;
use Google\Ads\GoogleAds\V5\Errors\GoogleAdsError;
use Google\Ads\GoogleAds\V5\Resources\MerchantCenterLink;
use Google\Ads\GoogleAds\V5\Services\MerchantCenterLinkOperation;
use Google\Ads\GoogleAds\V5\Services\MerchantCenterLinkServiceClient;
use Google\ApiCore\ApiException;

/**
Expand Down
Loading

0 comments on commit 098a3c4

Please sign in to comment.