Skip to content

Commit da77966

Browse files
abnegateclaude
andcommitted
chore: merge main into feat-query-lib
PR #42 conflicted with main after #43 moved usage to utopia-php/client 0.5's names, so GitHub ran no CI on it and it could not merge. Conflicts: - composer.json: both sides edited the require block. Kept this branch's file (database 8.*, PHP 8.5, wildcard constraints, dev stability with prefer-stable, the 0.17.x-dev branch alias) and took main's "utopia-php/client": "^0.5" line as main wrote it. - composer.lock: both sides changed the content hash. Rebuilt from this branch's lock with a partial update of utopia-php/client only, so client moves 0.4.3 -> 0.5.1 (the same entry as main's lock) and no other package moves; database stays dev-feat-query-lib 8b716e3c1c through its 8.0.x-dev alias. With -W, composer/semver would also have moved (3.4.4 -> 3.5.0), which client 0.5 does not need. src/Usage/Adapter/ClickHouse.php merged cleanly and takes main's Utopia\Client\Client import: client 0.5 moved the class, and the old Utopia\Client name is only an alias until client's next major (appwrite's in-repo packages/client, which replaces utopia-php/client there, has no such alias). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2 parents 24ace64 + 6340f12 commit da77966

3 files changed

Lines changed: 13 additions & 10 deletions

File tree

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"require": {
2222
"php": ">=8.5",
2323
"psr/http-client": "1.*",
24-
"utopia-php/client": "0.4.*",
24+
"utopia-php/client": "^0.5",
2525
"utopia-php/database": "8.*",
2626
"utopia-php/query": "0.6.*"
2727
},

‎composer.lock‎

Lines changed: 11 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Usage/Adapter/ClickHouse.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
use Exception;
1010
use Psr\Http\Client\ClientInterface;
1111
use Throwable;
12-
use Utopia\Client;
12+
use Utopia\Client\Client;
1313
use Utopia\Client\Adapter\Curl\Client as CurlAdapter;
1414
use Utopia\Psr7\Method as HttpMethod;
1515
use Utopia\Psr7\Request\Factory as RequestFactory;

0 commit comments

Comments
 (0)