diff options
| -rw-r--r-- | .drone.yml | 56 | ||||
| -rw-r--r-- | apps/dav/appinfo/info.xml | 1 | ||||
| -rw-r--r-- | apps/dav/lib/Migration/ValueFix.php | 71 | ||||
| -rw-r--r-- | apps/dav/lib/Migration/ValueFixInsert.php | 63 | ||||
| -rw-r--r-- | apps/dav/tests/unit/Migration/ValueFixInsertTest.php | 117 | ||||
| -rw-r--r-- | apps/dav/tests/unit/Migration/ValueFixTest.php | 200 | ||||
| -rw-r--r-- | cron.php | 7 | ||||
| -rw-r--r-- | lib/private/Setup/MySQL.php | 2 | ||||
| -rw-r--r-- | settings/personal.php | 2 |
9 files changed, 489 insertions, 30 deletions
diff --git a/.drone.yml b/.drone.yml index 6ff06127284..85b83eb20c1 100644 --- a/.drone.yml +++ b/.drone.yml @@ -13,14 +13,14 @@ pipeline: matrix: TESTS: jsunit check-autoloader: - image: nextcloudci/php7.0:php7.0-6 + image: nextcloudci/php7.0:php7.0-7 commands: - bash ./build/autoloaderchecker.sh when: matrix: TESTS: check-autoloader app-check-code: - image: nextcloudci/php7.0:php7.0-6 + image: nextcloudci/php7.0:php7.0-7 commands: - ./occ app:check-code admin_audit - ./occ app:check-code comments @@ -33,14 +33,14 @@ pipeline: matrix: TESTS: app-check-code signed-off-check: - image: nextcloudci/php7.0:php7.0-6 + image: nextcloudci/php7.0:php7.0-7 commands: - php ./build/signed-off-checker.php when: matrix: TESTS: signed-off-check htaccess-checker: - image: nextcloudci/php7.0:php7.0-6 + image: nextcloudci/php7.0:php7.0-7 commands: - php ./build/htaccess-checker.php when: @@ -55,7 +55,7 @@ pipeline: matrix: TESTS: syntax-php5.6 syntax-php7.0: - image: nextcloudci/php7.0:php7.0-6 + image: nextcloudci/php7.0:php7.0-7 commands: - composer install - ./lib/composer/bin/parallel-lint --exclude lib/composer/jakub-onderka/ --exclude 3rdparty/symfony/polyfill-php70/Resources/stubs/ --exclude 3rdparty/patchwork/utf8/src/Patchwork/Utf8/Bootup/ --exclude 3rdparty/paragonie/random_compat/lib/ --exclude lib/composer/composer/autoload_static.php --exclude 3rdparty/composer/autoload_static.php . @@ -131,7 +131,7 @@ pipeline: DB: NODB PHP: 5.6 nodb-php7.0: - image: nextcloudci/php7.0:php7.0-6 + image: nextcloudci/php7.0:php7.0-7 commands: - NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite when: @@ -155,7 +155,7 @@ pipeline: DB: sqlite PHP: 5.6 sqlite-php7.0: - image: nextcloudci/php7.0:php7.0-6 + image: nextcloudci/php7.0:php7.0-7 commands: - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite when: @@ -196,7 +196,7 @@ pipeline: DB: mysqlmb4 PHP: 5.6 integration-capabilities_features: - image: nextcloudci/integration-php7.0:integration-php7.0-2 + image: nextcloudci/integration-php7.0:integration-php7.0-3 commands: - ./occ maintenance:install --admin-pass=admin - cd build/integration @@ -205,7 +205,7 @@ pipeline: matrix: TESTS: integration-capabilities_features integration-federation_features: - image: nextcloudci/integration-php7.0:integration-php7.0-2 + image: nextcloudci/integration-php7.0:integration-php7.0-3 commands: - ./occ maintenance:install --admin-pass=admin - cd build/integration @@ -214,7 +214,7 @@ pipeline: matrix: TESTS: integration-federation_features integration-auth: - image: nextcloudci/integration-php7.0:integration-php7.0-2 + image: nextcloudci/integration-php7.0:integration-php7.0-3 commands: - ./occ maintenance:install --admin-pass=admin - cd build/integration @@ -223,7 +223,7 @@ pipeline: matrix: TESTS: integration-auth integration-carddav: - image: nextcloudci/integration-php7.0:integration-php7.0-2 + image: nextcloudci/integration-php7.0:integration-php7.0-3 commands: - ./occ maintenance:install --admin-pass=admin - cd build/integration @@ -232,7 +232,7 @@ pipeline: matrix: TESTS: integration-carddav integration-dav-v2: - image: nextcloudci/integration-php7.0:integration-php7.0-2 + image: nextcloudci/integration-php7.0:integration-php7.0-3 commands: - ./occ maintenance:install --admin-pass=admin - cd build/integration @@ -241,7 +241,7 @@ pipeline: matrix: TESTS: integration-dav-v2 integration-ocs-v1: - image: nextcloudci/integration-php7.0:integration-php7.0-2 + image: nextcloudci/integration-php7.0:integration-php7.0-3 commands: - ./occ maintenance:install --admin-pass=admin - cd build/integration @@ -250,7 +250,7 @@ pipeline: matrix: TESTS: integration-ocs-v1 integration-sharing-v1: - image: nextcloudci/integration-php7.0:integration-php7.0-2 + image: nextcloudci/integration-php7.0:integration-php7.0-3 commands: - ./occ maintenance:install --admin-pass=admin - cd build/integration @@ -259,7 +259,7 @@ pipeline: matrix: TESTS: integration-sharing-v1 integration-checksums-v1: - image: nextcloudci/integration-php7.0:integration-php7.0-2 + image: nextcloudci/integration-php7.0:integration-php7.0-3 commands: - ./occ maintenance:install --admin-pass=admin - cd build/integration @@ -268,7 +268,7 @@ pipeline: matrix: TESTS: integration-checksums integration-external-storage: - image: nextcloudci/integration-php7.0:integration-php7.0-2 + image: nextcloudci/integration-php7.0:integration-php7.0-3 commands: - ./occ maintenance:install --admin-pass=admin - cd build/integration @@ -277,7 +277,7 @@ pipeline: matrix: TESTS: integration-external-storage integration-provisioning-v1: - image: nextcloudci/integration-php7.0:integration-php7.0-2 + image: nextcloudci/integration-php7.0:integration-php7.0-3 commands: - ./occ maintenance:install --admin-pass=admin - cd build/integration @@ -286,7 +286,7 @@ pipeline: matrix: TESTS: integration-provisioning-v1 integration-tags: - image: nextcloudci/integration-php7.0:integration-php7.0-2 + image: nextcloudci/integration-php7.0:integration-php7.0-3 commands: - ./occ maintenance:install --admin-pass=admin - cd build/integration @@ -295,7 +295,7 @@ pipeline: matrix: TESTS: integration-tags integration-caldav: - image: nextcloudci/integration-php7.0:integration-php7.0-2 + image: nextcloudci/integration-php7.0:integration-php7.0-3 commands: - ./occ maintenance:install --admin-pass=admin - cd build/integration @@ -304,7 +304,7 @@ pipeline: matrix: TESTS: integration-caldav integration-comments: - image: nextcloudci/integration-php7.0:integration-php7.0-2 + image: nextcloudci/integration-php7.0:integration-php7.0-3 commands: - ./occ maintenance:install --admin-pass=admin - cd build/integration @@ -313,7 +313,7 @@ pipeline: matrix: TESTS: integration-comments integration-favorites: - image: nextcloudci/integration-php7.0:integration-php7.0-2 + image: nextcloudci/integration-php7.0:integration-php7.0-3 commands: - ./occ maintenance:install --admin-pass=admin - cd build/integration @@ -322,7 +322,7 @@ pipeline: matrix: TESTS: integration-favorites integration-provisioning-v2: - image: nextcloudci/integration-php7.0:integration-php7.0-2 + image: nextcloudci/integration-php7.0:integration-php7.0-3 commands: - ./occ maintenance:install --admin-pass=admin - cd build/integration @@ -331,7 +331,7 @@ pipeline: matrix: TESTS: integration-provisioning-v2 integration-webdav-related: - image: nextcloudci/integration-php7.0:integration-php7.0-2 + image: nextcloudci/integration-php7.0:integration-php7.0-3 commands: - ./occ maintenance:install --admin-pass=admin - cd build/integration @@ -340,7 +340,7 @@ pipeline: matrix: TESTS: integration-webdav-related integration-sharees-features: - image: nextcloudci/integration-php7.0:integration-php7.0-2 + image: nextcloudci/integration-php7.0:integration-php7.0-3 commands: - ./occ maintenance:install --admin-pass=admin - cd build/integration @@ -349,7 +349,7 @@ pipeline: matrix: TESTS: integration-sharees-features integration-setup-features: - image: nextcloudci/integration-php7.0:integration-php7.0-2 + image: nextcloudci/integration-php7.0:integration-php7.0-3 commands: - cd build/integration - ./run.sh setup_features/setup.feature @@ -357,7 +357,7 @@ pipeline: matrix: TESTS: integration-setup-features integration-filesdrop-features: - image: nextcloudci/integration-php7.0:integration-php7.0-2 + image: nextcloudci/integration-php7.0:integration-php7.0-3 commands: - ./occ maintenance:install --admin-pass=admin - cd build/integration @@ -366,7 +366,7 @@ pipeline: matrix: TESTS: integration-filesdrop-features nodb-codecov: - image: nextcloudci/php7.0:php7.0-6 + image: nextcloudci/php7.0:php7.0-7 commands: - TEST_SELECTION=NODB ./autotest.sh sqlite - wget https://codecov.io/bash -O codecov.sh @@ -376,7 +376,7 @@ pipeline: matrix: TESTS: nodb-codecov db-codecov: - image: nextcloudci/php7.0:php7.0-6 + image: nextcloudci/php7.0:php7.0-7 commands: - TEST_SELECTION=QUICKDB ./autotest.sh sqlite - wget https://codecov.io/bash -O codecov.sh diff --git a/apps/dav/appinfo/info.xml b/apps/dav/appinfo/info.xml index f362c882f97..38f55062c73 100644 --- a/apps/dav/appinfo/info.xml +++ b/apps/dav/appinfo/info.xml @@ -23,6 +23,7 @@ <repair-steps> <post-migration> <step>OCA\DAV\Migration\FixBirthdayCalendarComponent</step> + <step>OCA\DAV\Migration\ValueFixInsert</step> </post-migration> </repair-steps> <commands> diff --git a/apps/dav/lib/Migration/ValueFix.php b/apps/dav/lib/Migration/ValueFix.php new file mode 100644 index 00000000000..2ad043b409d --- /dev/null +++ b/apps/dav/lib/Migration/ValueFix.php @@ -0,0 +1,71 @@ +<?php +/** + * @copyright 2016, Roeland Jago Douma <roeland@famdouma.nl> + * + * @author Roeland Jago Douma <roeland@famdouma.nl> + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +namespace OCA\DAV\Migration; + +use OC\BackgroundJob\QueuedJob; +use OCA\DAV\CalDAV\CalDavBackend; +use OCP\ILogger; +use Sabre\VObject\InvalidDataException; + +class ValueFix extends QueuedJob { + + /** @var CalDavBackend */ + private $calDavBackend; + + /** @var ILogger */ + private $logger; + + public function __construct(CalDavBackend $calDavBackend, ILogger $logger) { + $this->calDavBackend = $calDavBackend; + $this->logger = $logger; + } + + public function run($argument) { + $user = $argument['user']; + + $pattern = '/;VALUE=:/'; + $principal = 'principals/users/' . $user; + $calendars = $this->calDavBackend->getCalendarsForUser($principal); + foreach ($calendars as $calendar) { + $objects = $this->calDavBackend->getCalendarObjects($calendar['id']); + foreach ($objects as $object) { + $calObject = $this->calDavBackend->getCalendarObject($calendar['id'], $object['uri']); + $data = preg_replace($pattern, ':', $calObject['calendardata']); + if ($data !== $calObject['calendardata']) { + try { + $this->calDavBackend->getDenormalizedData($data); + } catch (InvalidDataException $e) { + $this->logger->info('Calendar object for calendar {cal} with uri {uri} still invalid', [ + 'app'=> 'dav', + 'cal' => $calendar['id'], + 'uri' => $object['uri'], + ]); + continue; + } + $this->calDavBackend->updateCalendarObject($calendar['id'], $object['uri'], $data); + } + } + } + } + +} diff --git a/apps/dav/lib/Migration/ValueFixInsert.php b/apps/dav/lib/Migration/ValueFixInsert.php new file mode 100644 index 00000000000..25917691b20 --- /dev/null +++ b/apps/dav/lib/Migration/ValueFixInsert.php @@ -0,0 +1,63 @@ +<?php +/** + * @copyright 2016, Roeland Jago Douma <roeland@famdouma.nl> + * + * @author Roeland Jago Douma <roeland@famdouma.nl> + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +namespace OCA\DAV\Migration; + +use OCP\BackgroundJob\IJobList; +use OCP\IConfig; +use OCP\IUser; +use OCP\IUserManager; +use OCP\Migration\IOutput; +use OCP\Migration\IRepairStep; + +class ValueFixInsert implements IRepairStep { + + /** @var IUserManager */ + private $userManager; + + /** @var IJobList */ + private $jobList; + + /** @var IConfig */ + private $config; + + public function __construct(IUserManager $userManager, + IJobList $jobList, + IConfig $config) { + $this->userManager = $userManager; + $this->jobList = $jobList; + $this->config = $config; + } + + public function getName() { + return 'Insert ValueFix background job for each user'; + } + + public function run(IOutput $output) { + if ($this->config->getAppValue('dav', self::class . '_ran', 'false') !== 'true') { + $this->userManager->callForSeenUsers(function (IUser $user) { + $this->jobList->add(ValueFix::class, ['user' => $user->getUID()]); + }); + $this->config->setAppValue('dav', self::class . '_ran', 'true'); + } + } +} diff --git a/apps/dav/tests/unit/Migration/ValueFixInsertTest.php b/apps/dav/tests/unit/Migration/ValueFixInsertTest.php new file mode 100644 index 00000000000..26152e7d01d --- /dev/null +++ b/apps/dav/tests/unit/Migration/ValueFixInsertTest.php @@ -0,0 +1,117 @@ +<?php +/** + * @copyright 2016, Roeland Jago Douma <roeland@famdouma.nl> + * + * @author Roeland Jago Douma <roeland@famdouma.nl> + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +namespace OCA\DAV\Tests\Unit\DAV\Migration; + +use OCA\DAV\Migration\ValueFix; +use OCA\DAV\Migration\ValueFixInsert; +use OCP\BackgroundJob\IJobList; +use OCP\IConfig; +use OCP\IUser; +use OCP\IUserManager; +use OCP\Migration\IOutput; +use Test\TestCase; + +class ValueFixInsertTest extends TestCase { + /** @var IUserManager|\PHPUnit_Framework_MockObject_MockObject */ + private $userManager; + + /** @var IJobList|\PHPUnit_Framework_MockObject_MockObject */ + private $jobList; + + /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ + private $config; + + /** @var ValueFixInsert */ + private $job; + + public function setUp() { + parent::setUp(); + + $this->userManager = $this->createMock(IUserManager::class); + $this->jobList = $this->createMock(IJobList::class); + $this->config = $this->createMock(IConfig::class); + $this->job = new ValueFixInsert( + $this->userManager, + $this->jobList, + $this->config + ); + } + + public function testGetName() { + $this->assertSame('Insert ValueFix background job for each user', $this->job->getName()); + } + + public function testRun() { + $user1 = $this->createMock(IUser::class); + $user1->method('getUID')->willReturn('user1'); + $user2 = $this->createMock(IUser::class); + $user2->method('getUID')->willReturn('user2'); + + $this->config->method('getAppValue') + ->with( + $this->equalTo('dav'), + $this->equalTo(ValueFixInsert::class.'_ran'), + $this->anything() + )->will($this->returnCallback(function($app, $key, $value) { + return $value; + })); + + $this->userManager->method('callForSeenUsers') + ->will($this->returnCallback(function(\Closure $function) use ($user1, $user2) { + $function($user1); + $function($user2); + })); + + $this->jobList->expects($this->at(0)) + ->method('add') + ->with( + $this->equalTo(ValueFix::class), + $this->equalTo(['user' => 'user1']) + ); + $this->jobList->expects($this->at(1)) + ->method('add') + ->with( + $this->equalTo(ValueFix::class), + $this->equalTo(['user' => 'user2']) + ); + + $this->job->run($this->createMock(IOutput::class)); + } + + public function testRunOnlyOnce() { + $this->config->method('getAppValue') + ->with( + $this->equalTo('dav'), + $this->equalTo(ValueFixInsert::class.'_ran'), + $this->anything() + )->willReturn('true'); + + $this->userManager->expects($this->never()) + ->method($this->anything());; + + $this->jobList->expects($this->never()) + ->method($this->anything()); + + $this->job->run($this->createMock(IOutput::class)); + } +} diff --git a/apps/dav/tests/unit/Migration/ValueFixTest.php b/apps/dav/tests/unit/Migration/ValueFixTest.php new file mode 100644 index 00000000000..58b6f79621f --- /dev/null +++ b/apps/dav/tests/unit/Migration/ValueFixTest.php @@ -0,0 +1,200 @@ +<?php +/** + * @copyright 2016, Roeland Jago Douma <roeland@famdouma.nl> + * + * @author Roeland Jago Douma <roeland@famdouma.nl> + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +namespace OCA\DAV\Tests\Unit\DAV\Migration; + +use OCA\DAV\CalDAV\CalDavBackend; +use OCA\DAV\Migration\ValueFix; +use OCP\ILogger; +use Sabre\VObject\InvalidDataException; +use Test\TestCase; + +class ValueFixTest extends TestCase { + + /** @var ILogger|\PHPUnit_Framework_MockObject_MockObject */ + private $logger; + + /** @var CalDavBackend|\PHPUnit_Framework_MockObject_MockObject */ + private $backend; + + /** @var string */ + private $invalid = 'BEGIN:VCALENDAR +VERSION:2.0 +PRODID:-//Apple Inc.//Mac OS X 10.11.2//EN +CALSCALE:GREGORIAN +BEGIN:VEVENT +TRANSP:OPAQUE +DTEND;VALUE=:20151223T223000Z +LAST-MODIFIED:20151214T091032Z +ORGANIZER;CN="User 1":mailto:user1@example.com +UID:1234567890@example.com +DTSTAMP:20151214T091032Z +STATUS:CONFIRMED +SEQUENCE:0 +SUMMARY:Ein Geburtstag +DTSTART;VALUE=:20151223T173000Z +X-APPLE-TRAVEL-ADVISORY-BEHAVIOR:AUTOMATIC +CREATED;VALUE=:20151214T091032Z +END:VEVENT +END:VCALENDAR'; + + /** @var string */ + private $valid = 'BEGIN:VCALENDAR +VERSION:2.0 +PRODID:-//Apple Inc.//Mac OS X 10.11.2//EN +CALSCALE:GREGORIAN +BEGIN:VEVENT +TRANSP:OPAQUE +DTEND:20151223T223000Z +LAST-MODIFIED:20151214T091032Z +ORGANIZER;CN="User 1":mailto:user1@example.com +UID:1234567890@example.com +DTSTAMP:20151214T091032Z +STATUS:CONFIRMED +SEQUENCE:0 +SUMMARY:Ein Geburtstag +DTSTART:20151223T173000Z +X-APPLE-TRAVEL-ADVISORY-BEHAVIOR:AUTOMATIC +CREATED:20151214T091032Z +END:VEVENT +END:VCALENDAR'; + + /** @var ValueFix */ + private $job; + + public function setUp() { + parent::setUp(); + + $this->logger = $this->createMock(ILogger::class); + $this->backend = $this->createMock(CalDavBackend::class); + $this->job = new ValueFix( + $this->backend, + $this->logger + ); + } + + public function testRunInvalid() { + $calendars = [['id' => 42]]; + $objects = [['uri' => 'myuri']]; + + $this->backend->method('getCalendarsForUser') + ->with($this->equalTo('principals/users/u1')) + ->willReturn($calendars); + + $this->backend->method('getCalendarObjects') + ->with($this->equalTo(42)) + ->willReturn($objects); + + $this->backend->method('getCalendarObject') + ->with( + $this->equalTo(42), + $this->equalTo('myuri') + )->willReturn([ + 'calendardata' => $this->invalid + ]); + + $this->backend->expects($this->once()) + ->method('getDenormalizedData') + ->with($this->valid); + + $this->backend->expects($this->once()) + ->method('updateCalendarObject') + ->with( + $this->equalTo(42), + $this->equalTo('myuri'), + $this->equalTo($this->valid) + ); + + $this->job->run(['user' => 'u1']); + } + + public function testRunValid() { + $calendars = [['id' => 42]]; + $objects = [['uri' => 'myuri']]; + + $this->backend->method('getCalendarsForUser') + ->with($this->equalTo('principals/users/u1')) + ->willReturn($calendars); + + $this->backend->method('getCalendarObjects') + ->with($this->equalTo(42)) + ->willReturn($objects); + + $this->backend->method('getCalendarObject') + ->with( + $this->equalTo(42), + $this->equalTo('myuri') + )->willReturn([ + 'calendardata' => $this->valid + ]); + + $this->backend->expects($this->never()) + ->method('getDenormalizedData'); + + $this->backend->expects($this->never()) + ->method('updateCalendarObject'); + + $this->job->run(['user' => 'u1']); + } + + public function testRunStillInvalid() { + $calendars = [['id' => 42]]; + $objects = [['uri' => 'myuri']]; + + $this->backend->method('getCalendarsForUser') + ->with($this->equalTo('principals/users/u1')) + ->willReturn($calendars); + + $this->backend->method('getCalendarObjects') + ->with($this->equalTo(42)) + ->willReturn($objects); + + $this->backend->method('getCalendarObject') + ->with( + $this->equalTo(42), + $this->equalTo('myuri') + )->willReturn([ + 'calendardata' => $this->invalid + ]); + + $this->backend->expects($this->once()) + ->method('getDenormalizedData') + ->with($this->valid) + ->willThrowException(new InvalidDataException()); + + $this->logger->expects($this->once()) + ->method('info') + ->with( + $this->equalTo('Calendar object for calendar {cal} with uri {uri} still invalid'), + $this->equalTo([ + 'app'=> 'dav', + 'cal' => 42, + 'uri' => 'myuri', + ]) + ); + + $this->backend->expects($this->never()) + ->method('updateCalendarObject'); + + $this->job->run(['user' => 'u1']); + } +} @@ -30,6 +30,13 @@ * */ +// Show warning if a PHP version below 5.6.0 is used +if (version_compare(PHP_VERSION, '5.6.0') === -1) { + echo 'This version of Nextcloud requires at least PHP 5.6.0<br/>'; + echo 'You are currently running ' . PHP_VERSION . '. Please update your PHP version.'; + return; +} + try { require_once __DIR__ . '/lib/base.php'; diff --git a/lib/private/Setup/MySQL.php b/lib/private/Setup/MySQL.php index 1a3119807d0..bafb3866b76 100644 --- a/lib/private/Setup/MySQL.php +++ b/lib/private/Setup/MySQL.php @@ -152,7 +152,7 @@ class MySQL extends AbstractDatabase { }; } } catch (\Exception $ex) { - $this->logger->error('Specific user creation failed: {error}', [ + $this->logger->info('Can not create a new MySQL user, will continue with the provided user: {error}', [ 'app' => 'mysql.setup', 'error' => $ex->getMessage() ]); diff --git a/settings/personal.php b/settings/personal.php index 27c1a25653d..a5cf88a781d 100644 --- a/settings/personal.php +++ b/settings/personal.php @@ -196,7 +196,7 @@ $tmpl->assign('groups', $groups2); // add hardcoded forms from the template $formsAndMore = []; -$formsAndMore[]= ['anchor' => 'avatar', 'section-name' => $l->t('Personal info')]; +$formsAndMore[]= ['anchor' => 'personal-settings', 'section-name' => $l->t('Personal info')]; $formsAndMore[]= ['anchor' => 'sessions', 'section-name' => $l->t('Sessions')]; $formsAndMore[]= ['anchor' => 'apppasswords', 'section-name' => $l->t('App passwords')]; $formsAndMore[]= ['anchor' => 'clientsbox', 'section-name' => $l->t('Sync clients')]; |