Merge pull request #44 from BingAds/dec2017-update

eric-urban · web-flow · commit e033fb4d3620 · 2017-12-12T08:25:31.000-08:00
Dec2017 update
diff --git a/samples/AuthHelper.php b/samples/AuthHelper.php
@@ -126,5 +126,3 @@ static function WriteOAuthRefreshToken($refreshToken)
         return;
     }
 }
-
-?>
diff --git a/samples/V11/AdExtensions.php b/samples/V11/AdExtensions.php
@@ -578,5 +578,3 @@ function GetSampleSitelink2AdExtensions()
     
     return $adExtensions;
 }
-
-?>
diff --git a/samples/V11/AdInsightHelper.php b/samples/V11/AdInsightHelper.php
@@ -229,5 +229,3 @@ static function OutputBudgetPoint($budgetPoint)
     }
     
 }
-
-?>
diff --git a/samples/V11/BudgetOpportunities.php b/samples/V11/BudgetOpportunities.php
@@ -187,5 +187,3 @@
         print $e->getTraceAsString()."\n\n";
     }
 }
-
-?>
diff --git a/samples/V11/CampaignManagementHelper.php b/samples/V11/CampaignManagementHelper.php
@@ -1585,7 +1585,7 @@ static function OutputProductPartition($criterion)
             {
                 print("Condition:\n");
                 printf("Operand: %s\n", $criterion->Condition->Operand);
-                printf("Attribute: %s\n", isset($criterion->Condition->Attribute) ?? null);
+                printf("Attribute: %s\n", $criterion->Condition->Attribute);
             }
         }
     }
@@ -1618,7 +1618,7 @@ static function OutputWebpage($criterion)
                 foreach ($criterion->Parameter->Conditions->WebpageCondition as $webpageCondition)
                 {
                     printf("Operand: %s\n", $webpageCondition->Operand);
-                    printf("Attribute: %s\n", isset($webpageCondition->Attribute) ?? null);
+                    printf("Argument: %s\n", $webpageCondition->Argument);
                 }
             }
         }
@@ -2060,5 +2060,3 @@ static function StripEncoding($object)
         }
     }
 }
-
-?>
diff --git a/samples/V11/ConversionGoals.php b/samples/V11/ConversionGoals.php
@@ -517,5 +517,3 @@
         print $e->getTraceAsString()."\n\n";
     }
 }
-
-?>
diff --git a/samples/V11/CustomerManagementHelper.php b/samples/V11/CustomerManagementHelper.php
@@ -231,5 +231,3 @@ static function OutputPartialErrors($operationErrors, $partialErrors)
     }
 
 }
-
-?>
diff --git a/samples/V11/CustomerSignup.php b/samples/V11/CustomerSignup.php
@@ -258,5 +258,3 @@
         print $e->getTraceAsString()."\n\n";
     }
 }
-
-?>
diff --git a/samples/V11/DynamicSearchAds.php b/samples/V11/DynamicSearchAds.php
@@ -586,5 +586,3 @@
         print $e->getTraceAsString()."\n\n";
     }
 }
-
-?>
diff --git a/samples/V11/GeographicalLocations.php b/samples/V11/GeographicalLocations.php
@@ -191,5 +191,3 @@ function DownloadFile($fileUrl){
         unlink($GLOBALS['TempFile']);
     }
 }
-
-?>
diff --git a/samples/V11/KeywordPlanner.php b/samples/V11/KeywordPlanner.php
@@ -514,5 +514,3 @@
         print $e->getTraceAsString()."\n\n";
     }
 }
-
-?>
diff --git a/samples/V11/KeywordsAds.php b/samples/V11/KeywordsAds.php
@@ -644,5 +644,3 @@
         print $e->getTraceAsString()."\n\n";
     }
 }
-
-?>
diff --git a/samples/V11/ManageClient.php b/samples/V11/ManageClient.php
@@ -292,5 +292,3 @@
         print $e->getTraceAsString()."\n\n";
     }
 }
-
-?>
diff --git a/samples/V11/NegativeKeywords.php b/samples/V11/NegativeKeywords.php
@@ -488,5 +488,3 @@
         print $e->getTraceAsString()."\n\n";
     }
 }
-
-?>
diff --git a/samples/V11/RemarketingLists.php b/samples/V11/RemarketingLists.php
@@ -366,5 +366,3 @@
         print $e->getTraceAsString()."\n\n";
     }
 }
-
-?>
diff --git a/samples/V11/ReportRequests.php b/samples/V11/ReportRequests.php
@@ -301,5 +301,3 @@ function DownloadFile($reportDownloadUrl, $downloadPath)
     fflush($writer);
     fclose($writer);
 }
-
-?>
diff --git a/samples/V11/ReportingHelper.php b/samples/V11/ReportingHelper.php
@@ -228,5 +228,3 @@ static function GetAudiencePerformanceReportRequest($accountId)
  
 
 }
-
-?>
diff --git a/samples/V11/SearchUserAccounts.php b/samples/V11/SearchUserAccounts.php
@@ -179,5 +179,3 @@
         print $e->getTraceAsString()."\n\n";
     }
 }
-
-?>
diff --git a/samples/V11/ShoppingCampaigns.php b/samples/V11/ShoppingCampaigns.php
@@ -971,5 +971,3 @@ function OutputCampaignCriterionIdentifiers($criterionIds, $partialErrors)
 		}
 	}
 }
-
-?>
diff --git a/samples/V11/TargetCriterions.php b/samples/V11/TargetCriterions.php
@@ -412,5 +412,3 @@ function GetExampleCampaignIds()
 
     return $campaignIds;
 }
-
-?>
diff --git a/samples/WebAuthentication/CallBingAdsServices.php b/samples/WebAuthentication/CallBingAdsServices.php
@@ -39,4 +39,4 @@
 
 session_unset();
 
-?>
+?>
diff --git a/samples/WebAuthentication/Index.php b/samples/WebAuthentication/Index.php
@@ -28,4 +28,4 @@
 When the user presses this button, they will be redirected to fully formed URL to request an authorization token. 
 From here, the user will be redirected to the redirectUriPath where the authorization token can be extracted. 
 -->
-<input type="button" onClick="return window.location='<?php echo WebAuthHelper::RedirectUri;?>';" value="OK" />
+<input type="button" onClick="return window.location='<?php echo WebAuthHelper::RedirectUri;?>';" value="OK" />
diff --git a/samples/WebAuthentication/OAuth2Callback.php b/samples/WebAuthentication/OAuth2Callback.php
@@ -73,5 +73,3 @@
 {
     print $e;
 }
-
-?>
diff --git a/samples/WebAuthentication/WebAuthHelper.php b/samples/WebAuthentication/WebAuthHelper.php
@@ -16,5 +16,3 @@ final class WebAuthHelper {
     const ClientSecret = 'ClientSecretGoesHere'; 
     const RedirectUri = 'RedirectUriGoesHere'; 
 }
-
-?>
diff --git a/src/Auth/ApiEnvironment.php b/src/Auth/ApiEnvironment.php
@@ -17,5 +17,3 @@ final class ApiEnvironment
      */
     const Sandbox = 'Sandbox';
 }
-
-?>
diff --git a/src/Auth/Authentication.php b/src/Auth/Authentication.php
@@ -12,5 +12,3 @@ abstract class Authentication
      */
     public $Type;
 }
-
-?>
diff --git a/src/Auth/AuthorizationData.php b/src/Auth/AuthorizationData.php
@@ -74,5 +74,3 @@ public function withDeveloperToken($developerToken) {
         return $this;
     }
 }
-
-?>
diff --git a/src/Auth/HttpService.php b/src/Auth/HttpService.php
@@ -52,5 +52,3 @@ public function post($url, $postData) {
         return $response;
     }
 }
-
-?>
diff --git a/src/Auth/IOAuthService.php b/src/Auth/IOAuthService.php
@@ -13,5 +13,3 @@ abstract class IOAuthService
      */
     abstract function GetAccessTokens(OAuthRequestParameters $oauthParameters);
 }
-
-?>
diff --git a/src/Auth/LiveComOAuthService.php b/src/Auth/LiveComOAuthService.php
@@ -101,5 +101,3 @@ public static function GetAuthorizationEndpoint(OAuthUrlParameters $parameters)
         ) . (($parameters->State == null) ? "" : ("&state=" . $parameters->State));
     }
 }
-
-?>
diff --git a/src/Auth/OAuthAuthorization.php b/src/Auth/OAuthAuthorization.php
@@ -74,5 +74,3 @@ public function withOAuthTokens($oauthTokens) {
      */
     abstract public function GetAuthorizationEndpoint();
 }
-
-?>
diff --git a/src/Auth/OAuthDesktopMobileAuthCodeGrant.php b/src/Auth/OAuthDesktopMobileAuthCodeGrant.php
@@ -12,5 +12,3 @@ public function __construct() {
         $this->Type = 'OAuthDesktopMobileAuthCodeGrant';
     }
 }
-
-?>
diff --git a/src/Auth/OAuthDesktopMobileImplicitGrant.php b/src/Auth/OAuthDesktopMobileImplicitGrant.php
@@ -72,5 +72,3 @@ public function ExtractAccessTokenFromUri($redirectUri){
                 ->withRefreshToken(null); 
     }
 }
-
-?>
diff --git a/src/Auth/OAuthRequestParameters.php b/src/Auth/OAuthRequestParameters.php
@@ -111,5 +111,3 @@ public function withGrantValue($grantValue) {
     }
 
 }
-
-?>
diff --git a/src/Auth/OAuthTokenRequestException.php b/src/Auth/OAuthTokenRequestException.php
@@ -30,5 +30,3 @@ public function withDescription($description) {
         return $this;
     }
 }
-
-?>
diff --git a/src/Auth/OAuthTokens.php b/src/Auth/OAuthTokens.php
@@ -57,5 +57,3 @@ public function withRefreshToken($refreshToken) {
         return $this;
     }
 }
-
-?>
diff --git a/src/Auth/OAuthUrlParameters.php b/src/Auth/OAuthUrlParameters.php
@@ -76,5 +76,3 @@ public function withState($state) {
     }
 
 }
-
-?>
diff --git a/src/Auth/OAuthWebAuthCodeGrant.php b/src/Auth/OAuthWebAuthCodeGrant.php
@@ -14,5 +14,3 @@ public function __construct() {
         $this->Type = 'OAuthWebAuthCodeGrant';
     }
 }
-
-?>
diff --git a/src/Auth/OAuthWithAuthorizationCode.php b/src/Auth/OAuthWithAuthorizationCode.php
@@ -126,5 +126,3 @@ public function RequestOAuthTokensByRefreshToken($refreshToken)
         return $this->OAuthTokens; 
     }
 }
-
-?>
diff --git a/src/Auth/PasswordAuthentication.php b/src/Auth/PasswordAuthentication.php
@@ -32,5 +32,3 @@ public function withPassword($password) {
     }
     
 }
-
-?>
diff --git a/src/Auth/ServiceClient.php b/src/Auth/ServiceClient.php
@@ -175,39 +175,39 @@ private function RefreshServiceProxy()
 		$headers = array();
 
 		$headers[] = new SoapHeader(
-				$this->namespace,
-				'CustomerAccountId',
-				$this->accountId
+			$this->namespace,
+			'CustomerAccountId',
+			$this->accountId
 		);
 
 		$headers[] = new SoapHeader(
-				$this->namespace,
-				'CustomerId',
-				$this->customerId
+			$this->namespace,
+			'CustomerId',
+			$this->customerId
 		);
 
 		$headers[] = new SoapHeader(
-				$this->namespace,
-				'DeveloperToken',
-				$this->developerToken
+			$this->namespace,
+			'DeveloperToken',
+			$this->developerToken
 		);
 
 		$headers[] = new SoapHeader(
-				$this->namespace,
-				'UserName',
-				$this->username
+			$this->namespace,
+			'UserName',
+			$this->username
 		);
 
 		$headers[] = new SoapHeader(
-				$this->namespace,
-				'Password',
-				$this->password
+			$this->namespace,
+			'Password',
+			$this->password
 		);
 
-                $headers[] = new SoapHeader(
-				$this->namespace,
-				'AuthenticationToken',
-				$this->authenticationToken
+		$headers[] = new SoapHeader(
+			$this->namespace,
+			'AuthenticationToken',
+			$this->authenticationToken
 		);
 
         /** 
@@ -216,22 +216,24 @@ private function RefreshServiceProxy()
 		 * response, specify the SOAP_SINGLE_ELEMENT_ARRAYS feature.
          */ 
 		$options = array(
-				'trace' => TRUE,
-				'exceptions' => TRUE,
-				'features' => SOAP_SINGLE_ELEMENT_ARRAYS,
-
-                /** 
-                 * Map long type to string type. For details, see
-				 * from_long_xml and to_long_xml callbacks.
-                 */ 
-				'typemap' => array(
-						array(
-								'type_ns' => 'http://www.w3.org/2001/XMLSchema',
-								'type_name' => 'xs:long',
-								'to_xml' => 'to_long_xml',
-								'from_xml' => 'from_long_xml'
-						),
-				)
+			'trace' => TRUE,
+			'exceptions' => TRUE,
+			'features' => SOAP_SINGLE_ELEMENT_ARRAYS,
+			// Disable keep-alive to avoid 'Process open FD table is full'
+			'keep-alive' => FALSE, 
+
+			/** 
+			 * Map long type to string type. For details, see
+			 * from_long_xml and to_long_xml callbacks.
+			 */ 
+			'typemap' => array(
+				array(
+						'type_ns' => 'http://www.w3.org/2001/XMLSchema',
+						'type_name' => 'xs:long',
+						'to_xml' => 'to_long_xml',
+						'from_xml' => 'from_long_xml'
+				),
+			)
 		);
 
 		$proxy = @new SOAPClient($this->wsdlUrl, $options);
@@ -241,5 +243,3 @@ private function RefreshServiceProxy()
 		$this->service = $proxy;
 	}
 }
-
-?>
diff --git a/src/Auth/ServiceClientType.php b/src/Auth/ServiceClientType.php
@@ -14,5 +14,3 @@ final class ServiceClientType {
     const CustomerManagementVersion11 = 'CustomerManagementVersion11';
     const ReportingVersion11 = 'ReportingVersion11';    
 }
-
-?>
diff --git a/src/V11/Reporting/KeywordPerformanceReportColumn.php b/src/V11/Reporting/KeywordPerformanceReportColumn.php

Original file line number	Diff line number	Diff line change
`@@ -126,5 +126,3 @@ static function WriteOAuthRefreshToken($refreshToken)`
`126`	`126`	`return;`
`127`	`127`	`}`
`128`	`128`	`}`
`129`		`-`
`130`		`-?>`
Original file line number	Diff line number	Diff line change
`@@ -578,5 +578,3 @@ function GetSampleSitelink2AdExtensions()`
`578`	`578`
`579`	`579`	`return $adExtensions;`
`580`	`580`	`}`
`581`		`-`
`582`		`-?>`
Original file line number	Diff line number	Diff line change
`@@ -229,5 +229,3 @@ static function OutputBudgetPoint($budgetPoint)`
`229`	`229`	`}`
`230`	`230`
`231`	`231`	`}`
`232`		`-`
`233`		`-?>`
Original file line number	Diff line number	Diff line change
`@@ -187,5 +187,3 @@`
`187`	`187`	`print $e->getTraceAsString()."\n\n";`
`188`	`188`	`}`
`189`	`189`	`}`
`190`		`-`
`191`		`-?>`
Original file line number	Diff line number	Diff line change
`@@ -1585,7 +1585,7 @@ static function OutputProductPartition($criterion)`
`1585`	`1585`	`{`
`1586`	`1586`	`print("Condition:\n");`
`1587`	`1587`	`printf("Operand: %s\n", $criterion->Condition->Operand);`
`1588`		`- printf("Attribute: %s\n", isset($criterion->Condition->Attribute) ?? null);`
	`1588`	`+ printf("Attribute: %s\n", $criterion->Condition->Attribute);`
`1589`	`1589`	`}`
`1590`	`1590`	`}`
`1591`	`1591`	`}`
`@@ -1618,7 +1618,7 @@ static function OutputWebpage($criterion)`
`1618`	`1618`	`foreach ($criterion->Parameter->Conditions->WebpageCondition as $webpageCondition)`
`1619`	`1619`	`{`
`1620`	`1620`	`printf("Operand: %s\n", $webpageCondition->Operand);`
`1621`		`- printf("Attribute: %s\n", isset($webpageCondition->Attribute) ?? null);`
	`1621`	`+ printf("Argument: %s\n", $webpageCondition->Argument);`
`1622`	`1622`	`}`
`1623`	`1623`	`}`
`1624`	`1624`	`}`
`@@ -2060,5 +2060,3 @@ static function StripEncoding($object)`
`2060`	`2060`	`}`
`2061`	`2061`	`}`
`2062`	`2062`	`}`
`2063`		`-`
`2064`		`-?>`
Original file line number	Diff line number	Diff line change
`@@ -517,5 +517,3 @@`
`517`	`517`	`print $e->getTraceAsString()."\n\n";`
`518`	`518`	`}`
`519`	`519`	`}`
`520`		`-`
`521`		`-?>`
Original file line number	Diff line number	Diff line change
`@@ -231,5 +231,3 @@ static function OutputPartialErrors($operationErrors, $partialErrors)`
`231`	`231`	`}`
`232`	`232`
`233`	`233`	`}`
`234`		`-`
`235`		`-?>`
Original file line number	Diff line number	Diff line change
`@@ -258,5 +258,3 @@`
`258`	`258`	`print $e->getTraceAsString()."\n\n";`
`259`	`259`	`}`
`260`	`260`	`}`
`261`		`-`
`262`		`-?>`
Original file line number	Diff line number	Diff line change
`@@ -586,5 +586,3 @@`
`586`	`586`	`print $e->getTraceAsString()."\n\n";`
`587`	`587`	`}`
`588`	`588`	`}`
`589`		`-`
`590`		`-?>`
Original file line number	Diff line number	Diff line change
`@@ -191,5 +191,3 @@ function DownloadFile($fileUrl){`
`191`	`191`	`unlink($GLOBALS['TempFile']);`
`192`	`192`	`}`
`193`	`193`	`}`
`194`		`-`
`195`		`-?>`