[fusion-commits] r2820 - trunk/layers/MapGuide/php

[svn_fusion at osgeo.org]

Author: jng
Date: 2013-11-28 01:10:02 -0800 (Thu, 28 Nov 2013)
New Revision: 2820

Modified:
   trunk/layers/MapGuide/php/LoadMap.php
Log:
Compatibility fixes for PHP 5.5

Modified: trunk/layers/MapGuide/php/LoadMap.php
===================================================================
--- trunk/layers/MapGuide/php/LoadMap.php	2013-11-28 06:49:12 UTC (rev 2819)
+++ trunk/layers/MapGuide/php/LoadMap.php	2013-11-28 09:10:02 UTC (rev 2820)
@@ -38,7 +38,7 @@
 include('Utilities.php');
 
 
-$mapObj = NULL;
+$mapObj = new stdClass();
 try
 {
     $mappingService = $siteConnection->CreateService(MgServiceType::MappingService);
@@ -169,7 +169,7 @@
         $layer=$layers->GetItem($i);
         $layerContent = $layerDocs[$i];
         $fsContent = $fsDocs[$i];
-        $layerObj = NULL;
+        $layerObj = new stdClass();
         $mappings = GetLayerPropertyMappings($resourceService, $layer, $layerContent);
         $_SESSION['property_mappings'][$layer->GetObjectId()] = $mappings;
 
@@ -344,7 +344,7 @@
     $ruleNames = array("PointRule", "LineRule", "AreaRule", "CompositeRule");
     for($sc = 0; $sc < $scaleRanges->length; $sc++)
     {
-        $scaleRangeObj = NULL;
+        $scaleRangeObj = new stdClass();
         $scaleRangeObj->styles = array();
         $scaleRange = $scaleRanges->item($sc);
         $minElt = $scaleRange->getElementsByTagName('MinScale');
@@ -373,7 +373,6 @@
             $catIndex = 0;
             for($st = 0; $st < $typeStyle->length; $st++) {
 
-                $styleObj = NULL;
                 // We will check if this typestyle is going to be shown in the legend
                 $showInLegend = $typeStyle->item($st)->getElementsByTagName("ShowInLegend");
                 if($showInLegend->length > 0)
@@ -388,7 +387,7 @@
 
                     $labelText = $label->length==1? $label->item(0)->nodeValue: "";
                     $filterText = $filter->length==1? $filter->item(0)->nodeValue: "";
-                    $styleObj = NULL;
+                    $styleObj = new stdClass();
                     $styleObj->legendLabel = trim($labelText);
                     $styleObj->filter = trim($filterText);
                     $styleObj->geometryType = ($ts+1);
@@ -417,7 +416,7 @@
 
 function OutputGroupInfo($group)
 {
-    $groupObj = NULL;
+    $groupObj = new stdClass();
 
     $groupObj->groupName = $group->GetName();
     $groupObj->legendLabel = $group->GetLegendLabel();