[mapguide-commits] r8980 - trunk/MgDev/UnitTest/WebTier/Php

[svn_mapguide at osgeo.org]

Author: jng
Date: 2016-07-12 05:55:02 -0700 (Tue, 12 Jul 2016)
New Revision: 8980

Modified:
   trunk/MgDev/UnitTest/WebTier/Php/ResourceServiceHttpRequests.php
Log:
Fix mapagent requests in PHP test runner. "@" prefix for file uploads are long unsupported and we should be using CURLFile instead.

Modified: trunk/MgDev/UnitTest/WebTier/Php/ResourceServiceHttpRequests.php
===================================================================
--- trunk/MgDev/UnitTest/WebTier/Php/ResourceServiceHttpRequests.php	2016-07-12 11:10:14 UTC (rev 8979)
+++ trunk/MgDev/UnitTest/WebTier/Php/ResourceServiceHttpRequests.php	2016-07-12 12:55:02 UTC (rev 8980)
@@ -87,14 +87,14 @@
             if ($this->unitTestParamVm->GetString("ParamValue") != "")
             {
                 $arrayParam['CONTENT']=$this->unitTestParamVm->GetString("ParamValue");
-                $arrayParam['CONTENT']="@".Utils::GetPath($arrayParam['CONTENT']);
+                $arrayParam['CONTENT']=new CURLFile(Utils::GetPath($arrayParam['CONTENT']));
             }
 
             $this->unitTestParamVm->Execute("Select ParamValue from Params WHERE ParamSet=$paramSet AND ParamName=\"HEADER\"");
             if ($this->unitTestParamVm->GetString("ParamValue") != "")
             {
                 $arrayParam['HEADER']=$this->unitTestParamVm->GetString("ParamValue");
-                $arrayParam['HEADER']="@".Utils::GetPath($arrayParam['HEADER']);
+                $arrayParam['HEADER']=new CURLFile(Utils::GetPath($arrayParam['HEADER']));
 
             }
 
@@ -234,7 +234,7 @@
             if (!Utils::IsWindows() && !is_file($path)) {
                 return new Result("", "text/plain");
             }
-            $arrayParam["DATA"]="@".$path;
+            $arrayParam["DATA"]=new CURLFile($path);
 
             return $this->httpRequest->SendRequest($this->URL, $arrayParam, "POST");
         }
@@ -322,7 +322,7 @@
             if ($this->unitTestParamVm->GetString("ParamValue") != "")
             {
                 $arrayParam['PACKAGE']=$this->unitTestParamVm->GetString("ParamValue");
-                $arrayParam['PACKAGE']="@".Utils::GetPath($arrayParam['PACKAGE']);
+                $arrayParam['PACKAGE']=new CURLFile(Utils::GetPath($arrayParam['PACKAGE']));
             }
 
             return $this->httpRequest->SendRequest($this->URL, $arrayParam, "POST");
@@ -347,14 +347,14 @@
             if ($this->unitTestParamVm->GetString("ParamValue") != "")
             {
                 $arrayParam['CONTENT']=$this->unitTestParamVm->GetString("ParamValue");
-                $arrayParam['CONTENT']="@".Utils::GetPath($arrayParam['CONTENT']);
+                $arrayParam['CONTENT']=new CURLFile(Utils::GetPath($arrayParam['CONTENT']));
             }
 
             $this->unitTestParamVm->Execute("Select ParamValue from Params WHERE ParamSet=$paramSet AND ParamName=\"HEADER\"");
             if ($this->unitTestParamVm->GetString("ParamValue") != "")
             {
                 $arrayParam['HEADER']=$this->unitTestParamVm->GetString("ParamValue");
-                $arrayParam['HEADER']="@".Utils::GetPath($arrayParam['HEADER']);
+                $arrayParam['HEADER']=new CURLFile(Utils::GetPath($arrayParam['HEADER']));
             }
 
             return $this->httpRequest->SendRequest($this->URL, $arrayParam, "POST");