Fix get parameters

phpfui · phpfui · commit a6979ae90428 · 2021-11-11T19:39:09.000-05:00
diff --git a/Tools/Generator.php b/Tools/Generator.php
@@ -8,6 +8,8 @@ class Generator
 
 	private string $definitionNamespace = 'PHPFUI\\ConstantContact\\Definition';
 
+	private string $nl;
+
 	private array $duplicateClasses = [
 		'CustomFieldResource2' => 'CustomFieldResource',
 		'ContactResource2' => 'ContactResource',
@@ -19,6 +21,11 @@ class Generator
 
 	private array $generatedClasses = [];
 
+	public function __construct()
+		{
+		$this->nl = strtoupper(substr(PHP_OS, 0, 3)) === "\r\n" : "\n";
+		}
+
 	public function makeClasses(string $version, array $paths) : void
 		{
 		\ksort($paths);
@@ -518,7 +525,7 @@ class ~class~ extends {$backSlash}{$this->definitionNamespace}\Base
 			$template .= $output;
 			}
 			$template = \str_replace('~class~', $name, $template) . "\t}\n";
-			$template = \str_replace("/**\r\n */\r\n", '', $template);
+			$template = \str_replace("/**{$this->nl} */{$this->nl}", '', $template);
 
 			$path = __DIR__ . "/../src/ConstantContact/Definition/{$name}.php";
 
diff --git a/src/ConstantContact/Client.php b/src/ConstantContact/Client.php
@@ -112,7 +112,7 @@ public function getStatusCode() : int
    */
   public function getAuthorizationURL() : string
 		{
-		$scopes = \implode('+', \array_keys($this->scopes));
+		$scopes = \implode('%2B', \array_keys($this->scopes));
 		$authURL = "https://api.cc.email/v3/idfed?client_id={$this->clientAPIKey}&response_type=code&redirect_uri={$this->redirectURI}&scope={$scopes}";
 
 		return $authURL;
@@ -225,11 +225,11 @@ public function get(string $url, array $parameters) : array
 			if ($parameters)
 				{
 				$paramString = \urldecode(\http_build_query($parameters));
-				$paramString = \urlencode(\preg_replace('/\[[0-9]\]/', '', $paramString));
+				$paramString = \preg_replace('/\[[0-9]\]/', '', $paramString);
 
 				if ($paramString)
 					{
-					$url .= '&' . $paramString;
+					$url .= '?' . $paramString;
 					}
 				}
 
diff --git a/src/ConstantContact/Definition/ActivityLinks.php b/src/ConstantContact/Definition/ActivityLinks.php
@@ -4,8 +4,6 @@
 
 namespace PHPFUI\ConstantContact\Definition;
 
-/**
- */
 class ActivityLinks extends \PHPFUI\ConstantContact\Definition\Base
 	{
 	protected static array $fields = [
diff --git a/src/ConstantContact/Definition/CustomFields.php b/src/ConstantContact/Definition/CustomFields.php
@@ -4,8 +4,6 @@
 
 namespace PHPFUI\ConstantContact\Definition;
 
-/**
- */
 class CustomFields extends \PHPFUI\ConstantContact\Definition\Base
 	{
 	protected static array $fields = [
diff --git a/src/ConstantContact/Definition/Lin.php b/src/ConstantContact/Definition/Lin.php
@@ -4,8 +4,6 @@
 
 namespace PHPFUI\ConstantContact\Definition;
 
-/**
- */
 class Lin extends \PHPFUI\ConstantContact\Definition\Base
 	{
 	protected static array $fields = [
diff --git a/src/ConstantContact/Definition/Link2.php b/src/ConstantContact/Definition/Link2.php
@@ -4,8 +4,6 @@
 
 namespace PHPFUI\ConstantContact\Definition;
 
-/**
- */
 class Link2 extends \PHPFUI\ConstantContact\Definition\Base
 	{
 	protected static array $fields = [
diff --git a/src/ConstantContact/Definition/Next.php b/src/ConstantContact/Definition/Next.php
@@ -4,7 +4,5 @@
 
 namespace PHPFUI\ConstantContact\Definition;
 
-/**
- */
 class Next extends \PHPFUI\ConstantContact\Definition\Base
 	{	}
diff --git a/src/ConstantContact/Definition/PagedEmailCampaignResponse.php b/src/ConstantContact/Definition/PagedEmailCampaignResponse.php
@@ -4,8 +4,6 @@
 
 namespace PHPFUI\ConstantContact\Definition;
 
-/**
- */
 class PagedEmailCampaignResponse extends \PHPFUI\ConstantContact\Definition\Base
 	{
 	protected static array $fields = [
diff --git a/src/ConstantContact/Definition/PagingLinks.php b/src/ConstantContact/Definition/PagingLinks.php
@@ -4,8 +4,6 @@
 
 namespace PHPFUI\ConstantContact\Definition;
 
-/**
- */
 class PagingLinks extends \PHPFUI\ConstantContact\Definition\Base
 	{
 	protected static array $fields = [
diff --git a/src/ConstantContact/Definition/Results.php b/src/ConstantContact/Definition/Results.php
@@ -4,8 +4,6 @@
 
 namespace PHPFUI\ConstantContact\Definition;
 
-/**
- */
 class Results extends \PHPFUI\ConstantContact\Definition\Base
 	{
 	protected static array $fields = [

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ public function getStatusCode() : int`
`112`	`112`	`*/`
`113`	`113`	`public function getAuthorizationURL() : string`
`114`	`114`	`{`
`115`		`- $scopes = \implode('+', \array_keys($this->scopes));`
	`115`	`+ $scopes = \implode('%2B', \array_keys($this->scopes));`
`116`	`116`	`$authURL = "https://api.cc.email/v3/idfed?client_id={$this->clientAPIKey}&response_type=code&redirect_uri={$this->redirectURI}&scope={$scopes}";`
`117`	`117`
`118`	`118`	`return $authURL;`
`@@ -225,11 +225,11 @@ public function get(string $url, array $parameters) : array`
`225`	`225`	`if ($parameters)`
`226`	`226`	`{`
`227`	`227`	`$paramString = \urldecode(\http_build_query($parameters));`
`228`		`- $paramString = \urlencode(\preg_replace('/\[[0-9]\]/', '', $paramString));`
	`228`	`+ $paramString = \preg_replace('/\[[0-9]\]/', '', $paramString);`
`229`	`229`
`230`	`230`	`if ($paramString)`
`231`	`231`	`{`
`232`		`- $url .= '&' . $paramString;`
	`232`	`+ $url .= '?' . $paramString;`
`233`	`233`	`}`
`234`	`234`	`}`
`235`	`235`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,6 @@`
`4`	`4`
`5`	`5`	`namespace PHPFUI\ConstantContact\Definition;`
`6`	`6`
`7`		`-/**`
`8`		`- */`
`9`	`7`	`class ActivityLinks extends \PHPFUI\ConstantContact\Definition\Base`
`10`	`8`	`{`
`11`	`9`	`protected static array $fields = [`