Applied latest CS rules

Author: WyriHaximus

.php_cs

@@ -8,6 +8,7 @@ return (function (): Config
     $paths = [
         __DIR__ . DIRECTORY_SEPARATOR . 'src',
         __DIR__ . DIRECTORY_SEPARATOR . 'tests',
+        __DIR__ . DIRECTORY_SEPARATOR . 'examples',
     ];
 
     return PhpCsFixerConfig::create()

examples/benchmark.php

@@ -5,7 +5,7 @@
 use ApiClients\Middleware\UserAgent\UserAgentStrategy\PackageVersionStrategy;
 use RingCentral\Psr7\Request;
 
-require dirname(__DIR__) . '/vendor/autoload.php';
+require \dirname(__DIR__) . '/vendor/autoload.php';
 
 $options = [
     UserAgentMiddleware::class => [
@@ -16,8 +16,8 @@
 $request = new Request('GET', 'https://example.com/');
 $middleware = new UserAgentMiddleware();
 
-$start = time();
+$start = \time();
 for ($i = 0; $i < 1000000; $i++) {
     $middleware->pre(clone $request, (string)$i, $options);
 }
-echo 'Took: ', (time() - $start), ' seconds', PHP_EOL;
+echo 'Took: ', (\time() - $start), ' seconds', \PHP_EOL;

src/UserAgentMiddleware.php

@@ -2,7 +2,6 @@
 
 namespace ApiClients\Middleware\UserAgent;
 
-use ApiClients\Foundation\Middleware\DefaultPriorityTrait;
 use ApiClients\Foundation\Middleware\ErrorTrait;
 use ApiClients\Foundation\Middleware\MiddlewareInterface;
 use ApiClients\Foundation\Middleware\PostTrait;
@@ -18,8 +17,8 @@ final class UserAgentMiddleware implements MiddlewareInterface
     private $cache = [];
 
     /**
-     * @param RequestInterface $request
-     * @param array $options
+     * @param  RequestInterface            $request
+     * @param  array                       $options
      * @return CancellablePromiseInterface
      */
     public function pre(
@@ -33,15 +32,15 @@ public function pre(
 
         $strategy = $options[UserAgentMiddleware::class][Options::STRATEGY];
 
-        if (!class_exists($strategy)) {
+        if (!\class_exists($strategy)) {
             return resolve($request);
         }
 
-        if (!is_subclass_of($strategy, UserAgentStrategyInterface::class)) {
+        if (!\is_subclass_of($strategy, UserAgentStrategyInterface::class)) {
             return resolve($request);
         }
 
-        $hash = md5(serialize($options[UserAgentMiddleware::class]));
+        $hash = \md5(\serialize($options[UserAgentMiddleware::class]));
         if (!isset($this->cache[$hash])) {
             /** @var UserAgentStrategyInterface $strategy */
             $strategy = new $strategy();

src/UserAgentStrategies.php

@@ -2,8 +2,6 @@
 
 namespace ApiClients\Middleware\UserAgent;
 
-use ApiClients\Middleware\UserAgent\UserAgentStrategy;
-
 final class UserAgentStrategies
 {
     const STRING          = UserAgentStrategy\StringStrategy::class;

src/UserAgentStrategy/PackageVersionStrategy.php

@@ -4,10 +4,10 @@
 
 use ApiClients\Middleware\UserAgent\Options;
 use ApiClients\Middleware\UserAgent\UserAgentStrategyInterface;
+use function Composed\package;
 use InvalidArgumentException;
 use Jean85\PrettyVersions;
 use Psr\Http\Message\RequestInterface;
-use function Composed\package;
 
 final class PackageVersionStrategy implements UserAgentStrategyInterface
 {
@@ -26,13 +26,13 @@ public function determineUserAgent(RequestInterface $request, array $options): s
         $chunks[] = PrettyVersions::getVersion($package)->getShortVersion();
         $chunks[] = $this->getWebsite($package);
 
-        return sprintf(
+        return \sprintf(
             self::USER_AGENT,
             ...$chunks
         );
     }
 
-    protected function getWebsite(string $package)
+    private function getWebsite(string $package)
     {
         $package = package($package);
         $homepage = $package->getConfig('homepage');
@@ -41,7 +41,7 @@ protected function getWebsite(string $package)
             return '';
         }
 
-        if (filter_var($homepage, FILTER_VALIDATE_URL) === false) {
+        if (\filter_var($homepage, \FILTER_VALIDATE_URL) === false) {
             return '';
         }
 

tests/UserAgentMiddlewareTest.php

@@ -2,19 +2,20 @@
 
 namespace ApiClients\Tests\Middleware\UserAgent;
 
-use ApiClients\Foundation\Middleware\Priority;
 use ApiClients\Middleware\UserAgent\Options;
 use ApiClients\Middleware\UserAgent\UserAgentMiddleware;
 use ApiClients\Middleware\UserAgent\UserAgentStrategy\StringStrategy;
 use ApiClients\Tools\TestUtilities\TestCase;
+use function Clue\React\Block\await;
 use React\EventLoop\Factory;
 use RingCentral\Psr7\Request;
-use function Clue\React\Block\await;
-use function React\Promise\reject;
 
+/**
+ * @internal
+ */
 final class UserAgentMiddlewareTest extends TestCase
 {
-    public function testPre()
+    public function testPre(): void
     {
         $request = new Request('GET', 'https://example.com/');
         $expectedRequest = new Request('GET', 'https://example.com/', ['User-Agent' => 'foo.bar',]);

tests/UserAgentStrategy/PackageVersionStrategyTest.php

@@ -9,12 +9,15 @@
 use PackageVersions\Versions;
 use Psr\Http\Message\RequestInterface;
 
+/**
+ * @internal
+ */
 final class PackageVersionStrategyTest extends TestCase
 {
-    public function testWorking()
+    public function testWorking(): void
     {
         self::assertSame(
-            'api-clients/middleware-user-agent ' . explode('@', Versions::getVersion('api-clients/middleware-user-agent'))[0] . ' powered by PHP API Clients https://php-api-clients.org/',
+            'api-clients/middleware-user-agent ' . \explode('@', Versions::getVersion('api-clients/middleware-user-agent'))[0] . ' powered by PHP API Clients https://php-api-clients.org/',
             (new PackageVersionStrategy())->determineUserAgent(
                 $this->prophesize(RequestInterface::class)->reveal(),
                 [
@@ -28,7 +31,7 @@ public function testWorking()
      * @expectedException InvalidArgumentException
      * @expectedExceptionMessage Missing package option
      */
-    public function testFail()
+    public function testFail(): void
     {
         (new PackageVersionStrategy())->determineUserAgent(
             $this->prophesize(RequestInterface::class)->reveal(),

tests/UserAgentStrategy/StringStrategyTest.php

@@ -8,9 +8,12 @@
 use InvalidArgumentException;
 use Psr\Http\Message\RequestInterface;
 
+/**
+ * @internal
+ */
 final class StringStrategyTest extends TestCase
 {
-    public function testWorking()
+    public function testWorking(): void
     {
         $userAgent = 'abc';
 
@@ -29,7 +32,7 @@ public function testWorking()
      * @expectedException InvalidArgumentException
      * @expectedExceptionMessage Missing user agent option
      */
-    public function testFail()
+    public function testFail(): void
     {
         (new StringStrategy())->determineUserAgent(
             $this->prophesize(RequestInterface::class)->reveal(),