diff --git a/lib/Alchemy/Phrasea/Setup/Version/PreSchemaUpgrade/Upgrade39Users.php b/lib/Alchemy/Phrasea/Setup/Version/PreSchemaUpgrade/Upgrade39Users.php index 8184dac8c2..1ffde761ab 100644 --- a/lib/Alchemy/Phrasea/Setup/Version/PreSchemaUpgrade/Upgrade39Users.php +++ b/lib/Alchemy/Phrasea/Setup/Version/PreSchemaUpgrade/Upgrade39Users.php @@ -31,11 +31,11 @@ class Upgrade39Users implements PreSchemaUpgradeInterface // Sanitize usr table $this->sanitizeUsrTable($em); // Creates User schema - $version = $conf->getVersion('user'); + $version = $conf->getVersion('20131118000009'); if (false === $version->isMigrated()) { $version->execute('up'); } - $version = $conf->getVersion('ftp-credential'); + $version = $conf->getVersion('20131118000007'); if (false === $version->isMigrated()) { $version->execute('up'); } @@ -78,11 +78,11 @@ class Upgrade39Users implements PreSchemaUpgradeInterface $this->emptyTables($em); // rollback schema $this->alterTablesDown($em); - $version = $conf->getVersion('ftp-credential'); + $version = $conf->getVersion('20131118000007'); if ($version->isMigrated()) { $version->execute('down'); } - $version = $conf->getVersion('user'); + $version = $conf->getVersion('20131118000009'); if ($version->isMigrated()) { $version->execute('down'); } diff --git a/lib/classes/patch/320alpha1a.php b/lib/classes/patch/320alpha1a.php index 2dcb793f26..14442a4724 100644 --- a/lib/classes/patch/320alpha1a.php +++ b/lib/classes/patch/320alpha1a.php @@ -27,14 +27,6 @@ class patch_320alpha1a extends patchAbstract return $this->release; } - /** - * {@inheritdoc} - */ - public function getDoctrineMigrations() - { - return []; - } - /** * {@inheritdoc} */ diff --git a/lib/classes/patch/320alpha1b.php b/lib/classes/patch/320alpha1b.php index 167435e55e..148c775941 100644 --- a/lib/classes/patch/320alpha1b.php +++ b/lib/classes/patch/320alpha1b.php @@ -35,14 +35,6 @@ class patch_320alpha1b extends patchAbstract return false; } - /** - * {@inheritdoc} - */ - public function getDoctrineMigrations() - { - return []; - } - /** * {@inheritdoc} */ diff --git a/lib/classes/patch/320alpha2a.php b/lib/classes/patch/320alpha2a.php index a4625d9ff8..1b297ce60a 100644 --- a/lib/classes/patch/320alpha2a.php +++ b/lib/classes/patch/320alpha2a.php @@ -36,14 +36,6 @@ class patch_320alpha2a extends patchAbstract return false; } - /** - * {@inheritdoc} - */ - public function getDoctrineMigrations() - { - return []; - } - /** * {@inheritdoc} */ diff --git a/lib/classes/patch/320alpha3a.php b/lib/classes/patch/320alpha3a.php index 787a0370d1..76714ec0d2 100644 --- a/lib/classes/patch/320alpha3a.php +++ b/lib/classes/patch/320alpha3a.php @@ -35,14 +35,6 @@ class patch_320alpha3a extends patchAbstract return false; } - /** - * {@inheritdoc} - */ - public function getDoctrineMigrations() - { - return []; - } - /** * {@inheritdoc} */ diff --git a/lib/classes/patch/320alpha4a.php b/lib/classes/patch/320alpha4a.php index c248e11514..9caec1c4ee 100644 --- a/lib/classes/patch/320alpha4a.php +++ b/lib/classes/patch/320alpha4a.php @@ -35,14 +35,6 @@ class patch_320alpha4a extends patchAbstract return false; } - /** - * {@inheritdoc} - */ - public function getDoctrineMigrations() - { - return []; - } - /** * {@inheritdoc} */ diff --git a/lib/classes/patch/320alpha4b.php b/lib/classes/patch/320alpha4b.php index 60e41e95bf..8a75e9bc4e 100644 --- a/lib/classes/patch/320alpha4b.php +++ b/lib/classes/patch/320alpha4b.php @@ -39,7 +39,7 @@ class patch_320alpha4b extends patchAbstract */ public function getDoctrineMigrations() { - return ['user', 'feed']; + return ['20131118000009', '20131118000001']; } /** diff --git a/lib/classes/patch/320alpha5a.php b/lib/classes/patch/320alpha5a.php index cc57d1b4d5..0376dc207b 100644 --- a/lib/classes/patch/320alpha5a.php +++ b/lib/classes/patch/320alpha5a.php @@ -35,14 +35,6 @@ class patch_320alpha5a extends patchAbstract return false; } - /** - * {@inheritdoc} - */ - public function getDoctrineMigrations() - { - return []; - } - /** * {@inheritdoc} */ diff --git a/lib/classes/patch/320alpha6a.php b/lib/classes/patch/320alpha6a.php index 8ec6d92983..9b7cdb14fd 100644 --- a/lib/classes/patch/320alpha6a.php +++ b/lib/classes/patch/320alpha6a.php @@ -35,14 +35,6 @@ class patch_320alpha6a extends patchAbstract return false; } - /** - * {@inheritdoc} - */ - public function getDoctrineMigrations() - { - return []; - } - /** * {@inheritdoc} */ diff --git a/lib/classes/patch/320alpha8a.php b/lib/classes/patch/320alpha8a.php index e06a293adb..1dfe463624 100644 --- a/lib/classes/patch/320alpha8a.php +++ b/lib/classes/patch/320alpha8a.php @@ -35,14 +35,6 @@ class patch_320alpha8a extends patchAbstract return true; } - /** - * {@inheritdoc} - */ - public function getDoctrineMigrations() - { - return []; - } - /** * {@inheritdoc} */ diff --git a/lib/classes/patch/360alpha1a.php b/lib/classes/patch/360alpha1a.php index 6dae6a5edb..54a9479452 100644 --- a/lib/classes/patch/360alpha1a.php +++ b/lib/classes/patch/360alpha1a.php @@ -48,7 +48,7 @@ class patch_360alpha1a extends patchAbstract */ public function getDoctrineMigrations() { - return ['workzone', 'session']; + return ['20131118000002', '20131118000006']; } /** diff --git a/lib/classes/patch/360alpha1b.php b/lib/classes/patch/360alpha1b.php index e7e2d989c2..ad98c93a88 100644 --- a/lib/classes/patch/360alpha1b.php +++ b/lib/classes/patch/360alpha1b.php @@ -36,14 +36,6 @@ class patch_360alpha1b extends patchAbstract return false; } - /** - * {@inheritdoc} - */ - public function getDoctrineMigrations() - { - return []; - } - /** * {@inheritdoc} */ diff --git a/lib/classes/patch/360alpha2a.php b/lib/classes/patch/360alpha2a.php index f987db2469..d72bc88436 100644 --- a/lib/classes/patch/360alpha2a.php +++ b/lib/classes/patch/360alpha2a.php @@ -35,14 +35,6 @@ class patch_360alpha2a extends patchAbstract return true; } - /** - * {@inheritdoc} - */ - public function getDoctrineMigrations() - { - return []; - } - /** * {@inheritdoc} */ diff --git a/lib/classes/patch/360alpha2b.php b/lib/classes/patch/360alpha2b.php index 205dba4817..46216025e4 100644 --- a/lib/classes/patch/360alpha2b.php +++ b/lib/classes/patch/360alpha2b.php @@ -28,14 +28,6 @@ class patch_360alpha2b extends patchAbstract return $this->release; } - /** - * {@inheritdoc} - */ - public function getDoctrineMigrations() - { - return []; - } - /** * {@inheritdoc} */ diff --git a/lib/classes/patch/361alpha1a.php b/lib/classes/patch/361alpha1a.php index 5b770b40cc..3d573b9e8a 100644 --- a/lib/classes/patch/361alpha1a.php +++ b/lib/classes/patch/361alpha1a.php @@ -49,7 +49,7 @@ class patch_361alpha1a extends patchAbstract */ public function getDoctrineMigrations() { - return ['workzone']; + return ['20131118000002']; } /** diff --git a/lib/classes/patch/370alpha1a.php b/lib/classes/patch/370alpha1a.php index cfb20f3cd3..400fd52c05 100644 --- a/lib/classes/patch/370alpha1a.php +++ b/lib/classes/patch/370alpha1a.php @@ -27,14 +27,6 @@ class patch_370alpha1a extends patchAbstract return $this->release; } - /** - * {@inheritdoc} - */ - public function getDoctrineMigrations() - { - return []; - } - /** * {@inheritdoc} */ diff --git a/lib/classes/patch/370alpha3a.php b/lib/classes/patch/370alpha3a.php index 86f3b59e23..bd41efd3ef 100644 --- a/lib/classes/patch/370alpha3a.php +++ b/lib/classes/patch/370alpha3a.php @@ -42,7 +42,7 @@ class patch_370alpha3a extends patchAbstract */ public function getDoctrineMigrations() { - return ['api']; + return ['20140324000001']; } /** diff --git a/lib/classes/patch/370alpha4a.php b/lib/classes/patch/370alpha4a.php index d040d0f197..77704a9231 100644 --- a/lib/classes/patch/370alpha4a.php +++ b/lib/classes/patch/370alpha4a.php @@ -43,14 +43,6 @@ class patch_370alpha4a extends patchAbstract return $this->concern; } - /** - * {@inheritdoc} - */ - public function getDoctrineMigrations() - { - return []; - } - /** * {@inheritdoc} */ diff --git a/lib/classes/patch/370alpha5a.php b/lib/classes/patch/370alpha5a.php index 9386ce319a..fe75246ca0 100644 --- a/lib/classes/patch/370alpha5a.php +++ b/lib/classes/patch/370alpha5a.php @@ -43,14 +43,6 @@ class patch_370alpha5a extends patchAbstract return $this->concern; } - /** - * {@inheritdoc} - */ - public function getDoctrineMigrations() - { - return []; - } - /** * {@inheritdoc} */ diff --git a/lib/classes/patch/370alpha6a.php b/lib/classes/patch/370alpha6a.php index ca62ad114b..a85b9deb0b 100644 --- a/lib/classes/patch/370alpha6a.php +++ b/lib/classes/patch/370alpha6a.php @@ -43,14 +43,6 @@ class patch_370alpha6a extends patchAbstract return $this->concern; } - /** - * {@inheritdoc} - */ - public function getDoctrineMigrations() - { - return []; - } - /** * {@inheritdoc} */ diff --git a/lib/classes/patch/370alpha7a.php b/lib/classes/patch/370alpha7a.php index cf6669336e..8790908f01 100644 --- a/lib/classes/patch/370alpha7a.php +++ b/lib/classes/patch/370alpha7a.php @@ -53,7 +53,7 @@ class patch_370alpha7a extends patchAbstract */ public function getDoctrineMigrations() { - return ['user', 'lazaret']; + return ['20131118000009', '20131118000003']; } /** diff --git a/lib/classes/patch/370alpha8a.php b/lib/classes/patch/370alpha8a.php index 65e3a1097e..fdbee075db 100644 --- a/lib/classes/patch/370alpha8a.php +++ b/lib/classes/patch/370alpha8a.php @@ -46,7 +46,7 @@ class patch_370alpha8a extends patchAbstract public function getDoctrineMigrations() { - return ['task']; + return ['20131118000004']; } /** diff --git a/lib/classes/patch/370alpha9a.php b/lib/classes/patch/370alpha9a.php index e3f18145a3..1fc46e3bd9 100644 --- a/lib/classes/patch/370alpha9a.php +++ b/lib/classes/patch/370alpha9a.php @@ -35,14 +35,6 @@ class patch_370alpha9a extends patchAbstract return false; } - /** - * {@inheritdoc} - */ - public function getDoctrineMigrations() - { - return []; - } - /** * {@inheritdoc} */ diff --git a/lib/classes/patch/3715alpha1a.php b/lib/classes/patch/3715alpha1a.php index 3fe6f1f501..326ad391ba 100644 --- a/lib/classes/patch/3715alpha1a.php +++ b/lib/classes/patch/3715alpha1a.php @@ -38,14 +38,6 @@ class patch_3715alpha1a extends patchAbstract return false; } - /** - * {@inheritdoc} - */ - public function getDoctrineMigrations() - { - return []; - } - /** * {@inheritdoc} */ diff --git a/lib/classes/patch/371alpha1a.php b/lib/classes/patch/371alpha1a.php index c33cfebc10..548041b817 100644 --- a/lib/classes/patch/371alpha1a.php +++ b/lib/classes/patch/371alpha1a.php @@ -43,14 +43,6 @@ class patch_371alpha1a extends patchAbstract return $this->concern; } - /** - * {@inheritdoc} - */ - public function getDoctrineMigrations() - { - return []; - } - /** * {@inheritdoc} */ diff --git a/lib/classes/patch/373alpha1a.php b/lib/classes/patch/373alpha1a.php index 4fcf8be30c..39c0923bcd 100644 --- a/lib/classes/patch/373alpha1a.php +++ b/lib/classes/patch/373alpha1a.php @@ -35,14 +35,6 @@ class patch_373alpha1a extends patchAbstract return false; } - /** - * {@inheritdoc} - */ - public function getDoctrineMigrations() - { - return []; - } - /** * {@inheritdoc} */ diff --git a/lib/classes/patch/379alpha1a.php b/lib/classes/patch/379alpha1a.php index ebb1fc121f..bd23afc01d 100644 --- a/lib/classes/patch/379alpha1a.php +++ b/lib/classes/patch/379alpha1a.php @@ -35,14 +35,6 @@ class patch_379alpha1a extends patchAbstract return false; } - /** - * {@inheritdoc} - */ - public function getDoctrineMigrations() - { - return []; - } - /** * {@inheritdoc} */ diff --git a/lib/classes/patch/380alpha10a.php b/lib/classes/patch/380alpha10a.php index 3cefc55433..a7b834a86f 100644 --- a/lib/classes/patch/380alpha10a.php +++ b/lib/classes/patch/380alpha10a.php @@ -27,14 +27,6 @@ class patch_380alpha10a extends patchAbstract return $this->release; } - /** - * {@inheritdoc} - */ - public function getDoctrineMigrations() - { - return []; - } - /** * {@inheritdoc} */ diff --git a/lib/classes/patch/380alpha11a.php b/lib/classes/patch/380alpha11a.php index 9228cc2362..440645c6eb 100644 --- a/lib/classes/patch/380alpha11a.php +++ b/lib/classes/patch/380alpha11a.php @@ -51,7 +51,7 @@ class patch_380alpha11a extends patchAbstract */ public function getDoctrineMigrations() { - return ['user', 'session']; + return ['20131118000009', '20131118000006']; } /** diff --git a/lib/classes/patch/380alpha13a.php b/lib/classes/patch/380alpha13a.php index 3c0d9dc972..a4cd84bd17 100644 --- a/lib/classes/patch/380alpha13a.php +++ b/lib/classes/patch/380alpha13a.php @@ -27,14 +27,6 @@ class patch_380alpha13a extends patchAbstract return $this->release; } - /** - * {@inheritdoc} - */ - public function getDoctrineMigrations() - { - return []; - } - /** * {@inheritdoc} */ diff --git a/lib/classes/patch/380alpha14a.php b/lib/classes/patch/380alpha14a.php index a47b9e0f65..21ffa1f4d6 100644 --- a/lib/classes/patch/380alpha14a.php +++ b/lib/classes/patch/380alpha14a.php @@ -35,14 +35,6 @@ class patch_380alpha14a extends patchAbstract return false; } - /** - * {@inheritdoc} - */ - public function getDoctrineMigrations() - { - return []; - } - /** * {@inheritdoc} */ diff --git a/lib/classes/patch/380alpha15a.php b/lib/classes/patch/380alpha15a.php index 196656a8fa..b16b115d4c 100644 --- a/lib/classes/patch/380alpha15a.php +++ b/lib/classes/patch/380alpha15a.php @@ -27,14 +27,6 @@ class patch_380alpha15a extends patchAbstract return $this->release; } - /** - * {@inheritdoc} - */ - public function getDoctrineMigrations() - { - return []; - } - /** * {@inheritdoc} */ diff --git a/lib/classes/patch/380alpha16a.php b/lib/classes/patch/380alpha16a.php index 8ee289a7f3..2fe30b1b99 100644 --- a/lib/classes/patch/380alpha16a.php +++ b/lib/classes/patch/380alpha16a.php @@ -27,14 +27,6 @@ class patch_380alpha16a extends patchAbstract return $this->release; } - /** - * {@inheritdoc} - */ - public function getDoctrineMigrations() - { - return []; - } - /** * {@inheritdoc} */ diff --git a/lib/classes/patch/380alpha17a.php b/lib/classes/patch/380alpha17a.php index 9550ed3977..0f192925bf 100644 --- a/lib/classes/patch/380alpha17a.php +++ b/lib/classes/patch/380alpha17a.php @@ -27,14 +27,6 @@ class patch_380alpha17a extends patchAbstract return $this->release; } - /** - * {@inheritdoc} - */ - public function getDoctrineMigrations() - { - return []; - } - /** * {@inheritdoc} */ diff --git a/lib/classes/patch/380alpha18a.php b/lib/classes/patch/380alpha18a.php index e94700409a..3d1ad98155 100644 --- a/lib/classes/patch/380alpha18a.php +++ b/lib/classes/patch/380alpha18a.php @@ -28,14 +28,6 @@ class patch_380alpha18a extends patchAbstract return $this->release; } - /** - * {@inheritdoc} - */ - public function getDoctrineMigrations() - { - return []; - } - /** * {@inheritdoc} */ diff --git a/lib/classes/patch/380alpha2a.php b/lib/classes/patch/380alpha2a.php index ac82a0ca87..665d3f6219 100644 --- a/lib/classes/patch/380alpha2a.php +++ b/lib/classes/patch/380alpha2a.php @@ -35,14 +35,6 @@ class patch_380alpha2a extends patchAbstract return false; } - /** - * {@inheritdoc} - */ - public function getDoctrineMigrations() - { - return []; - } - /** * {@inheritdoc} */ diff --git a/lib/classes/patch/380alpha2b.php b/lib/classes/patch/380alpha2b.php index 9649e36884..61d390310f 100644 --- a/lib/classes/patch/380alpha2b.php +++ b/lib/classes/patch/380alpha2b.php @@ -35,14 +35,6 @@ class patch_380alpha2b extends patchAbstract return true; } - /** - * {@inheritdoc} - */ - public function getDoctrineMigrations() - { - return []; - } - /** * {@inheritdoc} */ diff --git a/lib/classes/patch/380alpha3a.php b/lib/classes/patch/380alpha3a.php index 3439109f16..6bb430b7e5 100644 --- a/lib/classes/patch/380alpha3a.php +++ b/lib/classes/patch/380alpha3a.php @@ -35,14 +35,6 @@ class patch_380alpha3a extends patchAbstract return true; } - /** - * {@inheritdoc} - */ - public function getDoctrineMigrations() - { - return []; - } - /** * {@inheritdoc} */ diff --git a/lib/classes/patch/380alpha3b.php b/lib/classes/patch/380alpha3b.php index a80ad9e5eb..d832233b89 100644 --- a/lib/classes/patch/380alpha3b.php +++ b/lib/classes/patch/380alpha3b.php @@ -43,14 +43,6 @@ class patch_380alpha3b extends patchAbstract return $this->concern; } - /** - * {@inheritdoc} - */ - public function getDoctrineMigrations() - { - return []; - } - /** * {@inheritdoc} */ diff --git a/lib/classes/patch/380alpha4a.php b/lib/classes/patch/380alpha4a.php index ace3ffa82b..7014c5150d 100644 --- a/lib/classes/patch/380alpha4a.php +++ b/lib/classes/patch/380alpha4a.php @@ -49,7 +49,7 @@ class patch_380alpha4a extends patchAbstract */ public function getDoctrineMigrations() { - return ['auth-failure']; + return ['20131118000005']; } /** diff --git a/lib/classes/patch/380alpha6a.php b/lib/classes/patch/380alpha6a.php index e3e3f45fe6..cfd1d5f057 100644 --- a/lib/classes/patch/380alpha6a.php +++ b/lib/classes/patch/380alpha6a.php @@ -43,14 +43,6 @@ class patch_380alpha6a extends patchAbstract return $this->concern; } - /** - * {@inheritdoc} - */ - public function getDoctrineMigrations() - { - return []; - } - /** * {@inheritdoc} */ diff --git a/lib/classes/patch/380alpha8a.php b/lib/classes/patch/380alpha8a.php index 80b3dd08a5..bed812676a 100644 --- a/lib/classes/patch/380alpha8a.php +++ b/lib/classes/patch/380alpha8a.php @@ -43,14 +43,6 @@ class patch_380alpha8a extends patchAbstract return $this->concern; } - /** - * {@inheritdoc} - */ - public function getDoctrineMigrations() - { - return []; - } - /** * {@inheritdoc} */ diff --git a/lib/classes/patch/380alpha9a.php b/lib/classes/patch/380alpha9a.php index 44ec54d194..60f587184b 100644 --- a/lib/classes/patch/380alpha9a.php +++ b/lib/classes/patch/380alpha9a.php @@ -43,14 +43,6 @@ class patch_380alpha9a extends patchAbstract return $this->concern; } - /** - * {@inheritdoc} - */ - public function getDoctrineMigrations() - { - return []; - } - /** * {@inheritdoc} */ diff --git a/lib/classes/patch/381alpha1b.php b/lib/classes/patch/381alpha1b.php index ef714232d0..960c6a6252 100644 --- a/lib/classes/patch/381alpha1b.php +++ b/lib/classes/patch/381alpha1b.php @@ -35,14 +35,6 @@ class patch_381alpha1b extends patchAbstract return false; } - /** - * {@inheritdoc} - */ - public function getDoctrineMigrations() - { - return []; - } - /** * {@inheritdoc} */ diff --git a/lib/classes/patch/381alpha2a.php b/lib/classes/patch/381alpha2a.php index 9b070ce0a3..95688e3d2d 100644 --- a/lib/classes/patch/381alpha2a.php +++ b/lib/classes/patch/381alpha2a.php @@ -35,14 +35,6 @@ class patch_381alpha2a extends patchAbstract return false; } - /** - * {@inheritdoc} - */ - public function getDoctrineMigrations() - { - return []; - } - /** * {@inheritdoc} */ diff --git a/lib/classes/patch/381alpha3a.php b/lib/classes/patch/381alpha3a.php index f5ae5bf2f7..486cf92b43 100644 --- a/lib/classes/patch/381alpha3a.php +++ b/lib/classes/patch/381alpha3a.php @@ -27,14 +27,6 @@ class patch_381alpha3a extends patchAbstract return $this->release; } - /** - * {@inheritdoc} - */ - public function getDoctrineMigrations() - { - return []; - } - /** * {@inheritdoc} */ diff --git a/lib/classes/patch/381alpha4a.php b/lib/classes/patch/381alpha4a.php index a9eaf52776..9f8ece9cd2 100644 --- a/lib/classes/patch/381alpha4a.php +++ b/lib/classes/patch/381alpha4a.php @@ -27,14 +27,6 @@ class patch_381alpha4a extends patchAbstract return $this->release; } - /** - * {@inheritdoc} - */ - public function getDoctrineMigrations() - { - return []; - } - /** * {@inheritdoc} */ diff --git a/lib/classes/patch/383alpha1a.php b/lib/classes/patch/383alpha1a.php index 4f08f0f94e..78ba91d0df 100644 --- a/lib/classes/patch/383alpha1a.php +++ b/lib/classes/patch/383alpha1a.php @@ -36,14 +36,6 @@ class patch_383alpha1a extends patchAbstract return false; } - /** - * {@inheritdoc} - */ - public function getDoctrineMigrations() - { - return []; - } - /** * {@inheritdoc} */ diff --git a/lib/classes/patch/383alpha2a.php b/lib/classes/patch/383alpha2a.php index 5f06b0c57a..42e4d80720 100644 --- a/lib/classes/patch/383alpha2a.php +++ b/lib/classes/patch/383alpha2a.php @@ -41,7 +41,7 @@ class patch_383alpha2a extends patchAbstract */ public function getDoctrineMigrations() { - return ['workzone']; + return ['20131118000002']; } /** diff --git a/lib/classes/patch/383alpha3a.php b/lib/classes/patch/383alpha3a.php index 15f5710660..e56d074557 100644 --- a/lib/classes/patch/383alpha3a.php +++ b/lib/classes/patch/383alpha3a.php @@ -35,14 +35,6 @@ class patch_383alpha3a extends patchAbstract return false; } - /** - * {@inheritdoc} - */ - public function getDoctrineMigrations() - { - return []; - } - /** * {@inheritdoc} */ diff --git a/lib/classes/patch/383alpha5a.php b/lib/classes/patch/383alpha5a.php index 241258050d..fe7c211745 100644 --- a/lib/classes/patch/383alpha5a.php +++ b/lib/classes/patch/383alpha5a.php @@ -27,14 +27,6 @@ class patch_383alpha5a extends patchAbstract return $this->release; } - /** - * {@inheritdoc} - */ - public function getDoctrineMigrations() - { - return []; - } - /** * {@inheritdoc} */ diff --git a/lib/classes/patch/386alpha1a.php b/lib/classes/patch/386alpha1a.php index d13ac818d7..9479703c5f 100644 --- a/lib/classes/patch/386alpha1a.php +++ b/lib/classes/patch/386alpha1a.php @@ -27,14 +27,9 @@ class patch_386alpha1a implements patchInterface return $this->release; } - /** - * Returns doctrine migrations needed for the patch. - * - * @return array - */ public function getDoctrineMigrations() { - return array(); + return []; } /** diff --git a/lib/classes/patch/386alpha2a.php b/lib/classes/patch/386alpha2a.php index 0ff9cb5c6a..374e2beb5c 100644 --- a/lib/classes/patch/386alpha2a.php +++ b/lib/classes/patch/386alpha2a.php @@ -45,14 +45,9 @@ class patch_386alpha2a implements patchInterface return $this->concern; } - /** - * Returns doctrine migrations needed for the patch. - * - * @return array - */ public function getDoctrineMigrations() { - return array(); + return []; } /** diff --git a/lib/classes/patch/386alpha3a.php b/lib/classes/patch/386alpha3a.php index 1e607f3277..393730a79c 100644 --- a/lib/classes/patch/386alpha3a.php +++ b/lib/classes/patch/386alpha3a.php @@ -45,14 +45,9 @@ class patch_386alpha3a implements patchInterface return $this->concern; } - /** - * Returns doctrine migrations needed for the patch. - * - * @return array - */ public function getDoctrineMigrations() { - return array(); + return []; } /** diff --git a/lib/classes/patch/386alpha4a.php b/lib/classes/patch/386alpha4a.php index 76ed5ea9cd..968b67fc95 100644 --- a/lib/classes/patch/386alpha4a.php +++ b/lib/classes/patch/386alpha4a.php @@ -42,7 +42,7 @@ class patch_386alpha4a implements patchInterface */ public function getDoctrineMigrations() { - return array('user-list'); + return array('20140219000003'); } /** diff --git a/lib/classes/patch/390alpha11a.php b/lib/classes/patch/390alpha11a.php index abc9379fc8..a18c2522da 100644 --- a/lib/classes/patch/390alpha11a.php +++ b/lib/classes/patch/390alpha11a.php @@ -44,14 +44,6 @@ class patch_390alpha11a extends patchAbstract return $this->concern; } - /** - * {@inheritdoc} - */ - public function getDoctrineMigrations() - { - return []; - } - /** * {@inheritdoc} */ diff --git a/lib/classes/patch/390alpha12a.php b/lib/classes/patch/390alpha12a.php index b351f6fe0a..00295667e4 100644 --- a/lib/classes/patch/390alpha12a.php +++ b/lib/classes/patch/390alpha12a.php @@ -46,14 +46,6 @@ class patch_390alpha12a extends patchAbstract return $this->concern; } - /** - * {@inheritdoc} - */ - public function getDoctrineMigrations() - { - return []; - } - /** * {@inheritdoc} */ diff --git a/lib/classes/patch/390alpha13a.php b/lib/classes/patch/390alpha13a.php index cd12d6937b..d0b7ca7118 100644 --- a/lib/classes/patch/390alpha13a.php +++ b/lib/classes/patch/390alpha13a.php @@ -52,7 +52,7 @@ class patch_390alpha13a implements patchInterface */ public function getDoctrineMigrations() { - return ['registration']; + return ['20140226000001']; } /** diff --git a/lib/classes/patch/390alpha14a.php b/lib/classes/patch/390alpha14a.php index 89fc68449b..a65769e807 100644 --- a/lib/classes/patch/390alpha14a.php +++ b/lib/classes/patch/390alpha14a.php @@ -43,14 +43,6 @@ class patch_390alpha14a extends patchAbstract return $this->concern; } - /** - * {@inheritdoc} - */ - public function getDoctrineMigrations() - { - return []; - } - /** * {@inheritdoc} */ diff --git a/lib/classes/patch/390alpha15a.php b/lib/classes/patch/390alpha15a.php index 2bf6c69b9f..7707f5e0b7 100644 --- a/lib/classes/patch/390alpha15a.php +++ b/lib/classes/patch/390alpha15a.php @@ -48,7 +48,7 @@ class patch_390alpha15a extends patchAbstract */ public function getDoctrineMigrations() { - return ['token']; + return ['20140305000001']; } /** diff --git a/lib/classes/patch/390alpha16a.php b/lib/classes/patch/390alpha16a.php index f6684c551e..020e82434d 100644 --- a/lib/classes/patch/390alpha16a.php +++ b/lib/classes/patch/390alpha16a.php @@ -50,7 +50,7 @@ class patch_390alpha16a extends patchAbstract */ public function getDoctrineMigrations() { - return ['preset']; + return ['20140314000002']; } /** diff --git a/lib/classes/patch/390alpha17a.php b/lib/classes/patch/390alpha17a.php index a41820a2c8..9173726293 100644 --- a/lib/classes/patch/390alpha17a.php +++ b/lib/classes/patch/390alpha17a.php @@ -49,7 +49,7 @@ class patch_390alpha17a extends patchAbstract */ public function getDoctrineMigrations() { - return ['api']; + return ['20140324000001']; } /** diff --git a/lib/classes/patch/390alpha18a.php b/lib/classes/patch/390alpha18a.php index 7877deb509..6652869871 100644 --- a/lib/classes/patch/390alpha18a.php +++ b/lib/classes/patch/390alpha18a.php @@ -48,7 +48,7 @@ class patch_390alpha18a extends patchAbstract */ public function getDoctrineMigrations() { - return ['user', 'lazaret', 'feed', 'session']; + return ['20131118000009', '20131118000003', '20131118000001', '20131118000006']; } /** diff --git a/lib/classes/patch/390alpha19a.php b/lib/classes/patch/390alpha19a.php index a4ad1f1eac..10541d002e 100644 --- a/lib/classes/patch/390alpha19a.php +++ b/lib/classes/patch/390alpha19a.php @@ -43,14 +43,6 @@ class patch_390alpha19a extends patchAbstract return $this->concern; } - /** - * {@inheritdoc} - */ - public function getDoctrineMigrations() - { - return []; - } - /** * {@inheritdoc} */ diff --git a/lib/classes/patch/390alpha1a.php b/lib/classes/patch/390alpha1a.php index 117f0eeb67..cefb0d1932 100644 --- a/lib/classes/patch/390alpha1a.php +++ b/lib/classes/patch/390alpha1a.php @@ -53,7 +53,7 @@ class patch_390alpha1a extends patchAbstract */ public function getDoctrineMigrations() { - return ['user', 'order']; + return ['20131118000009', '20131118000008']; } /** diff --git a/lib/classes/patch/390alpha20a.php b/lib/classes/patch/390alpha20a.php index 6967ede003..48db66c00b 100644 --- a/lib/classes/patch/390alpha20a.php +++ b/lib/classes/patch/390alpha20a.php @@ -43,14 +43,6 @@ class patch_390alpha20a extends patchAbstract return $this->concern; } - /** - * {@inheritdoc} - */ - public function getDoctrineMigrations() - { - return []; - } - /** * {@inheritdoc} */ diff --git a/lib/classes/patch/390alpha21a.php b/lib/classes/patch/390alpha21a.php index f530f70307..835ed312d2 100644 --- a/lib/classes/patch/390alpha21a.php +++ b/lib/classes/patch/390alpha21a.php @@ -43,14 +43,6 @@ class patch_390alpha21a extends patchAbstract return $this->concern; } - /** - * {@inheritdoc} - */ - public function getDoctrineMigrations() - { - return []; - } - /** * {@inheritdoc} */ diff --git a/lib/classes/patch/390alpha3a.php b/lib/classes/patch/390alpha3a.php index 795dd21ed7..0c0c699955 100644 --- a/lib/classes/patch/390alpha3a.php +++ b/lib/classes/patch/390alpha3a.php @@ -49,7 +49,7 @@ class patch_390alpha3a extends patchAbstract */ public function getDoctrineMigrations() { - return ['user', 'user-query']; + return ['20131118000009', '20131118000010']; } /** diff --git a/lib/classes/patch/390alpha4a.php b/lib/classes/patch/390alpha4a.php index 78703a1f85..bd6d76cb8e 100644 --- a/lib/classes/patch/390alpha4a.php +++ b/lib/classes/patch/390alpha4a.php @@ -49,7 +49,7 @@ class patch_390alpha4a extends patchAbstract */ public function getDoctrineMigrations() { - return ['user-setting']; + return ['20131118000011']; } /** diff --git a/lib/classes/patch/390alpha5a.php b/lib/classes/patch/390alpha5a.php index ffa5a19441..3dfcae6164 100644 --- a/lib/classes/patch/390alpha5a.php +++ b/lib/classes/patch/390alpha5a.php @@ -49,7 +49,7 @@ class patch_390alpha5a extends patchAbstract */ public function getDoctrineMigrations() { - return ['user-notif-setting']; + return ['20131118000012']; } /** diff --git a/lib/classes/patch/390alpha6a.php b/lib/classes/patch/390alpha6a.php index 86a5ae7ec3..c0fc855b2d 100644 --- a/lib/classes/patch/390alpha6a.php +++ b/lib/classes/patch/390alpha6a.php @@ -51,7 +51,7 @@ class patch_390alpha6a extends patchAbstract */ public function getDoctrineMigrations() { - return ['ftp-export']; + return ['20131118000013']; } /** diff --git a/lib/classes/patch/390alpha7a.php b/lib/classes/patch/390alpha7a.php index cba8798354..ee264e267a 100644 --- a/lib/classes/patch/390alpha7a.php +++ b/lib/classes/patch/390alpha7a.php @@ -55,7 +55,7 @@ class patch_390alpha7a extends patchAbstract */ public function getDoctrineMigrations() { - return ['aggregate-token', 'feed']; + return ['20140314000001', '20131118000001']; } /** diff --git a/lib/classes/patch/390alpha8a.php b/lib/classes/patch/390alpha8a.php index c7faac5539..cd427f76c4 100644 --- a/lib/classes/patch/390alpha8a.php +++ b/lib/classes/patch/390alpha8a.php @@ -49,7 +49,7 @@ class patch_390alpha8a extends patchAbstract */ public function getDoctrineMigrations() { - return ['task']; + return ['20131118000004']; } /** diff --git a/lib/classes/patch/390alpha9a.php b/lib/classes/patch/390alpha9a.php index 3c834a6821..681088a8e2 100644 --- a/lib/classes/patch/390alpha9a.php +++ b/lib/classes/patch/390alpha9a.php @@ -43,14 +43,6 @@ class patch_390alpha9a extends patchAbstract return $this->concern; } - /** - * {@inheritdoc} - */ - public function getDoctrineMigrations() - { - return []; - } - /** * {@inheritdoc} */ diff --git a/lib/classes/patch/390alpha9b.php b/lib/classes/patch/390alpha9b.php index 978a3a483a..874e969b7a 100644 --- a/lib/classes/patch/390alpha9b.php +++ b/lib/classes/patch/390alpha9b.php @@ -44,14 +44,6 @@ class patch_390alpha9b extends patchAbstract return $this->concern; } - /** - * {@inheritdoc} - */ - public function getDoctrineMigrations() - { - return []; - } - /** * {@inheritdoc} */ diff --git a/lib/classes/patchAbstract.php b/lib/classes/patchAbstract.php index 956a119476..785fa75394 100644 --- a/lib/classes/patchAbstract.php +++ b/lib/classes/patchAbstract.php @@ -47,4 +47,9 @@ abstract class patchAbstract implements patchInterface ->listTableDetails($tableName) ->hasColumn($fieldName); } + + public function getDoctrineMigrations() + { + return []; + } } diff --git a/lib/conf.d/migrations.yml b/lib/conf.d/migrations.yml index 8818bd7834..6041c3eaaa 100644 --- a/lib/conf.d/migrations.yml +++ b/lib/conf.d/migrations.yml @@ -4,69 +4,25 @@ migrations_directory: lib/Alchemy/Phrasea/Setup/DoctrineMigrations table_name: doctrine_migration_versions migrations: - migration1: - version: feed - class: Alchemy\Phrasea\Setup\DoctrineMigrations\FeedMigration - migration2: - version: workzone - class: Alchemy\Phrasea\Setup\DoctrineMigrations\WorkzoneMigration - migration3: - version: lazaret - class: Alchemy\Phrasea\Setup\DoctrineMigrations\LazaretMigration - migration4: - version: task - class: Alchemy\Phrasea\Setup\DoctrineMigrations\TaskMigration - migration5: - version: auth-failure - class: Alchemy\Phrasea\Setup\DoctrineMigrations\AuthFailureMigration - migration6: - version: session - class: Alchemy\Phrasea\Setup\DoctrineMigrations\SessionMigration - migration7: - version: ftp-credential - class: Alchemy\Phrasea\Setup\DoctrineMigrations\FtpCredentialMigration - migration8: - version: order - class: Alchemy\Phrasea\Setup\DoctrineMigrations\OrderMigration - migration9: - version: user - class: Alchemy\Phrasea\Setup\DoctrineMigrations\UserMigration - migration10: - version: user-query - class: Alchemy\Phrasea\Setup\DoctrineMigrations\UserQueryMigration - migration11: - version: user-setting - class: Alchemy\Phrasea\Setup\DoctrineMigrations\UserSettingMigration - migration12: - version: user-notif-setting - class: Alchemy\Phrasea\Setup\DoctrineMigrations\UserNotificationSettingMigration - migration13: - version: ftp-export - class: Alchemy\Phrasea\Setup\DoctrineMigrations\FtpExportMigration - migration14: - version: user-field - class: Alchemy\Phrasea\Setup\DoctrineMigrations\UserFieldMigration - migration15: - version: user-id-field-delete - class: Alchemy\Phrasea\Setup\DoctrineMigrations\DeleteUsrIdFieldMigration - migration16: - version: user-list - class: Alchemy\Phrasea\Setup\DoctrineMigrations\UserListMigration - migration17: - version: user-auth-provider - class: Alchemy\Phrasea\Setup\DoctrineMigrations\UserAuthProviderMigration - migration18: - version: registration - class: Alchemy\Phrasea\Setup\DoctrineMigrations\RegistrationMigration - migration19: - version: token - class: Alchemy\Phrasea\Setup\DoctrineMigrations\TokenMigration - migration20: - version: api - class: Alchemy\Phrasea\Setup\DoctrineMigrations\ApiMigration - migration21: - version: aggregate-token - class: Alchemy\Phrasea\Setup\DoctrineMigrations\AggregateTokenMigration - migration22: - version: preset - class: Alchemy\Phrasea\Setup\DoctrineMigrations\PresetMigration + - {version: '20131118000001', class: 'Alchemy\Phrasea\Setup\DoctrineMigrations\FeedMigration'} + - {version: '20131118000002', class: 'Alchemy\Phrasea\Setup\DoctrineMigrations\WorkzoneMigration'} + - {version: '20131118000003', class: 'Alchemy\Phrasea\Setup\DoctrineMigrations\LazaretMigration'} + - {version: '20131118000004', class: 'Alchemy\Phrasea\Setup\DoctrineMigrations\TaskMigration'} + - {version: '20131118000005', class: 'Alchemy\Phrasea\Setup\DoctrineMigrations\AuthFailureMigration'} + - {version: '20131118000006', class: 'Alchemy\Phrasea\Setup\DoctrineMigrations\SessionMigration'} + - {version: '20131118000007', class: 'Alchemy\Phrasea\Setup\DoctrineMigrations\FtpCredentialMigration'} + - {version: '20131118000008', class: 'Alchemy\Phrasea\Setup\DoctrineMigrations\OrderMigration'} + - {version: '20131118000009', class: 'Alchemy\Phrasea\Setup\DoctrineMigrations\UserMigration'} + - {version: '20131118000010', class: 'Alchemy\Phrasea\Setup\DoctrineMigrations\UserQueryMigration'} + - {version: '20131118000011', class: 'Alchemy\Phrasea\Setup\DoctrineMigrations\UserSettingMigration'} + - {version: '20131118000012', class: 'Alchemy\Phrasea\Setup\DoctrineMigrations\UserNotificationSettingMigration'} + - {version: '20131118000013', class: 'Alchemy\Phrasea\Setup\DoctrineMigrations\FtpExportMigration'} + - {version: '20140219000001', class: 'Alchemy\Phrasea\Setup\DoctrineMigrations\UserFieldMigration'} + - {version: '20140219000002', class: 'Alchemy\Phrasea\Setup\DoctrineMigrations\DeleteUsrIdFieldMigration'} + - {version: '20140219000003', class: 'Alchemy\Phrasea\Setup\DoctrineMigrations\UserListMigration'} + - {version: '20140219000004', class: 'Alchemy\Phrasea\Setup\DoctrineMigrations\UserAuthProviderMigration'} + - {version: '20140226000001', class: 'Alchemy\Phrasea\Setup\DoctrineMigrations\RegistrationMigration'} + - {version: '20140305000001', class: 'Alchemy\Phrasea\Setup\DoctrineMigrations\TokenMigration'} + - {version: '20140324000001', class: 'Alchemy\Phrasea\Setup\DoctrineMigrations\ApiMigration'} + - {version: '20140314000001', class: 'Alchemy\Phrasea\Setup\DoctrineMigrations\AggregateTokenMigration'} + - {version: '20140314000002', class: 'Alchemy\Phrasea\Setup\DoctrineMigrations\PresetMigration'}