Merge branch '1.x' into 3.x

Author: pjcdawkins

README.md

@@ -39,7 +39,7 @@ $client = new PlatformClient();
 // Set the API token to use.
 //
 // N.B. you must keep your API token(s) safe!
-$client->getConnector()->setApiToken('test', 'exchange');
+$client->getConnector()->setApiToken($myToken, 'exchange');
 
 // Get a project.
 $project = $client->getProject('my_project_id');

src/Model/AutoscalingSettings.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Platformsh\Client\Model;
+
+/**
+ * Represents environment autoscaling settings.
+ *
+ */
+class AutoscalingSettings extends ApiResourceBase {}

src/Model/Environment.php

@@ -5,6 +5,7 @@
 namespace Platformsh\Client\Model;
 
 use Cocur\Slugify\Slugify;
+use GuzzleHttp\Psr7\Request;
 use Platformsh\Client\Exception\EnvironmentStateException;
 use Platformsh\Client\Exception\OperationUnavailableException;
 use Platformsh\Client\Model\Activities\HasActivitiesInterface;
@@ -660,6 +661,30 @@ public function getSourceOperations(): array
         return SourceOperation::getCollection($this->getLink('#source-operations'), 0, [], $this->client);
     }
 
+    /**
+     * Lists environment settings.
+     */
+    public function getSettings(): Settings
+    {
+        $url = $this->getUri() . '/settings';
+        $request = new Request('GET', $url);
+        $data = self::send($request, $this->client);
+
+        return new Settings($data, $url, $this->client);
+    }
+
+    /**
+     * Lists environment autoscaling settings.
+     */
+    public function getAutoscalingSettings(): AutoscalingSettings
+    {
+        $url = $this->getUri() . '/autoscaling/settings';
+        $request = new Request('GET', $url);
+        $data = self::send($request, $this->client);
+
+        return new AutoscalingSettings($data, $url, $this->client);
+    }
+
     /**
      * Runs a source operation.
      *

src/Model/Organization/Organization.php

@@ -19,6 +19,7 @@
 
 /**
  * @property-read string $id The organization ID
+ * @property-read string $type The organization type
  * @property-read string $owner_id The user ID of the organization owner
  * @property-read string $name The organization's machine name (used in URLs)
  * @property-read string $label The organization's "human-readable" name

src/Model/Settings.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Platformsh\Client\Model;
+
+/**
+ * Represents environment settings.
+ *
+ * @property-read bool $enable_manual_deployments
+ */
+class Settings extends ApiResourceBase {}

src/PlatformClient.php

@@ -587,10 +587,15 @@ public function getOrganizationById(string $id): Organization|false
      * that are concerned with subscriptions or billing. The old API path will
      * only continue to work for users who own just 1 organization (or 0).
      *
+     * @param string $name The organization name (unique, "machine-readable", used in the URL path).
+     * @param string $label The organization label ("human-readable").
      * @param string $country An ISO 2-letter country code.
      * @param string $owner The organization owner ID. Leave empty to use the current user.
+     * @param string $type The organization type. Leave blank to use the default.
+     *
+     * @return Organization
      */
-    public function createOrganization(string $name, string $label = '', string $country = '', string $owner = ''): Organization
+    public function createOrganization(string $name, string $label = '', string $country = '', string $owner = '', string $type = ''): Organization
     {
         if (! $this->connector->getApiUrl()) {
             throw new \RuntimeException('No API URL configured');
@@ -604,6 +609,9 @@ public function createOrganization(string $name, string $label = '', string $cou
         if ($owner !== '') {
             $values['owner_id'] = $owner;
         }
+        if ($type !== '') {
+            $values['type'] = $type;
+        }
         return Organization::create($values, $url, $this->connector->getClient());
     }