Merge remote-tracking branch 'refs/remotes/upstream/main'

# Conflicts:
#	composer.json
#	src/Google/Ads/GoogleAds/Lib/ConfigurationLoader.php
#	src/Google/Ads/GoogleAds/Lib/OAuth2TokenBuilder.php
#	src/Google/Ads/GoogleAds/Lib/V15/ServiceClientFactoryTrait.php

.travis.yml

@@ -1,7 +1,6 @@
 language: php
 
 php:
-  - 8.0
   - 8.1
   - 8.2
   - nightly

CHANGELOG.md

@@ -1,3 +1,114 @@
+## 23.1.0
+*   Added support for v17 of Google Ads API.
+*   Updated code examples for removing the usage of `pageSize`:
+    * GetAccountHierarchy
+    * GetChangeDetails
+    * GetChangeSummary
+    * LinkManagerToClient
+    * FindAndRemoveCriteriaFromSharedSet
+    * GetAdGroupBidModifiers
+    * GetResponsiveSearchAds
+    * GetAllDisapprovedAds
+    * CampaignReportToCsv
+    * SetUpRemarketing
+    * UpdateAudienceTargetRestriction
+    * AddPerformanceMaxProductListingGroupTree
+    * AddPerformanceMaxRetailCampaign
+    * AddShoppingProductListingGroupTree
+    * GetProductCategoryConstants
+    * Utils\Feeds
+*   Removed code examples:
+    * NavigateSearchResultPagesCachingTokens
+
+## 23.0.1
+*   Re-generated the source code for v16_1 of Google Ads API to add some missing
+    classes and enum values.
+
+## 23.0.0
+*   Added support for v16_1 of Google Ads API.
+*   Removed support for v14 of Google Ads API.
+*   Added support for `google/protobuf` v4.26.
+*   Updated `composer.json` to require the minimum PHP version of 8.1.
+*   Rolled back changes to the code base that requires PHP 8.0 or above, so PHP
+    7 users can still easily clone this library to work with the legacy code.
+*   Updated `package.json` of LaravelSampleApp.
+*   Added VerifyAdvertiserIdentity example.
+*   Updated code examples:
+    * AddCompleteCampaignsUsingBatchJob
+    * DetectAndApplyRecommendations
+    * DismissRecommendation
+    * UploadConversionAdjustment
+*   Removed code examples:
+    * AddFlightsFeed
+    * AddRealEstateFeed
+    * ApplyRecommendation
+    * ApproveMerchantCenterLink
+    * DismissRecommendation
+    * RejectMerchantCenterLink
+
+## 22.1.0
+*   Added support for v16 of Google Ads API.
+*   Fixed dependabot alert in `examples/LaravelSampleApp/composer.lock`.
+*   Renamed `examples/Extensions` to `examples/Assets`. Removed some logic
+    related to the extensions.
+*   Renamed code examples:
+    * from AddLeadFormExtension to AddLeadFormAsset
+    * from AddSitelinksUsingAssets to AddSitelinks
+*   Updated code examples:
+    * AddConversionAction
+    * AddFlexibleRuleUserList
+    * GetAdGroupBidModifiers
+*   Removed code examples:
+    * AddAffiliateLocationExtensions
+    * AddBusinessProfileLocationExtensions
+    * AddGeoTarget
+    * AddImageExtension
+    * AddSitelinks (the old one that uses extensions)
+    * MigratePromotionFeedToAsset
+    * RemoveEntireSitelinkCampaignExtensionSetting
+    * UpdateSitelink
+    * UpdateSitelinkCampaignExtensionSetting
+
+## 22.0.0
+*   Removed support for v13 of Google Ads API.
+*   Added more methods to `ResourceNames` of v14 and v15.
+*   Updated `GoogleAdsFailuresInterceptorTest.php` and `GoogleAdsLoggingInterceptorTest` to make them work with the latest version of `google/gax`.
+*   Updated code examples:
+    * AddFlexibleRuleUserList
+    * AddShoppingProductAd
+    * UploadOfflineConversion
+
+## 21.1.0
+*   Added support for v15 of Google Ads API. The following code examples still use v14 because the services in the examples were removed in v15:
+    * ApproveMerchantCenterLink
+    * RejectMerchantCenterLink
+    * UploadImage
+    * UploadMediaBundle
+*   The GAPIC v2 service clients (`src/Google/Ads/GoogleAds/v15/Services/Client/<SERVICE_NAME>Client.php`) no longer rely on base classes (`src/Google/Ads/GoogleAds/v15/Services/Client/BaseClient/<SERVICE_NAME>BaseClient.php`). All functions and variables are now directly included in the service classes.
+*   Added support for `useCloudOrgForApiAccess` config. This is in preparation for the pilot that uses Google Cloud orgs for API Access levels.
+*   Updated
+    [`InfoRedactor`](https://github.com/googleads/google-ads-php/blob/main/src/Google/Ads/GoogleAds/Lib/V15/InfoRedactor.php) to redact fields of Local Services lead and Local Services lead
+conversation.
+*   Updated code examples:
+    * AddBillingSetup
+    * AddPerformanceMaxProductListingGroupTree
+    * AddCustomerMatchUserList
+    * UploadCallConversion
+    * UploadOfflineConversion
+    * UploadStoreSalesTransactions
+*   Renamed and updated code examples:
+    * UploadConversionWithIdentifiers to UploadEnhancedConversionsForLeads
+    * UploadConversionEnhancement to UploadEnhancedConversionsForWeb
+*   Fixed the following Shopping examples after the `ShoppingSetting::sales_country` field is
+    removed:
+    * AddMerchantCenterDynamicRemarketingCampaign
+    * AddPerformanceMaxRetailCampaign
+    * AddShoppingProductAd
+
+## 21.0.1
+*   Fixed #946 by adding `forTopicConstant()` to
+    [ResourceNames](https://github.com/googleads/google-ads-php/blob/main/src/Google/Ads/GoogleAds/Util/V14/ResourceNames.php).
+
 ## 21.0.0
 *   Removed support for v12 of Google Ads API.
 *   Use [the GAPIC v2 source

README.md

@@ -1,17 +1,15 @@
 # Google Ads API Client Library for PHP
 
-[![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%208.0-8892BF.svg)](https://www.php.net/supported-versions.php)
+[![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%208.1-8892BF.svg)](https://www.php.net/supported-versions.php)
 [![Latest Stable
 Version](https://img.shields.io/packagist/v/googleads/google-ads-php.svg)](https://packagist.org/packages/googleads/google-ads-php)
 [![Total Downloads](https://poser.pugx.org/googleads/google-ads-php/downloads.svg)](https://packagist.org/packages/googleads/google-ads-php)
 [![License](https://poser.pugx.org/googleads/google-ads-php/license.svg)](https://packagist.org/packages/googleads/google-ads-php)
-
-[![Build
-Status](https://travis-ci.org/googleads/google-ads-php.svg?branch=master)](https://travis-ci.org/googleads/google-ads-php)
 [![codecov](https://codecov.io/gh/googleads/google-ads-php/branch/master/graph/badge.svg)](https://codecov.io/gh/googleads/google-ads-php)
 
 This project hosts the PHP client library for the [Google Ads
 API](https://developers.google.com/google-ads/api/docs/start).
+It adheres to the [PHP sunset schedule]([url](https://www.php.net/supported-versions.php)) and updates the composer.json file _four_ to _five_ months after the minimum required PHP version reaches its end-of-life. Based on the existing supported PHP versions, the update occurs about once a year.
 
 **IMPORTANT** The Google Ads API client library for PHP has been updated to require PHP version 8 as the minimum version, as announced in [#880](https://github.com/googleads/google-ads-php/issues/880).
 This means that the final version of the library that supports PHP 7 is [v19.2.0](https://github.com/googleads/google-ads-php/releases/tag/v19.2.0), which supports Google Ads API v12 to v14.
@@ -144,7 +142,7 @@ Follow the below steps if you want to try our code examples.
 ### Instantiate a client
 
 To issue requests via the Google Ads API, you first need to create a
-[GoogleAdsClient](https://github.com/googleads/google-ads-php/blob/HEAD/src/Google/Ads/GoogleAds/Lib/V14/GoogleAdsClient.php).
+[GoogleAdsClient](https://github.com/googleads/google-ads-php/blob/HEAD/src/Google/Ads/GoogleAds/Lib/V17/GoogleAdsClient.php).
 
 For more information on how to configure a client when instantiating it, see the
 [configuration guide](https://developers.google.com/google-ads/api/docs/client-libs/php/configuration).
@@ -216,4 +214,3 @@ See the [Performance guide](https://developers.google.com/google-ads/api/docs/cl
 
 *   [Thanet Knack Praneenararat](https://github.com/fiboknacky)
 *   [Mattia Tommasone](https://github.com/Raibaz)
-*   [Pierrick Voulet](https://github.com/PierrickVoulet)

composer.json

@@ -6,7 +6,7 @@
     "php": ">=7.3",
     "google/gax": "^1.18.1",
     "grpc/grpc": "^1.36.0",
-    "google/protobuf": "^3.21.5",
+    "google/protobuf": "^3.21.5 || ^4.26",
     "monolog/monolog": "^1.26 || ^2.0 || ^3.0"
   },
   "require-dev": {