BUG: refs #0381. Cleaned out error supression.

Michael Grauer · Michael Grauer · commit 581e95a384f4 · 2011-12-02T13:24:40.000-05:00
Since we have error reporting turned on for STRICT, and we are setting
fields on a field that itself has not yet been created, we were generating
error messages.  By explicitly creating the field if the field does not yet
exist, the error message isn't generated, thus error supression can be removed.
diff --git a/core/GlobalController.php b/core/GlobalController.php
@@ -176,7 +176,11 @@ public function loadElements()
         {
         $nameComponent = $component . "Component";
         Zend_Loader::loadClass($nameComponent, BASE_PATH . '/core/controllers/components');
-        @$this->Component->$component = new $nameComponent();
+        if(!isset($this->Component))
+          {
+          $this->Component =  new stdClass();
+          }
+        $this->Component->$component = new $nameComponent();
         }
       }
 
@@ -188,7 +192,12 @@ public function loadElements()
         $nameForm = $forms . "Form";
 
         Zend_Loader::loadClass($nameForm, BASE_PATH . '/core/controllers/forms');
-        @$this->Form->$forms = new $nameForm();
+        
+        if(!isset($this->Form))
+          {
+          $this->Form =  new stdClass();
+          }
+        $this->Form->$forms = new $nameForm();
         }
       }
     }//end loadElements
diff --git a/core/models/GlobalDao.php b/core/models/GlobalDao.php
@@ -49,7 +49,11 @@ public function loadElements()
         {
         $nameComponent = $component . "Component";
         Zend_Loader::loadClass($nameComponent, BASE_PATH . '/core/controllers/components');
-        @$this->Component->$component = new $nameComponent();
+        if(!isset($this->Component))
+          {
+          $this->Component =  new stdClass();
+          }
+        $this->Component->$component = new $nameComponent();
         }
       }
     }
diff --git a/core/models/MIDASModel.php b/core/models/MIDASModel.php
@@ -98,7 +98,11 @@ public function loadElements()
         $nameComponent = $component . "Component";
 
         Zend_Loader::loadClass($nameComponent, BASE_PATH . '/core/controllers/components');
-        @$this->Component->$component = new $nameComponent();
+        if(!isset($this->Component))
+          {
+          $this->Component =  new stdClass();
+          }
+        $this->Component->$component = new $nameComponent();
         }
       }
     }
diff --git a/core/models/MIDASUpgrade.php b/core/models/MIDASUpgrade.php
@@ -94,7 +94,11 @@ public function loadModuleElements()
         {
         $nameComponent = ucfirst($this->moduleName).'_'.$component . "Component";
         include_once (BASE_PATH . "/modules/".$this->moduleName."/controllers/components/".$component."Component.php");
-        @$this->ModuleComponent->$component = new $nameComponent();
+        if(!isset($this->ModuleComponent))
+          {
+          $this->ModuleComponent =  new stdClass();
+          }
+        $this->ModuleComponent->$component = new $nameComponent();
         }
       }
 
@@ -104,7 +108,11 @@ public function loadModuleElements()
         {
         $nameForm = ucfirst($this->moduleName).'_'.$forms . "Form";
         include_once (BASE_PATH . "/modules/".$this->moduleName."/controllers/forms/".$forms."Form.php");
-        @$this->ModuleForm->$forms = new $nameForm();
+        if(!isset($this->ModuleForm))
+          {
+          $this->ModuleForm =  new stdClass();
+          }
+        $this->ModuleForm->$forms = new $nameForm();
         }
       }
     }
@@ -143,7 +151,11 @@ public function loadElements()
         {
         $nameComponent = $component . "Component";
         Zend_Loader::loadClass($nameComponent, BASE_PATH . '/core/controllers/components');
-        @$this->Component->$component = new $nameComponent();
+        if(!isset($this->Component))
+          {
+          $this->Component =  new stdClass();
+          }
+        $this->Component->$component = new $nameComponent();
         }
       }
 
@@ -155,7 +167,11 @@ public function loadElements()
         $nameForm = $forms . "Form";
 
         Zend_Loader::loadClass($nameForm, BASE_PATH . '/core/controllers/forms');
-        @$this->Form->$forms = new $nameForm();
+        if(!isset($this->Form))
+          {
+          $this->Form =  new stdClass();
+          }
+        $this->Form->$forms = new $nameForm();
         }
       }
     }//end loadElements
diff --git a/modules/GlobalModule.php b/modules/GlobalModule.php
@@ -118,7 +118,11 @@ public function loadModuleElements()
         {
         $nameComponent = ucfirst($this->moduleName).'_'.$component . "Component";
         include_once (BASE_PATH . "/modules/".$this->moduleName."/controllers/components/".$component."Component.php");
-        @$this->ModuleComponent->$component = new $nameComponent();
+        if(!isset($this->ModuleComponent))
+          {
+          $this->ModuleComponent =  new stdClass();
+          }
+        $this->ModuleComponent->$component = new $nameComponent();
         }
       }
 
@@ -128,7 +132,11 @@ public function loadModuleElements()
         {
         $nameForm = ucfirst($this->moduleName).'_'.$forms . "Form";
         include_once (BASE_PATH . "/modules/".$this->moduleName."/controllers/forms/".$forms."Form.php");
-        @$this->ModuleForm->$forms = new $nameForm();
+        if(!isset($this->ModuleForm))
+          {
+          $this->ModuleForm =  new stdClass();
+          }
+        $this->ModuleForm->$forms = new $nameForm();
         }
       }
     }
diff --git a/notification/GlobalNotification.php b/notification/GlobalNotification.php
@@ -115,7 +115,11 @@ public function loadElements()
         {
         $nameComponent = $component . "Component";
         Zend_Loader::loadClass($nameComponent, BASE_PATH . '/core/controllers/components');
-        @$this->Component->$component = new $nameComponent();
+        if(!isset($this->Component))
+          {
+          $this->Component =  new stdClass();
+          }
+        $this->Component->$component = new $nameComponent();
         }
       }
 
@@ -127,7 +131,11 @@ public function loadElements()
         $nameForm = $forms . "Form";
 
         Zend_Loader::loadClass($nameForm, BASE_PATH . '/core/controllers/forms');
-        @$this->Form->$forms = new $nameForm();
+        if(!isset($this->Form))
+          {
+          $this->Form =  new stdClass();
+          }
+        $this->Form->$forms = new $nameForm();
         }
       }
     }//end loadElements
@@ -167,7 +175,11 @@ public function loadModuleElements()
         {
         $nameComponent = ucfirst($this->moduleName).'_'.$component . "Component";
         include_once (BASE_PATH . "/modules/".$this->moduleName."/controllers/components/".$component."Component.php");
-        @$this->ModuleComponent->$component = new $nameComponent();
+        if(!isset($this->ModuleComponent))
+          {
+          $this->ModuleComponent =  new stdClass();
+          }
+        $this->ModuleComponent->$component = new $nameComponent();
         }
       }
       
@@ -177,7 +189,11 @@ public function loadModuleElements()
         {
         $nameForm = ucfirst($this->moduleName).'_'.$forms . "Form";
         include_once (BASE_PATH . "/modules/".$this->moduleName."/controllers/forms/".$forms."Form.php");
-        @$this->ModuleForm->$forms = new $nameForm();
+        if(!isset($this->ModuleForm))
+          {
+          $this->ModuleForm =  new stdClass();
+          }
+        $this->ModuleForm->$forms = new $nameForm();
         }
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,11 @@ public function loadElements()`
`176`	`176`	`{`
`177`	`177`	`$nameComponent = $component . "Component";`
`178`	`178`	`Zend_Loader::loadClass($nameComponent, BASE_PATH . '/core/controllers/components');`
`179`		`- @$this->Component->$component = new $nameComponent();`
	`179`	`+ if(!isset($this->Component))`
	`180`	`+ {`
	`181`	`+ $this->Component = new stdClass();`
	`182`	`+ }`
	`183`	`+ $this->Component->$component = new $nameComponent();`
`180`	`184`	`}`
`181`	`185`	`}`
`182`	`186`
`@@ -188,7 +192,12 @@ public function loadElements()`
`188`	`192`	`$nameForm = $forms . "Form";`
`189`	`193`
`190`	`194`	`Zend_Loader::loadClass($nameForm, BASE_PATH . '/core/controllers/forms');`
`191`		`- @$this->Form->$forms = new $nameForm();`
	`195`	`+`
	`196`	`+ if(!isset($this->Form))`
	`197`	`+ {`
	`198`	`+ $this->Form = new stdClass();`
	`199`	`+ }`
	`200`	`+ $this->Form->$forms = new $nameForm();`
`192`	`201`	`}`
`193`	`202`	`}`
`194`	`203`	`}//end loadElements`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,11 @@ public function loadElements()`
`49`	`49`	`{`
`50`	`50`	`$nameComponent = $component . "Component";`
`51`	`51`	`Zend_Loader::loadClass($nameComponent, BASE_PATH . '/core/controllers/components');`
`52`		`- @$this->Component->$component = new $nameComponent();`
	`52`	`+ if(!isset($this->Component))`
	`53`	`+ {`
	`54`	`+ $this->Component = new stdClass();`
	`55`	`+ }`
	`56`	`+ $this->Component->$component = new $nameComponent();`
`53`	`57`	`}`
`54`	`58`	`}`
`55`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,11 @@ public function loadElements()`
`98`	`98`	`$nameComponent = $component . "Component";`
`99`	`99`
`100`	`100`	`Zend_Loader::loadClass($nameComponent, BASE_PATH . '/core/controllers/components');`
`101`		`- @$this->Component->$component = new $nameComponent();`
	`101`	`+ if(!isset($this->Component))`
	`102`	`+ {`
	`103`	`+ $this->Component = new stdClass();`
	`104`	`+ }`
	`105`	`+ $this->Component->$component = new $nameComponent();`
`102`	`106`	`}`
`103`	`107`	`}`
`104`	`108`	`}`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,11 @@ public function loadModuleElements()`
`94`	`94`	`{`
`95`	`95`	`$nameComponent = ucfirst($this->moduleName).'_'.$component . "Component";`
`96`	`96`	`include_once (BASE_PATH . "/modules/".$this->moduleName."/controllers/components/".$component."Component.php");`
`97`		`- @$this->ModuleComponent->$component = new $nameComponent();`
	`97`	`+ if(!isset($this->ModuleComponent))`
	`98`	`+ {`
	`99`	`+ $this->ModuleComponent = new stdClass();`
	`100`	`+ }`
	`101`	`+ $this->ModuleComponent->$component = new $nameComponent();`
`98`	`102`	`}`
`99`	`103`	`}`
`100`	`104`
`@@ -104,7 +108,11 @@ public function loadModuleElements()`
`104`	`108`	`{`
`105`	`109`	`$nameForm = ucfirst($this->moduleName).'_'.$forms . "Form";`
`106`	`110`	`include_once (BASE_PATH . "/modules/".$this->moduleName."/controllers/forms/".$forms."Form.php");`
`107`		`- @$this->ModuleForm->$forms = new $nameForm();`
	`111`	`+ if(!isset($this->ModuleForm))`
	`112`	`+ {`
	`113`	`+ $this->ModuleForm = new stdClass();`
	`114`	`+ }`
	`115`	`+ $this->ModuleForm->$forms = new $nameForm();`
`108`	`116`	`}`
`109`	`117`	`}`
`110`	`118`	`}`
`@@ -143,7 +151,11 @@ public function loadElements()`
`143`	`151`	`{`
`144`	`152`	`$nameComponent = $component . "Component";`
`145`	`153`	`Zend_Loader::loadClass($nameComponent, BASE_PATH . '/core/controllers/components');`
`146`		`- @$this->Component->$component = new $nameComponent();`
	`154`	`+ if(!isset($this->Component))`
	`155`	`+ {`
	`156`	`+ $this->Component = new stdClass();`
	`157`	`+ }`
	`158`	`+ $this->Component->$component = new $nameComponent();`
`147`	`159`	`}`
`148`	`160`	`}`
`149`	`161`
`@@ -155,7 +167,11 @@ public function loadElements()`
`155`	`167`	`$nameForm = $forms . "Form";`
`156`	`168`
`157`	`169`	`Zend_Loader::loadClass($nameForm, BASE_PATH . '/core/controllers/forms');`
`158`		`- @$this->Form->$forms = new $nameForm();`
	`170`	`+ if(!isset($this->Form))`
	`171`	`+ {`
	`172`	`+ $this->Form = new stdClass();`
	`173`	`+ }`
	`174`	`+ $this->Form->$forms = new $nameForm();`
`159`	`175`	`}`
`160`	`176`	`}`
`161`	`177`	`}//end loadElements`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,11 @@ public function loadModuleElements()`
`118`	`118`	`{`
`119`	`119`	`$nameComponent = ucfirst($this->moduleName).'_'.$component . "Component";`
`120`	`120`	`include_once (BASE_PATH . "/modules/".$this->moduleName."/controllers/components/".$component."Component.php");`
`121`		`- @$this->ModuleComponent->$component = new $nameComponent();`
	`121`	`+ if(!isset($this->ModuleComponent))`
	`122`	`+ {`
	`123`	`+ $this->ModuleComponent = new stdClass();`
	`124`	`+ }`
	`125`	`+ $this->ModuleComponent->$component = new $nameComponent();`
`122`	`126`	`}`
`123`	`127`	`}`
`124`	`128`
`@@ -128,7 +132,11 @@ public function loadModuleElements()`
`128`	`132`	`{`
`129`	`133`	`$nameForm = ucfirst($this->moduleName).'_'.$forms . "Form";`
`130`	`134`	`include_once (BASE_PATH . "/modules/".$this->moduleName."/controllers/forms/".$forms."Form.php");`
`131`		`- @$this->ModuleForm->$forms = new $nameForm();`
	`135`	`+ if(!isset($this->ModuleForm))`
	`136`	`+ {`
	`137`	`+ $this->ModuleForm = new stdClass();`
	`138`	`+ }`
	`139`	`+ $this->ModuleForm->$forms = new $nameForm();`
`132`	`140`	`}`
`133`	`141`	`}`
`134`	`142`	`}`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,11 @@ public function loadElements()`
`115`	`115`	`{`
`116`	`116`	`$nameComponent = $component . "Component";`
`117`	`117`	`Zend_Loader::loadClass($nameComponent, BASE_PATH . '/core/controllers/components');`
`118`		`- @$this->Component->$component = new $nameComponent();`
	`118`	`+ if(!isset($this->Component))`
	`119`	`+ {`
	`120`	`+ $this->Component = new stdClass();`
	`121`	`+ }`
	`122`	`+ $this->Component->$component = new $nameComponent();`
`119`	`123`	`}`
`120`	`124`	`}`
`121`	`125`
`@@ -127,7 +131,11 @@ public function loadElements()`
`127`	`131`	`$nameForm = $forms . "Form";`
`128`	`132`
`129`	`133`	`Zend_Loader::loadClass($nameForm, BASE_PATH . '/core/controllers/forms');`
`130`		`- @$this->Form->$forms = new $nameForm();`
	`134`	`+ if(!isset($this->Form))`
	`135`	`+ {`
	`136`	`+ $this->Form = new stdClass();`
	`137`	`+ }`
	`138`	`+ $this->Form->$forms = new $nameForm();`
`131`	`139`	`}`
`132`	`140`	`}`
`133`	`141`	`}//end loadElements`
`@@ -167,7 +175,11 @@ public function loadModuleElements()`
`167`	`175`	`{`
`168`	`176`	`$nameComponent = ucfirst($this->moduleName).'_'.$component . "Component";`
`169`	`177`	`include_once (BASE_PATH . "/modules/".$this->moduleName."/controllers/components/".$component."Component.php");`
`170`		`- @$this->ModuleComponent->$component = new $nameComponent();`
	`178`	`+ if(!isset($this->ModuleComponent))`
	`179`	`+ {`
	`180`	`+ $this->ModuleComponent = new stdClass();`
	`181`	`+ }`
	`182`	`+ $this->ModuleComponent->$component = new $nameComponent();`
`171`	`183`	`}`
`172`	`184`	`}`
`173`	`185`
`@@ -177,7 +189,11 @@ public function loadModuleElements()`
`177`	`189`	`{`
`178`	`190`	`$nameForm = ucfirst($this->moduleName).'_'.$forms . "Form";`
`179`	`191`	`include_once (BASE_PATH . "/modules/".$this->moduleName."/controllers/forms/".$forms."Form.php");`
`180`		`- @$this->ModuleForm->$forms = new $nameForm();`
	`192`	`+ if(!isset($this->ModuleForm))`
	`193`	`+ {`
	`194`	`+ $this->ModuleForm = new stdClass();`
	`195`	`+ }`
	`196`	`+ $this->ModuleForm->$forms = new $nameForm();`
`181`	`197`	`}`
`182`	`198`	`}`
`183`	`199`	`}`