Skip to content

Commit 9d5babc

Browse files
committed
Merge branch 'support/3.0.0'
2 parents 4fb3a20 + 022e933 commit 9d5babc

File tree

433 files changed

+5268
-77383
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

433 files changed

+5268
-77383
lines changed
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: "Continuous integration"
2+
3+
on:
4+
push:
5+
branches:
6+
- "support/3.0.0"
7+
tags:
8+
- "*"
9+
pull_request:
10+
schedule:
11+
- cron: "0 0 * * *"
12+
workflow_dispatch:
13+
14+
concurrency:
15+
group: "${{ github.workflow }}-${{ github.ref }}"
16+
cancel-in-progress: true
17+
18+
jobs:
19+
generate-ci-matrix:
20+
name: "Generate CI matrix"
21+
uses: "glpi-project/plugin-ci-workflows/.github/workflows/generate-ci-matrix.yml@v1"
22+
with:
23+
glpi-version: "11.0.x"
24+
ci:
25+
name: "GLPI ${{ matrix.glpi-version }} - php:${{ matrix.php-version }} - ${{ matrix.db-image }}"
26+
needs: "generate-ci-matrix"
27+
strategy:
28+
fail-fast: false
29+
matrix: ${{ fromJson(needs.generate-ci-matrix.outputs.matrix) }}
30+
uses: "glpi-project/plugin-ci-workflows/.github/workflows/continuous-integration.yml@v1"
31+
with:
32+
plugin-key: "formcreator"
33+
glpi-version: "${{ matrix.glpi-version }}"
34+
php-version: "${{ matrix.php-version }}"
35+
db-image: "${{ matrix.db-image }}"

.github/workflows/tests.yml

Lines changed: 0 additions & 138 deletions
This file was deleted.

.phpunit.result.cache

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"version":2,"defects":{"EOLTest::testEOLInfoDisplay":8,"EOLTest::testEOLMenuIntegration":7,"EOLTest::testEOLPagesAccessible":7,"EOLTest::testEOLTemplatesExist":7,"EOLTest::testPluginConstants":7,"FormcreatorEOLTest::testEOLInfoMethods":8,"FormcreatorInstallTest::testEOLStatus":7,"FormcreatorEOLTest::testEOLClassExists":7,"DatabaseMigrationTest::testRealMigration2_13_9To3_0_0":7,"DatabaseMigrationTest::testIncrementalUpgradeSystem":8,"EOLInterfaceTest::testEOLWarningDisplayOnDashboard":5,"EOLInterfaceTest::testDataPersistenceAndSessions":8,"FormsMigrationTest::testFormcreatorToFormsMigration":7,"FormsMigrationTest::testComplexFormMigration":8,"FormsMigrationTest::testMigrationRollback":8},"times":{"EOLTest::testEOLInfoDisplay":0.018,"EOLTest::testEOLMenuIntegration":0.009,"EOLTest::testEOLPagesAccessible":0.004,"EOLTest::testEOLTemplatesExist":0.003,"EOLTest::testPluginConstants":0.004,"FormcreatorEOLTest::testEOLClassExists":0.003,"FormcreatorEOLTest::testEOLTemplatesExist":0.003,"FormcreatorEOLTest::testEOLInfoMethods":0.004,"FormcreatorInstallTest::testPluginCanLoad":0.004,"FormcreatorInstallTest::testPluginVersion":0.003,"FormcreatorInstallTest::testEOLStatus":0.006,"DatabaseMigrationTest::testRealMigration2_13_9To3_0_0":1.686,"DatabaseMigrationTest::testIncrementalUpgradeSystem":0.037,"DatabaseMigrationTest::testMigrationCommands":0.046,"EOLInterfaceTest::testEOLWarningDisplayOnDashboard":0.014,"EOLInterfaceTest::testEOLInfoPageAccess":0.004,"EOLInterfaceTest::testMigrationGuidanceInterface":0.005,"EOLInterfaceTest::testNavigationToFormsPlugin":0.004,"EOLInterfaceTest::testUserPermissionsAndAccess":0.045,"EOLInterfaceTest::testResponsiveDesignAndAccessibility":0.004,"EOLInterfaceTest::testErrorHandlingAndEdgeCases":0.004,"EOLInterfaceTest::testPerformanceAndLoadingTimes":0.005,"EOLInterfaceTest::testDataPersistenceAndSessions":0.004,"FormsMigrationTest::testFormcreatorToFormsMigration":0.02,"FormsMigrationTest::testComplexFormMigration":0.008,"FormsMigrationTest::testMigrationRollback":0.003}}

.tx/config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[main]
22
host = https://www.transifex.com
33

4-
[o:teclib:p:glpi-project-plugin-formcreator:r:2_13_0]
4+
[o:teclib:p:glpi-project-plugin-formcreator:r:3_0_0]
55
file_filter = locales/<lang>.po
66
source_file = locales/glpi.pot
77
source_lang = en_GB

CHANGELOG.md

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,26 @@
1+
# Formcreator Changelog
2+
3+
## [3.0.0 (Migration Only)](https://github.com/pluginsGLPI/formcreator/compare/2.13.10...3.0.0) (Unreleased)
4+
5+
### 🚨 BREAKING CHANGES - END OF LIFE VERSION
6+
7+
This version (3.0.0) is a **migration-only plugin** designed exclusively for GLPI 11.0+. After migration, Formcreator becomes End-of-Life (EOL).
8+
9+
### ✅ Added for Migration
10+
* **Migration Only**: Complete refactoring to migration-only plugin for GLPI 11+
11+
* **EOL Status**: Plugin shows End-of-Life status after migration completion
12+
* **Migration Preservation**: All migration scripts from 2.5.0 to 2.13.10 preserved
13+
* **GLPI 11 Support**: Native integration with GLPI 11 form migration system
14+
* **Migration Logging**: Enhanced logging and verification for migration process
15+
16+
### ❌ Removed
17+
* **All features**: GLPI 11 now includes the new Forms system
18+
19+
20+
## Previous Versions (Functional Releases)
21+
22+
**Note**: Versions below are the last functional releases of Formcreator. Version 3.0.0+ is migration-only.
23+
124
## [2.13.10](https://github.com/pluginsGLPI/formcreator/compare/2.13.9...2.13.10) (2025-02-26)
225

326

README.md

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,37 @@
77
[![IRC Chat](https://img.shields.io/badge/IRC-%23GLPI-green.svg)](http://webchat.freenode.net/?channels=GLPI)
88
[![Follow Twitter](https://img.shields.io/badge/Twitter-GLPI%20Project-26A2FA.svg)](https://twitter.com/GLPI_PROJECT)
99
[![Join the chat at https://gitter.im/TECLIB/formcreator](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/TECLIB/formcreator?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
10-
[![Project Status: Inactive](http://www.repostatus.org/badges/latest/inactive.svg)](http://www.repostatus.org/#inactive)
10+
[![Project Status: End Of Life](http://www.repostatus.org/badges/latest/active.svg)](http://www.repostatus.org/#active)
1111
[![Conventional Commits](https://img.shields.io/badge/Conventional%20Commits-1.0.0-yellow.svg)](https://conventionalcommits.org)
1212
[![GitHub All Releases](https://img.shields.io/github/downloads/PluginsGLPI/formcreator/total)](https://github.com/pluginsGLPI/formcreator/releases)
1313

14-
Extend GLPI with Plugins.
14+
## ⚠️ IMPORTANT NOTICE - END OF LIFE
15+
16+
**FormCreator 3.0.0 is a migration-only plugin designed exclusively for GLPI 11.0+**
17+
18+
Plugin marking the end of life of `formcreator`.
19+
It updates database tables and data to the final version, required before the automatic migration of forms into GLPI 11 core.
20+
⚠️ This plugin must be installed in production only to perform the update, and then uninstalled once the operation is complete.
21+
22+
### Purpose of this version
23+
24+
This version serves as a migration facilitator. Its main objectives are:
25+
Update database tables and data to prepare their final state for GLPI 11.
26+
Ensure the necessary compatibility for the automatic migration of objects and forms to the GLPI 11 core.
27+
28+
Usage Instructions:
29+
--------------------------
30+
1. After migrating to GLPI 11, install this final version (3.0.0).
31+
2. Run the data migration operation using the following command:
32+
- `php bin/console migration:formcreator_plugin_to_core`.
33+
3. Uninstall the `FormCreator` plugin once all data has been integrated and verified within the core of GLPI 11.
34+
35+
This version provides support for migration only. For features related to custom assets, use GLPI 11's native custom assets.
1536

1637
## Table of Contents
1738

18-
- [Form Creator](#form-creator)
39+
- [Form Creator](#form-creator)
40+
- [⚠️ IMPORTANT NOTICE - END OF LIFE](#️-important-notice---end-of-life)
1941
- [Table of Contents](#table-of-contents)
2042
- [Synopsis](#synopsis)
2143
- [Features](#features)

RoboFile.php

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
2+
23
/**
4+
*
35
* ---------------------------------------------------------------------
46
* Formcreator is a plugin which allows creation of custom forms of
57
* easy access.
@@ -21,7 +23,7 @@
2123
* You should have received a copy of the GNU General Public License
2224
* along with Formcreator. If not, see <http://www.gnu.org/licenses/>.
2325
* ---------------------------------------------------------------------
24-
* @copyright Copyright © 2011 - 2021 Teclib'
26+
* @copyright Copyright © 2011 - 2018-2021 Teclib'
2527
* @license http://www.gnu.org/licenses/gpl.txt GPLv3+
2628
* @link https://github.com/pluginsGLPI/formcreator/
2729
* @link https://pluginsglpi.github.io/formcreator/
@@ -151,7 +153,7 @@ public function archiveBuild($release = 'release') {
151153
// update version in package.json
152154
$this->sourceUpdatePackageJson($version);
153155
if ($release == 'release') {
154-
$this->updateChangelog();
156+
// $this->updateChangelog();
155157
}
156158

157159
$diff = $this->gitDiff(['package.json']);
@@ -195,12 +197,12 @@ public function archiveBuild($release = 'release') {
195197
$this->_exec("git archive --prefix=$pluginName/ $rev $filesToArchive | tar x -C '$archiveWorkdir'");
196198

197199
// Copy SCSS
198-
$srcFile = __DIR__ . '/css_compiled/styles.min.css';
199-
$dstFile = "$archiveWorkdir/$pluginName/css_compiled/styles.min.css";
200-
$success = copy($srcFile, $dstFile);
201-
if (!$success) {
202-
throw new RuntimeException("failed to generate CSS resources");
203-
}
200+
// $srcFile = __DIR__ . '/css_compiled/styles.min.css';
201+
// $dstFile = "$archiveWorkdir/$pluginName/css_compiled/styles.min.css";
202+
// $success = copy($srcFile, $dstFile);
203+
// if (!$success) {
204+
// throw new RuntimeException("failed to generate CSS resources");
205+
// }
204206

205207
// Add composer dependencies
206208
$success = $this->taskExec('composer')
@@ -213,15 +215,15 @@ public function archiveBuild($release = 'release') {
213215
}
214216

215217
// Add JS dependencies
216-
$success = $this->taskExec('yarn')
217-
->arg('--cwd')
218-
->arg("$archiveWorkdir/$pluginName")
219-
->arg('install')
220-
->arg('--prod')
221-
->run();
222-
if ($success->getExitCode() != 0) {
223-
throw new RuntimeException("failed to generate JS resources");
224-
}
218+
// $success = $this->taskExec('yarn')
219+
// ->arg('--cwd')
220+
// ->arg("$archiveWorkdir/$pluginName")
221+
// ->arg('install')
222+
// ->arg('--prod')
223+
// ->run();
224+
// if ($success->getExitCode() != 0) {
225+
// throw new RuntimeException("failed to generate JS resources");
226+
// }
225227

226228
// Create the final archive
227229
$this->taskPack($archiveFile)

RoboFilePlugin.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
2+
23
/**
4+
*
35
* ---------------------------------------------------------------------
46
* Formcreator is a plugin which allows creation of custom forms of
57
* easy access.
@@ -21,7 +23,7 @@
2123
* You should have received a copy of the GNU General Public License
2224
* along with Formcreator. If not, see <http://www.gnu.org/licenses/>.
2325
* ---------------------------------------------------------------------
24-
* @copyright Copyright © 2011 - 2021 Teclib'
26+
* @copyright Copyright © 2011 - 2018-2021 Teclib'
2527
* @license http://www.gnu.org/licenses/gpl.txt GPLv3+
2628
* @link https://github.com/pluginsGLPI/formcreator/
2729
* @link https://pluginsglpi.github.io/formcreator/

ajax/cancelticket.php

Lines changed: 0 additions & 43 deletions
This file was deleted.

0 commit comments

Comments
 (0)