[phpMyAdmin Git] [phpmyadmin/phpmyadmin] df7f32: Rewrite User preferences forms as clases

Michal Čihař michal at cihar.com
Wed Sep 6 12:04:11 CEST 2017


  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: df7f328f790dab5a3b3c4244977f65741cc851dc
      https://github.com/phpmyadmin/phpmyadmin/commit/df7f328f790dab5a3b3c4244977f65741cc851dc
  Author: Michal Čihař <michal at cihar.com>
  Date:   2017-09-06 (Wed, 06 Sep 2017)

  Changed paths:
    M doc/config.rst
    M libraries/classes/Config/Descriptions.php
    M libraries/classes/Config/Form.php
    M libraries/classes/Config/FormDisplay.php
    A libraries/classes/Config/Forms/BaseForm.php
    A libraries/classes/Config/Forms/BaseFormList.php
    A libraries/classes/Config/Forms/User/ExportForm.php
    A libraries/classes/Config/Forms/User/FeaturesForm.php
    A libraries/classes/Config/Forms/User/ImportForm.php
    A libraries/classes/Config/Forms/User/MainForm.php
    A libraries/classes/Config/Forms/User/NaviForm.php
    A libraries/classes/Config/Forms/User/SqlForm.php
    A libraries/classes/Config/Forms/User/UserFormList.php
    M libraries/user_preferences.inc.php
    M libraries/user_preferences.lib.php
    M prefs_forms.php
    M prefs_manage.php
    A test/classes/config/FormListTest.php
    M test/libraries/PMA_user_preferences_test.php

  Log Message:
  -----------
  Rewrite User preferences forms as clases

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: 73d1599a1a5e146ba9e0700e627161c025c6d531
      https://github.com/phpmyadmin/phpmyadmin/commit/73d1599a1a5e146ba9e0700e627161c025c6d531
  Author: Michal Čihař <michal at cihar.com>
  Date:   2017-09-06 (Wed, 06 Sep 2017)

  Changed paths:
    M db_sql.php
    A libraries/classes/Config/Forms/Page/BrowseForm.php
    A libraries/classes/Config/Forms/Page/DbStructureForm.php
    A libraries/classes/Config/Forms/Page/EditForm.php
    A libraries/classes/Config/Forms/Page/ExportForm.php
    A libraries/classes/Config/Forms/Page/ImportForm.php
    A libraries/classes/Config/Forms/Page/NaviForm.php
    A libraries/classes/Config/Forms/Page/PageFormList.php
    A libraries/classes/Config/Forms/Page/SqlForm.php
    A libraries/classes/Config/Forms/Page/TableStructureForm.php
    M libraries/classes/Config/PageSettings.php
    M server_sql.php
    M tbl_sql.php
    M test/classes/config/FormListTest.php
    M test/classes/config/PageSettingsTest.php

  Log Message:
  -----------
  Rewrite Page settings forms as classes

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: 94bb2e31a124e5212086a6de863f81ec1e92943e
      https://github.com/phpmyadmin/phpmyadmin/commit/94bb2e31a124e5212086a6de863f81ec1e92943e
  Author: Michal Čihař <michal at cihar.com>
  Date:   2017-09-06 (Wed, 06 Sep 2017)

  Changed paths:
    M db_export.php
    M db_import.php
    M db_sql.php
    M libraries/classes/Controllers/Database/DatabaseStructureController.php
    M libraries/classes/Controllers/Table/TableStructureController.php
    M libraries/common.inc.php
    R libraries/config/page_settings.forms.php
    R libraries/config/user_preferences.forms.php
    M server_export.php
    M server_import.php
    M server_sql.php
    M sql.php
    M tbl_change.php
    M tbl_export.php
    M tbl_import.php
    M tbl_sql.php
    M tbl_structure.php
    M test/classes/config/PageSettingsTest.php

  Log Message:
  -----------
  Remove no longer needed page_settings.forms.php and user_preferences.forms.php

Issue #11731

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: 1fb2887a2ad11ab4b030bc6cf427a75fa0384d0e
      https://github.com/phpmyadmin/phpmyadmin/commit/1fb2887a2ad11ab4b030bc6cf427a75fa0384d0e
  Author: Michal Čihař <michal at cihar.com>
  Date:   2017-09-06 (Wed, 06 Sep 2017)

  Changed paths:
    M libraries/classes/Config/Forms/User/FeaturesForm.php
    M libraries/classes/Config/Forms/User/NaviForm.php

  Log Message:
  -----------
  Bring User settings in sync with Setup

- add server navigation configuration, it makes no sense to hide this
  from user as it configures just UI
- reorganize Features form a bit to be in sync with Setup
- add DisableShortcutKeys settings to User
- remove LoginCookieValidity from User settings (there are more cookie
  related settings and all should be handled same)

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: 8490d3a571a59899f8aea46a77bfa4210f9050dd
      https://github.com/phpmyadmin/phpmyadmin/commit/8490d3a571a59899f8aea46a77bfa4210f9050dd
  Author: Michal Čihař <michal at cihar.com>
  Date:   2017-09-06 (Wed, 06 Sep 2017)

  Changed paths:
    A libraries/classes/Config/Forms/Setup/ConfigForm.php
    A libraries/classes/Config/Forms/Setup/ExportForm.php
    A libraries/classes/Config/Forms/Setup/FeaturesForm.php
    A libraries/classes/Config/Forms/Setup/ImportForm.php
    A libraries/classes/Config/Forms/Setup/MainForm.php
    A libraries/classes/Config/Forms/Setup/NaviForm.php
    A libraries/classes/Config/Forms/Setup/ServersForm.php
    A libraries/classes/Config/Forms/Setup/SetupFormList.php
    A libraries/classes/Config/Forms/Setup/SqlForm.php
    R libraries/config/setup.forms.php
    M setup/config.php
    M setup/frames/form.inc.php
    M setup/frames/menu.inc.php
    M setup/frames/servers.inc.php
    M test/classes/config/FormListTest.php

  Log Message:
  -----------
  Rewrite Setup settings forms as classes

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: 09642df6fcd3b7dff60cab2612677e8aa24a0d71
      https://github.com/phpmyadmin/phpmyadmin/commit/09642df6fcd3b7dff60cab2612677e8aa24a0d71
  Author: Michal Čihař <michal at cihar.com>
  Date:   2017-09-06 (Wed, 06 Sep 2017)

  Changed paths:
    M libraries/classes/Config/Forms/BaseForm.php

  Log Message:
  -----------
  Avoid using abstract static functions

This does not work in PHP 5, only in PHP 7.

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: 8490161073511bbd9bb5d35ed677ae6be155ba3e
      https://github.com/phpmyadmin/phpmyadmin/commit/8490161073511bbd9bb5d35ed677ae6be155ba3e
  Author: Michal Čihař <michal at cihar.com>
  Date:   2017-09-06 (Wed, 06 Sep 2017)

  Changed paths:
    M libraries/classes/Config/Forms/Page/PageFormList.php
    M libraries/classes/Config/Forms/Setup/SetupFormList.php
    M libraries/classes/Config/Forms/User/UserFormList.php
    M test/classes/config/FormListTest.php

  Log Message:
  -----------
  Share code for testing FormLists

The tests were same anyway, so avoid duplicating code.

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: 953ef05b92ffbafad0d0e25715038e2a7bd6c51f
      https://github.com/phpmyadmin/phpmyadmin/commit/953ef05b92ffbafad0d0e25715038e2a7bd6c51f
  Author: Michal Čihař <michal at cihar.com>
  Date:   2017-09-06 (Wed, 06 Sep 2017)

  Changed paths:
    M libraries/classes/Config/Descriptions.php
    M libraries/classes/Config/Forms/BaseForm.php
    M libraries/classes/Config/Forms/User/ExportForm.php
    M libraries/classes/Config/Forms/User/FeaturesForm.php
    M libraries/classes/Config/Forms/User/ImportForm.php
    M libraries/classes/Config/Forms/User/MainForm.php
    M libraries/classes/Config/Forms/User/NaviForm.php
    M libraries/classes/Config/Forms/User/SqlForm.php
    M setup/frames/form.inc.php
    M setup/frames/menu.inc.php
    M test/classes/config/FormListTest.php

  Log Message:
  -----------
  Use forms to define menu and titles on setup

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: 5788613cbc5b70947bf1d2d0869ab563862448f1
      https://github.com/phpmyadmin/phpmyadmin/commit/5788613cbc5b70947bf1d2d0869ab563862448f1
  Author: Michal Čihař <michal at cihar.com>
  Date:   2017-09-06 (Wed, 06 Sep 2017)

  Changed paths:
    M libraries/classes/Config/Descriptions.php
    M libraries/user_preferences.inc.php

  Log Message:
  -----------
  Use form name for menu in user preferences

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: e065793dc84f867572c48b193bef2c84df81c2c6
      https://github.com/phpmyadmin/phpmyadmin/commit/e065793dc84f867572c48b193bef2c84df81c2c6
  Author: Michal Čihař <michal at cihar.com>
  Date:   2017-09-06 (Wed, 06 Sep 2017)

  Changed paths:
    M libraries/classes/Config/PageSettings.php
    M prefs_forms.php
    M setup/frames/form.inc.php

  Log Message:
  -----------
  Fold validity check with getting class

There is no need to do this twice (once in ::get).

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: 3559f7a8a58d862d602e416a2af0acb3a0941248
      https://github.com/phpmyadmin/phpmyadmin/commit/3559f7a8a58d862d602e416a2af0acb3a0941248
  Author: Michal Čihař <michal at cihar.com>
  Date:   2017-09-06 (Wed, 06 Sep 2017)

  Changed paths:
    M libraries/classes/Config/Forms/BaseForm.php
    M libraries/classes/Config/Forms/Setup/FeaturesForm.php
    M libraries/classes/Config/Forms/User/FeaturesForm.php
    M libraries/user_preferences.lib.php
    M test/libraries/PMA_user_preferences_test.php

  Log Message:
  -----------
  Remove special casing for UserprefsDeveloperTab

- include it in user form only if allowed
- always include it in setup form

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: 4ec970fc824b775f20e6cd75d1598921236ce7ed
      https://github.com/phpmyadmin/phpmyadmin/commit/4ec970fc824b775f20e6cd75d1598921236ce7ed
  Author: Michal Čihař <michal at cihar.com>
  Date:   2017-09-06 (Wed, 06 Sep 2017)

  Changed paths:
    M libraries/user_preferences.inc.php

  Log Message:
  -----------
  Remove duplicite validation

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: 35fca8e2d5125ce61160b04fadf94a2176365f33
      https://github.com/phpmyadmin/phpmyadmin/commit/35fca8e2d5125ce61160b04fadf94a2176365f33
  Author: Michal Čihař <michal at cihar.com>
  Date:   2017-09-06 (Wed, 06 Sep 2017)

  Changed paths:
    M libraries/classes/Config/Forms/BaseFormList.php

  Log Message:
  -----------
  Remove not used BaseFormList::getDefault

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: bea182257b68e9b8e8a94c36cac29f2ff2813fda
      https://github.com/phpmyadmin/phpmyadmin/commit/bea182257b68e9b8e8a94c36cac29f2ff2813fda
  Author: Michal Čihař <michal at cihar.com>
  Date:   2017-09-06 (Wed, 06 Sep 2017)

  Changed paths:
    M test/libraries/PMA_user_preferences_test.php

  Log Message:
  -----------
  Add test for UserprefsDeveloperTab

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: 8780ae073ede0858fccfee7652baaa42a44a1aa6
      https://github.com/phpmyadmin/phpmyadmin/commit/8780ae073ede0858fccfee7652baaa42a44a1aa6
  Author: Māris <weblate at netparks.lv>
  Date:   2017-09-06 (Wed, 06 Sep 2017)

  Changed paths:
    M po/lv.po

  Log Message:
  -----------
  Translated using Weblate (Latvian)

Currently translated at 17.9% (574 of 3205 strings)

[CI skip]


  Commit: e900f5592941ef86d90a9335f7fa71598bc60c5e
      https://github.com/phpmyadmin/phpmyadmin/commit/e900f5592941ef86d90a9335f7fa71598bc60c5e
  Author: Michal Čihař <michal at cihar.com>
  Date:   2017-09-06 (Wed, 06 Sep 2017)

  Log Message:
  -----------
  Merge branch 'QA_4_7'


  Commit: 403b7ab72ba248103464fdd60bc90d9e06295d00
      https://github.com/phpmyadmin/phpmyadmin/commit/403b7ab72ba248103464fdd60bc90d9e06295d00
  Author: Michal Čihař <michal at cihar.com>
  Date:   2017-09-06 (Wed, 06 Sep 2017)

  Changed paths:
    M db_export.php
    M db_import.php
    M db_sql.php
    M doc/config.rst
    M libraries/classes/Config/Descriptions.php
    M libraries/classes/Config/Form.php
    M libraries/classes/Config/FormDisplay.php
    A libraries/classes/Config/Forms/BaseForm.php
    A libraries/classes/Config/Forms/BaseFormList.php
    A libraries/classes/Config/Forms/Page/BrowseForm.php
    A libraries/classes/Config/Forms/Page/DbStructureForm.php
    A libraries/classes/Config/Forms/Page/EditForm.php
    A libraries/classes/Config/Forms/Page/ExportForm.php
    A libraries/classes/Config/Forms/Page/ImportForm.php
    A libraries/classes/Config/Forms/Page/NaviForm.php
    A libraries/classes/Config/Forms/Page/PageFormList.php
    A libraries/classes/Config/Forms/Page/SqlForm.php
    A libraries/classes/Config/Forms/Page/TableStructureForm.php
    A libraries/classes/Config/Forms/Setup/ConfigForm.php
    A libraries/classes/Config/Forms/Setup/ExportForm.php
    A libraries/classes/Config/Forms/Setup/FeaturesForm.php
    A libraries/classes/Config/Forms/Setup/ImportForm.php
    A libraries/classes/Config/Forms/Setup/MainForm.php
    A libraries/classes/Config/Forms/Setup/NaviForm.php
    A libraries/classes/Config/Forms/Setup/ServersForm.php
    A libraries/classes/Config/Forms/Setup/SetupFormList.php
    A libraries/classes/Config/Forms/Setup/SqlForm.php
    A libraries/classes/Config/Forms/User/ExportForm.php
    A libraries/classes/Config/Forms/User/FeaturesForm.php
    A libraries/classes/Config/Forms/User/ImportForm.php
    A libraries/classes/Config/Forms/User/MainForm.php
    A libraries/classes/Config/Forms/User/NaviForm.php
    A libraries/classes/Config/Forms/User/SqlForm.php
    A libraries/classes/Config/Forms/User/UserFormList.php
    M libraries/classes/Config/PageSettings.php
    M libraries/classes/Controllers/Database/DatabaseStructureController.php
    M libraries/classes/Controllers/Table/TableStructureController.php
    M libraries/common.inc.php
    R libraries/config/page_settings.forms.php
    R libraries/config/setup.forms.php
    R libraries/config/user_preferences.forms.php
    M libraries/user_preferences.inc.php
    M libraries/user_preferences.lib.php
    M prefs_forms.php
    M prefs_manage.php
    M server_export.php
    M server_import.php
    M server_sql.php
    M setup/config.php
    M setup/frames/form.inc.php
    M setup/frames/menu.inc.php
    M setup/frames/servers.inc.php
    M sql.php
    M tbl_change.php
    M tbl_export.php
    M tbl_import.php
    M tbl_sql.php
    M tbl_structure.php
    A test/classes/config/FormListTest.php
    M test/classes/config/PageSettingsTest.php
    M test/libraries/PMA_user_preferences_test.php

  Log Message:
  -----------
  Merge branch 'forms'


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/8c30b3be14f8...403b7ab72ba2


More information about the Git mailing list