Merge pull request #4 from jeyroik/development

Up to installer v3
jeyroik · Jun 4, 2020 · 996cd09 · 996cd09
2 parents 259f826 + 12a0b14
commit 996cd09
Show file tree

Hide file tree

Showing 12 changed files with 189 additions and 109 deletions.
diff --git a/composer.json b/composer.json
@@ -3,15 +3,16 @@
   "description": "Extas fields package",
   "require": {
     "jeyroik/extas-base": "2.*",
-    "jeyroik/extas-samples": "2.*",
+    "jeyroik/extas-samples": "3.*",
     "jeyroik/extas-repositories-get": "0.*",
     "jeyroik/extas-repositories-fields-uuid": "0.*"
   },
   "require-dev": {
     "phpunit/phpunit": "^9",
     "vlucas/phpdotenv": "^3.4",
     "jeyroik/extas-repositories-mongo": "1.*",
-    "jeyroik/extas-snuffbox": "0.*"
+    "jeyroik/extas-snuffbox": "0.*",
+    "jeyroik/extas-installer": "*"
   },
   "autoload": {
     "psr-4": {

diff --git a/extas.json b/extas.json
@@ -1,48 +1,56 @@
 {
   "name": "extas/fields",
+  "installer_version": 3,
   "package_classes": [
-    {
-      "interface": "extas\\interfaces\\fields\\IFieldRepository",
-      "class": "extas\\components\\fields\\FieldRepository"
-    },
     {
       "interface": "fieldRepository",
       "class": "extas\\components\\fields\\FieldRepository"
     },
-    {
-      "interface": "extas\\interfaces\\fields\\IFieldSampleRepository",
-      "class": "extas\\components\\fields\\FieldSampleRepository"
-    },
     {
       "interface": "fieldSampleRepository",
       "class": "extas\\components\\fields\\FieldSampleRepository"
     },
-    {
-      "interface": "extas\\interfaces\\fields\\types\\IFieldTypeRepository",
-      "class": "extas\\components\\fields\\types\\FieldTypeRepository"
-    },
     {
       "interface": "fieldTypeRepository",
       "class": "extas\\components\\fields\\types\\FieldTypeRepository"
     },
-    {
-      "interface": "extas\\interfaces\\fields\\types\\IFieldTypeSampleRepository",
-      "class": "extas\\components\\fields\\types\\FieldTypeSampleRepository"
-    },
     {
       "interface": "fieldTypeSampleRepository",
       "class": "extas\\components\\fields\\types\\FieldTypeSampleRepository"
     }
   ],
   "plugins": [
     {
-      "class": [
-        "extas\\components\\plugins\\PluginInstallFieldsSamples",
-        "extas\\components\\plugins\\PluginInstallFields",
-        "extas\\components\\plugins\\PluginInstallFieldsTypesSamples",
-        "extas\\components\\plugins\\PluginInstallFieldsTypes"
-      ],
-      "stage": "extas.install"
+      "class": "extas\\components\\plugins\\install\\InstallFieldsSamples",
+      "stage": "extas.install.section.fields_samples"
+    },
+    {
+      "class": "extas\\components\\plugins\\install\\InstallFields",
+      "stage": "extas.install.section.fields"
+    },
+    {
+      "class": "extas\\components\\plugins\\install\\InstallFieldsTypesSamples",
+      "stage": "extas.install.section.fields_types_samples"
+    },
+    {
+      "class": "extas\\components\\plugins\\install\\InstallFieldsTypes",
+      "stage": "extas.install.section.fields_types"
+    },
+    {
+      "class": "extas\\components\\plugins\\install\\UninstallFieldsSamples",
+      "stage": "extas.uninstall.section.fields_samples"
+    },
+    {
+      "class": "extas\\components\\plugins\\install\\UninstallFields",
+      "stage": "extas.uninstall.section.fields"
+    },
+    {
+      "class": "extas\\components\\plugins\\install\\UniInstallFieldsTypesSamples",
+      "stage": "extas.uninstall.section.fields_types_samples"
+    },
+    {
+      "class": "extas\\components\\plugins\\install\\UninstallFieldsTypes",
+      "stage": "extas.uninstall.section.fields_types"
     },
     {
       "class": "extas\\components\\plugins\\repositories\\PluginFieldUuid",

diff --git a/src/components/plugins/PluginInstallFields.php b/src/components/plugins/PluginInstallFields.php
diff --git a/src/components/plugins/install/InstallFields.php b/src/components/plugins/install/InstallFields.php
@@ -0,0 +1,35 @@
+<?php
+namespace extas\components\plugins\install;
+
+use extas\components\fields\Field;
+use extas\interfaces\IItem;
+use extas\interfaces\packages\IInstaller;
+
+/**
+ * Class PluginInstallFields
+ *
+ * @package extas\components\plugins\install
+ * @author jeyroik@gmail.com
+ */
+class InstallFields extends InstallSection
+{
+    protected string $selfSection = 'fields';
+    protected string $selfName = 'field';
+    protected string $selfRepositoryClass = 'fieldRepository';
+    protected string $selfUID = Field::FIELD__ID;
+    protected string $selfItemClass = Field::class;
+
+    /**
+     * @param string $sectionName
+     * @param array $item
+     * @param IItem|null $existed
+     * @param IInstaller $installer
+     */
+    protected function installItem(string $sectionName, array $item, ?IItem $existed, IInstaller &$installer): void
+    {
+        $uid = $item[Field::FIELD__ID] ?? '@uuid6';
+        $item[Field::FIELD__ID] = $uid;
+
+        parent::installItem($sectionName, $item, $existed, $installer);
+    }
+}
diff --git a/...ts/plugins/PluginInstallFieldsSamples.php → .../plugins/install/InstallFieldsSamples.php b/...ts/plugins/PluginInstallFieldsSamples.php → .../plugins/install/InstallFieldsSamples.php
@@ -1,16 +1,16 @@
 <?php
-namespace extas\components\plugins;
+namespace extas\components\plugins\install;
 
 use extas\components\fields\FieldSample;
 use extas\interfaces\fields\IFieldSampleRepository;
 
 /**
- * Class PluginInstallFieldsSamples
+ * Class InstallFieldsSamples
  *
- * @package extas\components\plugins
+ * @package extas\components\plugins\install
  * @author jeyroik@gmail.com
  */
-class PluginInstallFieldsSamples extends PluginInstallDefault
+class InstallFieldsSamples extends InstallSection
 {
     protected string $selfSection = 'fields_samples';
     protected string $selfName = 'field sample';

diff --git a/...ents/plugins/PluginInstallFieldsTypes.php → ...ts/plugins/install/InstallFieldsTypes.php b/...ents/plugins/PluginInstallFieldsTypes.php → ...ts/plugins/install/InstallFieldsTypes.php
@@ -1,16 +1,16 @@
 <?php
-namespace extas\components\plugins;
+namespace extas\components\plugins\install;
 
 use extas\components\fields\types\FieldType;
 use extas\interfaces\fields\types\IFieldTypeRepository;
 
 /**
- * Class PluginInstallFieldsTypes
+ * Class InstallFieldsTypes
  *
- * @package extas\components\plugins
+ * @package extas\components\plugins\install
  * @author jeyroik@gmail.com
  */
-class PluginInstallFieldsTypes extends PluginInstallDefault
+class InstallFieldsTypes extends InstallSection
 {
     protected string $selfSection = 'fields_types';
     protected string $selfName = 'field type';

diff --git a/...ugins/PluginInstallFieldsTypesSamples.php → ...ins/install/InstallFieldsTypesSamples.php b/...ugins/PluginInstallFieldsTypesSamples.php → ...ins/install/InstallFieldsTypesSamples.php
@@ -1,16 +1,16 @@
 <?php
-namespace extas\components\plugins;
+namespace extas\components\plugins\install;
 
 use extas\components\fields\types\FieldTypeSample;
 use extas\interfaces\fields\types\IFieldTypeSampleRepository;
 
 /**
- * Class PluginInstallFieldsTypesSamples
+ * Class InstallFieldsTypesSamples
  *
- * @package extas\components\plugins
+ * @package extas\components\plugins\install
  * @author jeyroik@gmail.com
  */
-class PluginInstallFieldsTypesSamples extends PluginInstallDefault
+class InstallFieldsTypesSamples extends InstallSection
 {
     protected string $selfSection = 'fields_types_samples';
     protected string $selfName = 'field type sample';

diff --git a/src/components/plugins/uninstall/UninstallFields.php b/src/components/plugins/uninstall/UninstallFields.php
@@ -0,0 +1,19 @@
+<?php
+namespace extas\components\plugins\uninstall;
+
+use extas\components\fields\Field;
+
+/**
+ * Class UninstallFields
+ *
+ * @package extas\components\plugins\uninstall
+ * @author jeyroik <jeyroik@gmail.com>
+ */
+class UninstallFields extends UninstallSection
+{
+    protected string $selfSection = 'fields';
+    protected string $selfName = 'field';
+    protected string $selfRepositoryClass = 'fieldRepository';
+    protected string $selfUID = Field::FIELD__ID;
+    protected string $selfItemClass = Field::class;
+}
diff --git a/src/components/plugins/uninstall/UninstallFieldsSamples.php b/src/components/plugins/uninstall/UninstallFieldsSamples.php
@@ -0,0 +1,19 @@
+<?php
+namespace extas\components\plugins\uninstall;
+
+use extas\components\fields\FieldSample;
+
+/**
+ * Class UninstallFieldsSamples
+ *
+ * @package extas\components\plugins\uninstall
+ * @author jeyroik <jeyroik@gmail.com>
+ */
+class UninstallFieldsSamples extends UninstallSection
+{
+    protected string $selfSection = 'fields_samples';
+    protected string $selfName = 'field sample';
+    protected string $selfRepositoryClass = 'fieldSampleRepository';
+    protected string $selfUID = FieldSample::FIELD__NAME;
+    protected string $selfItemClass = FieldSample::class;
+}
diff --git a/src/components/plugins/uninstall/UninstallFieldsTypes.php b/src/components/plugins/uninstall/UninstallFieldsTypes.php
@@ -0,0 +1,19 @@
+<?php
+namespace extas\components\plugins\uninstall;
+
+use extas\components\fields\types\FieldType;
+
+/**
+ * Class UninstallFieldsTypes
+ *
+ * @package extas\components\plugins\uninstall
+ * @author jeyroik <jeyroik@gmail.com>
+ */
+class UninstallFieldsTypes extends UninstallSection
+{
+    protected string $selfSection = 'fields_types';
+    protected string $selfName = 'field type';
+    protected string $selfRepositoryClass = 'fieldTypeRepository';
+    protected string $selfUID = FieldType::FIELD__NAME;
+    protected string $selfItemClass = FieldType::class;
+}
diff --git a/src/components/plugins/uninstall/UninstallFieldsTypesSamples.php b/src/components/plugins/uninstall/UninstallFieldsTypesSamples.php
@@ -0,0 +1,19 @@
+<?php
+namespace extas\components\plugins\uninstall;
+
+use extas\components\fields\types\FieldTypeSample;
+
+/**
+ * Class UninstallFieldsTypesSamples
+ *
+ * @package extas\components\plugins\uninstall
+ * @author jeyroik <jeyroik@gmail.com>
+ */
+class UninstallFieldsTypesSamples extends UninstallSection
+{
+    protected string $selfSection = 'fields_types_samples';
+    protected string $selfName = 'field type sample';
+    protected string $selfRepositoryClass = 'fieldTypeSampleRepository';
+    protected string $selfUID = FieldTypeSample::FIELD__NAME;
+    protected string $selfItemClass = FieldTypeSample::class;
+}