Merge branch 'master' of github.com:rackspace/php-opencloud

Author: gecampbell

README.md

@@ -49,9 +49,8 @@ version list:
 
 ### Installation
 
-You can download the latest official release here:
-
-https://github.com/rackspace/php-opencloud/downloads
+GitHub has deprecated its `/downloads` directory. Click on the `ZIP` button
+on this page to download the entire repository as a .ZIP file.
 
 Move the files in the `lib/` directory to a location in your PHP's
 `include_path` or, conversely, set the `include_path` to point to the

RELEASENOTES.md

@@ -15,6 +15,8 @@ RELEASE NOTES
   the previous behavior, this might cause it to break.**
 * Support for Rackspace Cloud Load Balancers
 * Fix to remove requirement for Tenant ID in authentication
+* Added `ExportCredentials()` and `ImportCredentials()` methods to the
+  `OpenStack` class to permit caching of tokens.
 
 ### 11/06/2012 Version 1.2
 * Adds full support for OpenStack Cinder/Rackspace Cloud Block Storage

docs/api/base.inc.html

@@ -76,7 +76,7 @@ <h1>Properties</h1>
 <a title="">1.0</a>
 
         </div>
-<label class="property-key">Abstract</label><div class="property-value">No 
+<label class="property-key">Abstract</label><div class="property-value">Yes 
       </div>
 <label class="property-key">Final</label><div class="property-value">No 
       </div>
@@ -346,7 +346,8 @@ <h4>Tags</h4>
 </tr></thead>
 <tbody><tr>
 <td>throws</td>
-<td>if strict checks are on and the property prefix is not in the list of prefixes.</td>
+<td>if strict checks are on and
+     the property prefix is not in the list of prefixes.</td>
 </tr></tbody>
 </table>
 </div>
@@ -486,7 +487,8 @@ <h4>Description</h4>
 <tr>
 <td>$msg</td>
 <td style="white-space: normal;">string</td>
-<td><p>The message string (required); can be in sprintf() format.</p>
+<td><p>The message string (required); can be in
+     sprintf() format.</p>
 </td>
 <td></td>
 </tr>
@@ -605,7 +607,7 @@ <h4>Properties</h4>
 <div style="clear: both"></div>
 </div>
 </div>
-<small xmlns="" class="footer">Documentation was generated by <a href="http://www.phpdoc.org">phpDocumentor 2.0.0a8</a>.</small></div><div id="index"><div class="padder"><script xmlns="" type="text/javascript">
+<small xmlns="" class="footer">Documentation was generated by <a href="http://www.phpdoc.org">phpDocumentor 2.0.0a12</a>.</small></div><div id="index"><div class="padder"><script xmlns="" type="text/javascript">
       $(function() {
 
         var is_chrome = /chrome/.test( navigator.userAgent.toLowerCase() );

docs/api/cloud.inc.html

@@ -61,7 +61,7 @@ <h1>Properties</h1>
 </div>
 <h2>Description</h2>A convenience file that loads all the other components<br><br><a name="includes"></a><h2>Includes</h2>rackspace.inc <span class="nb-faded-text">(Require Once)</span><br>compute.inc <span class="nb-faded-text">(Require Once)</span><br>objectstore.inc <span class="nb-faded-text">(Require Once)</span><br>dbservice.inc <span class="nb-faded-text">(Require Once)</span><br>
 </div>
-<small xmlns="" class="footer">Documentation was generated by <a href="http://www.phpdoc.org">phpDocumentor 2.0.0a8</a>.</small></div><div id="index"><div class="padder"><script xmlns="" type="text/javascript">
+<small xmlns="" class="footer">Documentation was generated by <a href="http://www.phpdoc.org">phpDocumentor 2.0.0a12</a>.</small></div><div id="index"><div class="padder"><script xmlns="" type="text/javascript">
       $(function() {
 
         var is_chrome = /chrome/.test( navigator.userAgent.toLowerCase() );

docs/api/collection.inc.html

@@ -423,7 +423,7 @@ <h4>Tags</h4>
 </div>
 <div class="method">
 <a id="Collection::Select()"></a><h3>Select<span class="nb-faded-text">(
-          \OpenCloud\callable
+          callable
 
             $testfunc,
 
@@ -464,8 +464,11 @@ <h4>Description</h4>
 </tr></thead>
 <tbody><tr>
 <td>$testfunc</td>
-<td style="white-space: normal;">\OpenCloud\callable</td>
-<td><p>a callback function that is passed each item in turn. Note that <code>Select()</code> performs an explicit test for <code>FALSE</code>, so functions like <code>strpos()</code> need to be cast into a boolean value (and not just return the integer).</p>
+<td style="white-space: normal;">callable</td>
+<td><p>a callback function that is passed each item
+    in turn. Note that <code>Select()</code> performs an explicit test for
+    <code>FALSE</code>, so functions like <code>strpos()</code> need to be cast into a
+    boolean value (and not just return the integer).</p>
 </td>
 <td></td>
 </tr></tbody>
@@ -594,7 +597,8 @@ <h4>Tags</h4>
 <tbody>
 <tr>
 <td>throws</td>
-<td>if strict checks are on and the property prefix is not in the list of prefixes.</td>
+<td>if strict checks are on and
+     the property prefix is not in the list of prefixes.</td>
 </tr>
 <tr>
 <td>inherited_from</td>
@@ -766,7 +770,8 @@ <h4>Description</h4>
 <td>$itemclass</td>
 <td style="white-space: normal;">string</td>
 <td><ul>
-<li>the Class of each item in the collection (assumed to be the name of the factory method)</li>
+<li>the Class of each item in the collection
+(assumed to be the name of the factory method)</li>
 </ul>
 </td>
 <td></td>
@@ -907,7 +912,8 @@ <h4>Description</h4>
 <tr>
 <td>$msg</td>
 <td style="white-space: normal;">string</td>
-<td><p>The message string (required); can be in sprintf() format.</p>
+<td><p>The message string (required); can be in
+     sprintf() format.</p>
 </td>
 <td></td>
 </tr>
@@ -1148,7 +1154,7 @@ <h4>Properties</h4>
 <div style="clear: both"></div>
 </div>
 </div>
-<small xmlns="" class="footer">Documentation was generated by <a href="http://www.phpdoc.org">phpDocumentor 2.0.0a8</a>.</small></div><div id="index"><div class="padder"><script xmlns="" type="text/javascript">
+<small xmlns="" class="footer">Documentation was generated by <a href="http://www.phpdoc.org">phpDocumentor 2.0.0a12</a>.</small></div><div id="index"><div class="padder"><script xmlns="" type="text/javascript">
       $(function() {
 
         var is_chrome = /chrome/.test( navigator.userAgent.toLowerCase() );

docs/api/compute.inc.html

@@ -310,7 +310,8 @@ <h4>Description</h4>
 <tr>
 <td>$parm</td>
 <td style="white-space: normal;">array</td>
-<td><p>(optional) array of key/value pairs to use as query strings</p>
+<td><p>(optional) array of key/value pairs to use as
+    query strings</p>
 </td>
 <td>array()</td>
 </tr>
@@ -413,7 +414,8 @@ <h4>Description</h4>
 <td>$id</td>
 <td style="white-space: normal;">string</td>
 <td><ul>
-<li>if supplied, the Flavor identified by this is retrieved</li>
+<li>if supplied, the Flavor identified by this is
+ retrieved</li>
 </ul>
 </td>
 <td>NULL</td>
@@ -479,7 +481,9 @@ <h4>Description</h4>
 <td>$details</td>
 <td style="white-space: normal;">boolean</td>
 <td><ul>
-<li>if TRUE (the default), returns full details. Set to FALSE to retrieve minimal details and possibly improve performance.</li>
+<li>if TRUE (the default), returns full details.
+ Set to FALSE to retrieve minimal details and possibly improve
+ performance.</li>
 </ul>
 </td>
 <td>TRUE</td>
@@ -488,7 +492,8 @@ <h4>Description</h4>
 <td>$filter</td>
 <td style="white-space: normal;">array</td>
 <td><ul>
-<li>optional key/value pairs for creating query strings</li>
+<li>optional key/value pairs for creating query
+ strings</li>
 </ul>
 </td>
 <td>array()</td>
@@ -620,7 +625,8 @@ <h4>Description</h4>
 <tbody><tr>
 <td>$resource</td>
 <td style="white-space: normal;">string</td>
-<td><p>The resource requested; should NOT have slashes at the beginning or end</p></td>
+<td><p>The resource requested; should NOT have slashes
+     at the beginning or end</p></td>
 <td></td>
 </tr></tbody>
 </table>
@@ -739,7 +745,9 @@ <h4>Description</h4>
 <td>$details</td>
 <td style="white-space: normal;">boolean</td>
 <td><ul>
-<li>if TRUE (the default), returns complete image details. Set to FALSE to improve performance, but only return a minimal set of data</li>
+<li>if TRUE (the default), returns complete image
+details. Set to FALSE to improve performance, but only return a
+ minimal set of data</li>
 </ul>
 </td>
 <td>TRUE</td>
@@ -748,7 +756,11 @@ <h4>Description</h4>
 <td>$filter</td>
 <td style="white-space: normal;">array</td>
 <td><ul>
-<li>key/value pairs to pass to the images resource. The actual values available here are determined by the OpenStack code and any extensions installed by your cloud provider; see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/List_Images-d1e4435.html for current filters available.</li>
+<li>key/value pairs to pass to the images resource.
+The actual values available here are determined by the OpenStack
+code and any extensions installed by your cloud provider;
+see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/List_Images-d1e4435.html
+for current filters available.</li>
 </ul>
 </td>
 <td>array()</td>
@@ -1082,7 +1094,8 @@ <h4>Description</h4>
 <td>$headers</td>
 <td style="white-space: normal;">array</td>
 <td><ul>
-<li>an associative array of headers to pass to the request</li>
+<li>an associative array of headers to pass to
+ the request</li>
 </ul>
 </td>
 <td>array()</td>
@@ -1215,7 +1228,10 @@ <h4>Description</h4>
 <td>$details</td>
 <td style="white-space: normal;">boolean</td>
 <td><ul>
-<li>if TRUE, full server details are returned; if FALSE, just the minimal set of info is listed. Defaults to TRUE; you might set this to FALSE to improve performance at the risk of not having all the information you need.</li>
+<li>if TRUE, full server details are returned; if
+ FALSE, just the minimal set of info is listed. Defaults to TRUE;
+ you might set this to FALSE to improve performance at the risk of
+ not having all the information you need.</li>
 </ul>
 </td>
 <td>TRUE</td>
@@ -1224,7 +1240,8 @@ <h4>Description</h4>
 <td>$filter</td>
 <td style="white-space: normal;">array</td>
 <td><ul>
-<li>a set of key/value pairs that is passed to the servers list for filtering</li>
+<li>a set of key/value pairs that is passed to the
+servers list for filtering</li>
 </ul>
 </td>
 <td>array()</td>
@@ -1330,7 +1347,8 @@ <h4>Tags</h4>
 <tbody>
 <tr>
 <td>throws</td>
-<td>if strict checks are on and the property prefix is not in the list of prefixes.</td>
+<td>if strict checks are on and
+     the property prefix is not in the list of prefixes.</td>
 </tr>
 <tr>
 <td>inherited_from</td>
@@ -1379,15 +1397,18 @@ <h4>Description</h4>
 <td>$resource</td>
 <td style="white-space: normal;">string</td>
 <td><ul>
-<li>an optional child resource. For example, passing 'details' would return .../servers/details. Should <em>not</em> be prefixed with a slash (/).</li>
+<li>an optional child resource. For example,
+ passing 'details' would return .../servers/details. Should <em>not</em> be
+prefixed with a slash (/).</li>
 </ul>
 </td>
 <td>'servers'</td>
 </tr>
 <tr>
 <td>$args</td>
 <td style="white-space: normal;">array</td>
-<td><p>(optional) an array of key-value pairs for query strings to append to the URL</p>
+<td><p>(optional) an array of key-value pairs for query
+     strings to append to the URL</p>
 </td>
 <td>array()</td>
 </tr>
@@ -1468,7 +1489,8 @@ <h4>Description</h4>
 <td>$serviceName</td>
 <td style="white-space: normal;">string</td>
 <td><ul>
-<li>identifies the name of the service in the catalog</li>
+<li>identifies the name of the service in the
+ catalog</li>
 </ul>
 </td>
 <td></td>
@@ -1477,7 +1499,8 @@ <h4>Description</h4>
 <td>$serviceRegion</td>
 <td style="white-space: normal;">string</td>
 <td><ul>
-<li>identifies the region of this Compute service</li>
+<li>identifies the region of this Compute
+ service</li>
 </ul>
 </td>
 <td></td>
@@ -1486,7 +1509,8 @@ <h4>Description</h4>
 <td>$urltype</td>
 <td style="white-space: normal;">string</td>
 <td><ul>
-<li>identifies the URL type ("publicURL", "privateURL")</li>
+<li>identifies the URL type ("publicURL",
+ "privateURL")</li>
 </ul>
 </td>
 <td></td>
@@ -1628,7 +1652,8 @@ <h4>Description</h4>
 <tr>
 <td>$msg</td>
 <td style="white-space: normal;">string</td>
-<td><p>The message string (required); can be in sprintf() format.</p>
+<td><p>The message string (required); can be in
+     sprintf() format.</p>
 </td>
 <td></td>
 </tr>
@@ -1740,7 +1765,8 @@ <h4>Description</h4>
 <tr>
 <td>$type</td>
 <td style="white-space: normal;">string</td>
-<td><p>The OpenStack service type ("compute" or "object-store", for example</p>
+<td><p>The OpenStack service type ("compute" or
+     "object-store", for example</p>
 </td>
 <td></td>
 </tr>
@@ -2015,7 +2041,7 @@ <h4>Properties</h4>
 <div style="clear: both"></div>
 </div>
 </div>
-<small xmlns="" class="footer">Documentation was generated by <a href="http://www.phpdoc.org">phpDocumentor 2.0.0a8</a>.</small></div><div id="index"><div class="padder"><script xmlns="" type="text/javascript">
+<small xmlns="" class="footer">Documentation was generated by <a href="http://www.phpdoc.org">phpDocumentor 2.0.0a12</a>.</small></div><div id="index"><div class="padder"><script xmlns="" type="text/javascript">
       $(function() {
 
         var is_chrome = /chrome/.test( navigator.userAgent.toLowerCase() );