Merge pull request #435 from rackspace/working

Merging working -> master in preparation for minor release

Author: ycombinator

.travis.yml

@@ -17,6 +17,8 @@ branches:
 
 before_script:
   - composer install --prefer-source
+  - vendor/bin/parallel-lint --exclude vendor .
+  - vendor/bin/php-cs-fixer fix --dry-run --level psr2 .
 
 after_script:
   - php vendor/bin/coveralls -v

CONTRIBUTING.md

@@ -11,7 +11,7 @@ efforts. Here are a few general guidelines to follow:
    will need to write new test cases; if you're updating existing code, you will
    need to make sure the methods you're updating are still completely covered.
 
-3. Please abide by PSR code styling.
+3. Please abide by [PSR-2 code styling](#ensuring-psr-2-coding-style-compliance).
 
 4. Explaining your pull requests is appreciated. Unless you're fixing a
    minor typographical error, create a description which explains your changes
@@ -44,3 +44,11 @@ phpunit
   * Methods that create a new resource, say `Foo`, should be named `createFoo`. For example, [`createEntity`](/lib/OpenCloud/CloudMonitoring/Service.php#L105).
 
 * When validating arguments to a method, please throw `\InvalidArgumentException` when an invalid argument is found. For example, see [here](/lib/OpenCloud/LoadBalancer/Resource/LoadBalancer.php#L212-L215).
+
+## Ensuring PSR-2 coding style compliance
+
+The code in this library is compliant with the [PSR-2 Coding Style Guide](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md). To ensure that any code you contribute is also PSR-2 compliant, please run the following command from the base directory of this project _before_ submitting your contribution:
+
+    $ vendor/bin/php-cs-fixer fix --level psr2 .
+
+Running this command will _change_ your code to become PSR-2 compliant. You will need to _commit_ these changes and make them part of your pull request.

composer.json

@@ -27,6 +27,8 @@
     },
     "require-dev" : {
         "guzzle/guzzle": "~3.8",
-        "satooshi/php-coveralls": "0.6.*@dev"
+        "satooshi/php-coveralls": "0.6.*@dev",
+        "jakub-onderka/php-parallel-lint": "0.*",
+        "fabpot/php-cs-fixer": "1.0.*@dev"
     }
 }

lib/OpenCloud/Autoscale/Resource/LaunchConfiguration.php

@@ -38,7 +38,6 @@
  */
 class LaunchConfiguration extends AbstractResource
 {
-
     public $type;
     public $args;
 

lib/OpenCloud/CloudMonitoring/Collection/MonitoringIterator.php

@@ -32,4 +32,4 @@ public function parseResponseBody($body)
 
         return $parsed;
     }
-}
+}

lib/OpenCloud/CloudMonitoring/Resource/Agent.php

@@ -89,4 +89,4 @@ public function getAgentHost()
     {
         return $this->getService()->resource('AgentHost', null, $this);
     }
-}
+}

lib/OpenCloud/CloudMonitoring/Resource/AgentHost.php

@@ -57,4 +57,4 @@ public function info($type)
             'resourceClass' => 'AgentHostInfo'
         ));
     }
-}
+}

lib/OpenCloud/CloudMonitoring/Resource/AgentTarget.php

@@ -24,7 +24,6 @@
  */
 class AgentTarget extends ReadOnlyResource
 {
-
     private $type = 'agent.filesystem';
 
     protected static $json_name = 'targets';

lib/OpenCloud/CloudMonitoring/Resource/ReadOnlyResource.php

@@ -24,7 +24,6 @@
  */
 class ReadOnlyResource extends AbstractResource
 {
-
     public function create($params = array())
     {
         return $this->noCreate();

lib/OpenCloud/Common/Base.php

@@ -110,7 +110,6 @@ protected function setProperty($property, $value)
         if (method_exists($this, $setter)) {
             return call_user_func(array($this, $setter), $value);
         } elseif (false !== ($propertyVal = $this->propertyExists($property))) {
-
             // Are we setting a public or private property?
             if ($this->isAccessible($propertyVal)) {
                 $this->$propertyVal = $value;
@@ -120,7 +119,6 @@ protected function setProperty($property, $value)
 
             return $this;
         } else {
-
             $this->getLogger()->warning(
                 'Attempted to set {property} with value {value}, but the'
                 . ' property has not been defined. Please define first.',
@@ -284,15 +282,11 @@ public function url($path = null, array $query = array())
     public function populate($info, $setObjects = true)
     {
         if (is_string($info) || is_integer($info)) {
-
             $this->setProperty($this->primaryKeyField(), $info);
             $this->refresh($info);
         } elseif (is_object($info) || is_array($info)) {
-
             foreach ($info as $key => $value) {
-
                 if ($key == 'metadata' || $key == 'meta') {
-
                     // Try retrieving existing value
                     if (null === ($metadata = $this->getProperty($key))) {
                         // If none exists, create new object
@@ -305,21 +299,17 @@ public function populate($info, $setObjects = true)
                     // Set object property
                     $this->setProperty($key, $metadata);
                 } elseif (!empty($this->associatedResources[$key]) && $setObjects === true) {
-
                     // Associated resource
                     try {
-
                         $resource = $this->getService()->resource($this->associatedResources[$key], $value);
                         $resource->setParent($this);
 
                         $this->setProperty($key, $resource);
                     } catch (Exception\ServiceException $e) {
                     }
                 } elseif (!empty($this->associatedCollections[$key]) && $setObjects === true) {
-
                     // Associated collection
                     try {
-
                         $className = $this->associatedCollections[$key];
                         $options = $this->makeResourceIteratorOptions($className);
                         $iterator = ResourceIterator::factory($this, $options, $value);
@@ -328,7 +318,6 @@ public function populate($info, $setObjects = true)
                     } catch (Exception\ServiceException $e) {
                     }
                 } elseif (!empty($this->aliases[$key])) {
-
                     // Sometimes we might want to preserve camelCase
                     // or covert `rax-bandwidth:bandwidth` to `raxBandwidth`
                     $this->setProperty($this->aliases[$key], $value);