Cleanup

Author: pjcdawkins

src/Model/Activity.php

@@ -127,9 +127,7 @@ public function readLog(callable $onUpdate = null)
     private function readline(StreamInterface $stream, $newline = "\n") {
         $buffer = '';
         while (!$stream->eof()) {
-            if (false === ($byte = $stream->read(1))) {
-                return $buffer;
-            }
+            $byte = $stream->read(1);
             $buffer .= $byte;
             if ($byte === $newline) {
                 break;
@@ -218,9 +216,13 @@ public function getDescription($html = false)
     }
 
     /**
+     * Formats a timestamp as RFC3339, to be used in the API's starts_at parameter.
+     *
      * @param int|DateTime $timestamp UNIX UTC timestamp (seconds) or DateTime
      *
-     * @return false|string 2022-02-22T02:00:00.000000+00:00
+     * @throws \RuntimeException if the timestamp is invalid
+     *
+     * @return string 2022-02-22T02:00:00.000000+00:00
      */
     public static function formatStartsAt($timestamp)
     {
@@ -232,13 +234,13 @@ public static function formatStartsAt($timestamp)
             // Parse the UNIX UTC timestamp (seconds) into a DateTime
             $date = DateTime::createFromFormat('U', $timestamp, new DateTimeZone("UTC"));
         }
-        
+
         if (!$date) {
             throw new \RuntimeException(sprintf('Failed to format timestamp: %d', $timestamp));
         }
-        
+
         # Sample: 2022-02-22T02:00:00.000000+00:00
-        return $date = $date->format('Y-m-d\TH:i:s.uP');
+        return $date->format('Y-m-d\TH:i:s.uP');
     }
 
     /**

src/Model/Backups/BackupConfig.php

@@ -4,10 +4,7 @@
 
 class BackupConfig
 {
-    /** @var \Platformsh\Client\Model\Backups\Policy */
-    private $policies = [];
-
-    /** @var int */
+    private $policies;
     private $manualCount;
 
     /**
@@ -52,7 +49,7 @@ public function getManualCount()
     /**
      * Get a list of backup retention policies.
      *
-     * @return \Platformsh\Client\Model\Backups\Policy[]
+     * @return Policy[]
      */
     public function getPolicies()
     {

src/Model/Organization/Member.php

@@ -2,9 +2,7 @@
 
 namespace Platformsh\Client\Model\Organization;
 
-use GuzzleHttp\ClientInterface;
 use Platformsh\Client\Model\Ref\UserRef;
-use Platformsh\Client\Model\Resource;
 use Platformsh\Client\Model\ResourceWithReferences;
 
 /**

src/Model/Plan.php

@@ -2,8 +2,6 @@
 
 namespace Platformsh\Client\Model;
 
-use GuzzleHttp\ClientInterface;
-
 /**
  * Represents a Platform.sh plan.
  *

src/Model/Project.php

@@ -389,7 +389,7 @@ public function getVariables($limit = 0)
      * @param bool $json
      *   Whether this variable's value is JSON-encoded.
      * @param bool $visibleBuild
-     *   Whether this this variable should be exposed during the build phase.
+     *   Whether this variable should be exposed during the build phase.
      * @param bool $visibleRuntime
      *   Whether this variable should be exposed during deploy and runtime.
      * @param bool $sensitive

src/Model/Region.php

@@ -2,8 +2,6 @@
 
 namespace Platformsh\Client\Model;
 
-use GuzzleHttp\ClientInterface;
-
 /**
  * Represents a Platform.sh region.
  *

src/Model/Resource.php

@@ -134,7 +134,7 @@ public function offsetUnset($offset)
     }
 
     /**
-     * Get all of the API data for this resource.
+     * Get all the API data for this resource.
      *
      * @return array
      */
@@ -620,8 +620,7 @@ protected function makeAbsoluteUrl($relativeUrl, $baseUrl = null)
      */
     public function getPropertyNames()
     {
-        $keys = array_filter(array_keys($this->data), [$this, 'isProperty']);
-        return $keys;
+        return array_filter(array_keys($this->data), [$this, 'isProperty']);
     }
 
     /**

src/Model/ResourceWithReferences.php

@@ -51,7 +51,7 @@ public static function wrapCollection(array $data, $baseUrl, ClientInterface $cl
                     $item['ref:users'][$value] = $data['ref:users'][$value];
                 }
                 // And organization-related references.
-                if (\in_array($key, ['organization_id']) && isset($data['ref:organizations'][$value])) {
+                if ($key === 'organization_id' && isset($data['ref:organizations'][$value])) {
                     $item['ref:organizations'][$value] = $data['ref:organizations'][$value];
                 }
             }

src/SshCert/Metadata.php

@@ -78,7 +78,7 @@ private function readUint64(&$bytes) {
         // The 'J' format for pack/unpack was added in PHP 5.6.3.
         if (\version_compare(PHP_VERSION, '5.6.3', '<')) {
             list(, $most, $least) = \unpack('N2', $packed);
-            return (int) (($most << 32) | $least);
+            return ($most << 32) | $least;
         }
         return (int) \unpack('J', $packed)[1];
     }