diff --git a/composer.json b/composer.json index 2f0c0fafe40..b8404da39ad 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,8 @@ "ext-openssl": "*", "cweagans/composer-patches": "^1.7", "google/apiclient": "^2.16", - "google/apiclient-services-adsenselinks": "^0.1.0", + "google/apiclient-services-analyticsadmin-v1alpha": "dev-latest", + "google/apiclient-services-analyticsadmin-v1beta": "dev-latest", "google/apiclient-services-subscribewithgoogle": "^0.1.0", "guzzlehttp/guzzle": "^7.9.2", "symfony/polyfill-intl-idn": "^1.29.0" @@ -56,7 +57,6 @@ "google/apiclient-services": [ "Adsense", "AnalyticsData", - "GoogleAnalyticsAdmin", "PagespeedInsights", "PeopleService", "SearchConsole", @@ -73,7 +73,14 @@ "repositories": [ { "type": "path", - "url": "packages/apiclient-services-adsenselinks", + "url": "packages/apiclient-services-analyticsadmin-v1alpha", + "options": { + "symlink": false + } + }, + { + "type": "path", + "url": "packages/apiclient-services-analyticsadmin-v1beta", "options": { "symlink": false } diff --git a/composer.lock b/composer.lock index 6865177424f..2ed2186a3d1 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "c71ae91707a1e63e890687b66846c64c", + "content-hash": "ad885fd10b3b1d8570a9811f0c155aa0", "packages": [ { "name": "cweagans/composer-patches", @@ -231,19 +231,28 @@ "time": "2024-05-11T01:02:11+00:00" }, { - "name": "google/apiclient-services-adsenselinks", - "version": "v0.1", + "name": "google/apiclient-services-analyticsadmin-v1alpha", + "version": "dev-latest", "dist": { "type": "path", - "url": "packages/apiclient-services-adsenselinks", - "reference": "cab6e024be947d3690f317ed63fa33da5f5dcecf" + "url": "packages/apiclient-services-analyticsadmin-v1alpha", + "reference": "797a3c0e3c1ad821a147a0a464b7f57d50945a4b" }, "type": "library", - "autoload": { - "classmap": [ - "AdSenseLinks.php" - ] + "transport-options": { + "symlink": false, + "relative": true + } + }, + { + "name": "google/apiclient-services-analyticsadmin-v1beta", + "version": "dev-latest", + "dist": { + "type": "path", + "url": "packages/apiclient-services-analyticsadmin-v1beta", + "reference": "43db6137aea228b05d9a45a2e686337b1f56cb05" }, + "type": "library", "transport-options": { "symlink": false, "relative": true @@ -5240,6 +5249,8 @@ "aliases": [], "minimum-stability": "stable", "stability-flags": { + "google/apiclient-services-analyticsadmin-v1alpha": 20, + "google/apiclient-services-analyticsadmin-v1beta": 20, "roave/security-advisories": 20 }, "prefer-stable": false, diff --git a/includes/Modules/Analytics_4.php b/includes/Modules/Analytics_4.php index ccf1942afd9..7d34ce47afb 100644 --- a/includes/Modules/Analytics_4.php +++ b/includes/Modules/Analytics_4.php @@ -67,10 +67,6 @@ use Google\Site_Kit\Modules\Analytics_4\Synchronize_Property; use Google\Site_Kit\Modules\Analytics_4\Synchronize_AdSenseLinked; use Google\Site_Kit\Modules\Analytics_4\GoogleAnalyticsAdmin\AccountProvisioningService; -use Google\Site_Kit\Modules\Analytics_4\GoogleAnalyticsAdmin\EnhancedMeasurementSettingsModel; -use Google\Site_Kit\Modules\Analytics_4\GoogleAnalyticsAdmin\PropertiesAdSenseLinksService; -use Google\Site_Kit\Modules\Analytics_4\GoogleAnalyticsAdmin\PropertiesAudiencesService; -use Google\Site_Kit\Modules\Analytics_4\GoogleAnalyticsAdmin\PropertiesEnhancedMeasurementService; use Google\Site_Kit\Modules\Analytics_4\Report\Request as Analytics_4_Report_Request; use Google\Site_Kit\Modules\Analytics_4\Report\Response as Analytics_4_Report_Response; use Google\Site_Kit\Modules\Analytics_4\Resource_Data_Availability_Date; @@ -86,12 +82,14 @@ use Google\Site_Kit_Dependencies\Google\Service\AnalyticsData\Dimension as Google_Service_AnalyticsData_Dimension; use Google\Site_Kit_Dependencies\Google\Service\AnalyticsData\Metric as Google_Service_AnalyticsData_Metric; use Google\Site_Kit_Dependencies\Google\Service\GoogleAnalyticsAdmin as Google_Service_GoogleAnalyticsAdmin; -use Google\Site_Kit_Dependencies\Google\Service\GoogleAnalyticsAdmin\GoogleAnalyticsAdminV1alphaAudience; use Google\Site_Kit_Dependencies\Google\Service\GoogleAnalyticsAdmin\GoogleAnalyticsAdminV1betaCustomDimension; use Google\Site_Kit_Dependencies\Google\Service\GoogleAnalyticsAdmin\GoogleAnalyticsAdminV1betaDataStream; use Google\Site_Kit_Dependencies\Google\Service\GoogleAnalyticsAdmin\GoogleAnalyticsAdminV1betaDataStreamWebStreamData; use Google\Site_Kit_Dependencies\Google\Service\GoogleAnalyticsAdmin\GoogleAnalyticsAdminV1betaListDataStreamsResponse; use Google\Site_Kit_Dependencies\Google\Service\GoogleAnalyticsAdmin\GoogleAnalyticsAdminV1betaProperty as Google_Service_GoogleAnalyticsAdmin_GoogleAnalyticsAdminV1betaProperty; +use Google\Site_Kit_Dependencies\Google\Service\GoogleAnalyticsAdminV1alpha; +use Google\Site_Kit_Dependencies\Google\Service\GoogleAnalyticsAdminV1alpha\GoogleAnalyticsAdminV1alphaAudience; +use Google\Site_Kit_Dependencies\Google\Service\GoogleAnalyticsAdminV1alpha\GoogleAnalyticsAdminV1alphaEnhancedMeasurementSettings; use Google\Site_Kit_Dependencies\Google\Service\TagManager as Google_Service_TagManager; use Google\Site_Kit_Dependencies\Google_Service_TagManager_Container; use Google\Site_Kit_Dependencies\Psr\Http\Message\RequestInterface; @@ -684,7 +682,7 @@ protected function get_datapoint_definitions() { 'GET:account-summaries' => array( 'service' => 'analyticsadmin' ), 'GET:accounts' => array( 'service' => 'analyticsadmin' ), 'GET:ads-links' => array( 'service' => 'analyticsadmin' ), - 'GET:adsense-links' => array( 'service' => 'analyticsadsenselinks' ), + 'GET:adsense-links' => array( 'service' => 'analyticsadmin-v1alpha' ), 'GET:container-lookup' => array( 'service' => 'tagmanager', 'scopes' => array( @@ -751,9 +749,9 @@ protected function get_datapoint_definitions() { ), 'GET:webdatastreams' => array( 'service' => 'analyticsadmin' ), 'GET:webdatastreams-batch' => array( 'service' => 'analyticsadmin' ), - 'GET:enhanced-measurement-settings' => array( 'service' => 'analyticsenhancedmeasurement' ), + 'GET:enhanced-measurement-settings' => array( 'service' => 'analyticsadmin-v1alpha' ), 'POST:enhanced-measurement-settings' => array( - 'service' => 'analyticsenhancedmeasurement', + 'service' => 'analyticsadmin-v1alpha', 'scopes' => array( self::EDIT_SCOPE ), 'request_scopes_message' => __( 'You’ll need to grant Site Kit permission to update enhanced measurement settings for this Analytics web data stream on your behalf.', 'google-site-kit' ), ), @@ -775,7 +773,7 @@ protected function get_datapoint_definitions() { 'service' => '', ), 'POST:create-audience' => array( - 'service' => 'analyticsaudiences', + 'service' => 'analyticsadmin-v1alpha', 'scopes' => array( self::EDIT_SCOPE ), 'request_scopes_message' => __( 'You’ll need to grant Site Kit permission to create new audiences for your Analytics property on your behalf.', 'google-site-kit' ), ), @@ -783,7 +781,7 @@ protected function get_datapoint_definitions() { 'service' => '', ), 'POST:sync-audiences' => array( - 'service' => 'analyticsaudiences', + 'service' => 'analyticsadmin-v1alpha', 'shareable' => true, ), 'GET:audience-settings' => array( @@ -1189,7 +1187,9 @@ protected function create_data_request( Data_Request $data ) { $parent = self::normalize_property_id( $data['propertyID'] ); - return $this->get_analyticsadsenselinks_service()->properties_adSenseLinks->listPropertiesAdSenseLinks( $parent ); + return $this->get_analyticsadminv1alpha_service() + ->properties_adSenseLinks + ->listPropertiesAdSenseLinks( $parent ); case 'POST:create-audience': $settings = $this->get_settings()->get(); if ( ! isset( $settings['propertyID'] ) ) { @@ -1231,9 +1231,7 @@ protected function create_data_request( Data_Request $data ) { $post_body = new GoogleAnalyticsAdminV1alphaAudience( $audience ); - $analyticsadmin = $this->get_analyticsaudiences_service(); - - return $analyticsadmin + return $this->get_analyticsadminv1alpha_service() ->properties_audiences ->create( $property_id, @@ -1394,10 +1392,8 @@ protected function create_data_request( Data_Request $data ) { $data['propertyID'] ) . '/dataStreams/' . $data['webDataStreamID'] . '/enhancedMeasurementSettings'; - $analyticsadmin = $this->get_analyticsenhancedmeasurements_service(); - - return $analyticsadmin - ->properties_enhancedMeasurements // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase + return $this->get_analyticsadminv1alpha_service() + ->properties_dataStreams // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase ->getEnhancedMeasurementSettings( $name ); case 'POST:enhanced-measurement-settings': if ( ! isset( $data['propertyID'] ) ) { @@ -1458,12 +1454,10 @@ protected function create_data_request( Data_Request $data ) { $data['propertyID'] ) . '/dataStreams/' . $data['webDataStreamID'] . '/enhancedMeasurementSettings'; - $post_body = new EnhancedMeasurementSettingsModel( $data['enhancedMeasurementSettings'] ); + $post_body = new GoogleAnalyticsAdminV1alphaEnhancedMeasurementSettings( $data['enhancedMeasurementSettings'] ); - $analyticsadmin = $this->get_analyticsenhancedmeasurements_service(); - - return $analyticsadmin - ->properties_enhancedMeasurements // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase + return $this->get_analyticsadminv1alpha_service() + ->properties_dataStreams // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase ->updateEnhancedMeasurementSettings( $name, $post_body, @@ -1603,10 +1597,9 @@ protected function create_data_request( Data_Request $data ) { ); } - $analyticsadmin = $this->get_analyticsaudiences_service(); - $property_id = self::normalize_property_id( $settings['propertyID'] ); + $property_id = self::normalize_property_id( $settings['propertyID'] ); - return $analyticsadmin + return $this->get_analyticsadminv1alpha_service() ->properties_audiences ->listPropertiesAudiences( $property_id ); case 'POST:sync-custom-dimensions': @@ -1942,47 +1935,25 @@ protected function setup_info() { } /** - * Gets the configured Analytics Data service object instance. + * Gets the configured Analytics Admin v1alpha service instance. * - * @since 1.93.0 + * @since n.e.x.t * - * @return Google_Service_AnalyticsData The Analytics Data API service. + * @return GoogleAnalyticsAdminV1alpha */ - protected function get_analyticsdata_service() { - return $this->get_service( 'analyticsdata' ); + protected function get_analyticsadminv1alpha_service(): GoogleAnalyticsAdminV1alpha { + return $this->get_service( 'analyticsadmin-v1alpha' ); } /** * Gets the configured Analytics Data service object instance. * - * @since 1.110.0 - * - * @return PropertiesEnhancedMeasurementService The Analytics Admin API service. - */ - protected function get_analyticsenhancedmeasurements_service() { - return $this->get_service( 'analyticsenhancedmeasurement' ); - } - - /** - * Gets the configured Analytics Admin service object instance that includes `adSenseLinks` related methods. - * - * @since 1.120.0 - * - * @return PropertiesAdSenseLinksService The Analytics Admin API service. - */ - protected function get_analyticsadsenselinks_service() { - return $this->get_service( 'analyticsadsenselinks' ); - } - - /** - * Gets the configured Analytics Data service object instance. - * - * @since 1.120.0 + * @since 1.93.0 * - * @return PropertiesAudiencesService The Analytics Admin API service. + * @return Google_Service_AnalyticsData The Analytics Data API service. */ - protected function get_analyticsaudiences_service() { - return $this->get_service( 'analyticsaudiences' ); + protected function get_analyticsdata_service() { + return $this->get_service( 'analyticsdata' ); } /** @@ -2001,13 +1972,11 @@ protected function setup_services( Google_Site_Kit_Client $client ) { $google_proxy = $this->authentication->get_google_proxy(); return array( - 'analyticsadmin' => new Google_Service_GoogleAnalyticsAdmin( $client ), - 'analyticsdata' => new Google_Service_AnalyticsData( $client ), - 'analyticsprovisioning' => new AccountProvisioningService( $client, $google_proxy->url() ), - 'analyticsenhancedmeasurement' => new PropertiesEnhancedMeasurementService( $client ), - 'analyticsaudiences' => new PropertiesAudiencesService( $client ), - 'analyticsadsenselinks' => new PropertiesAdSenseLinksService( $client ), - 'tagmanager' => new Google_Service_TagManager( $client ), + 'analyticsadmin' => new Google_Service_GoogleAnalyticsAdmin( $client ), + 'analyticsadmin-v1alpha' => new GoogleAnalyticsAdminV1alpha( $client ), + 'analyticsdata' => new Google_Service_AnalyticsData( $client ), + 'analyticsprovisioning' => new AccountProvisioningService( $client, $google_proxy->url() ), + 'tagmanager' => new Google_Service_TagManager( $client ), ); } diff --git a/includes/Modules/Analytics_4/GoogleAnalyticsAdmin/EnhancedMeasurementSettingsModel.php b/includes/Modules/Analytics_4/GoogleAnalyticsAdmin/EnhancedMeasurementSettingsModel.php deleted file mode 100644 index 62a387441de..00000000000 --- a/includes/Modules/Analytics_4/GoogleAnalyticsAdmin/EnhancedMeasurementSettingsModel.php +++ /dev/null @@ -1,93 +0,0 @@ -fileDownloadsEnabled = $fileDownloadsEnabled; - } - public function getFileDownloadsEnabled() { - return $this->fileDownloadsEnabled; - } - public function setName( $name ) { - $this->name = $name; - } - public function getName() { - return $this->name; - } - public function setOutboundClicksEnabled( $outboundClicksEnabled ) { - $this->outboundClicksEnabled = $outboundClicksEnabled; - } - public function getOutboundClicksEnabled() { - return $this->outboundClicksEnabled; - } - public function setPageChangesEnabled( $pageChangesEnabled ) { - $this->pageChangesEnabled = $pageChangesEnabled; - } - public function getPageChangesEnabled() { - return $this->pageChangesEnabled; - } - public function setScrollsEnabled( $scrollsEnabled ) { - $this->scrollsEnabled = $scrollsEnabled; - } - public function getScrollsEnabled() { - return $this->scrollsEnabled; - } - public function setSearchQueryParameter( $searchQueryParameter ) { - $this->searchQueryParameter = $searchQueryParameter; - } - public function getSearchQueryParameter() { - return $this->searchQueryParameter; - } - public function setSiteSearchEnabled( $siteSearchEnabled ) { - $this->siteSearchEnabled = $siteSearchEnabled; - } - public function getSiteSearchEnabled() { - return $this->siteSearchEnabled; - } - public function setStreamEnabled( $streamEnabled ) { - $this->streamEnabled = $streamEnabled; - } - public function getStreamEnabled() { - return $this->streamEnabled; - } - public function setUriQueryParameter( $uriQueryParameter ) { - $this->uriQueryParameter = $uriQueryParameter; - } - public function getUriQueryParameter() { - return $this->uriQueryParameter; - } - public function setVideoEngagementEnabled( $videoEngagementEnabled ) { - $this->videoEngagementEnabled = $videoEngagementEnabled; - } - public function getVideoEngagementEnabled() { - return $this->videoEngagementEnabled; - } -} diff --git a/includes/Modules/Analytics_4/GoogleAnalyticsAdmin/PropertiesAdSenseLinksService.php b/includes/Modules/Analytics_4/GoogleAnalyticsAdmin/PropertiesAdSenseLinksService.php deleted file mode 100644 index 86a86bb42cd..00000000000 --- a/includes/Modules/Analytics_4/GoogleAnalyticsAdmin/PropertiesAdSenseLinksService.php +++ /dev/null @@ -1,108 +0,0 @@ -version = 'v1alpha'; - - // phpcs:ignore WordPress.NamingConventions.ValidVariableName - $this->properties_adSenseLinks = new PropertiesAdSenseLinksResource( - $this, - $this->serviceName, // phpcs:ignore WordPress.NamingConventions.ValidVariableName - 'adSenseLinks', - array( - 'methods' => array( - 'create' => array( - 'path' => 'v1alpha/{+parent}/adSenseLinks', - 'httpMethod' => 'POST', - 'parameters' => array( - 'parent' => array( - 'location' => 'path', - 'type' => 'string', - 'required' => true, - ), - ), - ), - 'delete' => array( - 'path' => 'v1alpha/{+name}', - 'httpMethod' => 'DELETE', - 'parameters' => array( - 'name' => array( - 'location' => 'path', - 'type' => 'string', - 'required' => true, - ), - ), - ), - 'get' => array( - 'path' => 'v1alpha/{+name}', - 'httpMethod' => 'GET', - 'parameters' => array( - 'name' => array( - 'location' => 'path', - 'type' => 'string', - 'required' => true, - ), - ), - ), - 'list' => array( - 'path' => 'v1alpha/{+parent}/adSenseLinks', - 'httpMethod' => 'GET', - 'parameters' => array( - 'parent' => array( - 'location' => 'path', - 'type' => 'string', - 'required' => true, - ), - 'pageSize' => array( - 'location' => 'query', - 'type' => 'integer', - ), - 'pageToken' => array( - 'location' => 'query', - 'type' => 'string', - ), - ), - ), - ), - ) - ); - } -} diff --git a/includes/Modules/Analytics_4/GoogleAnalyticsAdmin/PropertiesAudiencesService.php b/includes/Modules/Analytics_4/GoogleAnalyticsAdmin/PropertiesAudiencesService.php deleted file mode 100644 index cc932a499be..00000000000 --- a/includes/Modules/Analytics_4/GoogleAnalyticsAdmin/PropertiesAudiencesService.php +++ /dev/null @@ -1,85 +0,0 @@ -version = 'v1alpha'; - - $this->properties_audiences = new PropertiesAudiences( - $this, - $this->serviceName, // phpcs:ignore WordPress.NamingConventions.ValidVariableName - 'audiences', - array( - 'methods' => array( - 'create' => array( - 'path' => 'v1alpha/{+parent}/audiences', - 'httpMethod' => 'POST', - 'parameters' => array( - 'parent' => array( - 'location' => 'path', - 'type' => 'string', - 'required' => true, - ), - ), - ), - 'list' => array( - 'path' => 'v1alpha/{+parent}/audiences', - 'httpMethod' => 'GET', - 'parameters' => array( - 'parent' => array( - 'location' => 'path', - 'type' => 'string', - 'required' => true, - ), - 'pageSize' => array( - 'location' => 'query', - 'type' => 'integer', - ), - 'pageToken' => array( - 'location' => 'query', - 'type' => 'string', - ), - ), - ), - ), - ) - ); - } -} diff --git a/includes/Modules/Analytics_4/GoogleAnalyticsAdmin/PropertiesEnhancedMeasurementResource.php b/includes/Modules/Analytics_4/GoogleAnalyticsAdmin/PropertiesEnhancedMeasurementResource.php deleted file mode 100644 index 67f9ab8568a..00000000000 --- a/includes/Modules/Analytics_4/GoogleAnalyticsAdmin/PropertiesEnhancedMeasurementResource.php +++ /dev/null @@ -1,63 +0,0 @@ - $name ); - $params = array_merge( $params, $opt_params ); - return $this->call( 'getEnhancedMeasurementSettings', array( $params ), EnhancedMeasurementSettingsModel::class ); - } - - /** - * Updates the singleton enhanced measurement settings for this web stream. Note - * that the stream must enable enhanced measurement for these settings to take - * effect. (webDataStreams.updateEnhancedMeasurementSettings) - * - * @param string $name Output only. Resource name of this Data Stream. Format: properties/{property_id}/webDataStreams/{stream_id}/enhancedMeasurementSettings - * Example: "properties/1000/webDataStreams/2000/enhancedMeasurementSettings". - * @param EnhancedMeasurementSettingsModel $post_body The body of the request. - * @param array $opt_params Optional parameters. - * - * @opt_param string updateMask Required. The list of fields to be updated. - * Field names must be in snake case (e.g., "field_to_update"). Omitted fields - * will not be updated. To replace the entire entity, use one path with the - * string "*" to match all fields. - * @return EnhancedMeasurementSettingsModel - */ - public function updateEnhancedMeasurementSettings( $name, EnhancedMeasurementSettingsModel $post_body, $opt_params = array() ) { - $params = array( - 'name' => $name, - 'postBody' => $post_body, - ); - $params = array_merge( $params, $opt_params ); - return $this->call( 'updateEnhancedMeasurementSettings', array( $params ), EnhancedMeasurementSettingsModel::class ); - } -} diff --git a/includes/Modules/Analytics_4/GoogleAnalyticsAdmin/PropertiesEnhancedMeasurementService.php b/includes/Modules/Analytics_4/GoogleAnalyticsAdmin/PropertiesEnhancedMeasurementService.php deleted file mode 100644 index ad82d70498c..00000000000 --- a/includes/Modules/Analytics_4/GoogleAnalyticsAdmin/PropertiesEnhancedMeasurementService.php +++ /dev/null @@ -1,81 +0,0 @@ -version = 'v1alpha'; - - // phpcs:ignore WordPress.NamingConventions.ValidVariableName - $this->properties_enhancedMeasurements = new PropertiesEnhancedMeasurementResource( - $this, - $this->serviceName, // phpcs:ignore WordPress.NamingConventions.ValidVariableName - 'enhancedMeasurements', - array( - 'methods' => array( - 'getEnhancedMeasurementSettings' => array( - 'path' => 'v1alpha/{+name}', - 'httpMethod' => 'GET', - 'parameters' => array( - 'name' => array( - 'location' => 'path', - 'type' => 'string', - 'required' => true, - ), - ), - ), - 'updateEnhancedMeasurementSettings' => array( - 'path' => 'v1alpha/{+name}', - 'httpMethod' => 'PATCH', - 'parameters' => array( - 'name' => array( - 'location' => 'path', - 'type' => 'string', - 'required' => true, - ), - 'updateMask' => array( - 'location' => 'query', - 'type' => 'string', - ), - ), - ), - ), - ) - ); - } -} diff --git a/packages/apiclient-services-adsenselinks/AdSenseLinks.php b/packages/apiclient-services-adsenselinks/AdSenseLinks.php deleted file mode 100644 index c067fb4de94..00000000000 --- a/packages/apiclient-services-adsenselinks/AdSenseLinks.php +++ /dev/null @@ -1,158 +0,0 @@ - - * $analyticsadminService = new Google_Service_GoogleAnalyticsAdmin(...); - * $adSenseLinks = $analyticsadminService->adSenseLinks; - * - */ -class Google_Service_GoogleAnalyticsAdmin_PropertiesAdSenseLinks_Resource extends Google_Service_Resource -{ - - /** - * Creates an AdSenseLink. (adSenseLinks.create) - * - * @param string $parent Required. The property for which to create an AdSense - * Link. Format: properties/{propertyId} Example: properties/1234 - * @param Google_Service_GoogleAnalyticsAdmin_GoogleAnalyticsAdminV1alphaAdSenseLink $postBody - * @param array $optParams Optional parameters. - * @return Google_Service_GoogleAnalyticsAdmin_GoogleAnalyticsAdminV1alphaAdSenseLink - */ - public function create($parent, Google_Service_GoogleAnalyticsAdmin_GoogleAnalyticsAdminV1alphaAdSenseLink $postBody, $optParams = array()) - { - $params = array('parent' => $parent, 'postBody' => $postBody); - $params = array_merge($params, $optParams); - return $this->call('create', array($params), "Google_Service_GoogleAnalyticsAdmin_GoogleAnalyticsAdminV1alphaAdSenseLink"); - } - - /** - * Deletes an AdSenseLink. (adSenseLinks.delete) - * - * @param string $name Required. Unique identifier for the AdSense Link to be - * deleted. Format: properties/{propertyId}/adSenseLinks/{linkId} Example: - * properties/1234/adSenseLinks/5678 - * @param array $optParams Optional parameters. - * @return Google_Service_GoogleAnalyticsAdmin_GoogleProtobufEmpty - */ - public function delete($name, $optParams = array()) - { - $params = array('name' => $name); - $params = array_merge($params, $optParams); - return $this->call('delete', array($params), "Google_Service_GoogleAnalyticsAdmin_GoogleProtobufEmpty"); - } - - /** - * Looks up a single AdSenseLink. (adSenseLinks.get) - * - * @param string $name Required. Unique identifier for the AdSense Link - * requested. Format: properties/{propertyId}/adSenseLinks/{linkId} Example: - * properties/1234/adSenseLinks/5678 - * @param array $optParams Optional parameters. - * @return Google_Service_GoogleAnalyticsAdmin_GoogleAnalyticsAdminV1alphaAdSenseLink - */ - public function get($name, $optParams = array()) - { - $params = array('name' => $name); - $params = array_merge($params, $optParams); - return $this->call('get', array($params), "Google_Service_GoogleAnalyticsAdmin_GoogleAnalyticsAdminV1alphaAdSenseLink"); - } - - /** - * Lists AdSenseLinks on a property. (adSenseLinks.listPropertiesAdSenseLinks) - * - * @param string $parent Required. Resource name of the parent property. Format: - * properties/{propertyId} Example: properties/1234 - * @param array $optParams Optional parameters. - * - * @opt_param int pageSize The maximum number of resources to return. If - * unspecified, at most 50 resources will be returned. The maximum value is 200 - * (higher values will be coerced to the maximum). - * @opt_param string pageToken A page token received from a previous - * `ListAdSenseLinks` call. Provide this to retrieve the subsequent page. When - * paginating, all other parameters provided to `ListAdSenseLinks` must match - * the call that provided the page token. - * @return Google_Service_GoogleAnalyticsAdmin_GoogleAnalyticsAdminV1alphaListAdSenseLinksResponse - */ - public function listPropertiesAdSenseLinks($parent, $optParams = array()) - { - $params = array('parent' => $parent); - $params = array_merge($params, $optParams); - return $this->call('list', array($params), "Google_Service_GoogleAnalyticsAdmin_GoogleAnalyticsAdminV1alphaListAdSenseLinksResponse"); - } -} - -class Google_Service_GoogleAnalyticsAdmin_GoogleAnalyticsAdminV1alphaAdSenseLink extends Google_Model -{ - protected $internal_gapi_mappings = array( - ); - public $adClientCode; - public $name; - - - public function setAdClientCode($adClientCode) - { - $this->adClientCode = $adClientCode; - } - public function getAdClientCode() - { - return $this->adClientCode; - } - public function setName($name) - { - $this->name = $name; - } - public function getName() - { - return $this->name; - } -} - -class Google_Service_GoogleAnalyticsAdmin_GoogleAnalyticsAdminV1alphaListAdSenseLinksResponse extends Google_Collection -{ - protected $collection_key = 'adsenseLinks'; - protected $internal_gapi_mappings = array( - ); - protected $adsenseLinksType = 'Google_Service_GoogleAnalyticsAdmin_GoogleAnalyticsAdminV1alphaAdSenseLink'; - protected $adsenseLinksDataType = 'array'; - public $adsenseLinks; - public $nextPageToken; - - - public function setAdsenseLinks($adsenseLinks) - { - $this->adsenseLinks = $adsenseLinks; - } - public function getAdsenseLinks() - { - return $this->adsenseLinks; - } - public function setNextPageToken($nextPageToken) - { - $this->nextPageToken = $nextPageToken; - } - public function getNextPageToken() - { - return $this->nextPageToken; - } -} - -class Google_Service_GoogleAnalyticsAdmin_GoogleProtobufEmpty extends Google_Model -{ -} diff --git a/packages/apiclient-services-adsenselinks/composer.json b/packages/apiclient-services-adsenselinks/composer.json deleted file mode 100644 index eb4a58964f2..00000000000 --- a/packages/apiclient-services-adsenselinks/composer.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "google/apiclient-services-adsenselinks", - "version": "v0.1", - "autoload": { - "classmap": [ - "AdSenseLinks.php" - ] - } -} diff --git a/scoper.inc.php b/scoper.inc.php index c0580a70f9a..cbb73763811 100644 --- a/scoper.inc.php +++ b/scoper.inc.php @@ -61,6 +61,15 @@ function ( $file_path, $prefix, $contents ) { // Rewrite "Class_Name" to Class_Name::class to inherit namespace. $contents = preg_replace( '/"(Google_[^"]+)"/', '\\1::class', $contents ); } + if ( false !== strpos( $file_path, 'apiclient-services-analyticsadmin-v1alpha' ) ) { + // Put v1alpha library in alternate namespace to avoid collision with v1beta for some things. + $contents = preg_replace( + // Use a regular expression to avoid prefixing those that have V1alpha already. + '/GoogleAnalyticsAdmin(V1alpha)?/', + 'GoogleAnalyticsAdminV1alpha', + $contents + ); + } if ( false !== strpos( $file_path, 'phpseclib' ) ) { $contents = str_replace( "'phpseclib3\\\\", "'\\\\" . $doubled_backslash_prefix . '\\\\phpseclib3\\\\', $contents ); $contents = str_replace( "'\\\\phpseclib3", "'\\\\" . $doubled_backslash_prefix . '\\\\phpseclib3', $contents ); diff --git a/tests/phpunit/integration/Modules/Analytics_4/Datapoints/Create_Account_TicketTest.php b/tests/phpunit/integration/Modules/Analytics_4/Datapoints/Create_Account_TicketTest.php index 533e2e1e19f..3aba72c62de 100644 --- a/tests/phpunit/integration/Modules/Analytics_4/Datapoints/Create_Account_TicketTest.php +++ b/tests/phpunit/integration/Modules/Analytics_4/Datapoints/Create_Account_TicketTest.php @@ -11,8 +11,8 @@ namespace Google\Site_Kit\Tests\Modules\Analytics_4\Datapoints; use Google\Site_Kit\Core\REST_API\Exception\Missing_Required_Param_Exception; -use Google\Site_Kit\Modules\Analytics_4\GoogleAnalyticsAdmin\AccountProvisioningService; use Google\Site_Kit\Core\REST_API\Data_Request; +use Google\Site_Kit\Modules\Analytics_4\GoogleAnalyticsAdmin\AccountProvisioningService; use Google\Site_Kit\Tests\TestCase; use Google\Site_Kit\Context; use Google\Site_Kit\Core\Authentication\Authentication; diff --git a/tests/phpunit/integration/Modules/Analytics_4/Synchronize_AdSenseLinkedTest.php b/tests/phpunit/integration/Modules/Analytics_4/Synchronize_AdSenseLinkedTest.php index 7592b6d83ed..6846ad52a2b 100644 --- a/tests/phpunit/integration/Modules/Analytics_4/Synchronize_AdSenseLinkedTest.php +++ b/tests/phpunit/integration/Modules/Analytics_4/Synchronize_AdSenseLinkedTest.php @@ -23,10 +23,11 @@ use Google\Site_Kit\Tests\ModulesHelperTrait; use Google\Site_Kit\Tests\TestCase; use Google\Site_Kit_Dependencies\Google\Service\GoogleAnalyticsAdmin\GoogleAnalyticsAdminV1betaProperty; +use Google\Site_Kit_Dependencies\Google\Service\GoogleAnalyticsAdminV1alpha\GoogleAnalyticsAdminV1alphaAdSenseLink; +use Google\Site_Kit_Dependencies\Google\Service\GoogleAnalyticsAdminV1alpha\GoogleAnalyticsAdminV1alphaListAdSenseLinksResponse; use Google\Site_Kit_Dependencies\GuzzleHttp\Promise\FulfilledPromise; use Google\Site_Kit_Dependencies\GuzzleHttp\Psr7\Request; use Google\Site_Kit_Dependencies\GuzzleHttp\Psr7\Response; -use Google_Service_GoogleAnalyticsAdmin_GoogleAnalyticsAdminV1alphaAdSenseLink; use Google_Service_GoogleAnalyticsAdmin_GoogleAnalyticsAdminV1alphaListAdSenseLinksResponse; /** @@ -130,11 +131,11 @@ function ( Request $request ) use ( $property_id, $client_id ) { $property->setName( "properties/{$property_id}" ); if ( "/v1alpha/properties/{$property_id}/adSenseLinks" === $url['path'] ) { - $mock_adSenseLink = new Google_Service_GoogleAnalyticsAdmin_GoogleAnalyticsAdminV1alphaAdSenseLink(); + $mock_adSenseLink = new GoogleAnalyticsAdminV1alphaAdSenseLink(); $mock_adSenseLink->setName( "properties/{$property_id}/adSenseLinks/{$property_id}" ); $mock_adSenseLink->setAdClientCode( $client_id ); - $response = new Google_Service_GoogleAnalyticsAdmin_GoogleAnalyticsAdminV1alphaListAdSenseLinksResponse(); + $response = new GoogleAnalyticsAdminV1alphaListAdSenseLinksResponse(); $response->setAdsenseLinks( array( $mock_adSenseLink ) ); return new FulfilledPromise( new Response( diff --git a/tests/phpunit/integration/Modules/Analytics_4Test.php b/tests/phpunit/integration/Modules/Analytics_4Test.php index a8f6960775d..ca646afa38a 100644 --- a/tests/phpunit/integration/Modules/Analytics_4Test.php +++ b/tests/phpunit/integration/Modules/Analytics_4Test.php @@ -33,7 +33,6 @@ use Google\Site_Kit\Modules\Analytics_4\Conversion_Reporting\Conversion_Reporting_Events_Sync; use Google\Site_Kit\Modules\Analytics_4\Conversion_Reporting\Conversion_Reporting_New_Badge_Events_Sync; use Google\Site_Kit\Modules\Analytics_4\Custom_Dimensions_Data_Available; -use Google\Site_Kit\Modules\Analytics_4\GoogleAnalyticsAdmin\EnhancedMeasurementSettingsModel; use Google\Site_Kit\Modules\Analytics_4\Resource_Data_Availability_Date; use Google\Site_Kit\Modules\Analytics_4\Settings; use Google\Site_Kit\Modules\Analytics_4\Synchronize_AdSenseLinked; @@ -59,13 +58,13 @@ use Google\Site_Kit_Dependencies\Google\Service\GoogleAnalyticsAdmin\GoogleAnalyticsAdminV1betaListCustomDimensionsResponse; use Google\Site_Kit_Dependencies\Google\Service\GoogleAnalyticsAdmin\GoogleAnalyticsAdminV1betaListKeyEventsResponse; use Google\Site_Kit_Dependencies\Google\Service\GoogleAnalyticsAdmin\GoogleAnalyticsAdminV1betaProvisionAccountTicketResponse; +use Google\Site_Kit_Dependencies\Google\Service\GoogleAnalyticsAdminV1alpha\GoogleAnalyticsAdminV1alphaAdSenseLink; +use Google\Site_Kit_Dependencies\Google\Service\GoogleAnalyticsAdminV1alpha\GoogleAnalyticsAdminV1alphaListAdSenseLinksResponse; use Google\Site_Kit_Dependencies\Google\Service\TagManager\Container; use Google\Site_Kit_Dependencies\GuzzleHttp\Promise\FulfilledPromise; use Google\Site_Kit_Dependencies\GuzzleHttp\Psr7\Request; use Google\Site_Kit_Dependencies\GuzzleHttp\Psr7\Response; use Google\Site_Kit_Dependencies\Google\Service\GoogleAnalyticsAdmin\GoogleAnalyticsAdminV1betaProperty; -use Google_Service_GoogleAnalyticsAdmin_GoogleAnalyticsAdminV1alphaAdSenseLink; -use Google_Service_GoogleAnalyticsAdmin_GoogleAnalyticsAdminV1alphaListAdSenseLinksResponse; use WP_Query; use WP_User; use ReflectionMethod; @@ -3730,7 +3729,7 @@ public function create_enhanced_measurement_fake_http_handler( $property_id, $we switch ( $url['path'] ) { case "/v1alpha/properties/$property_id/dataStreams/$web_data_stream_id/enhancedMeasurementSettings": - $enhanced_measurement_settings = new EnhancedMeasurementSettingsModel(); + $enhanced_measurement_settings = new GoogleAnalyticsAdminV1alphaEnhancedMeasurementSettings(); $enhanced_measurement_settings->setStreamEnabled( true ); return new FulfilledPromise( @@ -4447,11 +4446,11 @@ public function test_get_data__adsense_links() { FakeHttp::fake_google_http_handler( $this->analytics->get_client(), function () { - $mock_adSenseLink = new Google_Service_GoogleAnalyticsAdmin_GoogleAnalyticsAdminV1alphaAdSenseLink(); + $mock_adSenseLink = new GoogleAnalyticsAdminV1alphaAdSenseLink(); $mock_adSenseLink->setName( 'properties/12345/adSenseLinks/12345' ); $mock_adSenseLink->setAdClientCode( 'ca-pub-12345' ); - $response = new Google_Service_GoogleAnalyticsAdmin_GoogleAnalyticsAdminV1alphaListAdSenseLinksResponse(); + $response = new GoogleAnalyticsAdminV1alphaListAdSenseLinksResponse(); $response->setAdsenseLinks( array( $mock_adSenseLink ) ); return new FulfilledPromise( new Response( 200, array(), json_encode( $response ) ) ); @@ -4469,7 +4468,7 @@ function () { // Should return array with `GoogleAnalyticsAdminV1alphaAdSenseLink` as defined in the mock response. $this->assertNotWPError( $result, 'AdSense links request should succeed when propertyID is provided.' ); - $this->assertContainsOnlyInstancesOf( Google_Service_GoogleAnalyticsAdmin_GoogleAnalyticsAdminV1alphaAdSenseLink::class, $result, 'AdSense links result should contain only GoogleAnalyticsAdminV1alphaAdSenseLink instances.' ); + $this->assertContainsOnlyInstancesOf( GoogleAnalyticsAdminV1alphaAdSenseLink::class, $result, 'AdSense links result should contain only GoogleAnalyticsAdminV1alphaAdSenseLink instances.' ); $adsense_link = $result[0]; $this->assertEquals( 'properties/12345/adSenseLinks/12345', $adsense_link->getName(), 'AdSense link name should match expected value.' ); $this->assertEquals( 'ca-pub-12345', $adsense_link->getAdClientCode(), 'AdSense link client code should match expected value.' );