Preparing src for release 8.1.0

Author: vtsao

ChangeLog.md

@@ -1,3 +1,13 @@
+### 8.1.0
+
+AdWords:
+  - Fixed [issue #119](https://github.com/googleads/googleads-php-lib/issues/119).
+
+DFP:
+  - Added support for v201602.
+  - Removed examples for v201502 (deprecated).
+  - Removed support for v201411 (sunset).
+
 ### 8.0.0
 
 AdWords:

README.md

@@ -166,11 +166,11 @@ below.
   - REQUEST_INFO_LOG: Logs all requests from the client library along
     with information such as the timestamp, email, service, method,
     request Id, response time and which server was used. The default
-    behavior is to log this information to "logs/request_info.log" relative to
+    behavior is to log this information to "request_info.log" relative to
     your project's home directory.
 
   - SOAP_XML_LOG: Logs all incoming and outgoing SOAP requests/responses. The
-    default behavior is to log this information to "logs/soap_xml.log" relative
+    default behavior is to log this information to "soap_xml.log" relative
     to your project's home directory. Sensitive information, such as
     authentication tokens, will be stripped.
 
@@ -187,6 +187,26 @@ Logging can be enabled using the following methods.
 You can use the methods of the Logger class directly for even more control over
 how requests are logged.
 
+### Notes about using composer.json
+
+As there are some classes declared with the same names in each version directory
+under `src/Google/Api/Ads/AdWords/Util`, this path cannot be included in
+`classmap` of `composer.json`.
+
+Thus, if you use composer, you will still need to manually copy over the version
+of the utility files you need to use.
+For instance, if you use `classmap` and v201601 of this library, you may add the
+following to your project's `composer.json`:
+
+```json
+  "classmap": [
+    "vendor/googleads/googleads-php-lib/src/Google/Api/Ads/AdWords/Util/v201601"
+  ]
+```
+
+We are working on rewriting this library with namespacing and PSR-4 support.
+The progress and discussion of this work can be found at issue
+[#4](https://github.com/googleads/googleads-php-lib/issues/4).
 
 ### Where do I submit client library bug reports, feature requests, and patches?
 

examples/AdWords/v201509/AccountManagement/GetAccountHierarchy.php

@@ -61,7 +61,7 @@ function GetAccountHierarchyExample(AdWordsUser $user) {
       if (isset($graph->links)) {
         foreach ($graph->links as $link) {
           $childLinks[$link->managerCustomerId][] = $link;
-          $parentLinks[$link->clientCustomerId][] = $link;
+          $parentLinks[$link->clientCustomerId] = $link;
         }
       }
       foreach ($graph->entries as $account) {
@@ -79,9 +79,13 @@ function GetAccountHierarchyExample(AdWordsUser $user) {
     }
   }
 
-  // Display account tree.
-  print "(Customer Id, Account Name)\n";
-  DisplayAccountTree($rootAccount, $accounts, $childLinks, 0);
+  if ($rootAccount !== null) {
+    // Display account tree.
+    print "(Customer Id, Account Name)\n";
+    DisplayAccountTree($rootAccount, $accounts, $childLinks, 0);
+  } else {
+    printf("No accounts were found.\n");
+  }
 }
 
 /**

examples/AdWords/v201601/AccountManagement/GetAccountHierarchy.php

@@ -61,7 +61,7 @@ function GetAccountHierarchyExample(AdWordsUser $user) {
       if (isset($graph->links)) {
         foreach ($graph->links as $link) {
           $childLinks[$link->managerCustomerId][] = $link;
-          $parentLinks[$link->clientCustomerId][] = $link;
+          $parentLinks[$link->clientCustomerId] = $link;
         }
       }
       foreach ($graph->entries as $account) {
@@ -79,9 +79,13 @@ function GetAccountHierarchyExample(AdWordsUser $user) {
     }
   }
 
-  // Display account tree.
-  print "(Customer Id, Account Name)\n";
-  DisplayAccountTree($rootAccount, $accounts, $childLinks, 0);
+  if ($rootAccount !== null) {
+    // Display account tree.
+    print "(Customer Id, Account Name)\n";
+    DisplayAccountTree($rootAccount, $accounts, $childLinks, 0);
+  } else {
+    printf("No accounts were found.\n");
+  }
 }
 
 /**

examples/Dfp/v201511/InventoryService/CreateMobileAdUnit.php

@@ -64,7 +64,6 @@
   $adUnit->description = 'Ad unit description.';
   $adUnit->targetWindow = 'BLANK';
   $adUnit->explicitlyTargeted = true;
-  $adUnit->targetPlatform = 'WEB';
 
   // Create master ad unit size.
   $masterAdUnitSize = new AdUnitSize();

examples/Dfp/v201511/InventoryService/CreateVideoAdUnit.php

@@ -20,7 +20,7 @@
  * limitations under the License.
  *
  * @package    GoogleApiAdsDfp
- * @subpackage v201502
+ * @subpackage v201602
  * @category   WebServices
  * @copyright  2013, Google Inc. All Rights Reserved.
  * @license    http://www.apache.org/licenses/LICENSE-2.0 Apache License,
@@ -46,7 +46,7 @@
   $user->LogDefaults();
 
   // Get the ActivityGroupService.
-  $activityGroupService = $user->GetService('ActivityGroupService', 'v201502');
+  $activityGroupService = $user->GetService('ActivityGroupService', 'v201602');
 
   // Set the ID of the advertiser company this activity group is associated
   // with.

examples/Dfp/v201502/ActivityGroupService/CreateActivityGroups.php renamed to examples/Dfp/v201602/ActivityGroupService/CreateActivityGroups.php

@@ -20,7 +20,7 @@
  * limitations under the License.
  *
  * @package    GoogleApiAdsDfp
- * @subpackage v201502
+ * @subpackage v201602
  * @category   WebServices
  * @copyright  2014, Google Inc. All Rights Reserved.
  * @license    http://www.apache.org/licenses/LICENSE-2.0 Apache License,
@@ -35,7 +35,7 @@
 set_include_path(get_include_path() . PATH_SEPARATOR . $path);
 
 require_once 'Google/Api/Ads/Dfp/Lib/DfpUser.php';
-require_once 'Google/Api/Ads/Dfp/Util/v201502/StatementBuilder.php';
+require_once 'Google/Api/Ads/Dfp/Util/v201602/StatementBuilder.php';
 require_once dirname(__FILE__) . '/../../../Common/ExampleUtils.php';
 
 try {
@@ -47,7 +47,7 @@
   $user->LogDefaults();
 
   // Get the ActivityGroupService.
-  $activityGroupService = $user->GetService('ActivityGroupService', 'v201502');
+  $activityGroupService = $user->GetService('ActivityGroupService', 'v201602');
 
   // Create a statement to select only active activity groups.
   $statementBuilder = new StatementBuilder();

examples/Dfp/v201502/ActivityGroupService/GetActiveActivityGroups.php renamed to examples/Dfp/v201602/ActivityGroupService/GetActiveActivityGroups.php

@@ -20,7 +20,7 @@
  * limitations under the License.
  *
  * @package    GoogleApiAdsDfp
- * @subpackage v201502
+ * @subpackage v201602
  * @category   WebServices
  * @copyright  2014, Google Inc. All Rights Reserved.
  * @license    http://www.apache.org/licenses/LICENSE-2.0 Apache License,
@@ -35,7 +35,7 @@
 set_include_path(get_include_path() . PATH_SEPARATOR . $path);
 
 require_once 'Google/Api/Ads/Dfp/Lib/DfpUser.php';
-require_once 'Google/Api/Ads/Dfp/Util/v201502/StatementBuilder.php';
+require_once 'Google/Api/Ads/Dfp/Util/v201602/StatementBuilder.php';
 require_once dirname(__FILE__) . '/../../../Common/ExampleUtils.php';
 
 try {
@@ -47,7 +47,7 @@
   $user->LogDefaults();
 
   // Get the ActivityGroupService.
-  $activityGroupService = $user->GetService('ActivityGroupService', 'v201502');
+  $activityGroupService = $user->GetService('ActivityGroupService', 'v201602');
 
   // Create a statement to select all activity groups.
   $statementBuilder = new StatementBuilder();

examples/Dfp/v201502/ActivityGroupService/GetAllActivityGroups.php renamed to examples/Dfp/v201602/ActivityGroupService/GetAllActivityGroups.php

@@ -20,7 +20,7 @@
  * limitations under the License.
  *
  * @package    GoogleApiAdsDfp
- * @subpackage v201502
+ * @subpackage v201602
  * @category   WebServices
  * @copyright  2014, Google Inc. All Rights Reserved.
  * @license    http://www.apache.org/licenses/LICENSE-2.0 Apache License,
@@ -35,7 +35,7 @@
 set_include_path(get_include_path() . PATH_SEPARATOR . $path);
 
 require_once 'Google/Api/Ads/Dfp/Lib/DfpUser.php';
-require_once 'Google/Api/Ads/Dfp/Util/v201502/StatementBuilder.php';
+require_once 'Google/Api/Ads/Dfp/Util/v201602/StatementBuilder.php';
 require_once dirname(__FILE__) . '/../../../Common/ExampleUtils.php';
 
 // Set the ID of the activity group to update.
@@ -53,7 +53,7 @@
   $user->LogDefaults();
 
   // Get the ActivityGroupService.
-  $activityGroupService = $user->GetService('ActivityGroupService', 'v201502');
+  $activityGroupService = $user->GetService('ActivityGroupService', 'v201602');
 
   // Create a statement to select a single activity group by ID.
   $statementBuilder = new StatementBuilder();