From 1d5a33b5601537c22429b3bd95752bee0b5cc6c8 Mon Sep 17 00:00:00 2001
From: Olivier PEREZ <olivier@olivierperez.fr>
Date: Thu, 5 Mar 2015 21:30:33 +0100
Subject: [PATCH] Remove the notion of 0.9.1, replace it with 0.9

---
 admin/migration.php                           |  4 ++--
 ... AddColumn_receiveNewComments_For_0_9.php} | 24 ++++++++++++++++---
 .../Migration/From_0_0_to_0_8_Migration.php   | 23 ++++++++++++++++++
 .../Migration/From_0_8_to_0_9_Migration.php   | 18 ++++++++++++++
 app/classes/Framadate/Migration/Migration.php | 17 +++++++++++++
 app/inc/constants.php                         |  2 +-
 6 files changed, 82 insertions(+), 6 deletions(-)
 rename app/classes/Framadate/Migration/{From_0_9_to_0_9_1_Migration.php => AddColumn_receiveNewComments_For_0_9.php} (58%)

diff --git a/admin/migration.php b/admin/migration.php
index 9c34f97..e19f4d5 100644
--- a/admin/migration.php
+++ b/admin/migration.php
@@ -19,7 +19,7 @@
 
 use Framadate\Migration\From_0_0_to_0_8_Migration;
 use Framadate\Migration\From_0_8_to_0_9_Migration;
-use Framadate\Migration\From_0_9_to_0_9_1_Migration;
+use Framadate\Migration\AddColumn_receiveNewComments_For_0_9;
 use Framadate\Migration\Migration;
 use Framadate\Utils;
 
@@ -31,7 +31,7 @@ set_time_limit(300);
 $migrations = [
     new From_0_0_to_0_8_Migration(),
     new From_0_8_to_0_9_Migration(),
-    new From_0_9_to_0_9_1_Migration()
+    new AddColumn_receiveNewComments_For_0_9()
 ];
 // ---------------------------------------
 
diff --git a/app/classes/Framadate/Migration/From_0_9_to_0_9_1_Migration.php b/app/classes/Framadate/Migration/AddColumn_receiveNewComments_For_0_9.php
similarity index 58%
rename from app/classes/Framadate/Migration/From_0_9_to_0_9_1_Migration.php
rename to app/classes/Framadate/Migration/AddColumn_receiveNewComments_For_0_9.php
index 49896ba..9f698f9 100644
--- a/app/classes/Framadate/Migration/From_0_9_to_0_9_1_Migration.php
+++ b/app/classes/Framadate/Migration/AddColumn_receiveNewComments_For_0_9.php
@@ -1,14 +1,32 @@
 <?php
+/**
+ * This software is governed by the CeCILL-B license. If a copy of this license
+ * is not distributed with this file, you can obtain one at
+ * http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.txt
+ *
+ * Authors of STUdS (initial project): Guilhem BORGHESI (borghesi@unistra.fr) and Raphaël DROZ
+ * Authors of Framadate/OpenSondate: Framasoft (https://github.com/framasoft)
+ *
+ * =============================
+ *
+ * Ce logiciel est régi par la licence CeCILL-B. Si une copie de cette licence
+ * ne se trouve pas avec ce fichier vous pouvez l'obtenir sur
+ * http://www.cecill.info/licences/Licence_CeCILL-B_V1-fr.txt
+ *
+ * Auteurs de STUdS (projet initial) : Guilhem BORGHESI (borghesi@unistra.fr) et Raphaël DROZ
+ * Auteurs de Framadate/OpenSondage : Framasoft (https://github.com/framasoft)
+ */
 namespace Framadate\Migration;
 
 use Framadate\Utils;
 
 /**
- * This class executes the aciton in database to migrate data from version 0.9 to 0.9.1.
+ * This migration adds the field receiveNewComments on the poll table.
  *
  * @package Framadate\Migration
+ * @version 0.9
  */
-class From_0_9_to_0_9_1_Migration implements Migration {
+class AddColumn_receiveNewComments_For_0_9 implements Migration {
 
     function __construct() {
     }
@@ -19,7 +37,7 @@ class From_0_9_to_0_9_1_Migration implements Migration {
      * @return string The description of the migration class
      */
     function description() {
-        return "From 0.9 to 0.9.1";
+        return "Add column \"receiveNewComments\" for version 0.9";
     }
 
     /**
diff --git a/app/classes/Framadate/Migration/From_0_0_to_0_8_Migration.php b/app/classes/Framadate/Migration/From_0_0_to_0_8_Migration.php
index c85ec1a..4e0c0e8 100644
--- a/app/classes/Framadate/Migration/From_0_0_to_0_8_Migration.php
+++ b/app/classes/Framadate/Migration/From_0_0_to_0_8_Migration.php
@@ -1,8 +1,31 @@
 <?php
+/**
+ * This software is governed by the CeCILL-B license. If a copy of this license
+ * is not distributed with this file, you can obtain one at
+ * http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.txt
+ *
+ * Authors of STUdS (initial project): Guilhem BORGHESI (borghesi@unistra.fr) and Raphaël DROZ
+ * Authors of Framadate/OpenSondate: Framasoft (https://github.com/framasoft)
+ *
+ * =============================
+ *
+ * Ce logiciel est régi par la licence CeCILL-B. Si une copie de cette licence
+ * ne se trouve pas avec ce fichier vous pouvez l'obtenir sur
+ * http://www.cecill.info/licences/Licence_CeCILL-B_V1-fr.txt
+ *
+ * Auteurs de STUdS (projet initial) : Guilhem BORGHESI (borghesi@unistra.fr) et Raphaël DROZ
+ * Auteurs de Framadate/OpenSondage : Framasoft (https://github.com/framasoft)
+ */
 namespace Framadate\Migration;
 
 use Framadate\Utils;
 
+/**
+ * Class From_0_0_to_0_8_Migration
+ *
+ * @package Framadate\Migration
+ * @version 0.8
+ */
 class From_0_0_to_0_8_Migration implements Migration {
 
     function __construct() {
diff --git a/app/classes/Framadate/Migration/From_0_8_to_0_9_Migration.php b/app/classes/Framadate/Migration/From_0_8_to_0_9_Migration.php
index e570b5f..2920bd3 100644
--- a/app/classes/Framadate/Migration/From_0_8_to_0_9_Migration.php
+++ b/app/classes/Framadate/Migration/From_0_8_to_0_9_Migration.php
@@ -1,4 +1,21 @@
 <?php
+/**
+ * This software is governed by the CeCILL-B license. If a copy of this license
+ * is not distributed with this file, you can obtain one at
+ * http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.txt
+ *
+ * Authors of STUdS (initial project): Guilhem BORGHESI (borghesi@unistra.fr) and Raphaël DROZ
+ * Authors of Framadate/OpenSondate: Framasoft (https://github.com/framasoft)
+ *
+ * =============================
+ *
+ * Ce logiciel est régi par la licence CeCILL-B. Si une copie de cette licence
+ * ne se trouve pas avec ce fichier vous pouvez l'obtenir sur
+ * http://www.cecill.info/licences/Licence_CeCILL-B_V1-fr.txt
+ *
+ * Auteurs de STUdS (projet initial) : Guilhem BORGHESI (borghesi@unistra.fr) et Raphaël DROZ
+ * Auteurs de Framadate/OpenSondage : Framasoft (https://github.com/framasoft)
+ */
 namespace Framadate\Migration;
 
 use Framadate\Utils;
@@ -7,6 +24,7 @@ use Framadate\Utils;
  * This class executes the aciton in database to migrate data from version 0.8 to 0.9.
  *
  * @package Framadate\Migration
+ * @version 0.9
  */
 class From_0_8_to_0_9_Migration implements Migration {
 
diff --git a/app/classes/Framadate/Migration/Migration.php b/app/classes/Framadate/Migration/Migration.php
index 0cd22f8..ab2e4e7 100644
--- a/app/classes/Framadate/Migration/Migration.php
+++ b/app/classes/Framadate/Migration/Migration.php
@@ -1,4 +1,21 @@
 <?php
+/**
+ * This software is governed by the CeCILL-B license. If a copy of this license
+ * is not distributed with this file, you can obtain one at
+ * http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.txt
+ *
+ * Authors of STUdS (initial project): Guilhem BORGHESI (borghesi@unistra.fr) and Raphaël DROZ
+ * Authors of Framadate/OpenSondate: Framasoft (https://github.com/framasoft)
+ *
+ * =============================
+ *
+ * Ce logiciel est régi par la licence CeCILL-B. Si une copie de cette licence
+ * ne se trouve pas avec ce fichier vous pouvez l'obtenir sur
+ * http://www.cecill.info/licences/Licence_CeCILL-B_V1-fr.txt
+ *
+ * Auteurs de STUdS (projet initial) : Guilhem BORGHESI (borghesi@unistra.fr) et Raphaël DROZ
+ * Auteurs de Framadate/OpenSondage : Framasoft (https://github.com/framasoft)
+ */
 namespace Framadate\Migration;
 
 interface Migration {
diff --git a/app/inc/constants.php b/app/inc/constants.php
index f395541..60bab3c 100644
--- a/app/inc/constants.php
+++ b/app/inc/constants.php
@@ -18,7 +18,7 @@
  */
 
 // FRAMADATE version
-const VERSION = '0.9.1';
+const VERSION = '0.9';
 
 // Regex
 const POLL_REGEX = '/^[a-z0-9]+$/';