From 22eb49249ed079b95f5de62e9d106cf8668fbf26 Mon Sep 17 00:00:00 2001
From: Ha Phan <thanhha.work@gmail.com>
Date: Wed, 29 Aug 2018 10:07:01 +0800
Subject: [PATCH 1/2] Removed sami/sami. Changed travis email notification

---
 .travis.yml   | 2 +-
 composer.json | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 81677f5c..419f76bc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,4 +36,4 @@ after_success:
 
 notifications:
   email:
-    - jamie.hannaford@rackspace.com
+    - thanhha.work@gmail.com
diff --git a/composer.json b/composer.json
index 7abc54b2..76d360e4 100644
--- a/composer.json
+++ b/composer.json
@@ -32,12 +32,6 @@
             "OpenStack\\Integration\\": "tests/integration/"
         }
     },
-    "repositories": [
-        {
-            "type": "vcs",
-            "url": "https://github.com/php-opencloud/Sami"
-        }
-    ],
     "require": {
         "php": "~7.0",
         "guzzlehttp/guzzle": "~6.1",
@@ -45,7 +39,6 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^6.5",
-        "sami/sami": "dev-master",
         "psr/log": "^1.0",
         "satooshi/php-coveralls": "^2.0",
         "jakub-onderka/php-parallel-lint": "^1.0",

From 884e7ec0699269b1f7280cc284c4db2aeb5fdcdf Mon Sep 17 00:00:00 2001
From: Ha Phan <thanhha.work@gmail.com>
Date: Wed, 29 Aug 2018 10:16:02 +0800
Subject: [PATCH 2/2] Keep php-cs-fixer happy

---
 src/Common/Service/Builder.php   | 4 ++--
 src/Compute/v2/Models/Server.php | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Common/Service/Builder.php b/src/Common/Service/Builder.php
index b678e112..c687e064 100644
--- a/src/Common/Service/Builder.php
+++ b/src/Common/Service/Builder.php
@@ -36,9 +36,9 @@ class Builder
     private $defaults = ['urlType' => 'publicURL'];
 
     /**
-     * @param array  $globalOptions Options that will be applied to every service created by this builder.
+     * @param array  $globalOptions options that will be applied to every service created by this builder.
      *                              Eventually they will be merged (and if necessary overridden) by the
-     *                              service-specific options passed in.
+     *                              service-specific options passed in
      * @param string $rootNamespace API classes' root namespace
      */
     public function __construct(array $globalOptions = [], $rootNamespace = 'OpenStack')
diff --git a/src/Compute/v2/Models/Server.php b/src/Compute/v2/Models/Server.php
index d976c34e..9e9b4b0d 100644
--- a/src/Compute/v2/Models/Server.php
+++ b/src/Compute/v2/Models/Server.php
@@ -308,7 +308,7 @@ public function revertResize()
      */
     public function getConsoleOutput(int $length = -1): string
     {
-        $definition = $length == -1 ? $this->api->getAllConsoleOutput() : $this->api->getConsoleOutput();
+        $definition = -1 == $length ? $this->api->getAllConsoleOutput() : $this->api->getConsoleOutput();
 
         $response = $this->execute($definition, [
             'os-getConsoleOutput' => new \stdClass(),
@@ -322,8 +322,8 @@ public function getConsoleOutput(int $length = -1): string
     /**
      * Gets a VNC console for a server.
      *
-     * @param string $type The type of VNC console: novnc|xvpvnc.
-     *                     Defaults to novnc.
+     * @param string $type the type of VNC console: novnc|xvpvnc.
+     *                     Defaults to novnc
      *
      * @return array
      */