<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>examples/characterData.php</filename>
    </added>
    <added>
      <filename>examples/guildData.php</filename>
    </added>
    <added>
      <filename>examples/item-by-id.php</filename>
    </added>
    <added>
      <filename>examples/item-by-name.php</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -2,18 +2,26 @@
 
 ## Summary
 
-phpArmory is a PHP class library that can easily fetch and unserialize World of Warcraft Armory XML data into structured associative arrays.
+phpArmory is a PHP class library that can easily fetch and unserialize World
+of Warcraft Armory XML data into structured associative arrays.
 
-This class library requires the PHP extensions for CURL, and XML installed. Please make sure that these extensions are installed on your server.
+This class library requires the PHP extensions for CURL, and XML installed.
+Please make sure that these extensions are installed on your server.
 
 ## Usage
 
-Include phpArmory.class.php4 as the base class in your project, and inherit new classes from the phpArmory class.
+Include phpArmory.class.php as the base class in your project, and inherit
+new classes from the `phpArmory5` class.
 
-If you need caching of the retrieved XML results, include the caching class from phpArmoryCache.class.php4 in your project, and inherit new classes from the phpArmoryCache class.
+If you need caching of the retrieved XML results, include the caching class
+from phpArmoryCache.class.php in your project, and inherit new classes from
+the `phpArmory5Cache` class.
 
 ## Notes
 
-If you use PHP5, please use the phpArmory.class.php5 file for normal data retrieval, and the phpArmoryCache.class.php5 for database / file cache data retrieval.
+* With the release of phpArmory 0.4.0 support for running the classes with
+  PHP4 has been dropped, due to PHP4 not being supported by the developers
+  anymore. Thus we recommend to upgrade your PHP installation to PHP5 now.
 
-The PHP4 and PHP5 versions of phpArmory are not API compatible. The PHP4 versions are not supported anymore, as PHP 4 is deprecated, and everyone is recommended to use PHP5.
+* The phpArmory API has changed with phpArmory 0.4.0 and is not backwards
+  compatible.
\ No newline at end of file</diff>
      <filename>README</filename>
    </modified>
    <modified>
      <diff>@@ -20,7 +20,7 @@
 &lt;/ul&gt;
 
 	&lt;p class=&quot;notes&quot; id=&quot;credit&quot;&gt;
-		Documentation generated on Wed, 19 Nov 2008 17:25:12 +0100 by &lt;a href=&quot;http://www.phpdoc.org&quot; target=&quot;_blank&quot;&gt;phpDocumentor 1.4.2&lt;/a&gt;
+		Documentation generated on Wed, 19 Nov 2008 21:55:01 +0100 by &lt;a href=&quot;http://www.phpdoc.org&quot; target=&quot;_blank&quot;&gt;phpDocumentor 1.4.2&lt;/a&gt;
 	&lt;/p&gt;
 	&lt;/body&gt;
 &lt;/html&gt;
\ No newline at end of file</diff>
      <filename>doc/classtrees_phpArmory.html</filename>
    </modified>
    <modified>
      <diff>@@ -257,6 +257,20 @@
 			&lt;div class=&quot;index-item-details&quot;&gt;&lt;a href=&quot;phpArmory/classes/phpArmory5.html#var$timeOut&quot;&gt;phpArmory5::$timeOut&lt;/a&gt; in phpArmory.class.php&lt;/div&gt;
 							&lt;div class=&quot;index-item-description&quot;&gt;The amount of time in seconds after which to consider a connection timed  out if no data has been yet retrieved.&lt;/div&gt;
 					&lt;/dd&gt;
+			&lt;dt class=&quot;field&quot;&gt;
+						&lt;span class=&quot;method-title&quot;&gt;triggerError&lt;/span&gt;
+					&lt;/dt&gt;
+		&lt;dd class=&quot;index-item-body&quot;&gt;
+			&lt;div class=&quot;index-item-details&quot;&gt;&lt;a href=&quot;phpArmory/classes/phpArmory5.html#methodtriggerError&quot;&gt;phpArmory5::triggerError()&lt;/a&gt; in phpArmory.class.php&lt;/div&gt;
+							&lt;div class=&quot;index-item-description&quot;&gt;Raise a PHP error.&lt;/div&gt;
+					&lt;/dd&gt;
+			&lt;dt class=&quot;field&quot;&gt;
+						&lt;span class=&quot;method-title&quot;&gt;triggerNotice&lt;/span&gt;
+					&lt;/dt&gt;
+		&lt;dd class=&quot;index-item-body&quot;&gt;
+			&lt;div class=&quot;index-item-details&quot;&gt;&lt;a href=&quot;phpArmory/classes/phpArmory5.html#methodtriggerNotice&quot;&gt;phpArmory5::triggerNotice()&lt;/a&gt; in phpArmory.class.php&lt;/div&gt;
+							&lt;div class=&quot;index-item-description&quot;&gt;Raise a PHP notice if the class is used from the command line.&lt;/div&gt;
+					&lt;/dd&gt;
 		&lt;/dl&gt;
 	&lt;a name=&quot;u&quot;&gt;&lt;/a&gt;
 	&lt;div class=&quot;index-letter-section&quot;&gt;</diff>
      <filename>doc/elementindex.html</filename>
    </modified>
    <modified>
      <diff>@@ -291,6 +291,20 @@
 			&lt;div class=&quot;index-item-details&quot;&gt;&lt;a href=&quot;phpArmory/classes/phpArmory5.html#var$timeOut&quot;&gt;phpArmory5::$timeOut&lt;/a&gt; in phpArmory.class.php&lt;/div&gt;
 							&lt;div class=&quot;index-item-description&quot;&gt;The amount of time in seconds after which to consider a connection timed  out if no data has been yet retrieved.&lt;/div&gt;
 					&lt;/dd&gt;
+			&lt;dt class=&quot;field&quot;&gt;
+						&lt;span class=&quot;method-title&quot;&gt;triggerError&lt;/span&gt;
+					&lt;/dt&gt;
+		&lt;dd class=&quot;index-item-body&quot;&gt;
+			&lt;div class=&quot;index-item-details&quot;&gt;&lt;a href=&quot;phpArmory/classes/phpArmory5.html#methodtriggerError&quot;&gt;phpArmory5::triggerError()&lt;/a&gt; in phpArmory.class.php&lt;/div&gt;
+							&lt;div class=&quot;index-item-description&quot;&gt;Raise a PHP error.&lt;/div&gt;
+					&lt;/dd&gt;
+			&lt;dt class=&quot;field&quot;&gt;
+						&lt;span class=&quot;method-title&quot;&gt;triggerNotice&lt;/span&gt;
+					&lt;/dt&gt;
+		&lt;dd class=&quot;index-item-body&quot;&gt;
+			&lt;div class=&quot;index-item-details&quot;&gt;&lt;a href=&quot;phpArmory/classes/phpArmory5.html#methodtriggerNotice&quot;&gt;phpArmory5::triggerNotice()&lt;/a&gt; in phpArmory.class.php&lt;/div&gt;
+							&lt;div class=&quot;index-item-description&quot;&gt;Raise a PHP notice if the class is used from the command line.&lt;/div&gt;
+					&lt;/dd&gt;
 		&lt;/dl&gt;
 	&lt;a name=&quot;u&quot;&gt;&lt;/a&gt;
 	&lt;div class=&quot;index-letter-section&quot;&gt;</diff>
      <filename>doc/elementindex_phpArmory.html</filename>
    </modified>
    <modified>
      <diff>@@ -10,7 +10,7 @@
 		&lt;body&gt;
 						&lt;a href=&quot;#Post-parsing&quot;&gt;Post-parsing&lt;/a&gt;&lt;br&gt;
 	&lt;p class=&quot;notes&quot; id=&quot;credit&quot;&gt;
-		Documentation generated on Wed, 19 Nov 2008 17:25:12 +0100 by &lt;a href=&quot;http://www.phpdoc.org&quot; target=&quot;_blank&quot;&gt;phpDocumentor 1.4.2&lt;/a&gt;
+		Documentation generated on Wed, 19 Nov 2008 21:55:02 +0100 by &lt;a href=&quot;http://www.phpdoc.org&quot; target=&quot;_blank&quot;&gt;phpDocumentor 1.4.2&lt;/a&gt;
 	&lt;/p&gt;
 	&lt;/body&gt;
 &lt;/html&gt;
\ No newline at end of file</diff>
      <filename>doc/errors.html</filename>
    </modified>
    <modified>
      <diff>@@ -4,7 +4,7 @@
      &quot;http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd&quot;&gt;
    &lt;html xmlns=&quot;http://www.w3.org/1999/xhtml&quot;&gt;
 &lt;head&gt;
-	&lt;!-- Generated by phpDocumentor on Wed, 19 Nov 2008 17:25:12 +0100  --&gt;
+	&lt;!-- Generated by phpDocumentor on Wed, 19 Nov 2008 21:55:01 +0100  --&gt;
   &lt;title&gt;Generated Documentation&lt;/title&gt;
   &lt;meta http-equiv='Content-Type' content='text/html; charset=iso-8859-1'/&gt;
 &lt;/head&gt;</diff>
      <filename>doc/index.html</filename>
    </modified>
    <modified>
      <diff>@@ -63,7 +63,7 @@
 	
 	
 	&lt;p class=&quot;notes&quot; id=&quot;credit&quot;&gt;
-		Documentation generated on Wed, 19 Nov 2008 17:25:12 +0100 by &lt;a href=&quot;http://www.phpdoc.org&quot; target=&quot;_blank&quot;&gt;phpDocumentor 1.4.2&lt;/a&gt;
+		Documentation generated on Wed, 19 Nov 2008 21:55:01 +0100 by &lt;a href=&quot;http://www.phpdoc.org&quot; target=&quot;_blank&quot;&gt;phpDocumentor 1.4.2&lt;/a&gt;
 	&lt;/p&gt;
 	&lt;/div&gt;&lt;/body&gt;
 &lt;/html&gt;
\ No newline at end of file</diff>
      <filename>doc/phpArmory/_phpArmory.class.php.html</filename>
    </modified>
    <modified>
      <diff>@@ -91,7 +91,7 @@
 	
 	
 	&lt;p class=&quot;notes&quot; id=&quot;credit&quot;&gt;
-		Documentation generated on Wed, 19 Nov 2008 17:25:12 +0100 by &lt;a href=&quot;http://www.phpdoc.org&quot; target=&quot;_blank&quot;&gt;phpDocumentor 1.4.2&lt;/a&gt;
+		Documentation generated on Wed, 19 Nov 2008 21:55:02 +0100 by &lt;a href=&quot;http://www.phpdoc.org&quot; target=&quot;_blank&quot;&gt;phpDocumentor 1.4.2&lt;/a&gt;
 	&lt;/p&gt;
 	&lt;/div&gt;&lt;/body&gt;
 &lt;/html&gt;
\ No newline at end of file</diff>
      <filename>doc/phpArmory/_phpArmoryCache.class.php.html</filename>
    </modified>
    <modified>
      <diff>@@ -132,7 +132,7 @@
 		&lt;/div&gt;
 		&lt;div class=&quot;info-box-body&quot;&gt;			
 			&lt;div class=&quot;method-summary&quot;&gt;
-																																																																																																																																				
+																																																																																																																																																				
 												&lt;div class=&quot;method-definition&quot;&gt;
 											&lt;span class=&quot;method-result&quot;&gt;mixed&lt;/span&gt;
 										&lt;a href=&quot;#__construct&quot; title=&quot;details&quot; class=&quot;method-name&quot;&gt;__construct&lt;/a&gt;
@@ -213,6 +213,16 @@
 										&lt;a href=&quot;#setLocale&quot; title=&quot;details&quot; class=&quot;method-name&quot;&gt;setLocale&lt;/a&gt;
 											(&lt;span class=&quot;var-type&quot;&gt;string&lt;/span&gt;&amp;nbsp;&lt;span class=&quot;var-name&quot;&gt;$localeName&lt;/span&gt;)
 									&lt;/div&gt;
+																&lt;div class=&quot;method-definition&quot;&gt;
+											&lt;span class=&quot;method-result&quot;&gt;void&lt;/span&gt;
+										&lt;a href=&quot;#triggerError&quot; title=&quot;details&quot; class=&quot;method-name&quot;&gt;triggerError&lt;/a&gt;
+											([&lt;span class=&quot;var-type&quot;&gt;string&lt;/span&gt;&amp;nbsp;&lt;span class=&quot;var-name&quot;&gt;$userError&lt;/span&gt; = &lt;span class=&quot;var-default&quot;&gt;NULL&lt;/span&gt;])
+									&lt;/div&gt;
+																&lt;div class=&quot;method-definition&quot;&gt;
+											&lt;span class=&quot;method-result&quot;&gt;void&lt;/span&gt;
+										&lt;a href=&quot;#triggerNotice&quot; title=&quot;details&quot; class=&quot;method-name&quot;&gt;triggerNotice&lt;/a&gt;
+											([&lt;span class=&quot;var-type&quot;&gt;string&lt;/span&gt;&amp;nbsp;&lt;span class=&quot;var-name&quot;&gt;$userNotice&lt;/span&gt; = &lt;span class=&quot;var-default&quot;&gt;NULL&lt;/span&gt;])
+									&lt;/div&gt;
 								&lt;/div&gt;
 		&lt;/div&gt;
 	&lt;/div&gt;		
@@ -617,7 +627,7 @@
 &lt;div class=&quot;evenrow&quot;&gt;
 	
 	&lt;div class=&quot;method-header&quot;&gt;
-		&lt;span class=&quot;method-title&quot;&gt;getArenaTeamData&lt;/span&gt; (line &lt;span class=&quot;line-number&quot;&gt;497&lt;/span&gt;)
+		&lt;span class=&quot;method-title&quot;&gt;getArenaTeamData&lt;/span&gt; (line &lt;span class=&quot;line-number&quot;&gt;522&lt;/span&gt;)
 	&lt;/div&gt; 
 	
 	&lt;!-- ========== Info from phpDoc block ========= --&gt;
@@ -654,7 +664,7 @@
 &lt;div class=&quot;oddrow&quot;&gt;
 	
 	&lt;div class=&quot;method-header&quot;&gt;
-		&lt;span class=&quot;method-title&quot;&gt;getCharacterData&lt;/span&gt; (line &lt;span class=&quot;line-number&quot;&gt;514&lt;/span&gt;)
+		&lt;span class=&quot;method-title&quot;&gt;getCharacterData&lt;/span&gt; (line &lt;span class=&quot;line-number&quot;&gt;543&lt;/span&gt;)
 	&lt;/div&gt; 
 	
 	&lt;!-- ========== Info from phpDoc block ========= --&gt;
@@ -687,7 +697,7 @@
 &lt;div class=&quot;evenrow&quot;&gt;
 	
 	&lt;div class=&quot;method-header&quot;&gt;
-		&lt;span class=&quot;method-title&quot;&gt;getCharacterIconURL&lt;/span&gt; (line &lt;span class=&quot;line-number&quot;&gt;565&lt;/span&gt;)
+		&lt;span class=&quot;method-title&quot;&gt;getCharacterIconURL&lt;/span&gt; (line &lt;span class=&quot;line-number&quot;&gt;596&lt;/span&gt;)
 	&lt;/div&gt; 
 	
 	&lt;!-- ========== Info from phpDoc block ========= --&gt;
@@ -717,7 +727,7 @@
 &lt;div class=&quot;oddrow&quot;&gt;
 	
 	&lt;div class=&quot;method-header&quot;&gt;
-		&lt;span class=&quot;method-title&quot;&gt;getGuildData&lt;/span&gt; (line &lt;span class=&quot;line-number&quot;&gt;584&lt;/span&gt;)
+		&lt;span class=&quot;method-title&quot;&gt;getGuildData&lt;/span&gt; (line &lt;span class=&quot;line-number&quot;&gt;615&lt;/span&gt;)
 	&lt;/div&gt; 
 	
 	&lt;!-- ========== Info from phpDoc block ========= --&gt;
@@ -750,7 +760,7 @@
 &lt;div class=&quot;evenrow&quot;&gt;
 	
 	&lt;div class=&quot;method-header&quot;&gt;
-		&lt;span class=&quot;method-title&quot;&gt;getItemData&lt;/span&gt; (line &lt;span class=&quot;line-number&quot;&gt;615&lt;/span&gt;)
+		&lt;span class=&quot;method-title&quot;&gt;getItemData&lt;/span&gt; (line &lt;span class=&quot;line-number&quot;&gt;646&lt;/span&gt;)
 	&lt;/div&gt; 
 	
 	&lt;!-- ========== Info from phpDoc block ========= --&gt;
@@ -780,7 +790,7 @@
 &lt;div class=&quot;oddrow&quot;&gt;
 	
 	&lt;div class=&quot;method-header&quot;&gt;
-		&lt;span class=&quot;method-title&quot;&gt;getItemDataByName&lt;/span&gt; (line &lt;span class=&quot;line-number&quot;&gt;641&lt;/span&gt;)
+		&lt;span class=&quot;method-title&quot;&gt;getItemDataByName&lt;/span&gt; (line &lt;span class=&quot;line-number&quot;&gt;672&lt;/span&gt;)
 	&lt;/div&gt; 
 	
 	&lt;!-- ========== Info from phpDoc block ========= --&gt;
@@ -841,7 +851,7 @@
 &lt;div class=&quot;oddrow&quot;&gt;
 	
 	&lt;div class=&quot;method-header&quot;&gt;
-		&lt;span class=&quot;method-title&quot;&gt;getPatchLevel&lt;/span&gt; (line &lt;span class=&quot;line-number&quot;&gt;436&lt;/span&gt;)
+		&lt;span class=&quot;method-title&quot;&gt;getPatchLevel&lt;/span&gt; (line &lt;span class=&quot;line-number&quot;&gt;461&lt;/span&gt;)
 	&lt;/div&gt; 
 	
 	&lt;!-- ========== Info from phpDoc block ========= --&gt;
@@ -866,7 +876,7 @@
 &lt;div class=&quot;evenrow&quot;&gt;
 	
 	&lt;div class=&quot;method-header&quot;&gt;
-		&lt;span class=&quot;method-title&quot;&gt;getTalentData&lt;/span&gt; (line &lt;span class=&quot;line-number&quot;&gt;467&lt;/span&gt;)
+		&lt;span class=&quot;method-title&quot;&gt;getTalentData&lt;/span&gt; (line &lt;span class=&quot;line-number&quot;&gt;492&lt;/span&gt;)
 	&lt;/div&gt; 
 	
 	&lt;!-- ========== Info from phpDoc block ========= --&gt;
@@ -985,13 +995,71 @@
 		
 			
 	&lt;/div&gt;
+&lt;a name=&quot;methodtriggerError&quot; id=&quot;triggerError&quot;&gt;&lt;!-- --&gt;&lt;/a&gt;
+&lt;div class=&quot;evenrow&quot;&gt;
+	
+	&lt;div class=&quot;method-header&quot;&gt;
+		&lt;span class=&quot;method-title&quot;&gt;triggerError&lt;/span&gt; (line &lt;span class=&quot;line-number&quot;&gt;436&lt;/span&gt;)
+	&lt;/div&gt; 
+	
+	&lt;!-- ========== Info from phpDoc block ========= --&gt;
+&lt;p class=&quot;short-description&quot;&gt;Raise a PHP error.&lt;/p&gt;
+	&lt;ul class=&quot;tags&quot;&gt;
+				&lt;li&gt;&lt;span class=&quot;field&quot;&gt;access:&lt;/span&gt; protected&lt;/li&gt;
+			&lt;/ul&gt;
+	
+	&lt;div class=&quot;method-signature&quot;&gt;
+		&lt;span class=&quot;method-result&quot;&gt;void&lt;/span&gt;
+		&lt;span class=&quot;method-name&quot;&gt;
+			triggerError
+		&lt;/span&gt;
+					([&lt;span class=&quot;var-type&quot;&gt;string&lt;/span&gt;&amp;nbsp;&lt;span class=&quot;var-name&quot;&gt;$userError&lt;/span&gt; = &lt;span class=&quot;var-default&quot;&gt;NULL&lt;/span&gt;])
+			&lt;/div&gt;
+	
+			&lt;ul class=&quot;parameters&quot;&gt;
+					&lt;li&gt;
+				&lt;span class=&quot;var-type&quot;&gt;string&lt;/span&gt;
+				&lt;span class=&quot;var-name&quot;&gt;$userError&lt;/span&gt;&lt;span class=&quot;var-description&quot;&gt;: The error string to output.&lt;/span&gt;			&lt;/li&gt;
+				&lt;/ul&gt;
+		
+			
+	&lt;/div&gt;
+&lt;a name=&quot;methodtriggerNotice&quot; id=&quot;triggerNotice&quot;&gt;&lt;!-- --&gt;&lt;/a&gt;
+&lt;div class=&quot;oddrow&quot;&gt;
+	
+	&lt;div class=&quot;method-header&quot;&gt;
+		&lt;span class=&quot;method-title&quot;&gt;triggerNotice&lt;/span&gt; (line &lt;span class=&quot;line-number&quot;&gt;447&lt;/span&gt;)
+	&lt;/div&gt; 
+	
+	&lt;!-- ========== Info from phpDoc block ========= --&gt;
+&lt;p class=&quot;short-description&quot;&gt;Raise a PHP notice if the class is used from the command line.&lt;/p&gt;
+	&lt;ul class=&quot;tags&quot;&gt;
+				&lt;li&gt;&lt;span class=&quot;field&quot;&gt;access:&lt;/span&gt; protected&lt;/li&gt;
+			&lt;/ul&gt;
+	
+	&lt;div class=&quot;method-signature&quot;&gt;
+		&lt;span class=&quot;method-result&quot;&gt;void&lt;/span&gt;
+		&lt;span class=&quot;method-name&quot;&gt;
+			triggerNotice
+		&lt;/span&gt;
+					([&lt;span class=&quot;var-type&quot;&gt;string&lt;/span&gt;&amp;nbsp;&lt;span class=&quot;var-name&quot;&gt;$userNotice&lt;/span&gt; = &lt;span class=&quot;var-default&quot;&gt;NULL&lt;/span&gt;])
+			&lt;/div&gt;
+	
+			&lt;ul class=&quot;parameters&quot;&gt;
+					&lt;li&gt;
+				&lt;span class=&quot;var-type&quot;&gt;string&lt;/span&gt;
+				&lt;span class=&quot;var-name&quot;&gt;$userNotice&lt;/span&gt;&lt;span class=&quot;var-description&quot;&gt;: The notice string to output.&lt;/span&gt;			&lt;/li&gt;
+				&lt;/ul&gt;
+		
+			
+	&lt;/div&gt;
 						
 		&lt;/div&gt;
 	&lt;/div&gt;
 
 
 	&lt;p class=&quot;notes&quot; id=&quot;credit&quot;&gt;
-		Documentation generated on Wed, 19 Nov 2008 17:25:12 +0100 by &lt;a href=&quot;http://www.phpdoc.org&quot; target=&quot;_blank&quot;&gt;phpDocumentor 1.4.2&lt;/a&gt;
+		Documentation generated on Wed, 19 Nov 2008 21:55:01 +0100 by &lt;a href=&quot;http://www.phpdoc.org&quot; target=&quot;_blank&quot;&gt;phpDocumentor 1.4.2&lt;/a&gt;
 	&lt;/p&gt;
 	&lt;/div&gt;&lt;/body&gt;
 &lt;/html&gt;
\ No newline at end of file</diff>
      <filename>doc/phpArmory/classes/phpArmory5.html</filename>
    </modified>
    <modified>
      <diff>@@ -206,6 +206,8 @@
 													&lt;span class=&quot;method-name&quot;&gt;&lt;a href=&quot;../../phpArmory/classes/phpArmory5.html#methodgetXmlData&quot;&gt;phpArmory5::getXmlData()&lt;/a&gt;&lt;/span&gt;&lt;br&gt;
 													&lt;span class=&quot;method-name&quot;&gt;&lt;a href=&quot;../../phpArmory/classes/phpArmory5.html#methodsetArea&quot;&gt;phpArmory5::setArea()&lt;/a&gt;&lt;/span&gt;&lt;br&gt;
 													&lt;span class=&quot;method-name&quot;&gt;&lt;a href=&quot;../../phpArmory/classes/phpArmory5.html#methodsetLocale&quot;&gt;phpArmory5::setLocale()&lt;/a&gt;&lt;/span&gt;&lt;br&gt;
+													&lt;span class=&quot;method-name&quot;&gt;&lt;a href=&quot;../../phpArmory/classes/phpArmory5.html#methodtriggerError&quot;&gt;phpArmory5::triggerError()&lt;/a&gt;&lt;/span&gt;&lt;br&gt;
+													&lt;span class=&quot;method-name&quot;&gt;&lt;a href=&quot;../../phpArmory/classes/phpArmory5.html#methodtriggerNotice&quot;&gt;phpArmory5::triggerNotice()&lt;/a&gt;&lt;/span&gt;&lt;br&gt;
 													&lt;span class=&quot;method-name&quot;&gt;&lt;a href=&quot;../../phpArmory/classes/phpArmory5.html#method__destruct&quot;&gt;phpArmory5::__destruct()&lt;/a&gt;&lt;/span&gt;&lt;br&gt;
 											&lt;/blockquote&gt;
 										
@@ -214,7 +216,7 @@
 
 
 	&lt;p class=&quot;notes&quot; id=&quot;credit&quot;&gt;
-		Documentation generated on Wed, 19 Nov 2008 17:25:12 +0100 by &lt;a href=&quot;http://www.phpdoc.org&quot; target=&quot;_blank&quot;&gt;phpDocumentor 1.4.2&lt;/a&gt;
+		Documentation generated on Wed, 19 Nov 2008 21:55:02 +0100 by &lt;a href=&quot;http://www.phpdoc.org&quot; target=&quot;_blank&quot;&gt;phpDocumentor 1.4.2&lt;/a&gt;
 	&lt;/p&gt;
 	&lt;/div&gt;&lt;/body&gt;
 &lt;/html&gt;
\ No newline at end of file</diff>
      <filename>doc/phpArmory/classes/phpArmory5Cache.html</filename>
    </modified>
    <modified>
      <diff>@@ -23,7 +23,7 @@
     &lt;li&gt;IMPLEMENTATION MISSING.&lt;/li&gt;
 &lt;/ul&gt;
 	&lt;p class=&quot;notes&quot; id=&quot;credit&quot;&gt;
-		Documentation generated on Wed, 19 Nov 2008 17:25:12 +0100 by &lt;a href=&quot;http://www.phpdoc.org&quot; target=&quot;_blank&quot;&gt;phpDocumentor 1.4.2&lt;/a&gt;
+		Documentation generated on Wed, 19 Nov 2008 21:55:02 +0100 by &lt;a href=&quot;http://www.phpdoc.org&quot; target=&quot;_blank&quot;&gt;phpDocumentor 1.4.2&lt;/a&gt;
 	&lt;/p&gt;
 	&lt;/body&gt;
 &lt;/html&gt;
\ No newline at end of file</diff>
      <filename>doc/todolist.html</filename>
    </modified>
    <modified>
      <diff>@@ -135,7 +135,7 @@ class phpArmory5 {
     public function __construct($areaName = NULL, $downloadRetries = NULL) {
 
         if (!extension_loaded('curl') &amp;&amp; !extension_loaded('xml')) {
-            trigger_error(&quot;phpArmory &quot; . $this-&gt;version . &quot; - &quot; . $this-&gt;version_state . &quot;: The PHP extensions \&quot;curl\&quot; and \&quot;xml\&quot; are required to use this class.&quot;, E_USER_ERROR);
+            self::triggerError(&quot;The PHP extensions \&quot;curl\&quot; and \&quot;xml\&quot; are required to use this class.&quot;);
         } else {
 
             // If an area is provided, we will configure armory site, wow site, and language appropriately.
@@ -195,9 +195,9 @@ class phpArmory5 {
                 break;
         }
 
-        trigger_error(&quot;phpArmory &quot; . $this-&gt;version . &quot; - &quot; . $this-&gt;version_state . &quot;: Area now is [&quot; . $this-&gt;areaName . &quot;].&quot;, E_USER_NOTICE);
-        trigger_error(&quot;phpArmory &quot; . $this-&gt;version . &quot; - &quot; . $this-&gt;version_state . &quot;: Armory now is [&quot; . $this-&gt;armory . &quot;].&quot;, E_USER_NOTICE);
-        trigger_error(&quot;phpArmory &quot; . $this-&gt;version . &quot; - &quot; . $this-&gt;version_state . &quot;: Wow site now is [&quot; . $this-&gt;wow . &quot;].&quot;, E_USER_NOTICE);
+        self::triggerNotice(&quot;Area now is [&quot; . $this-&gt;areaName . &quot;].&quot;);
+        self::triggerNotice(&quot;Armory now is [&quot; . $this-&gt;armory . &quot;].&quot;);
+        self::triggerNotice(&quot;Wow site now is [&quot; . $this-&gt;wow . &quot;].&quot;);
 
         return TRUE;
     }
@@ -235,7 +235,7 @@ class phpArmory5 {
                 $this-&gt;localeName = 'en';
         }
 
-        trigger_error(&quot;phpArmory &quot; . $this-&gt;version . &quot; - &quot; . $this-&gt;version_state . &quot;: Locale now is [&quot; . $this-&gt;localeName . &quot;].&quot;, E_USER_NOTICE);
+        self::triggerNotice(&quot;Locale now is [&quot; . $this-&gt;localeName . &quot;].&quot;);
 
         return TRUE;
     }
@@ -270,12 +270,12 @@ class phpArmory5 {
             if (time() &lt; $this-&gt;lastDownload+1) {
 
                 $delay = rand (1,2);
-                trigger_error(&quot;phpArmory &quot; . $this-&gt;version . &quot; - &quot; . $this-&gt;version_state . &quot;: Inserting fetch delay of &quot; . $delay . &quot; seconds.&quot;, E_USER_NOTICE);
+                self::triggerNotice(&quot;Inserting fetch delay of &quot; . $delay . &quot; seconds.&quot;);
                 sleep($delay);    //random delay
 
             } // if
 
-            trigger_error(&quot;phpArmory &quot; . $this-&gt;version . &quot; - &quot; . $this-&gt;version_state . &quot;: Fetching [&quot; . $url . &quot;] (tries: #&quot; . $i . &quot;).&quot;, E_USER_NOTICE);
+            self::triggerNotice(&quot;Fetching [&quot; . $url . &quot;] (tries: #&quot; . $i . &quot;).&quot;);
             $ch = curl_init();
             $timeout = $this-&gt;timeOut;
 
@@ -315,7 +315,7 @@ class phpArmory5 {
 
         }
 
-        trigger_error(&quot;phpArmory &quot; . $this-&gt;version . &quot; - &quot; . $this-&gt;version_state . &quot;: Fetched [&quot; . $url . &quot;] in &quot; . $i . &quot; tries.&quot;, E_USER_NOTICE);
+        self::triggerNotice(&quot;Fetched [&quot; . $url . &quot;] in &quot; . $i . &quot; tries.&quot;);
         return array ( 'result' =&gt; TRUE, 'XmlData' =&gt; $f);
 
     }
@@ -429,6 +429,31 @@ class phpArmory5 {
     }
 
     /**
+     * Raise a PHP error.
+     * @access      protected
+     * @param       string       $userError              The error string to output.
+     */
+    protected function triggerError ($userError = NULL) {
+        if (is_string($userError)) {
+            trigger_error(&quot;phpArmory &quot; . $this-&gt;version . &quot; - &quot; . $this-&gt;version_state . &quot;: &quot; . $userError, E_USER_ERROR);
+        }
+    }
+
+    /**
+     * Raise a PHP notice if the class is used from the command line.
+     * @access      protected
+     * @param       string       $userNotice             The notice string to output.
+     */
+    protected function triggerNotice ($userNotice = NULL) {
+        if (is_string($userNotice)) {
+            $sapi_type = substr(php_sapi_name(), 0, 3);
+            if ($sapi_type == 'cli') {
+                trigger_error(&quot;phpArmory &quot; . $this-&gt;version . &quot; - &quot; . $this-&gt;version_state . &quot;: &quot; . $userNotice, E_USER_NOTICE);
+            }
+        }
+    }
+
+    /**
      * Provides information on the current patch level of World of Warcraft.
      * @access      public
      * @return      string       $patchLevel             Returns a string with int $patchLevelMajor, int $patchLevelMinor, and int $patchLevelFix.
@@ -628,7 +653,7 @@ class phpArmory5 {
 
             $itemArray = $this-&gt;convertXmlToArray($itemXML['XmlData']);
 
-            trigger_error(&quot;phpArmory &quot; . $this-&gt;version . &quot; - &quot; . $this-&gt;version_state . &quot;: Fetched item by ID [&quot; . $itemID . &quot;].&quot;, E_USER_NOTICE);
+            self::triggerNotice(&quot;Fetched item by ID [&quot; . $itemID . &quot;].&quot;);
 
             return $itemArray;
         } else {</diff>
      <filename>phpArmory.class.php</filename>
    </modified>
  </modified>
  <removed type="array">
    <removed>
      <filename>examples/characterData.php4</filename>
    </removed>
    <removed>
      <filename>examples/guildData.php4</filename>
    </removed>
    <removed>
      <filename>examples/item-by-id.php4</filename>
    </removed>
    <removed>
      <filename>examples/item-by-name.php4</filename>
    </removed>
  </removed>
  <parents type="array">
    <parent>
      <id>93b75bfb52c811b7b38f291452e36948396ce436</id>
    </parent>
  </parents>
  <author>
    <name>Daniel S. Reichenbach</name>
    <email>shiendra@marenkay.com</email>
  </author>
  <url>http://github.com/marenkay/phparmory/commit/59e8f6f02e5c94b66a9b41f6940c312235b16584</url>
  <id>59e8f6f02e5c94b66a9b41f6940c312235b16584</id>
  <committed-date>2008-11-19T12:55:51-08:00</committed-date>
  <authored-date>2008-11-19T12:55:51-08:00</authored-date>
  <message>Updated examples for the new PHP5 class, all working. Enjoy!</message>
  <tree>a79b846aee4fe04e77914ac9dba26084587d282c</tree>
  <committer>
    <name>Daniel S. Reichenbach</name>
    <email>shiendra@marenkay.com</email>
  </committer>
</commit>
