Merge branch 'working'

Author: gecampbell

Diff for: .travis.yml

@@ -4,6 +4,6 @@ php:
   - "5.4"
   - "5.3"
 notifications:
-  - email:
+  email:
     - [email protected]
-  - "irc.freenode.org#rackspace-dev"
+  irc: "irc.freenode.org#rackspace-dev"

Diff for: HACKING.md

@@ -19,6 +19,9 @@ efforts. Here are a few general guidelines to follow.
    a `quickref.md` (quick reference) and `userguide/` (user guide) under the
    `docs/` directory.
 
-Thanks again!
+Note to self:
 
-Glen Campbell
+	git tag -s <tagname>
+	git push origin <tagname>
+
+(I always forget these commands)

Diff for: RELEASENOTES.md

@@ -3,6 +3,10 @@ RELEASE NOTES
 
 ### Current branch: master
 
+### 1.5.5
+* PSR-2 implementation (code formatting)
+* issue #95 - attempt to fix default timezone to satisfy folks
+
 ### 04/30/2013 Version 1.5.4
 * Issue #38 - added support for Cloud Files TEMP_URL feature
 * Revised structure around namespaces

Diff for: docs/api/Autoload.html

@@ -524,9 +524,6 @@ <h1>Namespaces</h1>
 </ul>
 </li>
 <li class="closed">
-<span class="folder">Autoscale</span><ul><li><span class="class"><a href="OpenCloud.Autoscale.Service.html#Service">Service</a><br><small>The Rackspace Cloud Load Balancers</small></span></li></ul>
-</li>
-<li class="closed">
 <span class="folder">Base</span><ul>
 <li><span class="class"><a href="OpenCloud.Base.Base.html#Base">Base</a><br><small>The Base class is the root class for all other objects used or defined by
 this SDK.</small></span></li>

Diff for: docs/api/OpenCloud.AbstractClass.Collection.html

@@ -315,9 +315,9 @@ <h4>Tags</h4>
 </div>
 <div class="method">
 <a id="Collection::MakeQueryString()"></a><h3>MakeQueryString<span class="nb-faded-text">(
-          array
+          
 
-            $arr,
+            $array,
 
           )
         </span>
@@ -334,10 +334,9 @@ <h4>Description</h4>
 <th>Default</th>
 </tr></thead>
 <tbody><tr>
-<td>$arr</td>
-<td style="white-space: normal;">array</td>
-<td><p>array of key/value pairs</p>
-</td>
+<td>$array</td>
+<td style="white-space: normal;">n/a</td>
+<td></td>
 <td></td>
 </tr></tbody>
 </table>
@@ -409,12 +408,12 @@ <h4>Description</h4>
 FALSE if there are no more pages</em><br><small><p>Generally, the structure for a multi-page collection will look like
 this:</p>
 
-<pre><code>$coll = $obj-&gt;Collection();
-do {
-    while($item = $coll-&gt;Next()) {
-        // do something with the item
-    |
-} while ($coll = $coll-&gt;NextPage());
+<pre><code> $coll = $obj-&gt;Collection();
+ do {
+     while($item = $coll-&gt;Next()) {
+         // do something with the item
+     |
+ } while ($coll = $coll-&gt;NextPage());
 </code></pre></small><br><h4>Return value</h4>
 <table>
 <thead><tr>
@@ -515,9 +514,9 @@ <h4>Description</h4>
 <td>$testfunc</td>
 <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>
+     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 +593,7 @@ <h4>Description</h4>
 <em>for paginated collection, sets the callback function and URL for
 the next page</em><br><small><p>The callback function should have the signature:</p>
 
-<pre><code>function Whatever($class, $url, $parent)
+<pre><code> function Whatever($class, $url, $parent)
 </code></pre>
 
 <p>and the <code>$url</code> should be the URL of the next page of results</p></small><br><h4>Arguments</h4>
@@ -610,7 +609,7 @@ <h4>Description</h4>
 <td>$callback</td>
 <td style="white-space: normal;">callable</td>
 <td><p>the name of the function (or array of
-    object, function name)</p>
+     object, function name)</p>
 </td>
 <td></td>
 </tr>
@@ -888,7 +887,7 @@ <h4>Description</h4>
 <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>
+ (assumed to be the name of the factory method)</li>
 </ul>
 </td>
 <td></td>
@@ -988,23 +987,23 @@ <h4>Tags</h4>
           mixed
 
             $p1
-            = NULL,
+            = null,
           mixed
 
             $p2
-            = NULL,
+            = null,
           mixed
 
             $p3
-            = NULL,
+            = null,
           mixed
 
             $p4
-            = NULL,
+            = null,
           mixed
 
             $p5
-            = NULL,
+            = null,
 
           )
         </span>
@@ -1039,35 +1038,35 @@ <h4>Description</h4>
 <td style="white-space: normal;">mixed</td>
 <td><p>Optional argument to be passed to sprintf()</p>
 </td>
-<td>NULL</td>
+<td>null</td>
 </tr>
 <tr>
 <td>$p2</td>
 <td style="white-space: normal;">mixed</td>
 <td><p>Optional argument to be passed to sprintf()</p>
 </td>
-<td>NULL</td>
+<td>null</td>
 </tr>
 <tr>
 <td>$p3</td>
 <td style="white-space: normal;">mixed</td>
 <td><p>Optional argument to be passed to sprintf()</p>
 </td>
-<td>NULL</td>
+<td>null</td>
 </tr>
 <tr>
 <td>$p4</td>
 <td style="white-space: normal;">mixed</td>
 <td><p>Optional argument to be passed to sprintf()</p>
 </td>
-<td>NULL</td>
+<td>null</td>
 </tr>
 <tr>
 <td>$p5</td>
 <td style="white-space: normal;">mixed</td>
 <td><p>Optional argument to be passed to sprintf()</p>
 </td>
-<td>NULL</td>
+<td>null</td>
 </tr>
 </tbody>
 </table>
@@ -1471,9 +1470,6 @@ <h1>Namespaces</h1>
 </ul>
 </li>
 <li class="closed">
-<span class="folder">Autoscale</span><ul><li><span class="class"><a href="OpenCloud.Autoscale.Service.html#Service">Service</a><br><small>The Rackspace Cloud Load Balancers</small></span></li></ul>
-</li>
-<li class="closed">
 <span class="folder">Base</span><ul>
 <li><span class="class"><a href="OpenCloud.Base.Base.html#Base">Base</a><br><small>The Base class is the root class for all other objects used or defined by
 this SDK.</small></span></li>