Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/Client.php
Original file line number Diff line number Diff line change
Expand Up @@ -278,9 +278,13 @@ public function __call($name, $args)
}

// args, {Operation}Request request, array options
$request = isset($args[0]) ? $args[0] : [];
$options = count($args) > 1 ? $args[1] : [];
$request = $args[0] ?? [];
$options = $args[1] ?? [];

if (version_compare(PHP_VERSION, '8.0.0', '>=')) {
$request = $args['request'] ?? $request;
$options = $args['args'] ?? $options;
}
if (!($request instanceof Types\RequestModel)) {
throw new \InvalidArgumentException('args[0] is not subclass of RequestModel, got ' . \gettype($request));
}
Expand Down
51 changes: 51 additions & 0 deletions tests/IntegrationTests/ClientCallArgsTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
<?php

namespace IntegrationTests;

require_once __DIR__ . DIRECTORY_SEPARATOR . 'TestIntegration.php';

use AlibabaCloud\Oss\V2 as Oss;
use SebastianBergmann\Type\ObjectType;

class ClientCallArgsTest extends TestIntegration
{
public function testClientCallArgs()
{
$client = $this->getDefaultClient();
$bucketName = self::$bucketName;
$key = self::randomObjectName();

// case 1:
$request = new \AlibabaCloud\Oss\V2\Models\PutObjectRequest($bucketName, $key);
$request->body = \AlibabaCloud\Oss\V2\Utils::streamFor('hi oss');
$result = $client->putObject($request);
$this->assertEquals(200, $result->statusCode);
$this->assertEquals('OK', $result->status);
$this->assertEquals(True, count($result->headers) > 0);
$this->assertEquals(24, strlen($result->requestId));

// case 2:
$result = $client->putObject(
new \AlibabaCloud\Oss\V2\Models\PutObjectRequest(
bucket: $bucketName,
key: $key,
body: \AlibabaCloud\Oss\V2\Utils::streamFor('hi oss')
));
$this->assertEquals(200, $result->statusCode);
$this->assertEquals('OK', $result->status);
$this->assertEquals(True, count($result->headers) > 0);
$this->assertEquals(24, strlen($result->requestId));

// case 3:
$result = $client->putObject(
request: new \AlibabaCloud\Oss\V2\Models\PutObjectRequest(
bucket: $bucketName,
key: $key,
body: \AlibabaCloud\Oss\V2\Utils::streamFor('hi oss')
));
$this->assertEquals(200, $result->statusCode);
$this->assertEquals('OK', $result->status);
$this->assertEquals(True, count($result->headers) > 0);
$this->assertEquals(24, strlen($result->requestId));
}
}