Skip to content

Commit 5230354

Browse files
authored
Merge pull request #253 from php-opencloud/remove-sami
Removed sami/sami. Changed travis email notification
2 parents 3374e2b + 884e7ec commit 5230354

File tree

4 files changed

+6
-13
lines changed

4 files changed

+6
-13
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,4 @@ after_success:
3636

3737
notifications:
3838
email:
39-
- jamie.hannaford@rackspace.com
39+
- thanhha.work@gmail.com

composer.json

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,20 +32,13 @@
3232
"OpenStack\\Integration\\": "tests/integration/"
3333
}
3434
},
35-
"repositories": [
36-
{
37-
"type": "vcs",
38-
"url": "https://github.com/php-opencloud/Sami"
39-
}
40-
],
4135
"require": {
4236
"php": "~7.0",
4337
"guzzlehttp/guzzle": "~6.1",
4438
"justinrainbow/json-schema": "~5.2"
4539
},
4640
"require-dev": {
4741
"phpunit/phpunit": "^6.5",
48-
"sami/sami": "dev-master",
4942
"psr/log": "^1.0",
5043
"satooshi/php-coveralls": "^2.0",
5144
"jakub-onderka/php-parallel-lint": "^1.0",

src/Common/Service/Builder.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ class Builder
3636
private $defaults = ['urlType' => 'publicURL'];
3737

3838
/**
39-
* @param array $globalOptions Options that will be applied to every service created by this builder.
39+
* @param array $globalOptions options that will be applied to every service created by this builder.
4040
* Eventually they will be merged (and if necessary overridden) by the
41-
* service-specific options passed in.
41+
* service-specific options passed in
4242
* @param string $rootNamespace API classes' root namespace
4343
*/
4444
public function __construct(array $globalOptions = [], $rootNamespace = 'OpenStack')

src/Compute/v2/Models/Server.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ public function revertResize()
308308
*/
309309
public function getConsoleOutput(int $length = -1): string
310310
{
311-
$definition = $length == -1 ? $this->api->getAllConsoleOutput() : $this->api->getConsoleOutput();
311+
$definition = -1 == $length ? $this->api->getAllConsoleOutput() : $this->api->getConsoleOutput();
312312

313313
$response = $this->execute($definition, [
314314
'os-getConsoleOutput' => new \stdClass(),
@@ -322,8 +322,8 @@ public function getConsoleOutput(int $length = -1): string
322322
/**
323323
* Gets a VNC console for a server.
324324
*
325-
* @param string $type The type of VNC console: novnc|xvpvnc.
326-
* Defaults to novnc.
325+
* @param string $type the type of VNC console: novnc|xvpvnc.
326+
* Defaults to novnc
327327
*
328328
* @return array
329329
*/

0 commit comments

Comments
 (0)