Support Nextcloud 30, update CSP header #1336
Conversation
|
Btw I've seen that the CI failed because of a missing Signed-off-by, will fix it up on the next iteration. |
Closes nextcloud#1333 I decided to not cross-check the availability of all all deprecated things with older majors, so both min and max version are v30 for now. A list of all things that I've fixed: * Deprecated SCSS variables updated as documented in the upgrade notes[1]. * Fixed a bunch of query builder deprecations: * $qb->resetQueryParts() is deprecated, one should just create a new query-builder object. Done that. * Calling `$qb->expr()->andX()` (and `orX()`) with no arguments is deprecated. Instead, one should list all arguments in an array and pass that to the method. Reworked queries where necessary to do so. * The PHPUnit version I got by running `make test` downloaded a version that prohibits non-static data providers. Made all affected data providers static. With that, everything from `make test` passes in a local dev installation of Nextcloud 30 except for two tests: 1) OCA\Maps\Controller\PhotosControllerTest::testAddGetPhotos Failed asserting that actual size 0 matches expected size 1. /home/ma27/Projects/nextcloud/apps/maps/tests/Unit/Controller/PhotosControllerTest.php:206 2) OCA\Maps\Controller\TracksControllerTest::testAddGetTracks Failed asserting that false matches expected true. /home/ma27/Projects/nextcloud/apps/maps/tests/Unit/Controller/TracksControllerTest.php:205 Both tests failed on the previous commit already, so I decided to leave those for now. [1] https://docs.nextcloud.com/server/latest/developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_30.html#front-end-changes Signed-off-by: Maximilian Bosch <maximilian@mbosch.me>
This is already set by Nextcloud's bootstrap (and from what I've seen we
require that anyways), so no need to do this on our own.
This also resolves the following warnings from `make test`:
Warning: Constant PHPUNIT_RUN already defined in /home/ma27/Projects/nextcloud/tests/bootstrap.php on line 7
PHP Warning: Cannot modify header information - headers already sent by (output started at /home/ma27/Projects/nextcloud/tests/bootstrap.php:7) in /home/ma27/Projects/nextcloud/lib/private/legacy/OC_Response.php on line 71
Signed-off-by: Maximilian Bosch <maximilian@mbosch.me>
So far, we only allowed subdomains, but when I rolled out the other changes, this was missing from having a working map with OSM tiles. This is probably not related to the other changes (it worked fine a few days ago, perhaps something was just changed within OSM), but I figured it's still worth fixing. Signed-off-by: Maximilian Bosch <maximilian@mbosch.me>
|
cc @julien-nc I guess |
Rather than having to remember to reset the query builder in each method that uses it, these are now created on-demand from the db connection. Signed-off-by: Maximilian Bosch <maximilian@mbosch.me>
|
Hi @Ma27, Could you update the Test workflow such that the tests are run on NC30? |
|
Hi @tacruc! Pushed a commit that does that. Not sure if it's completely correct though, I usually work with other CI systems 🙃 |
|
Thanks a lot. In theory I should be able to push to your branch. In practice I didn't find a good git client for Android. Do you know one? Can you remove v28 and v29 from testing and make the DCO, happy? I think then we can go for a merge. |
|
Done. |
Signed-off-by: Maximilian Bosch <maximilian@mbosch.me>
|
@Ma27, there is a nightly build with your PR https://apps.nextcloud.com/apps/maps |
Closes #1333
It probably makes most sense to review this commit-by-commit.
cc @come-nc @susnux @tacruc