feat: Add Cms\License::delete() & ::root()

Author: distantnative

src/Cms/License.php

@@ -30,6 +30,8 @@ class License
 
 	protected const SALT = 'kwAHMLyLPBnHEskzH9pPbJsBxQhKXZnX';
 
+	protected App $kirby;
+
 	// cache
 	protected LicenseStatus $status;
 	protected LicenseType $type;
@@ -50,6 +52,8 @@ public function __construct(
 		if ($email !== null) {
 			$this->email = $this->normalizeEmail($email);
 		}
+
+		$this->kirby = App::instance();
 	}
 
 	/**
@@ -100,6 +104,15 @@ public function date(
 		return $this->date !== null ? Str::date(strtotime($this->date), $format, $handler) : null;
 	}
 
+	/**
+	 * Deletes the license file if it exists
+	 * @since 5.0.0
+	 */
+	public function delete(): bool
+	{
+		return F::remove($this->root());
+	}
+
 	/**
 	 * Returns the activation domain if available
 	 */
@@ -179,7 +192,7 @@ public function isLegacy(): bool
 		}
 
 		// get release date of current major version
-		$major   = Str::before(App::instance()->version(), '.');
+		$major   = Str::before($this->kirby->version(), '.');
 		$release = strtotime(static::HISTORY[$major] ?? '');
 
 		// if there's no matching version in the history
@@ -219,7 +232,7 @@ public function isOnCorrectDomain(): bool
 		}
 
 		// compare domains
-		if ($this->normalizeDomain(App::instance()->system()->indexUrl()) !== $this->normalizeDomain($this->domain)) {
+		if ($this->normalizeDomain($this->kirby->system()->indexUrl()) !== $this->normalizeDomain($this->domain)) {
 			return false;
 		}
 
@@ -236,7 +249,7 @@ public function isSigned(): bool
 		}
 
 		// get the public key
-		$pubKey = F::read(App::instance()->root('kirby') . '/kirby.pub');
+		$pubKey = F::read($this->kirby->root('kirby') . '/kirby.pub');
 
 		// verify the license signature
 		$data      = json_encode($this->signatureData());
@@ -328,7 +341,7 @@ public static function polyfill(array $license): array
 	public static function read(): static
 	{
 		try {
-			$license = Json::read(App::instance()->root('license'));
+			$license = Json::read(static::root());
 		} catch (Throwable) {
 			return new static();
 		}
@@ -409,6 +422,15 @@ public function request(string $path, array $data): array
 		// @codeCoverageIgnoreEnd
 	}
 
+	/**
+	 * Returns the root path to the license file
+	 * @since 5.0.0
+	 */
+	public static function root(): string
+	{
+		return App::instance()->root('license');
+	}
+
 	/**
 	 * Saves the license in the config folder
 	 */
@@ -420,11 +442,11 @@ public function save(): bool
 			);
 		}
 
-		// where to store the license file
-		$file = App::instance()->root('license');
-
 		// save the license information
-		return Json::write($file, $this->content());
+		return Json::write(
+			file: $this->root(),
+			data: $this->content()
+		);
 	}
 
 	/**

tests/Cms/System/LicenseTest.php

@@ -3,6 +3,7 @@
 namespace Kirby\Cms;
 
 use Kirby\Exception\InvalidArgumentException;
+use Kirby\Filesystem\F;
 use Kirby\Toolkit\Str;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\DataProvider;
@@ -85,6 +86,16 @@ public function testDate(): void
 		$this->assertSame('1/12/2023 00:00', $license->date('d/M/yyyy HH:mm', 'intl'));
 	}
 
+	public function testDelete(): void
+	{
+		$license = new License();
+		F::write($license->root(), 'test');
+
+		$this->assertFileExists($license->root());
+		$this->assertTrue($license->delete());
+		$this->assertFileDoesNotExist($license->root());
+	}
+
 	public function testDomain(): void
 	{
 		$license = new License(
@@ -357,6 +368,14 @@ public function testRenewal(): void
 		$this->assertNull($license->renewal('Y-m-d'));
 	}
 
+	public function testRoot(): void
+	{
+		$this->assertSame(
+			App::instance()->root('license'),
+			License::root()
+		);
+	}
+
 	public function testSaveWhenNotActivatable(): void
 	{
 		$license = new License();