Merge branch 'release/2.1.0'

Author: jalendport

CHANGELOG.md

@@ -4,46 +4,50 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 2.1.0 - 2024-07-11
+### Changed
+- Migrated to `jalendport/craft-preparse`
+
 ## 2.0.2 - 2022-12-05
 ### Fixed
 - Updated reference to Twigfield
 
 ## 2.0.1 - 2022-12-02
 ### Changed
-- Updated to use craft-code-editor instead of craft-twigfield ([#87](https://github.com/besteadfast/craft-preparse-field/pull/87) - thanks @khalwat)
+- Updated to use craft-code-editor instead of craft-twigfield ([#87](https://github.com/jalendport/craft-preparse/pull/87) - thanks @khalwat)
 
 ## 2.0.0 - 2022-08-08
 ### Added
 - Initial Craft 4 release
 
 ## 1.4.1 - 2022-12-02
 ### Changed
-- Updated to use craft-code-editor instead of craft-twigfield ([#86](https://github.com/besteadfast/craft-preparse-field/pull/86) - thanks @khalwat)
+- Updated to use craft-code-editor instead of craft-twigfield ([#86](https://github.com/jalendport/craft-preparse/pull/86) - thanks @khalwat)
 
 ## 1.4.0 - 2022-08-08
 ### Added
-- Added support for craft-twigfield ([#81](https://github.com/besteadfast/craft-preparse-field/pull/81) - thanks @khalwat)
+- Added support for craft-twigfield ([#81](https://github.com/jalendport/craft-preparse/pull/81) - thanks @khalwat)
 
 ## 1.3.0 - 2022-08-06
 ### Added
-- Added datetime column type option ([#63](https://github.com/besteadfast/craft-preparse-field/pull/63) - thanks @mmikkel)
+- Added datetime column type option ([#63](https://github.com/jalendport/craft-preparse/pull/63) - thanks @mmikkel)
 
 ## 1.2.5 - 2021-07-02
 ### Fixed
-- Reverted [#66](https://github.com/besteadfast/craft-preparse-field/pull/66) due to bug where sometimes the element couldn't be re-fetched from the database ([#70](https://github.com/besteadfast/craft-preparse-field/issues/70), [#71](https://github.com/besteadfast/craft-preparse-field/issues/71), [#72](https://github.com/besteadfast/craft-preparse-field/issues/72), [#73](https://github.com/besteadfast/craft-preparse-field/issues/73))
-- Fixed a bug causing missing Matrix blocks on elements in certain cases ([#69](https://github.com/besteadfast/craft-preparse-field/issues/69))
+- Reverted [#66](https://github.com/jalendport/craft-preparse/pull/66) due to bug where sometimes the element couldn't be re-fetched from the database ([#70](https://github.com/jalendport/craft-preparse/issues/70), [#71](https://github.com/jalendport/craft-preparse/issues/71), [#72](https://github.com/jalendport/craft-preparse/issues/72), [#73](https://github.com/jalendport/craft-preparse/issues/73))
+- Fixed a bug causing missing Matrix blocks on elements in certain cases ([#69](https://github.com/jalendport/craft-preparse/issues/69))
 
 ## 1.2.4 - 2021-02-24
 ### Fixed
-- Fixed a bug preventing elements from saving successfully in certain multisite setups ([#70](https://github.com/besteadfast/craft-preparse-field/pull/70))
+- Fixed a bug preventing elements from saving successfully in certain multisite setups ([#70](https://github.com/jalendport/craft-preparse/pull/70))
 
 ## 1.2.3 - 2021-02-23
 ### Fixed
-- Fixed a bug causing missing Matrix blocks on new elements ([#66](https://github.com/besteadfast/craft-preparse-field/pull/66) - thanks @monachilada)
+- Fixed a bug causing missing Matrix blocks on new elements ([#66](https://github.com/jalendport/craft-preparse/pull/66) - thanks @monachilada)
 
 ## 1.2.2 - 2020-11-30
 ### Fixed
-- Fixed a bug causing missing Matrix blocks on revisions ([#65](https://github.com/besteadfast/craft-preparse-field/pull/65) - thanks @brandonkelly)
+- Fixed a bug causing missing Matrix blocks on revisions ([#65](https://github.com/jalendport/craft-preparse/pull/65) - thanks @brandonkelly)
 
 ## 1.2.1 - 2020-06-25
 ### Fixed

LICENSE.md

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) Steadfast Design Firm
+Copyright (c) Jalen Davenport
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

README.md

@@ -16,7 +16,7 @@ To install the plugin, follow these instructions.
 
 2. Then tell Composer to load the plugin:
 
-        composer require besteadfast/craft-preparse-field
+        composer require jalendport/craft-preparse
 
 3. In the Control Panel, go to Settings → Plugins and click the “Install” button for Preparse Field.
 
@@ -77,4 +77,4 @@ The plugin is released under the MIT license, meaning you can do whatever you wa
 
 ## Changelog
 
-See the [changelog file](https://github.com/besteadfast/craft-preparse-field/blob/master/CHANGELOG.md).
+See the [changelog file](https://github.com/jalendport/craft-preparse/blob/master/CHANGELOG.md).

composer.json

@@ -1,8 +1,8 @@
 {
-	"name": "besteadfast/craft-preparse-field",
+	"name": "jalendport/craft-preparse",
 	"description": "A fieldtype that parses Twig when an element is saved and saves the result as plain text.",
 	"type": "craft-plugin",
-	"version": "2.0.2",
+	"version": "2.1.0",
 	"keywords": [
 		"craft",
 		"cms",
@@ -13,14 +13,14 @@
 		"twig"
 	],
 	"support": {
-		"docs": "https://github.com/besteadfast/craft-preparse-field/blob/master/README.md",
-		"issues": "https://github.com/besteadfast/craft-preparse-field/issues"
+		"docs": "https://github.com/jalendport/craft-preparse/blob/master/README.md",
+		"issues": "https://github.com/jalendport/craft-preparse/issues"
 	},
 	"license": "MIT",
 	"authors": [
 		{
-			"name": "Steadfast Design Firm",
-			"homepage": "https://www.steadfastdesignfirm.com/"
+			"name": "Jalen Davenport",
+			"homepage": "https://jalendport.com/"
 		},
 		{
 			"name": "André Elvan",
@@ -34,19 +34,12 @@
 	},
 	"autoload": {
 		"psr-4": {
-			"besteadfast\\preparsefield\\": "src/"
+			"jalendport\\preparse\\": "src/"
 		}
 	},
 	"extra": {
-		"name": "Preparse Field",
+		"name": "Preparse",
 		"handle": "preparse-field",
-		"schemaVersion": "1.0.5",
-		"hasCpSettings": false,
-		"hasCpSection": false,
-		"changelogUrl": "https://github.com/besteadfast/craft-preparse-field/blob/master/CHANGELOG.md",
-		"components": {
-			"preparseFieldService": "besteadfast\\preparsefield\\services\\PreparseFieldService"
-		},
-		"class": "besteadfast\\preparsefield\\PreparseField"
+		"class": "jalendport\\preparse\\PreparseField"
 	}
 }

src/PreparseField.php

@@ -1,15 +1,12 @@
 <?php
 /**
  * Preparse Field plugin for Craft CMS 4.x
- *
- * @link      https://www.steadfastdesignfirm.com/
- * @copyright Copyright (c) Steadfast Design Firm
  */
 
-namespace besteadfast\preparsefield;
+namespace jalendport\preparse;
 
-use besteadfast\preparsefield\fields\PreparseFieldType;
-use besteadfast\preparsefield\services\PreparseFieldService as PreparseFieldServiceService;
+use jalendport\preparse\fields\PreparseFieldType;
+use jalendport\preparse\services\PreparseFieldService;
 use Craft;
 use craft\base\Element;
 use craft\base\Plugin;
@@ -29,14 +26,13 @@
 /**
  * Preparse field plugin
  *
- * @author    Steadfast Design Firm
- * @package   PreparseField
- * @since     1.0.0
- *
- * @property  PreparseFieldServiceService $preparseFieldService
+ * @property  PreparseFieldService $preparseFieldService
  */
 class PreparseField extends Plugin
 {
+
+	public string $schemaVersion = '1.1.0';
+
     /**
      * Static property that is an instance of this plugin class so that it can be accessed via
      * PreparseField::$plugin
@@ -116,7 +112,7 @@ function (ModelEvent $event) {
                 }
 
                 $key = $element->id . '__' . $element->siteId;
-                    
+
                 if (!isset($this->preparsedElements['onPropagate'][$key])) {
                     $this->preparsedElements['onPropagate'][$key] = true;
 
@@ -204,7 +200,7 @@ public static function error($msg, string $level = 'error', string $file = 'Prep
     /**
      * Fix file uploads being processed twice by craft, which causes an error.
      *
-     * @see https://github.com/besteadfast/craft-preparse-field/issues/23#issuecomment-284682292
+     * @see https://github.com/jalendport/craft-preparse/issues/23#issuecomment-284682292
      */
     private function resetUploads()
     {

src/fields/PreparseFieldType.php

@@ -1,12 +1,9 @@
 <?php
 /**
  * Preparse Field plugin for Craft CMS 4.x
- *
- * @link      https://www.steadfastdesignfirm.com/
- * @copyright Copyright (c) Steadfast Design Firm
  */
 
-namespace besteadfast\preparsefield\fields;
+namespace jalendport\preparse\fields;
 
 use Craft;
 use craft\base\ElementInterface;
@@ -28,11 +25,7 @@
 use yii\base\InvalidConfigException;
 
 /**
- *  Preparse field type
- *
- * @author    Steadfast Design Firm
- * @package   PreparseField
- * @since     1.0.0
+ * Preparse field type
  *
  * @property string $contentColumnType
  * @property null|string $settingsHtml

src/migrations/m190226_225259_craft3.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace besteadfast\preparsefield\migrations;
+namespace jalendport\preparse\migrations;
 
-use besteadfast\preparsefield\fields\PreparseFieldType;
+use jalendport\preparse\fields\PreparseFieldType;
 use craft\db\Migration;
 
 /**

src/migrations/m240711_230833_jalendport.php

@@ -0,0 +1,60 @@
+<?php
+
+namespace jalendport\preparse\migrations;
+
+use Craft;
+use craft\db\Migration;
+use jalendport\preparse\fields\PreparseFieldType;
+use yii\base\ErrorException;
+use yii\base\Exception;
+
+/**
+ * m240711_230833_jalendport migration.
+ */
+class m240711_230833_jalendport extends Migration
+{
+    /**
+     * @inheritdoc
+     */
+    public function safeUp(): bool
+    {
+		$oldType = 'besteadfast\preparsefield\fields\PreparseFieldType';
+
+        $this->update('{{%fields}}', ['type'=> PreparseFieldType::class], ['type' => $oldType]);
+
+		// Don’t make the same config changes twice
+		$projectConfig = Craft::$app->getProjectConfig();
+		$schemaVersion = $projectConfig->get('plugins.preparse-field.schemaVersion', true);
+
+		if (version_compare($schemaVersion, '1.1.0', '>='))
+		{
+			return true;
+		}
+
+		$fields = $projectConfig->get('fields') ?? [];
+
+		foreach ($fields as $fieldUid => $field)
+		{
+			if ($field['type'] === $oldType)
+			{
+				$field['type'] = PreparseFieldType::class;
+				try {
+					$projectConfig->set("fields.{$fieldUid}", $field);
+				} catch (Exception|ErrorException $e) {
+					return false;
+				}
+			}
+		}
+
+        return true;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function safeDown(): bool
+    {
+        echo "m240711_230833_jalendport cannot be reverted.\n";
+        return false;
+    }
+}

src/services/PreparseFieldService.php

@@ -1,14 +1,11 @@
 <?php
 /**
  * Preparse Field plugin for Craft CMS 4.x
- *
- * @link      https://www.steadfastdesignfirm.com/
- * @copyright Copyright (c) Steadfast Design Firm
  */
 
-namespace besteadfast\preparsefield\services;
+namespace jalendport\preparse\services;
 
-use besteadfast\preparsefield\fields\PreparseFieldType;
+use jalendport\preparse\fields\PreparseFieldType;
 use Craft;
 use craft\base\Component;
 use craft\base\Element;
@@ -26,10 +23,6 @@
  * and other plugins can interact with.
  *
  * https://craftcms.com/docs/plugins/services
- *
- * @author    Steadfast Design Firm
- * @package   PreparseField
- * @since     1.0.0
  */
 class PreparseFieldService extends Component
 {

src/templates/_components/fields/_input.twig

@@ -2,13 +2,7 @@
 /**
  * Preparse Field plugin for Craft CMS 4.x
  *
- *  Field Input
- *
- * @author    Steadfast Design Firm
- * @copyright Copyright (c) Steadfast Design Firm
- * @link      https://www.steadfastdesignfirm.com/
- * @package   PreparseField
- * @since     1.0.0
+ * Field Input
  */
 #}