From 793efdfb45ed9ef662038f488a26a459e15bed99 Mon Sep 17 00:00:00 2001 From: Formatter Bot Date: Fri, 18 Sep 2020 19:27:39 +0000 Subject: [PATCH] Automated formatting changes --- .../HttpBasicAuthOptionProvider.php | 2 +- .../OptionProvider/PostAuthOptionProvider.php | 4 +-- Auth/OAuth2/Provider/ProviderAbstract.php | 36 ++++++++++--------- Message/Mail/Mail.php | 9 ++--- .../Business/Marketing/CustomerValueTest.php | 1 - tests/Business/Marketing/MetricsTest.php | 10 +++--- .../Client/NullClientConnectionTest.php | 2 +- tests/Stdlib/Graph/GraphTest.php | 2 +- tests/Stdlib/Graph/NodeTest.php | 6 ++-- 9 files changed, 34 insertions(+), 38 deletions(-) diff --git a/Auth/OAuth2/OptionProvider/HttpBasicAuthOptionProvider.php b/Auth/OAuth2/OptionProvider/HttpBasicAuthOptionProvider.php index 71354b158..10bcb4ac5 100644 --- a/Auth/OAuth2/OptionProvider/HttpBasicAuthOptionProvider.php +++ b/Auth/OAuth2/OptionProvider/HttpBasicAuthOptionProvider.php @@ -30,7 +30,7 @@ class HttpBasicAuthOptionProvider extends PostAuthOptionProvider $encoded = \base64_encode($params['client_id'] . ':' . $params['client_secret']); unset($params['client_id'], $params['client_secret']); - $options = parent::getAccessTokenOptions($method, $params); + $options = parent::getAccessTokenOptions($method, $params); $options['headers']['Authorization'] = 'Basic ' . $encoded; return $options; diff --git a/Auth/OAuth2/OptionProvider/PostAuthOptionProvider.php b/Auth/OAuth2/OptionProvider/PostAuthOptionProvider.php index 7b5d22013..1830c377f 100644 --- a/Auth/OAuth2/OptionProvider/PostAuthOptionProvider.php +++ b/Auth/OAuth2/OptionProvider/PostAuthOptionProvider.php @@ -15,8 +15,8 @@ declare(strict_types=1); namespace phpOMS\Auth\OAuth2\OptionProvider; -use phpOMS\System\MimeType; use phpOMS\Message\Http\RequestMethod; +use phpOMS\System\MimeType; /** * Provider class. @@ -31,7 +31,7 @@ class PostAuthOptionProvider implements OptionProviderInterface public function getAccessTokenOptions(string $method, array $params) : array { $options = [ - 'headers' => ['content-type' => MimeType::M_POST] + 'headers' => ['content-type' => MimeType::M_POST], ]; if ($method === RequestMethod::POST) { diff --git a/Auth/OAuth2/Provider/ProviderAbstract.php b/Auth/OAuth2/Provider/ProviderAbstract.php index 71fe495f3..b6f057318 100644 --- a/Auth/OAuth2/Provider/ProviderAbstract.php +++ b/Auth/OAuth2/Provider/ProviderAbstract.php @@ -126,12 +126,12 @@ abstract class ProviderAbstract $this->state = $options['state']; $options += [ - 'response_type' => 'code', + 'response_type' => 'code', 'approval_prompt' => 'auto', ]; if (\is_array($options['scope'])) { - $options['scope'] = implode($this->getScopeSeparator(), $options['scope']); + $options['scope'] = \implode($this->getScopeSeparator(), $options['scope']); } $options['redirect_uri'] ??= $this->redirectUri; @@ -147,9 +147,9 @@ abstract class ProviderAbstract public function getauthorizationUrl(array $options = []) : string { - $base = $this->getBaseAuthorizationUrl(); + $base = $this->getBaseAuthorizationUrl(); $params = $this->getAuthorizationParameters($options); - $query = $this->getAuthorizationQuery($params); + $query = $this->getAuthorizationQuery($params); return UriFactory::build($base . '?' . $query); } @@ -162,7 +162,7 @@ abstract class ProviderAbstract } // @codeCoverageIgnoreStart - header('Location: ' . $url); + \header('Location: ' . $url); exit; // @codeCoverageIgnoreEnd } @@ -199,8 +199,8 @@ abstract class ProviderAbstract protected function getAccessTokenRequest(array $params) : HttpRequest { - $method = $this->getAccessTokenMethod(); - $url = $this->getAccessTokenUrl($params); + $method = $this->getAccessTokenMethod(); + $url = $this->getAccessTokenUrl($params); $options = $this->getoptionProvider->getAccessTokenOptions($this->getAccessTokenMethod(), $params); return $this->createRequest($method, $url, null, $options); @@ -212,17 +212,17 @@ abstract class ProviderAbstract $grant = \is_string($grant) ? $this->grantFactory->getGrant($grant) : $this->verifyGrant(); $params = [ - 'client_id' => $this->clientId, + 'client_id' => $this->clientId, 'client_secret' => $this->clientSecret, - 'redirect_uri' => $this->redirectUri, + 'redirect_uri' => $this->redirectUri, ]; - $params = $grant->prepareRequestParameters($params, $options); - $request = $this->getAccessTokenRequest($params); + $params = $grant->prepareRequestParameters($params, $options); + $request = $this->getAccessTokenRequest($params); $response = $this->getParsedResponse($request); $prepared = $this->prepareAccessTokenResponse($response); - $token = $this->createAccessToken($prepared, $grant); + $token = $this->createAccessToken($prepared, $grant); return $token; } @@ -242,7 +242,7 @@ abstract class ProviderAbstract public function getParsedResponse(HttpRequest $request) { $response = $request->rest(); - $parsed = $this->parseResponse($response); + $parsed = $this->parseResponse($response); $this->checkResponse($response, $parsed); @@ -252,7 +252,7 @@ abstract class ProviderAbstract protected function parseResponse(HttpResponse $response) : array { $content = $response->getBody(); - $type = \implode(';', (array) $response->getHeader()->get('Content-Type')); + $type = \implode(';', (array) $response->getHeader()->get('Content-Type')); if (\stripos($type, 'urlencoded') !== false) { \parse_str($content, $parsed); @@ -267,7 +267,9 @@ abstract class ProviderAbstract } } - abstract protected function checkResponse(HttpResponse $response, $data) : void; // todo: consider to make bool + abstract protected function checkResponse(HttpResponse $response, $data) : void; + + // todo: consider to make bool protected function prepareAccessTokenResponse(array $result) : array { @@ -294,8 +296,8 @@ abstract class ProviderAbstract protected function fetchResourceOwnerDetails(AccessToken $token) { - $url = $this->getResourceOwnerDetailsUrl($token); - $request = $this->getAuthenticatedRequest(RequestMethod::GET, $url, $token); + $url = $this->getResourceOwnerDetailsUrl($token); + $request = $this->getAuthenticatedRequest(RequestMethod::GET, $url, $token); $response = $this->getParsedResponse($request); return $response; diff --git a/Message/Mail/Mail.php b/Message/Mail/Mail.php index 4f892f1e5..5dbfcd818 100644 --- a/Message/Mail/Mail.php +++ b/Message/Mail/Mail.php @@ -194,8 +194,6 @@ class Mail */ protected ?\DateTime $messageDate = null; - - /** * Should confirm reading * @@ -1408,8 +1406,8 @@ class Mail public function clearAddresses() : void { - $this->to = []; - $this->cc = []; + $this->to = []; + $this->cc = []; $this->bcc = []; } @@ -1455,7 +1453,7 @@ class Mail list($name, $value) = \explode(':', $name, 2); } - $name = \trim($name); + $name = \trim($name); $value = \trim($value); if (empty($name) || \strbrk($name . $value, "\r\n") !== false) { @@ -1475,7 +1473,6 @@ class Mail public function msgHtml(string $message, string $baseDir = '') : string { - } /** diff --git a/tests/Business/Marketing/CustomerValueTest.php b/tests/Business/Marketing/CustomerValueTest.php index 000f754bb..2422528d3 100644 --- a/tests/Business/Marketing/CustomerValueTest.php +++ b/tests/Business/Marketing/CustomerValueTest.php @@ -35,7 +35,6 @@ class CustomerValueTest extends \PHPUnit\Framework\TestCase self::assertEqualsWithDelta(30000, CustomerValue::getSimpleCLV($margin, $retention, 0.0), 0.1); } - /** * @testdox The monthly recurring revenue (MRR) is correctly calculated * @group framework diff --git a/tests/Business/Marketing/MetricsTest.php b/tests/Business/Marketing/MetricsTest.php index ce16df945..f963612aa 100644 --- a/tests/Business/Marketing/MetricsTest.php +++ b/tests/Business/Marketing/MetricsTest.php @@ -38,12 +38,12 @@ class MetricsTest extends \PHPUnit\Framework\TestCase */ public function testBerrysCustomerProfits() : void { - $acquisitionCost = 30.0; - $customers = 100000; + $acquisitionCost = 30.0; + $customers = 100000; $ongoingMarketingCustomer = 10; - $revenueCustomer = 100; - $cogsCustomer = 50; - $discountRate = 0.15; + $revenueCustomer = 100; + $cogsCustomer = 50; + $discountRate = 0.15; self::assertEqualsWithDelta( 4076923.08, diff --git a/tests/Socket/Client/NullClientConnectionTest.php b/tests/Socket/Client/NullClientConnectionTest.php index a2f0e37aa..8979a33f7 100644 --- a/tests/Socket/Client/NullClientConnectionTest.php +++ b/tests/Socket/Client/NullClientConnectionTest.php @@ -14,8 +14,8 @@ declare(strict_types=1); namespace phpOMS\tests\Socket\Client; -use phpOMS\Socket\Client\NullClientConnection; use phpOMS\Socket\Client\ClientConnection; +use phpOMS\Socket\Client\NullClientConnection; /** * @internal diff --git a/tests/Stdlib/Graph/GraphTest.php b/tests/Stdlib/Graph/GraphTest.php index a8ea49b77..3bb3ea632 100644 --- a/tests/Stdlib/Graph/GraphTest.php +++ b/tests/Stdlib/Graph/GraphTest.php @@ -270,7 +270,7 @@ class GraphTest extends \PHPUnit\Framework\TestCase $this->graph->getEdge($node1->getId(), $node3->getId())->getNode2()->getId() ); - self::assertEquals(null, $this->graph->getEdge('invalid1', 'invalid2')); + self::assertNull($this->graph->getEdge('invalid1', 'invalid2')); } /** diff --git a/tests/Stdlib/Graph/NodeTest.php b/tests/Stdlib/Graph/NodeTest.php index 4b1ac17c7..d63246a7e 100644 --- a/tests/Stdlib/Graph/NodeTest.php +++ b/tests/Stdlib/Graph/NodeTest.php @@ -14,10 +14,8 @@ declare(strict_types=1); namespace phpOMS\tests\Stdlib\Graph; -use phpOMS\Stdlib\Graph\Node; use phpOMS\Stdlib\Graph\Edge; - -use function PHPUnit\Framework\assertInstanceOf; +use phpOMS\Stdlib\Graph\Node; /** * @testdox phpOMS\tests\Stdlib\Graph\NodeTest: Node in a graph @@ -121,7 +119,7 @@ class NodeTest extends \PHPUnit\Framework\TestCase $node = new Node('A', 1); $node->setEdge(new Edge($node, new Node('B')), 3); - self::assertEquals(null, $node->getEdge(2)); + self::assertNull($node->getEdge(2)); self::assertInstanceOf(Edge::class, $node->getEdge(3)); }