Preparing src for release 6.4.0

Author: fiboknacky

ChangeLog.md

@@ -1,3 +1,11 @@
+### 6.4.0
+
+AdWords:
+  - Added support and examples for v201509.
+
+Common:
+  - Fixed [issue #96](https://github.com/googleads/googleads-php-lib/issues/96).
+
 ### 6.3.0
 
 DFP:

examples/AdWords/v201502/AccountManagement/CreateAccount.php

@@ -1,8 +1,9 @@
 <?php
 /**
- * This example creates a new account under an MCC account. Note: this example
- * must be run using the credentials of an MCC account, and by default the new
- * account will only be accessible via the parent MCC account.
+ * This example creates a new account under an AdWords manager account. Note:
+ * this example must be run using the credentials of an AdWords manager account,
+ * and by default the new account will only be accessible via the parent AdWords
+ * manager account.
  *
  * Restriction: adwords-only
  *

examples/AdWords/v201502/AccountManagement/GetAccountHierarchy.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * This example gets the account hierarchy under the current account. Note: this
- * example must be run using the credentials of an MCC account.
+ * example must be run using the credentials of an AdWords manager account.
  *
  * Restriction: adwords-only
  *

examples/AdWords/v201502/BasicOperations/UpdateKeyword.php

@@ -67,8 +67,8 @@ function UpdateKeywordExample(AdWordsUser $user, $adGroupId, $criterionId) {
 
   // Display result.
   $adGroupCriterion = $result->value[0];
-  printf("Keyword with ID '%s' has updated destination URL '%s'.\n",
-      $adGroupCriterion->criterion->id, $adGroupCriterion->destinationUrl);
+  printf("Keyword with ID '%s' has updated final URL '%s'.\n",
+      $adGroupCriterion->criterion->id, $adGroupCriterion->finalUrls->urls[0]);
 }
 
 // Don't run the example if the file is being included.

examples/AdWords/v201502/CampaignManagement/AddExperiment.php

@@ -36,8 +36,8 @@
 require_once dirname(dirname(__FILE__)) . '/init.php';
 
 // Enter parameters required by the code example.
-$campaignId = "INSERT_CAMPAIGN_ID_HERE";
-$adGroupId = "INSERT_AD_GROUP_ID_HERE";
+$campaignId = 'INSERT_CAMPAIGN_ID_HERE';
+$adGroupId = 'INSERT_AD_GROUP_ID_HERE';
 
 /**
  * Runs the example.

examples/AdWords/v201502/Express/GetPromotions.php

@@ -43,7 +43,9 @@ function GetPromotionsExample(AdWordsUser $user, $businessId) {
 
   // Create selector.
   $selector = new Selector();
-  $selector->fields = array('PromotionId', 'Name');
+  $selector->fields = array('PromotionId', 'Name', 'Status', 'DestinationUrl',
+      'CallTrackingEnabled', 'Budget', 'PromotionCriteria', 'RemainingBudget',
+      'Creatives', 'CampaignIds');
   $selector->ordering[] = new OrderBy('Name', 'ASCENDING');
 
   // Create paging controls.

examples/AdWords/v201502/Extensions/AddGoogleMyBusinessLocationExtensions.php

@@ -160,7 +160,7 @@ function AddGoogleMyBusinessLocationExtensions(
 
   // OPTIONAL: Create a CampaignFeed to specify which FeedItems to use at the
   // Campaign level.  This will be similar to the CampaignFeed in the
-  // AddSiteLinks example, except you can also filter based on the business
+  // AddSitelinks example, except you can also filter based on the business
   // name and category of each FeedItem by using a FeedAttributeOperand in
   // your matching function.
 

examples/AdWords/v201502/Extensions/AddSitelinksUsingFeeds.php

@@ -39,17 +39,17 @@
  * @param string $campaignId the ID of the campaign to add the sitelinks to
  */
 function AddSitelinksUsingFeedsExample(AdWordsUser $user, $campaignId) {
-  $sitelinksData = CreateSiteLinksFeed($user);
-  $sitelinksData = CreateSiteLinksFeedItems($user, $sitelinksData);
-  CreateSiteLinksFeedMapping($user, $sitelinksData);
-  CreateSiteLinksCampaignFeed($user, $sitelinksData, $campaignId);
+  $sitelinksData = CreateSitelinksFeed($user);
+  $sitelinksData = CreateSitelinksFeedItems($user, $sitelinksData);
+  CreateSitelinksFeedMapping($user, $sitelinksData);
+  CreateSitelinksCampaignFeed($user, $sitelinksData, $campaignId);
 }
 
 /**
  * Creates the feed that holds the sitelinks data.
  * @param AdWordsUser $user the user to run the example with
  */
-function CreateSiteLinksFeed(AdWordsUser $user) {
+function CreateSitelinksFeed(AdWordsUser $user) {
   // Map that holds IDs associated to the feeds metadata.
   $sitelinksData = array();
 
@@ -72,7 +72,7 @@ function CreateSiteLinksFeed(AdWordsUser $user) {
 
   // Create the feed.
   $sitelinksFeed = new Feed();
-  $sitelinksFeed->name = 'Feed For Site Links';
+  $sitelinksFeed->name = 'Feed For Sitelinks';
   $sitelinksFeed->attributes = array($textAttribute, $finalUrlAttribute,
       $line1Attribute, $line2Attribute);
   $sitelinksFeed->origin = 'USER';
@@ -113,38 +113,39 @@ function CreateSiteLinksFeed(AdWordsUser $user) {
  * @param AdWordsUser $user the user to run the example with
  * @param map $sitelinksData IDs associated to created sitelinks feed metadata
  */
-function CreateSiteLinksFeedItems(AdWordsUser $user, $sitelinksData) {
+function CreateSitelinksFeedItems(AdWordsUser $user, $sitelinksData) {
   // Get the FeedItemService, which loads the required classes.
   $feedItemService = $user->GetService('FeedItemService', ADWORDS_VERSION);
 
   // Create operations to add FeedItems.
-  $home = NewSiteLinkFeedItemAddOperation($sitelinksData, 'Home',
+  $home = NewSitelinkFeedItemAddOperation($sitelinksData, 'Home',
       'http://www.example.com', 'Home line 1', 'Home line 2');
-  $stores = NewSiteLinkFeedItemAddOperation($sitelinksData, 'Stores',
+  $stores = NewSitelinkFeedItemAddOperation($sitelinksData, 'Stores',
       'http://www.example.com/stores', 'Stores line 1', 'Stores line 2');
-  $onSale = NewSiteLinkFeedItemAddOperation($sitelinksData, 'On Sale',
+  $onSale = NewSitelinkFeedItemAddOperation($sitelinksData, 'On Sale',
       'http://www.example.com/sale', 'On Sale line 1', 'On Sale line 2');
-  $support = NewSiteLinkFeedItemAddOperation($sitelinksData, 'Support',
+  $support = NewSitelinkFeedItemAddOperation($sitelinksData, 'Support',
       'http://www.example.com/support', 'Support line 1', 'Support line 2');
-  $products = NewSiteLinkFeedItemAddOperation($sitelinksData, 'Products',
+  $products = NewSitelinkFeedItemAddOperation($sitelinksData, 'Products',
       'http://www.example.com/products', 'Products line 1', 'Products line 2');
-  $aboutUs = NewSiteLinkFeedItemAddOperation($sitelinksData, 'About Us',
+  $aboutUs = NewSitelinkFeedItemAddOperation($sitelinksData, 'About Us',
       'http://www.example.com/about', 'About Us line 1', 'About Us line 2');
 
   $operations = array($home, $stores, $onSale, $support, $products, $aboutUs);
 
   $result = $feedItemService->mutate($operations);
-  $sitelinksData['siteLinkFeedItemIds'] = array();
+  $sitelinksData['sitelinkFeedItemIds'] = array();
 
   foreach ($result->value as $feedItem) {
     printf("FeedItem with feedItemId %d was added.\n", $feedItem->feedItemId);
-    $sitelinksData['siteLinkFeedItemIds'][] = $feedItem->feedItemId;
+    $sitelinksData['sitelinkFeedItemIds'][] = $feedItem->feedItemId;
   }
 
   return $sitelinksData;
 }
 
-// See the Placeholder reference page for a list of all the placeholder types and fields.
+// See the Placeholder reference page for a list of all the placeholder types
+// and fields.
 // https://developers.google.com/adwords/api/docs/appendix/placeholders.html
 define('PLACEHOLDER_SITELINKS', 1);
 define('PLACEHOLDER_FIELD_SITELINK_LINK_TEXT', 1);
@@ -157,7 +158,7 @@ function CreateSiteLinksFeedItems(AdWordsUser $user, $sitelinksData) {
  * @param AdWordsUser $user the user to run the example with
  * @param map $sitelinksData IDs associated to created sitelinks feed metadata
  */
-function CreateSiteLinksFeedMapping(AdWordsUser $user, $sitelinksData) {
+function CreateSitelinksFeedMapping(AdWordsUser $user, $sitelinksData) {
   // Get the FeedMappingService, which loads the required classes.
   $feedMappingService = $user->GetService('FeedMappingService',
       ADWORDS_VERSION);
@@ -208,19 +209,19 @@ function CreateSiteLinksFeedMapping(AdWordsUser $user, $sitelinksData) {
  * @param map $sitelinksData IDs associated to created sitelinks feed metadata
  * @param string $campaignId the ID of the campaign to add the sitelinks to
  */
-function CreateSiteLinksCampaignFeed(AdWordsUser $user, $sitelinksData,
+function CreateSitelinksCampaignFeed(AdWordsUser $user, $sitelinksData,
     $campaignId) {
   // Get the CampaignFeedService, which loads the required classes.
   $campaignFeedService = $user->GetService('CampaignFeedService',
       ADWORDS_VERSION);
   $matchingFunctionString = sprintf(
       'AND( IN(FEED_ITEM_ID, {%s}), EQUALS(CONTEXT.DEVICE, "Mobile") )',
-      implode(',', $sitelinksData['siteLinkFeedItemIds']));
-  
+      implode(',', $sitelinksData['sitelinkFeedItemIds']));
+
   $campaignFeed = new CampaignFeed();
   $campaignFeed->feedId = $sitelinksData['sitelinksFeedId'];
   $campaignFeed->campaignId = $campaignId;
-  
+
   $matchingFunction = new FeedFunction();
   $matchingFunction->functionString = $matchingFunctionString;
   $campaignFeed->matchingFunction = $matchingFunction;
@@ -248,7 +249,7 @@ function CreateSiteLinksCampaignFeed(AdWordsUser $user, $sitelinksData,
  * @param string $text text of the sitelink
  * @param string $finalUrl URL of the sitelink
  */
-function NewSiteLinkFeedItemAddOperation($sitelinksData, $text, $finalUrl,
+function NewSitelinkFeedItemAddOperation($sitelinksData, $text, $finalUrl,
     $line1, $line2) {
   // Create the FeedItemAttributeValues for our text values.
   $linkTextAttributeValue = new FeedItemAttributeValue();

examples/AdWords/v201502/Migration/MigrateToExtensionSettings.php

@@ -48,7 +48,7 @@
 define('PLACEHOLDER_FIELD_FINAL_MOBILE_URLS', 6);
 define('PLACEHOLDER_FIELD_TRACKING_URL_TEMPLATE', 7);
 
-class SiteLinkFromFeed {
+class SitelinkFromFeed {
   public $feedId;
   public $feedItemId;
   public $text;
@@ -74,7 +74,7 @@ function MigrateToExtensionSettingsExample(AdWordsUser $user) {
   $feeds = GetFeeds($user);
   foreach ($feeds as $feed) {
     // Retrieve all the sitelinks from the current feed.
-    $feedItems = GetSiteLinksFromFeed($user, $feed->id);
+    $feedItems = GetSitelinksFromFeed($user, $feed->id);
     printf("Loaded %d sitelinks for feed ID %d.\n",
            count($feedItems), $feed->id);
 
@@ -171,9 +171,9 @@ function GetFeedMapping($user, $feedId, $placeholderTypeId) {
   return $attributeMappings;
 }
 
-function GetSiteLinksFromFeed($user, $feedId) {
+function GetSitelinksFromFeed($user, $feedId) {
   printf("Processing feed ID %d...\n", $feedId);
-  $siteLinks = array();
+  $sitelinks = array();
 
   // Retrieve all the feed items from the feed.
   $feedItems = GetFeedItems($user, $feedId);
@@ -184,7 +184,7 @@ function GetSiteLinksFromFeed($user, $feedId) {
 
     foreach ($feedItems as $feedItem) {
       $sitelinkFromFeed =
-          new SiteLinkFromFeed($feedItem->feedId, $feedItem->feedItemId);
+          new SitelinkFromFeed($feedItem->feedId, $feedItem->feedItemId);
 
       foreach ($feedItem->attributeValues as $attributeValue) {
         // This attribute hasn't been mapped to a field.
@@ -223,10 +223,10 @@ function GetSiteLinksFromFeed($user, $feedId) {
         }
       }
       $sitelinkFromFeed->scheduling = $feedItem->scheduling;
-      $siteLinks[$feedItem->feedItemId] = $sitelinkFromFeed;
+      $sitelinks[$feedItem->feedItemId] = $sitelinkFromFeed;
     }
   }
-  return $siteLinks;
+  return $sitelinks;
 }
 
 function GetPlatformRestrictionsForCampaign($campaignFeed) {

examples/AdWords/v201502/Optimization/GetKeywordIdeas.php

@@ -79,8 +79,12 @@ function GetKeywordIdeasExample(AdWordsUser $user) {
         $keyword = $data['KEYWORD_TEXT']->value;
         $search_volume = isset($data['SEARCH_VOLUME']->value)
             ? $data['SEARCH_VOLUME']->value : 0;
-        $categoryIds =
-            implode(', ', $data['CATEGORY_PRODUCTS_AND_SERVICES']->value);
+        if ($data['CATEGORY_PRODUCTS_AND_SERVICES']->value === null) {
+          $categoryIds = '';
+        } else {
+          $categoryIds =
+              implode(', ', $data['CATEGORY_PRODUCTS_AND_SERVICES']->value);
+        }
         printf("Keyword idea with text '%s', category IDs (%s) and average "
             . "monthly search volume '%s' was found.\n",
             $keyword, $categoryIds, $search_volume);