Skip to content

Removed sami/sami. Changed travis email notification #253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
haphan merged 2 commits into from
Aug 29, 2018
Merged

Removed sami/sami. Changed travis email notification #253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22eb492
Removed sami/sami. Changed travis email notification
haphan Aug 29, 2018
884e7ec
Keep php-cs-fixer happy
haphan Aug 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ after_success:

notifications:
email:
- jamie.hannaford@rackspace.com
- thanhha.work@gmail.com
7 changes: 0 additions & 7 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,20 +32,13 @@
"OpenStack\\Integration\\": "tests/integration/"
}
},
"repositories": [
{
"type": "vcs",
"url": "https://github.com/php-opencloud/Sami"
}
],
"require": {
"php": "~7.0",
"guzzlehttp/guzzle": "~6.1",
"justinrainbow/json-schema": "~5.2"
},
"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",
Expand Down
4 changes: 2 additions & 2 deletions src/Common/Service/Builder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
6 changes: 3 additions & 3 deletions src/Compute/v2/Models/Server.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand All @@ -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
*/
Expand Down