Merge pull request #27 from davidwebca/master

Upgrading for Craft 4.0

composer.json

@@ -22,7 +22,7 @@
     }
   ],
   "require": {
-    "craftcms/cms": "^3.0.0-RC17"
+    "craftcms/cms": "^4.0"
   },
   "autoload": {
     "psr-4": {

src/TagManager.php

@@ -41,11 +41,11 @@ class TagManager extends Plugin
 	// Properties
 	// =========================================================================
 
-	public $schemaVersion = '1.0.0';
+	public string $schemaVersion = '1.0.0';
 
-	public $hasCpSettings = true;
+	public bool $hasCpSettings = true;
 
-	public $hasCpSection  = true;
+	public bool $hasCpSection  = true;
 
 	// Init
 	// =========================================================================
@@ -88,7 +88,7 @@ public function init ()
 	// Craft
 	// =========================================================================
 
-	public function getCpNavItem ()
+	public function getCpNavItem (): ?array
 	{
 		$item = parent::getCpNavItem();
 
@@ -106,7 +106,7 @@ protected function createSettingsModel (): Settings
 	/**
 	 * @return bool|Model|null
 	 */
-	public function getSettings ()
+	public function getSettings (): ?Model
 	{
 		return parent::getSettings();
 	}
@@ -117,7 +117,7 @@ public function getSettings ()
 	 * @throws RuntimeError
 	 * @throws SyntaxError|Exception
 	 */
-	protected function settingsHtml ()
+	protected function settingsHtml (): ?string
 	{
 		return Craft::$app->getView()->renderTemplate('tag-manager/_settings', [
 			'settings' => $this->getSettings(),

src/elements/Tag.php

@@ -37,7 +37,7 @@ class Tag extends \craft\elements\Tag
 	// Methods
 	// =========================================================================
 
-	public static function find (): ElementQueryInterface
+	public static function find (): TagQuery
 	{
 		return new TagQuery(static::class);
 	}
@@ -46,7 +46,7 @@ public static function find (): ElementQueryInterface
 	 * @return null|string
 	 * @throws InvalidConfigException
 	 */
-	public function getCpEditUrl ()
+	public function getCpEditUrl (): ?string
 	{
 		$url = UrlHelper::cpUrl(
 			'tags/' . $this->group->handle . '/' . $this->id

src/elements/actions/Delete.php

@@ -53,7 +53,7 @@ public function getTriggerLabel (): string
 	 * @throws \yii\base\Exception
 	 * @throws InvalidConfigException
 	 */
-	public function getTriggerHtml ()
+	public function getTriggerHtml (): ?string
 	{
 		$type = Json::encode(static::class);
 		$redirect = Json::encode(Craft::$app->security->hashData('tags'));
@@ -101,6 +101,8 @@ function(response, textStatus) {
 
 		Craft::$app->view->registerAssetBundle(DeleteTagAsset::class);
 		Craft::$app->view->registerJs($js);
+
+		return '';
 	}
 
 	/**

src/templates/_edit.twig

@@ -107,7 +107,7 @@
 		}) }}
 
 		{% include "_includes/fields" with {
-			fields:  tag.group.getFieldLayout().getFields(),
+			fields:  tag.group.getFieldLayout().getCustomFields(),
 			element: tag,
 		} only %}
 	</div>