Merge pull request #89 from BingAds/v12-0-1

sunset version 11 and refresh version 12

Author: eric-urban

samples/V12/AuthHelper.php

@@ -122,7 +122,7 @@ static function AuthenticateWithOAuth()
         $authentication = (new OAuthDesktopMobileAuthCodeGrant())
             ->withEnvironment(AuthHelper::ApiEnvironment)
             ->withClientId(AuthHelper::ClientId);
-
+            
         $GLOBALS['AuthorizationData'] = (new AuthorizationData())
             ->withAuthentication($authentication)
             ->withDeveloperToken(AuthHelper::DeveloperToken);
@@ -139,8 +139,7 @@ static function AuthenticateWithOAuth()
             else
             {
                 AuthHelper::RequestUserConsent();
-            }
-            
+            }            
         }
         catch(OAuthTokenRequestException $e)
         {

samples/V12/BudgetOpportunities.php

@@ -26,6 +26,7 @@
 
 // Specify the Microsoft\BingAds\V12\CampaignManagement classes that will be used.
 use Microsoft\BingAds\V12\CampaignManagement\CampaignType;
+use Microsoft\BingAds\V12\CampaignManagement\CampaignAdditionalField;
 
 $GLOBALS['AuthorizationData'] = null;
 $GLOBALS['Proxy'] = null;
@@ -55,7 +56,9 @@
 
     $getCampaignsByAccountIdResponse = CampaignManagementExampleHelper::GetCampaignsByAccountId(
     	$GLOBALS['AuthorizationData']->AccountId,
-        AuthHelper::CampaignTypes);
+        AuthHelper::CampaignTypes,
+        CampaignAdditionalField::ExperimentId
+    );
 
     if(isset($getCampaignsByAccountIdResponse->Campaigns))
     {

samples/V12/CampaignManagementExampleHelper.php

@@ -24,6 +24,7 @@
 use Microsoft\BingAds\V12\CampaignManagement\Ad;
 use Microsoft\BingAds\V12\CampaignManagement\AdType;
 use Microsoft\BingAds\V12\CampaignManagement\AdAdditionalField;
+use Microsoft\BingAds\V12\CampaignManagement\CampaignAdditionalField;
 use Microsoft\BingAds\V12\CampaignManagement\ExpandedTextAd;
 use Microsoft\BingAds\V12\CampaignManagement\Bid;
 use Microsoft\BingAds\V12\CampaignManagement\BiddingScheme;
@@ -312,7 +313,9 @@
 
     $getCampaigns = CampaignManagementExampleHelper::GetCampaignsByAccountId(
             $GLOBALS['AuthorizationData']->AccountId, 
-            AuthHelper::CampaignTypes)->Campaigns;
+            AuthHelper::CampaignTypes,
+            CampaignAdditionalField::ExperimentId
+        )->Campaigns;
 
     $updateCampaigns = array();
     $updateBudgets = array();
@@ -424,7 +427,9 @@
         $getCampaigns = CampaignManagementExampleHelper::GetCampaignsByIds(
             $GLOBALS['AuthorizationData']->AccountId, 
             $getCampaignIds, 
-            AuthHelper::CampaignTypes)->Campaigns;
+            AuthHelper::CampaignTypes,
+            CampaignAdditionalField::ExperimentId
+        )->Campaigns;
 
         print("List of campaigns AFTER update:\n");
         foreach ($getCampaigns->Campaign as $campaign)
@@ -477,6 +482,7 @@
         $nillableAdGroupIds->long[0], 
         $adTypes,
         $adAdditionalFields);
+
     if(isset($ads->Ads)){
         CampaignManagementExampleHelper::OutputArrayOfAd($ads->Ads);
     }    

samples/V12/KeywordsAds.php

@@ -20,6 +20,7 @@
 use Microsoft\BingAds\V12\CampaignManagement\GetCampaignsByAccountIdRequest;
 use Microsoft\BingAds\V12\CampaignManagement\Campaign;
 use Microsoft\BingAds\V12\CampaignManagement\CampaignType;
+use Microsoft\BingAds\V12\CampaignManagement\CampaignAdditionalField;
 
 // Specify the Microsoft\BingAds\V12\CustomerManagement classes that will be used.
 use Microsoft\BingAds\V12\CustomerManagement\Paging;
@@ -96,7 +97,9 @@
         CustomerManagementExampleHelper::OutputArrayOfInt($featurePilotFlags);
         $getCampaignsByAccountIdResponse = CampaignManagementExampleHelper::GetCampaignsByAccountId(
             $account->Id, 
-            AuthHelper::CampaignTypes);
+            AuthHelper::CampaignTypes,
+            CampaignAdditionalField::ExperimentId
+        );
         CampaignManagementExampleHelper::OutputArrayOfCampaign($getCampaignsByAccountIdResponse->Campaigns);
     }
 }

samples/V12/SearchUserAccounts.php

@@ -33,6 +33,7 @@
 use Microsoft\BingAds\V12\CampaignManagement\BudgetLimitType;
 use Microsoft\BingAds\V12\CampaignManagement\Bid;
 use Microsoft\BingAds\V12\CampaignManagement\Date;
+use Microsoft\BingAds\V12\CampaignManagement\CampaignAdditionalField;
 
 // Specify the Microsoft\BingAds\Auth classes that will be used.
 use Microsoft\BingAds\Auth\ServiceClient;
@@ -70,7 +71,9 @@
     $getCampaigns = CampaignManagementExampleHelper::GetCampaignsByIds(
         $GLOBALS['AuthorizationData']->AccountId, 
         $campaignIds, 
-        AuthHelper::CampaignTypes)->Campaigns;
+        AuthHelper::CampaignTypes,
+        CampaignAdditionalField::ExperimentId
+        )->Campaigns;
 
     // Loop through all campaigns and ad groups to get the target criterion IDs.
 

samples/V12/TargetCriterions.php

@@ -89,7 +89,8 @@ public function GetAccessTokens(OAuthRequestParameters $oauthRequestParameters,
             return (new OAuthTokens())
                 ->withAccessToken($accessToken)
                 ->withAccessTokenExpiresInSeconds($expiresIn)
-                ->withRefreshToken($refreshToken);
+                ->withRefreshToken($refreshToken)
+                ->withResponseFragments($responseArray);
         }
         else if(isset($responseArray['error']))
         {

src/Auth/LiveComOAuthService.php

@@ -22,6 +22,12 @@ class OAuthTokens
      */
     public $RefreshToken;
 
+    /** 
+     * Represents the full set of fragments returned from the authorization service 
+     * in resposne to an access token request.
+     */
+    public $ResponseFragments;
+
     public function __construct() {}
 
     /** 
@@ -47,4 +53,12 @@ public function withRefreshToken($refreshToken) {
         $this->RefreshToken = $refreshToken;
         return $this;
     }
+    
+    /** 
+     * Includes the response fragments.
+     */
+    public function withResponseFragments($responseFragments) {
+        $this->ResponseFragments = $responseFragments;
+        return $this;
+    }
 }

src/Auth/OAuthTokens.php

@@ -9,13 +9,6 @@
 use Microsoft\BingAds\V12\CustomerManagement\CustomerManagementServiceSettings as CustomerManagementServiceSettingsVersion12;
 use Microsoft\BingAds\V12\Reporting\ReportingServiceSettings as ReportingServiceSettingsVersion12;
 
-use Microsoft\BingAds\V11\AdInsight\AdInsightServiceSettings as AdInsightServiceSettingsVersion11;
-use Microsoft\BingAds\V11\Bulk\BulkServiceSettings as BulkServiceSettingsVersion11;
-use Microsoft\BingAds\V11\CampaignManagement\CampaignManagementServiceSettings as CampaignManagementServiceSettingsVersion11;
-use Microsoft\BingAds\V11\CustomerBilling\CustomerBillingServiceSettings as CustomerBillingServiceSettingsVersion11;
-use Microsoft\BingAds\V11\CustomerManagement\CustomerManagementServiceSettings as CustomerManagementServiceSettingsVersion11;
-use Microsoft\BingAds\V11\Reporting\ReportingServiceSettings as ReportingServiceSettingsVersion11;
-
 use \DOMDocument;
 use \DOMXPath;
 use \SoapHeader;
@@ -45,13 +38,6 @@ class ServiceClient
 		ServiceClientType::CustomerBillingVersion12 => CustomerBillingServiceSettingsVersion12::SandboxEndpoint,
 		ServiceClientType::CustomerManagementVersion12 => CustomerManagementServiceSettingsVersion12::SandboxEndpoint,
 		ServiceClientType::ReportingVersion12 => ReportingServiceSettingsVersion12::SandboxEndpoint,
-
-		ServiceClientType::AdInsightVersion11 => AdInsightServiceSettingsVersion11::SandboxEndpoint,
-		ServiceClientType::BulkVersion11 => BulkServiceSettingsVersion11::SandboxEndpoint,
-		ServiceClientType::CampaignManagementVersion11 => CampaignManagementServiceSettingsVersion11::SandboxEndpoint,
-		ServiceClientType::CustomerBillingVersion11 => CustomerBillingServiceSettingsVersion11::SandboxEndpoint,
-		ServiceClientType::CustomerManagementVersion11 => CustomerManagementServiceSettingsVersion11::SandboxEndpoint,
-		ServiceClientType::ReportingVersion11 => ReportingServiceSettingsVersion11::SandboxEndpoint
 	);
 
 	private $productionServiceClientEndpoints = array(
@@ -61,13 +47,6 @@ class ServiceClient
 		ServiceClientType::CustomerBillingVersion12 => CustomerBillingServiceSettingsVersion12::ProductionEndpoint,
 		ServiceClientType::CustomerManagementVersion12 => CustomerManagementServiceSettingsVersion12::ProductionEndpoint,
 		ServiceClientType::ReportingVersion12 => ReportingServiceSettingsVersion12::ProductionEndpoint,
-
-		ServiceClientType::AdInsightVersion11 => AdInsightServiceSettingsVersion11::ProductionEndpoint,
-		ServiceClientType::BulkVersion11 => BulkServiceSettingsVersion11::ProductionEndpoint,
-		ServiceClientType::CampaignManagementVersion11 => CampaignManagementServiceSettingsVersion11::ProductionEndpoint,
-		ServiceClientType::CustomerBillingVersion11 => CustomerBillingServiceSettingsVersion11::ProductionEndpoint,
-		ServiceClientType::CustomerManagementVersion11 => CustomerManagementServiceSettingsVersion11::ProductionEndpoint,
-		ServiceClientType::ReportingVersion11 => ReportingServiceSettingsVersion11::ProductionEndpoint
 	);
 
 	private $serviceClientNamespaces = array(
@@ -77,13 +56,6 @@ class ServiceClient
 		ServiceClientType::CustomerBillingVersion12 => CustomerBillingServiceSettingsVersion12::ServiceNamespace,
 		ServiceClientType::CustomerManagementVersion12 => CustomerManagementServiceSettingsVersion12::ServiceNamespace,
 		ServiceClientType::ReportingVersion12 => ReportingServiceSettingsVersion12::ServiceNamespace,
-
-		ServiceClientType::AdInsightVersion11 => AdInsightServiceSettingsVersion11::ServiceNamespace,
-		ServiceClientType::BulkVersion11 => BulkServiceSettingsVersion11::ServiceNamespace,
-		ServiceClientType::CampaignManagementVersion11 => CampaignManagementServiceSettingsVersion11::ServiceNamespace,
-		ServiceClientType::CustomerBillingVersion11 => CustomerBillingServiceSettingsVersion11::ServiceNamespace,
-		ServiceClientType::CustomerManagementVersion11 => CustomerManagementServiceSettingsVersion11::ServiceNamespace,
-		ServiceClientType::ReportingVersion11 => ReportingServiceSettingsVersion11::ServiceNamespace
 	);
 
 	/** 

src/Auth/ServiceClient.php

@@ -13,11 +13,4 @@ final class ServiceClientType {
     const CustomerBillingVersion12 = 'CustomerBillingVersion12';
     const CustomerManagementVersion12 = 'CustomerManagementVersion12';
     const ReportingVersion12 = 'ReportingVersion12';    
-
-    const AdInsightVersion11 = 'AdInsightVersion11';
-    const BulkVersion11 = 'BulkVersion11';
-    const CampaignManagementVersion11 = 'CampaignManagementVersion11';
-    const CustomerBillingVersion11 = 'CustomerBillingVersion11';
-    const CustomerManagementVersion11 = 'CustomerManagementVersion11';
-    const ReportingVersion11 = 'ReportingVersion11';    
 }