Upgrade to v17 of the Google Ads API

Setono · Sep 17, 2024 · 028f991 · 028f991
1 parent 72e3bcc
commit 028f991
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 37 deletions.
diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
         "doctrine/persistence": "^1.3 || ^2.2 || ^3.2",
         "google/auth": "^1.26",
         "google/gax": "^1.19",
-        "googleads/google-ads-php": "^23.0",
+        "googleads/google-ads-php": "^24.0",
         "knplabs/knp-menu": "^3.1",
         "ocramius/doctrine-batch-utils": "^2.4",
         "psr/event-dispatcher": "^1.0",
@@ -58,8 +58,8 @@
         "phpunit/phpunit": "^9.6",
         "psalm/plugin-phpunit": "^0.18",
         "setono/client-bundle": "^1.0@beta",
-        "setono/code-quality-pack": "^2.7",
-        "sylius/sylius": "~1.12.15",
+        "setono/code-quality-pack": "^2.8.2",
+        "sylius/sylius": "~1.12.19",
         "symfony/debug-bundle": "^6.4 || ^7.0",
         "symfony/dotenv": "^6.4 || ^7.0",
         "symfony/intl": "^6.4 || ^7.0",

diff --git a/src/Controller/Action/SetupMapCustomerIdAction.php b/src/Controller/Action/SetupMapCustomerIdAction.php
@@ -5,20 +5,20 @@
 namespace Setono\SyliusGoogleAdsPlugin\Controller\Action;
 
 use Doctrine\Persistence\ManagerRegistry;
-use Google\Ads\GoogleAds\Lib\V15\GoogleAdsClient;
-use Google\Ads\GoogleAds\Lib\V15\GoogleAdsServerStreamDecorator;
-use Google\Ads\GoogleAds\V15\Enums\ConversionActionCategoryEnum\ConversionActionCategory;
-use Google\Ads\GoogleAds\V15\Enums\ConversionActionStatusEnum\ConversionActionStatus;
-use Google\Ads\GoogleAds\V15\Enums\ConversionActionTypeEnum\ConversionActionType;
-use Google\Ads\GoogleAds\V15\Enums\ResponseContentTypeEnum\ResponseContentType;
-use Google\Ads\GoogleAds\V15\Resources\ConversionAction;
-use Google\Ads\GoogleAds\V15\Services\Client\ConversionActionServiceClient;
-use Google\Ads\GoogleAds\V15\Services\Client\GoogleAdsServiceClient;
-use Google\Ads\GoogleAds\V15\Services\ConversionActionOperation;
-use Google\Ads\GoogleAds\V15\Services\GoogleAdsRow;
-use Google\Ads\GoogleAds\V15\Services\MutateConversionActionResult;
-use Google\Ads\GoogleAds\V15\Services\MutateConversionActionsRequest;
-use Google\Ads\GoogleAds\V15\Services\SearchGoogleAdsStreamRequest;
+use Google\Ads\GoogleAds\Lib\V17\GoogleAdsClient;
+use Google\Ads\GoogleAds\Lib\V17\GoogleAdsServerStreamDecorator;
+use Google\Ads\GoogleAds\V17\Enums\ConversionActionCategoryEnum\ConversionActionCategory;
+use Google\Ads\GoogleAds\V17\Enums\ConversionActionStatusEnum\ConversionActionStatus;
+use Google\Ads\GoogleAds\V17\Enums\ConversionActionTypeEnum\ConversionActionType;
+use Google\Ads\GoogleAds\V17\Enums\ResponseContentTypeEnum\ResponseContentType;
+use Google\Ads\GoogleAds\V17\Resources\ConversionAction;
+use Google\Ads\GoogleAds\V17\Services\Client\ConversionActionServiceClient;
+use Google\Ads\GoogleAds\V17\Services\Client\GoogleAdsServiceClient;
+use Google\Ads\GoogleAds\V17\Services\ConversionActionOperation;
+use Google\Ads\GoogleAds\V17\Services\GoogleAdsRow;
+use Google\Ads\GoogleAds\V17\Services\MutateConversionActionResult;
+use Google\Ads\GoogleAds\V17\Services\MutateConversionActionsRequest;
+use Google\Ads\GoogleAds\V17\Services\SearchGoogleAdsStreamRequest;
 use Setono\Doctrine\ORMTrait;
 use Setono\SyliusGoogleAdsPlugin\Factory\GoogleAdsClientFactoryInterface;
 use Setono\SyliusGoogleAdsPlugin\Form\Type\MapCustomerIdType;

diff --git a/src/ConversionProcessor/ConversionProcessor.php b/src/ConversionProcessor/ConversionProcessor.php
@@ -4,12 +4,12 @@
 
 namespace Setono\SyliusGoogleAdsPlugin\ConversionProcessor;
 
-use Google\Ads\GoogleAds\Util\V15\ResourceNames;
-use Google\Ads\GoogleAds\V15\Common\Consent as GoogleConsent;
-use Google\Ads\GoogleAds\V15\Enums\ConsentStatusEnum\ConsentStatus;
-use Google\Ads\GoogleAds\V15\Services\ClickConversion;
-use Google\Ads\GoogleAds\V15\Services\Client\ConversionUploadServiceClient;
-use Google\Ads\GoogleAds\V15\Services\UploadClickConversionsRequest;
+use Google\Ads\GoogleAds\Util\V17\ResourceNames;
+use Google\Ads\GoogleAds\V17\Common\Consent as GoogleConsent;
+use Google\Ads\GoogleAds\V17\Enums\ConsentStatusEnum\ConsentStatus;
+use Google\Ads\GoogleAds\V17\Services\ClickConversion;
+use Google\Ads\GoogleAds\V17\Services\Client\ConversionUploadServiceClient;
+use Google\Ads\GoogleAds\V17\Services\UploadClickConversionsRequest;
 use Psr\EventDispatcher\EventDispatcherInterface;
 use Setono\SyliusGoogleAdsPlugin\Event\PreSetClickConversionConsentEvent;
 use Setono\SyliusGoogleAdsPlugin\Event\PreSetClickConversionDataEvent;

diff --git a/src/Event/PreSetClickConversionUserIdentifiersEvent.php b/src/Event/PreSetClickConversionUserIdentifiersEvent.php
@@ -4,7 +4,7 @@
 
 namespace Setono\SyliusGoogleAdsPlugin\Event;
 
-use Google\Ads\GoogleAds\V15\Common\UserIdentifier;
+use Google\Ads\GoogleAds\V17\Common\UserIdentifier;
 use Setono\SyliusGoogleAdsPlugin\Model\ConversionInterface;
 use Symfony\Contracts\EventDispatcher\Event;
 

diff --git a/src/EventSubscriber/ConversionProcessing/AddEmailUserIdentifierSubscriber.php b/src/EventSubscriber/ConversionProcessing/AddEmailUserIdentifierSubscriber.php
@@ -4,8 +4,8 @@
 
 namespace Setono\SyliusGoogleAdsPlugin\EventSubscriber\ConversionProcessing;
 
-use Google\Ads\GoogleAds\V15\Common\UserIdentifier;
-use Google\Ads\GoogleAds\V15\Enums\UserIdentifierSourceEnum\UserIdentifierSource;
+use Google\Ads\GoogleAds\V17\Common\UserIdentifier;
+use Google\Ads\GoogleAds\V17\Enums\UserIdentifierSourceEnum\UserIdentifierSource;
 use Setono\SyliusGoogleAdsPlugin\Event\PreSetClickConversionUserIdentifiersEvent;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 

diff --git a/src/EventSubscriber/ConversionProcessing/AddPhoneNumberUserIdentifierSubscriber.php b/src/EventSubscriber/ConversionProcessing/AddPhoneNumberUserIdentifierSubscriber.php
@@ -6,8 +6,8 @@
 
 use Brick\PhoneNumber\PhoneNumber;
 use Brick\PhoneNumber\PhoneNumberFormat;
-use Google\Ads\GoogleAds\V15\Common\UserIdentifier;
-use Google\Ads\GoogleAds\V15\Enums\UserIdentifierSourceEnum\UserIdentifierSource;
+use Google\Ads\GoogleAds\V17\Common\UserIdentifier;
+use Google\Ads\GoogleAds\V17\Enums\UserIdentifierSourceEnum\UserIdentifierSource;
 use Setono\SyliusGoogleAdsPlugin\Event\PreSetClickConversionUserIdentifiersEvent;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 

diff --git a/src/Factory/GoogleAdsClientFactory.php b/src/Factory/GoogleAdsClientFactory.php
@@ -5,8 +5,8 @@
 namespace Setono\SyliusGoogleAdsPlugin\Factory;
 
 use Google\Ads\GoogleAds\Lib\OAuth2TokenBuilder;
-use Google\Ads\GoogleAds\Lib\V15\GoogleAdsClient;
-use Google\Ads\GoogleAds\Lib\V15\GoogleAdsClientBuilder;
+use Google\Ads\GoogleAds\Lib\V17\GoogleAdsClient;
+use Google\Ads\GoogleAds\Lib\V17\GoogleAdsClientBuilder;
 use Psr\Log\LoggerInterface;
 use Psr\Log\LogLevel;
 use Setono\SyliusGoogleAdsPlugin\Model\ConnectionInterface;

diff --git a/src/Factory/GoogleAdsClientFactoryInterface.php b/src/Factory/GoogleAdsClientFactoryInterface.php
@@ -4,7 +4,7 @@
 
 namespace Setono\SyliusGoogleAdsPlugin\Factory;
 
-use Google\Ads\GoogleAds\Lib\V15\GoogleAdsClient;
+use Google\Ads\GoogleAds\Lib\V17\GoogleAdsClient;
 use Psr\Log\LoggerInterface;
 use Setono\SyliusGoogleAdsPlugin\Model\ConnectionInterface;
 

diff --git a/src/Resolver/CustomerIdsResolver.php b/src/Resolver/CustomerIdsResolver.php
@@ -4,12 +4,12 @@
 
 namespace Setono\SyliusGoogleAdsPlugin\Resolver;
 
-use Google\Ads\GoogleAds\Lib\V15\GoogleAdsServerStreamDecorator;
-use Google\Ads\GoogleAds\V15\Services\Client\CustomerServiceClient;
-use Google\Ads\GoogleAds\V15\Services\Client\GoogleAdsServiceClient;
-use Google\Ads\GoogleAds\V15\Services\GoogleAdsRow;
-use Google\Ads\GoogleAds\V15\Services\ListAccessibleCustomersRequest;
-use Google\Ads\GoogleAds\V15\Services\SearchGoogleAdsStreamRequest;
+use Google\Ads\GoogleAds\Lib\V17\GoogleAdsServerStreamDecorator;
+use Google\Ads\GoogleAds\V17\Services\Client\CustomerServiceClient;
+use Google\Ads\GoogleAds\V17\Services\Client\GoogleAdsServiceClient;
+use Google\Ads\GoogleAds\V17\Services\GoogleAdsRow;
+use Google\Ads\GoogleAds\V17\Services\ListAccessibleCustomersRequest;
+use Google\Ads\GoogleAds\V17\Services\SearchGoogleAdsStreamRequest;
 use Google\ApiCore\ApiException;
 use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerInterface;