Repository navigation
Commit da77966
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>3 files changed
Lines changed: 13 additions & 10 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
24 | | - | |
| 24 | + | |
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
| |||
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
12 | | - | |
| 12 | + | |
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
| |||
0 commit comments