Minor code cleanup (#455)

* Minor code cleanup

* Fixed ResultMockFactory

* cs

Author: Nyholm

src/AbstractApi.php

@@ -112,7 +112,14 @@ final protected function getResponse(Request $request, ?RequestContext $context
             $requestBody = $requestBody->stringify();
         }
 
-        $response = $this->httpClient->request($request->getMethod(), $request->getEndpoint(), ['headers' => $request->getHeaders(), 'body' => 0 === $length ? null : $requestBody]);
+        $response = $this->httpClient->request(
+            $request->getMethod(),
+            $request->getEndpoint(),
+            [
+                'headers' => $request->getHeaders(),
+                'body' => 0 === $length ? null : $requestBody,
+            ]
+        );
 
         return new Response($response, $this->httpClient);
     }

src/Result.php

@@ -8,7 +8,8 @@
 use AsyncAws\Core\Exception\Http\NetworkException;
 
 /**
- * Base class for all return values from a Api Client methods. Example: `FooClient::bar(): Result`.
+ * Base class for all return values from a Api Client methods.
+ * Example: `FooClient::bar(): Result`.
  */
 class Result
 {
@@ -24,7 +25,7 @@ class Result
      */
     protected $input;
 
-    protected $initialized = false;
+    private $initialized = false;
 
     private $response;
 

src/Stream/ReadOnceResultStream.php

@@ -6,6 +6,8 @@
 
 /**
  * Marker for ResultStream that can be read only once.
+ *
+ * @internal
  */
 interface ReadOnceResultStream
 {

src/Test/ResultMockFactory.php

@@ -73,13 +73,18 @@ public static function create(string $class, array $data = [])
         $property->setAccessible(true);
         $property->setValue($response, true);
 
+        // Make sure the Result is initialized
+        $reflectionClass = new \ReflectionClass(Result::class);
+        $initializedProperty = $reflectionClass->getProperty('initialized');
+        $initializedProperty->setAccessible(true);
+
         $reflectionClass = new \ReflectionClass($class);
         $object = $reflectionClass->newInstance($response);
         if (Result::class !== $class) {
             self::addPropertiesOnResult($reflectionClass, $object, $class);
         }
 
-        $data['initialized'] = true;
+        $initializedProperty->setValue($object, true);
         foreach ($data as $propertyName => $propertyValue) {
             $property = $reflectionClass->getProperty($propertyName);
             $property->setAccessible(true);

src/Waiter.php

@@ -48,13 +48,6 @@ class Waiter
      */
     private $finalState;
 
-    /**
-     * A Result can be resolved many times. This variable contains the last resolve result.
-     *
-     * @var bool|NetworkException|null
-     */
-    private $resolveResult;
-
     public function __construct(Response $response, AbstractApi $awsClient, $request)
     {
         $this->response = $response;