Skip to content

Commit

Permalink
Cleans up results of phpmd and phpcbf.
Browse files Browse the repository at this point in the history
  • Loading branch information
typhonius committed Mar 3, 2020
1 parent a451914 commit 913fdc5
Show file tree
Hide file tree
Showing 83 changed files with 658 additions and 362 deletions.
13 changes: 10 additions & 3 deletions src/Connector/Client.php
Expand Up @@ -9,17 +9,24 @@

/**
* Class Client
*
* @package AcquiaCloudApi\CloudApi
*/
class Client implements ClientInterface
{
/** @var ConnectorInterface The API connector. */
/**
* @var ConnectorInterface The API connector.
*/
protected $connector;

/** @var array Query strings to be applied to the request. */
/**
* @var array Query strings to be applied to the request.
*/
protected $query = [];

/** @var array Guzzle options to be applied to the request. */
/**
* @var array Guzzle options to be applied to the request.
*/
protected $options = [];

/**
Expand Down
10 changes: 5 additions & 5 deletions src/Connector/ClientInterface.php
Expand Up @@ -4,7 +4,7 @@

use Psr\Http\Message\ResponseInterface;
use GuzzleHttp\Exception\BadResponseException;
use Psr\Http\Message\StreamInterface;
use AcquiaCloudApi\Exception\ApiErrorException;

/**
* Interface ClientInterface
Expand All @@ -26,17 +26,17 @@ interface ClientInterface
public function request(string $verb, string $path, array $options = []);

/**
* @param string $verb
* @param string $path
* @param array $options
* @param string $verb
* @param string $path
* @param array $options
* @return ResponseInterface
*/
public function makeRequest(string $verb, string $path, array $options = []);

/**
* Processes the returned response from the API.
*
* @param ResponseInterface $response
* @param ResponseInterface $response
* @return mixed|StreamInterface
* @throws \Exception
*/
Expand Down
10 changes: 5 additions & 5 deletions src/Connector/Connector.php
Expand Up @@ -3,16 +3,14 @@
namespace AcquiaCloudApi\Connector;

use League\OAuth2\Client\Provider\GenericProvider;
use League\OAuth2\Client\Provider\Exception\IdentityProviderException;
use League\OAuth2\Client\Token\AccessTokenInterface;
use GuzzleHttp\Client as GuzzleClient;
use GuzzleHttp\Exception\BadResponseException;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\RequestInterface;
use Psr\Http\Message\StreamInterface;

/**
* Class Connector
*
* @package AcquiaCloudApi\CloudApi
*/
class Connector implements ConnectorInterface
Expand Down Expand Up @@ -42,13 +40,15 @@ class Connector implements ConnectorInterface
*/
public function __construct(array $config)
{
$this->provider = new GenericProvider([
$this->provider = new GenericProvider(
[
'clientId' => $config['key'],
'clientSecret' => $config['secret'],
'urlAuthorize' => '',
'urlAccessToken' => self::URL_ACCESS_TOKEN,
'urlResourceOwnerDetails' => '',
]);
]
);
}

/**
Expand Down
6 changes: 4 additions & 2 deletions src/Connector/ConnectorInterface.php
Expand Up @@ -2,9 +2,11 @@

namespace AcquiaCloudApi\Connector;

use League\OAuth2\Client\Provider\GenericProvider;
use League\OAuth2\Client\Token\AccessTokenInterface;
use GuzzleHttp\Client as GuzzleClient;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\RequestInterface;
use Psr\Http\Message\StreamInterface;

/**
* Interface ConnectorInterface
Expand Down Expand Up @@ -36,7 +38,7 @@ public function createRequest($verb, $path);
*
* @param string $verb
* @param string $path
* @param array $options
* @param array $options
*
* @return ResponseInterface
*/
Expand Down
2 changes: 1 addition & 1 deletion src/Endpoints/Account.php
Expand Up @@ -2,12 +2,12 @@

namespace AcquiaCloudApi\Endpoints;

use AcquiaCloudApi\Connector\ClientInterface;
use AcquiaCloudApi\Response\AccountResponse;
use Psr\Http\Message\StreamInterface;

/**
* Class Account
*
* @package AcquiaCloudApi\CloudApi
*/
class Account extends CloudApiBase implements CloudApiInterface
Expand Down
20 changes: 10 additions & 10 deletions src/Endpoints/Applications.php
Expand Up @@ -2,7 +2,6 @@

namespace AcquiaCloudApi\Endpoints;

use AcquiaCloudApi\Connector\ClientInterface;
use AcquiaCloudApi\Response\ApplicationResponse;
use AcquiaCloudApi\Response\ApplicationsResponse;
use AcquiaCloudApi\Response\TagResponse;
Expand All @@ -11,6 +10,7 @@

/**
* Class Applications
*
* @package AcquiaCloudApi\CloudApi
*/
class Applications extends CloudApiBase implements CloudApiInterface
Expand All @@ -29,7 +29,7 @@ public function getAll()
/**
* Shows information about an application.
*
* @param string $applicationUuid
* @param string $applicationUuid
* @return ApplicationResponse
*/
public function get($applicationUuid)
Expand All @@ -45,8 +45,8 @@ public function get($applicationUuid)
/**
* Renames an application.
*
* @param string $applicationUuid
* @param string $name
* @param string $applicationUuid
* @param string $name
* @return OperationResponse
*/
public function rename($applicationUuid, $name)
Expand All @@ -70,7 +70,7 @@ public function rename($applicationUuid, $name)
/**
* Returns a list of application tags associated with this application.
*
* @param string $applicationUuid
* @param string $applicationUuid
* @return TagsResponse
*/
public function getAllTags($applicationUuid)
Expand All @@ -87,9 +87,9 @@ public function getAllTags($applicationUuid)
/**
* Creates a new application tag.
*
* @param string $applicationUuid
* @param string $name
* @param string $color
* @param string $applicationUuid
* @param string $name
* @param string $color
* @return OperationResponse
*/
public function createTag($applicationUuid, $name, $color)
Expand All @@ -114,8 +114,8 @@ public function createTag($applicationUuid, $name, $color)
/**
* Deletes an application tag.
*
* @param string $applicationUuid
* @param string $tagName
* @param string $applicationUuid
* @param string $tagName
* @return OperationResponse
*/
public function deleteTag($applicationUuid, $tagName)
Expand Down
5 changes: 4 additions & 1 deletion src/Endpoints/CloudApiBase.php
Expand Up @@ -6,12 +6,15 @@

/**
* Class CloudApiBase
*
* @package AcquiaCloudApi\CloudApi
*/
abstract class CloudApiBase implements CloudApiInterface
{

/** @var ClientInterface The API client. */
/**
* @var ClientInterface The API client.
*/
protected $client;

/**
Expand Down
8 changes: 4 additions & 4 deletions src/Endpoints/Code.php
Expand Up @@ -2,12 +2,12 @@

namespace AcquiaCloudApi\Endpoints;

use AcquiaCloudApi\Connector\ClientInterface;
use AcquiaCloudApi\Response\BranchesResponse;
use AcquiaCloudApi\Response\OperationResponse;

/**
* Class Code
*
* @package AcquiaCloudApi\CloudApi
*/
class Code extends CloudApiBase implements CloudApiInterface
Expand All @@ -16,7 +16,7 @@ class Code extends CloudApiBase implements CloudApiInterface
/**
* Shows all code branches and tags in an application.
*
* @param string $applicationUuid
* @param string $applicationUuid
* @return BranchesResponse
*/
public function getAll($applicationUuid)
Expand All @@ -32,8 +32,8 @@ public function getAll($applicationUuid)
/**
* Deploys a code branch/tag to an environment.
*
* @param string $environmentUuid
* @param string $branch
* @param string $environmentUuid
* @param string $branch
* @return OperationResponse
*/
public function switch($environmentUuid, $branch)
Expand Down
42 changes: 21 additions & 21 deletions src/Endpoints/Crons.php
Expand Up @@ -2,13 +2,13 @@

namespace AcquiaCloudApi\Endpoints;

use AcquiaCloudApi\Connector\ClientInterface;
use AcquiaCloudApi\Response\CronsResponse;
use AcquiaCloudApi\Response\CronResponse;
use AcquiaCloudApi\Response\OperationResponse;

/**
* Class Crons
*
* @package AcquiaCloudApi\CloudApi
*/
class Crons extends CloudApiBase implements CloudApiInterface
Expand All @@ -17,7 +17,7 @@ class Crons extends CloudApiBase implements CloudApiInterface
/**
* Show all cron tasks for an environment.
*
* @param string $environmentUuid The environment ID
* @param string $environmentUuid The environment ID
* @return CronsResponse
*/
public function getAll($environmentUuid)
Expand All @@ -33,8 +33,8 @@ public function getAll($environmentUuid)
/**
* Get information about a cron task.
*
* @param string $environmentUuid The environment ID
* @param int $cronId
* @param string $environmentUuid The environment ID
* @param int $cronId
* @return CronResponse
*/
public function get($environmentUuid, $cronId)
Expand All @@ -50,11 +50,11 @@ public function get($environmentUuid, $cronId)
/**
* Add a cron task.
*
* @param string $environmentUuid
* @param string $command
* @param string $frequency
* @param string $label
* @param string $serverId
* @param string $environmentUuid
* @param string $command
* @param string $frequency
* @param string $label
* @param string $serverId
* @return OperationResponse
*/
public function create($environmentUuid, $command, $frequency, $label, $serverId = null)
Expand All @@ -77,12 +77,12 @@ public function create($environmentUuid, $command, $frequency, $label, $serverId
/**
* Update a cron task.
*
* @param string $environmentUuid
* @param string $cronId
* @param string $command
* @param string $frequency
* @param string $label
* @param string $serverId
* @param string $environmentUuid
* @param string $cronId
* @param string $command
* @param string $frequency
* @param string $label
* @param string $serverId
* @return OperationResponse
*/
public function update($environmentUuid, $cronId, $command, $frequency, $label, $serverId = null)
Expand All @@ -105,8 +105,8 @@ public function update($environmentUuid, $cronId, $command, $frequency, $label,
/**
* Delete a cron task.
*
* @param string $environmentUuid
* @param int $cronId
* @param string $environmentUuid
* @param int $cronId
* @return OperationResponse
*/
public function delete($environmentUuid, $cronId)
Expand All @@ -119,8 +119,8 @@ public function delete($environmentUuid, $cronId)
/**
* Disable a cron task.
*
* @param string $environmentUuid
* @param int $cronId
* @param string $environmentUuid
* @param int $cronId
* @return OperationResponse
*/
public function disable($environmentUuid, $cronId)
Expand All @@ -136,8 +136,8 @@ public function disable($environmentUuid, $cronId)
/**
* Enable a cron task.
*
* @param string $environmentUuid
* @param int $cronId
* @param string $environmentUuid
* @param int $cronId
* @return OperationResponse
*/
public function enable($environmentUuid, $cronId)
Expand Down

0 comments on commit 913fdc5

Please sign in to comment.