Merge pull request #11069 from nextcloud/release/14.0.0

14.0.0 final

apps/dav/lib/CalDAV/Plugin.php

@@ -28,10 +28,16 @@ class Plugin extends \Sabre\CalDAV\Plugin {
 	const SYSTEM_CALENDAR_ROOT = 'system-calendars';
 
 	/**
-	 * @inheritdoc
+	 * Returns the path to a principal's calendar home.
+	 *
+	 * The return url must not end with a slash.
+	 * This function should return null in case a principal did not have
+	 * a calendar home.
+	 *
+	 * @param string $principalUrl
+	 * @return string|null
 	 */
-	function getCalendarHomeForPrincipal($principalUrl):string {
-
+	function getCalendarHomeForPrincipal($principalUrl) {
 		if (strrpos($principalUrl, 'principals/users', -strlen($principalUrl)) !== false) {
 			list(, $principalId) = \Sabre\Uri\split($principalUrl);
 			return self::CALENDAR_ROOT . '/' . $principalId;
@@ -44,8 +50,6 @@ class Plugin extends \Sabre\CalDAV\Plugin {
 			list(, $principalId) = \Sabre\Uri\split($principalUrl);
 			return self::SYSTEM_CALENDAR_ROOT . '/calendar-rooms/' . $principalId;
 		}
-
-		throw new \LogicException('This is not supposed to happen');
 	}
 
 }

apps/dav/lib/CardDAV/Plugin.php

@@ -39,10 +39,9 @@ class Plugin extends \Sabre\CardDAV\Plugin {
 	 * Returns the addressbook home for a given principal
 	 *
 	 * @param string $principal
-	 * @return string
+	 * @return string|null
 	 */
 	protected function getAddressbookHomeForPrincipal($principal) {
-
 		if (strrpos($principal, 'principals/users', -strlen($principal)) !== false) {
 			list(, $principalId) = \Sabre\Uri\split($principal);
 			return self::ADDRESSBOOK_ROOT . '/users/' . $principalId;
@@ -55,8 +54,6 @@ class Plugin extends \Sabre\CardDAV\Plugin {
 			list(, $principalId) = \Sabre\Uri\split($principal);
 			return self::ADDRESSBOOK_ROOT . '/system/' . $principalId;
 		}
-
-		throw new \LogicException('This is not supposed to happen');
 	}
 
 	/**

apps/dav/tests/unit/CalDAV/PluginTest.php

@@ -63,11 +63,7 @@ class PluginTest extends TestCase  {
 		$this->assertSame($expected, $this->plugin->getCalendarHomeForPrincipal($input));
 	}
 
-	/**
-	 * @expectedException        \LogicException
-	 * @expectedExceptionMessage This is not supposed to happen
-	 */
 	public function testGetCalendarHomeForUnknownPrincipal() {
-		$this->plugin->getCalendarHomeForPrincipal('FOO/BAR/BLUB');
+		$this->assertNull($this->plugin->getCalendarHomeForPrincipal('FOO/BAR/BLUB'));
 	}
 }

core/css/variables.scss

@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
- 
+
  // SCSS darken/lighten function override
 @function nc-darken($color, $value) {
 	@return darken($color, $value);
@@ -60,8 +60,8 @@ $color-text-maxcontrast: nc-lighten($color-main-text, 46.2%) !default;
 $color-text-light: nc-lighten($color-main-text, 15%) !default;
 $color-text-lighter: nc-lighten($color-main-text, 30%) !default;
 
-$image-logo: url('../img/logo.svg?v=1');
-$image-login-background: url('../img/background.png?v=2');
+$image-logo: url('../img/logo.svg?v=1') !default;
+$image-login-background: url('../img/background.png?v=2') !default;
 
 $color-loading-light: #ccc !default;
 $color-loading-dark: #777 !default;

version.php

@@ -29,10 +29,10 @@
 // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
 // when updating major/minor version number.
 
-$OC_Version = array(14, 0, 0, 18);
+$OC_Version = array(14, 0, 0, 19);
 
 // The human readable string
-$OC_VersionString = '14.0.0 RC 2';
+$OC_VersionString = '14.0.0';
 
 $OC_VersionCanBeUpgradedFrom = [
 	'nextcloud' => [