Merge pull request #6131 from getkirby/release/4.0.3

4.0.3

composer.json

@@ -3,7 +3,7 @@
 	"description": "The Kirby core",
 	"license": "proprietary",
 	"type": "kirby-cms",
-	"version": "4.0.2",
+	"version": "4.0.3",
 	"keywords": [
 		"kirby",
 		"cms",

i18n/translations/de.json

@@ -98,7 +98,7 @@
 	"error.file.changeName.empty": "Bitte gib einen Namen an",
 	"error.file.changeName.permission": "Du darfst den Dateinamen von \"{filename}\" nicht ändern",
 	"error.file.changeTemplate.invalid": "Die Vorlage für die Datei \"{id}\" kann nicht zu \"{template}\" geändert werden (gültig: \"{blueprints}\")",
-	"error.file.changeTemplate.permission": "Du kannst die Voralge für die Datei \"{id}\" nicht ändern",
+	"error.file.changeTemplate.permission": "Du kannst die Vorlage für die Datei \"{id}\" nicht ändern",
 
 	"error.file.duplicate": "Eine Datei mit dem Dateinamen \"{filename}\" besteht bereits",
 	"error.file.extension.forbidden": "Verbotene Dateiendung \"{extension}\"",

i18n/translations/it.json

@@ -535,7 +535,7 @@
 	"page.changeStatus.select": "Seleziona un nuovo stato",
 	"page.changeTemplate": "Cambia template",
 	"page.changeTemplate.notice": "Changing the page's template will remove content for fields that don't match in type. Use with caution.",
-	"page.create": "Create as {status}",
+	"page.create": "Crea come \"{status}\"",
 	"page.delete.confirm": "Sei sicuro di voler eliminare questa pagina?",
 	"page.delete.confirm.subpages": "<strong>Questa pagina ha sottopagine</strong>. <br>Anche tutte le sottopagine verranno eliminate.",
 	"page.delete.confirm.title": "Inserisci il titolo della pagina per confermare",

i18n/translations/tr.json

@@ -135,7 +135,7 @@
 
 	"error.license.domain": "Lisans için alan adı eksik",
 	"error.license.email": "Lütfen geçerli bir e-posta adresi girin",
-	"error.license.format": "Please enter a valid license code",
+	"error.license.format": "Lütfen geçerli bir lisans anahtarı girin",
 	"error.license.verification": "Lisans doğrulanamadı",
 
 	"error.login.totp.confirm.invalid": "Geçersiz kod",
@@ -425,7 +425,7 @@
 	"license.code.label": "Lütfen lisans kodunu giriniz",
 	"license.status.active.info": "{date} tarihine kadar yeni ana sürümleri içerir",
 	"license.status.active.label": "Geçerli lisans",
-	"license.status.demo.info": "This is a demo installation",
+	"license.status.demo.info": "Bu bir demo kurulumudur",
 	"license.status.demo.label": "Demo",
 	"license.status.inactive.info": "Yeni ana sürümlere güncellemek için lisansı yenileyin",
 	"license.status.inactive.label": "Yeni ana sürüm yok",

src/Cms/App.php

@@ -437,8 +437,6 @@ public function contentToken(mixed $model, string $value): string
 	/**
 	 * Calls a page controller by name
 	 * and with the given arguments
-	 *
-	 * @internal
 	 */
 	public function controller(
 		string $name,

src/Cms/License.php

@@ -391,7 +391,7 @@ public function request(string $path, array $data): array
 	 */
 	public function save(): bool
 	{
-		if ($this->status() !== LicenseStatus::Active) {
+		if ($this->status()->activatable() !== true) {
 			throw new InvalidArgumentException([
 				'key' => 'license.verification'
 			]);

src/Cms/LicenseStatus.php

@@ -43,6 +43,22 @@ enum LicenseStatus: string
 	 */
 	case Missing = 'missing';
 
+	/**
+	 * Checks if the license can be saved when it
+	 * was entered in the activation dialog;
+	 * renewable licenses are accepted as well
+	 * to allow renewal from the Panel
+	 */
+	public function activatable(): bool
+	{
+		return match ($this) {
+			static::Active,
+			static::Inactive,
+			static::Legacy    => true,
+			default           => false
+		};
+	}
+
 	/**
 	 * Returns the dialog according to the status
 	 */
@@ -95,7 +111,7 @@ public function label(): string
 	public function renewable(): bool
 	{
 		return match ($this) {
-			static::Demo   => false,
+			static::Demo,
 			static::Active => false,
 			default        => true
 		};

src/Http/Environment.php

@@ -753,6 +753,10 @@ public function isLocal(): bool
 			return true;
 		}
 
+		if (Str::endsWith($host, '.ddev.site') === true) {
+			return true;
+		}
+
 		// collect all possible visitor ips
 		$ips = [
 			$this->get('REMOTE_ADDR'),

src/Http/Url.php

@@ -186,7 +186,7 @@ public static function short(
 		$uri->slash = false;
 
 		$url = $base ? $uri->base() : $uri->toString();
-		$url = str_replace('www.', '', $url);
+		$url = str_replace('www.', '', $url ?? '');
 
 		return Str::short($url, $length, $rep);
 	}

tests/Cms/System/LicenseTest.php

@@ -402,7 +402,7 @@ public function testRenewal()
 	/**
 	 * @covers ::save
 	 */
-	public function testSaveWhenNotActive()
+	public function testSaveWhenNotActivatable()
 	{
 		$license = new License();
 

tests/Http/EnvironmentTest.php

@@ -1050,6 +1050,7 @@ public function providerForServerNames()
 			['localhost', true],
 			['mydomain.local', true],
 			['mydomain.test', true],
+			['mydomain.ddev.site', true],
 			['mydomain.com', false],
 			['mydomain.dev', false],
 		];

tests/Option/OptionsApiTest.php

@@ -16,7 +16,7 @@ class OptionsApiTest extends TestCase
 	 */
 	public function testConstruct()
 	{
-		$options = new OptionsApi($url = 'https://api.getkirby.com');
+		$options = new OptionsApi($url = 'https://api.example.com');
 		$this->assertSame($url, $options->url);
 		$this->assertNull($options->query);
 		$this->assertNull($options->text);
@@ -28,7 +28,7 @@ public function testConstruct()
 	 */
 	public function testDefaults()
 	{
-		$options = new OptionsApi($url = 'https://api.getkirby.com');
+		$options = new OptionsApi($url = 'https://api.example.com');
 		$this->assertSame($url, $options->url);
 		$this->assertNull($options->text);
 		$this->assertNull($options->value);
@@ -46,7 +46,7 @@ public function testDefaults()
 	public function testFactory()
 	{
 		$options = OptionsApi::factory([
-			'url'   => $url = 'https://api.getkirby.com',
+			'url'   => $url = 'https://api.example.com',
 			'query' => $query = 'Companies',
 			'text'  => $text = '{{ item.name }}',
 			'value' => $value =  '{{ item.id }}',
@@ -57,7 +57,7 @@ public function testFactory()
 		$this->assertSame($text, $options->text);
 		$this->assertSame($value, $options->value);
 
-		$options = OptionsApi::factory($url = 'https://api.getkirby.com');
+		$options = OptionsApi::factory($url = 'https://api.example.com');
 		$this->assertSame($url, $options->url);
 		$this->assertNull($options->query);
 		$this->assertNull($options->text);
@@ -67,12 +67,12 @@ public function testFactory()
 	/**
 	 * @covers ::load
 	 */
-	public function testLoadNotFound()
+	public function testLoadNoJson()
 	{
 		$model   = new Page(['slug' => 'test']);
-		$options = new OptionsApi(url: 'https://api.getkirby.com');
+		$options = new OptionsApi(url: 'https://example.com');
 		$this->expectException(NotFoundException::class);
-		$this->expectExceptionMessage('Options could not be loaded from API: https://api.getkirby.com');
+		$this->expectExceptionMessage('Options could not be loaded from API: https://example.com');
 		$options->resolve($model);
 	}
 
@@ -81,10 +81,10 @@ public function testLoadNotFound()
 	 */
 	public function testPolyfill()
 	{
-		$api = 'https//api.getkirby.com';
+		$api = 'https://api.example.com';
 		$this->assertSame(['url' => $api], OptionsApi::polyfill($api));
 
-		$api = ['url' => 'https//api.getkirby.com'];
+		$api = ['url' => 'https://api.example.com'];
 		$this->assertSame($api, OptionsApi::polyfill($api));
 
 		$api = ['fetch' => 'Companies'];