Revert interface changes from "store unencrypted size in the unencrypted_size column"

[icewind1991]

This reverts #31966 and uses the changes from #32708 instead which removes the significant interface changes at the cost of a "less nice" solution.

[PVince81]

👍

[CarlSchwan]

now this will break all the app I changed a few days ago. For files_lock the solution was nextcloud/files_lock#77

[icewind1991]

The casts to string will still work, it will just be a noop

[PVince81]

do we still need this or do we keep this change for 25 at least ?

[danxuliu]

Please check #33484 for a regression introduced in this pull request (second item in the list, storage stats size after deleting the last file in a folder is wrong).

[icewind1991]

@danxuliu thanks for making the test, regression should be fixed now

[danxuliu]

@danxuliu thanks for making the test, regression should be fixed now

I have run the integration tests again rebased on the latest commit and that issue is indeed fixed. Thanks!

[icewind1991]

do we still need this or do we keep this change for 25 at least ?

Imo it still makes sense to merge this to prevent needless churn for apps

[PVince81]

@icewind1991 I'm worried that apps might have already adjusted by now, especially if the interface change was already released recently or was it not ?

[icewind1991]

24 doesn't have the interface change.

For apps that added casts like nextcloud/files_lock#77, it will still work with this PR applied, only if apps extended the querybuilder and overwrote existing method should they need to adjust for this PR

[skjnldsv]

This breaks master,

{
  "reqId": "r9OmEUeVynCcFsLI8Lvu",
  "level": 3,
  "time": "2022-08-17T13:37:17+00:00",
  "remoteAddr": "172.18.0.1",
  "user": "admin",
  "app": "PHP",
  "method": "GET",
  "url": "/ocs/v2.php/apps/notifications/api/v2/notifications",
  "message": "Declaration of OC\\DB\\QueryBuilder\\ExpressionBuilder\\ExpressionBuilder::comparison($x, string $operator, $y, $type = null): string must be compatible with OCP\\DB\\QueryBuilder\\IExpressionBuilder::comparison($x, string $operator, $y, $type = null): OCP\\DB\\QueryBuilder\\IQueryFunction at /var/www/nextcloud/lib/private/DB/QueryBuilder/ExpressionBuilder/ExpressionBuilder.php#119",
  "userAgent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.81 Safari/537.36",
  "version": "25.0.0.5",
  "data": {
    "app": "PHP"
  }
}

[skjnldsv]

Hum, weird, they look identical! 🤔

[skjnldsv]

#31966 (comment)