Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Convert system and themes to PSR-4 #2563

Merged
merged 35 commits into from
Aug 23, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
2092a04
convert ThemeModule
craigh Aug 16, 2015
3525db2
convert AdminModule
craigh Aug 16, 2015
265036c
convert BlocksModule to psr-4
craigh Aug 16, 2015
42c2b97
convert CategoriesModule and ExtensionsModule to psr-4
craigh Aug 16, 2015
ed47b77
correct plugin path for AdminModule
craigh Aug 16, 2015
6231304
convert GroupsModule to psr-4
craigh Aug 16, 2015
4b78c42
convert PageLockModule to psr-4
craigh Aug 16, 2015
4488b83
convert PermissionsModule to psr-4
craigh Aug 16, 2015
1efbad9
reorganize composer file
craigh Aug 16, 2015
201b066
convert SearchModule to psr-4 (@Guite note change to AbstractSearchab…
craigh Aug 16, 2015
1e92c76
convert SecurityCenterModule to psr-4
craigh Aug 16, 2015
de2f251
convert SettingsModule to psr-4
craigh Aug 16, 2015
44d5762
convert UsersModule to psr-4
craigh Aug 16, 2015
de8b95d
move LessGenerator to lib/ ping @phaidon
craigh Aug 16, 2015
a315207
rename ZikulaRoutesModule directory to RoutesModule for consistency a…
craigh Aug 16, 2015
694165e
simplify composer.jsob autoload settings
craigh Aug 16, 2015
daebf62
remove unneeded or commented code related to theme autoloading. (all …
craigh Aug 17, 2015
183e7cd
convert Andreas08Theme to psr-4
craigh Aug 17, 2015
622c695
convert AtomTheme to psr-4
craigh Aug 17, 2015
1eb2fc5
convert BootstrapTheme to psr-4
craigh Aug 17, 2015
c3c8cc7
convert PrinterTheme to psr-4
craigh Aug 17, 2015
07b377b
convert RssTheme to psr-4
craigh Aug 17, 2015
bd5bf57
add themes to autoloading for psr-4. this allows the `composer update…
craigh Aug 17, 2015
85bf413
correct classname path to correct installation error
craigh Aug 17, 2015
f59657c
add comment to upgrade procedure. Themes and modules are already rege…
craigh Aug 17, 2015
97fb019
update changelog
craigh Aug 17, 2015
3e8c470
Add two more BC stub classes needed due to refactoring to psr-4
craigh Aug 19, 2015
e046737
correct method of maintaining BC with psr-0 classes.
craigh Aug 21, 2015
0a1925d
correct paths in theme overrides.yml
craigh Aug 21, 2015
37306d6
correct hard-coded asset paths for psr-4 change
craigh Aug 22, 2015
4d3ade3
correct hard-coded asset paths for psr-4 change
craigh Aug 22, 2015
eb236eb
correct hard-coded asset paths for psr-4 change
craigh Aug 22, 2015
f6b390e
update pot files (includes directory name changes)
craigh Aug 22, 2015
3d3b388
correct classname casing.
craigh Aug 22, 2015
5a31056
correct hard-coded asset paths for psr-4 change
craigh Aug 22, 2015
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
13 changes: 5 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,12 @@
/src/config/personal_config.php
/src/config/multisites_config.php
/src/modules/*
!/src/modules/acme-example
/src/themes/*
!/src/themes/Zikula/Theme/Andreas08Theme
!/src/themes/Zikula/Theme/AtomTheme
!/src/themes/Zikula/Theme/BootstrapTheme
!/src/themes/Zikula/Theme/MobileTheme
!/src/themes/Zikula/Theme/PrinterTheme
!/src/themes/Zikula/Theme/RssTheme
!/src/themes/Zikula/Theme/SeaBreezeTheme
!/src/themes/Andreas08Theme
!/src/themes/AtomTheme
!/src/themes/BootstrapTheme
!/src/themes/PrinterTheme
!/src/themes/RssTheme
!/src/themes/SeaBreezeTheme
/src/app/Resources/locale/*
!/src/app/Resources/locale/en
Expand Down
16 changes: 15 additions & 1 deletion CHANGELOG-1.4.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,20 @@
CHANGELOG - ZIKULA 1.4.0
CHANGELOG - ZIKULA 1.4.x
------------------------

* 1.4.1 ()

- Symfony update to 2.7.3(#2551)
- All system modules and themes updated to PSR-4 (#2563, #2424)
- Core-2.0 Theme Specification finalized and enabled (#2500, #2560)
- Core-2.0 Module Specification finalized and enabled (#2500, #2560)
- TranslatorTrait added (#2560)
- Add vierbergenlars/php-semver vendor lib for version comparison (#2560)
- Add Twig-based theme engine (refs #1753)
- Categorization of Entities enabled (#411)


* 1.4.0 (2015-07-20)

BC Breaks:
- Zikula 1.4.0 requires PHP >=5.4.1
- Removed interactive installer from module specification.
Expand Down
5 changes: 1 addition & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,13 @@
"prefer-stable": true,
"autoload": {
"psr-0": {
"Zikula\\Module\\": "src/system",
"Zikula\\Composer\\": "src/system",
"Zikula\\Theme\\": "src/themes",
"Zikula\\": "src/lib",
"Zikula_": "src/lib/legacy",
"DoctrineExtensions\\StandardFields\\": "src/lib/legacy",
"CustomBundle\\": "src/app/custom"
},
"psr-4": {
"Zikula\\RoutesModule\\": "src/system/ZikulaRoutesModule"
"Zikula\\": ["src/system", "src/themes"]
},
"classmap": [
"src/lib/util/",
Expand Down
219 changes: 2 additions & 217 deletions src/app/Resources/translations/messages.template.pot
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-06-28 15:11+0200\n"
"POT-Creation-Date: 2015-08-22 15:23+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <EMAIL@ADDRESS>\n"
Expand All @@ -11,221 +11,6 @@ msgstr ""
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"


#: Module/SecurityCenterModule/SecurityCenterModuleInstaller.php on line 170
#: system/SecurityCenterModule/SecurityCenterModuleInstaller.php on line 170
msgid "1"
msgstr ""
#: Form/Type/CreateAdminType.php on line 54
msgid "Admin Password"
msgstr ""
#: views/Install/ajaxinstaller.html.twig on line 23
msgid "Begin Installer"
msgstr ""
#: views/Upgrade/ajaxupgrader.html.twig on line 23
msgid "Begin Upgrader"
msgstr ""
#: Resources/views/installheader.html.twig on line 9
msgid "Check requirements"
msgstr ""
#: views/Install/requirements.html.twig on line 111
msgid "Check requirements again"
msgstr ""
#: views/Install/alreadyinstalled.html.twig on line 15
msgid "Click here to visit your homepage"
msgstr ""
#: views/Install/requirements.html.twig on line 79
msgid "Configuration files"
msgstr ""
#: views/Install/createadmin.html.twig on line 9
#: Resources/views/installheader.html.twig on line 15
msgid "Create administrator's account"
msgstr ""
#: views/Install/dbcreds.html.twig on line 9
#: Resources/views/installheader.html.twig on line 12
msgid "Database information"
msgstr ""
#: views/Install/requirements.html.twig on line 98
#: Resources/views/theme.html.twig on line 36
msgid "File system permissions"
msgstr ""
#: views/Install/ajaxinstaller.html.twig on line 44
#: views/Upgrade/ajaxupgrader.html.twig on line 44
msgid "Finish"
msgstr ""
#: views/Pager/pager.html.twig on line 5
#: views/Pager/pagercss.html.twig on line 4
#: views/Pager/pagercss.html.twig on line 7
#: views/Pager/pagerimage.html.twig on line 4
#: views/Pager/pagerimage.html.twig on line 5
#: views/Pager/pagerintervals.html.twig on line 3
#: views/Pager/pageritems.html.twig on line 4
#: views/Pager/pagerjs.html.twig on line 5
msgid "First page"
msgstr ""
#: views/Install/notinstalled.html.twig on line 23
msgid "Install Zikula!"
msgstr ""
#: Resources/views/theme.html.twig on line 31
msgid "Installation guide"
msgstr ""
#: Resources/views/installheader.html.twig on line 3
msgid "Installer script"
msgstr ""
#: views/Install/ajaxinstaller.html.twig on line 26
msgid "Installing Modules and Helpers"
msgstr ""
#: views/Pager/pager.html.twig on line 39
#: views/Pager/pagercss.html.twig on line 21
#: views/Pager/pagercss.html.twig on line 24
#: views/Pager/pagerimage.html.twig on line 23
#: views/Pager/pagerimage.html.twig on line 24
#: views/Pager/pagerintervals.html.twig on line 28
#: views/Pager/pageritems.html.twig on line 24
#: views/Pager/pagerjs.html.twig on line 47
msgid "Last page"
msgstr ""
#: views/Install/createadmin.html.twig on line 44
#: views/Install/dbcreds.html.twig on line 59
#: views/Install/locale.html.twig on line 21
#: Resources/views/login.html.twig on line 30
msgid "Next"
msgstr ""
#: views/Pager/pager.html.twig on line 37
#: views/Pager/pagercss.html.twig on line 20
#: views/Pager/pagercss.html.twig on line 23
#: views/Pager/pagercss2.html.twig on line 46
#: views/Pager/pagerimage.html.twig on line 19
#: views/Pager/pagerimage.html.twig on line 20
#: views/Pager/pagerintervals.html.twig on line 27
#: views/Pager/pageritems.html.twig on line 21
#: views/Pager/pagerjs.html.twig on line 44
msgid "Next page"
msgstr ""
#: views/Pager/pagercss2.html.twig on line 50
msgid "No further pages"
msgstr ""
#: views/Pager/pagercss2.html.twig on line 13
msgid "No previous pages"
msgstr ""
#: views/Install/requirements.html.twig on line 8
msgid "PHP"
msgstr ""
#: views/Install/requirements.html.twig on line 34
msgid "PHP magic_quotes_gpc = Off"
msgstr ""
#: views/Install/requirements.html.twig on line 27
msgid "PHP register_globals = Off"
msgstr ""
#: views/Pager/pagerimage.html.twig on line 14
msgid "Page %1$s / %2$s (%3$s - %4$s of %5$s total)"
msgstr ""
#: Resources/views/login.html.twig on line 9
msgid "Please Login with Admin credentials"
msgstr ""
#: views/Pager/pager.html.twig on line 6
#: views/Pager/pagercss.html.twig on line 5
#: views/Pager/pagercss.html.twig on line 8
#: views/Pager/pagercss2.html.twig on line 9
#: views/Pager/pagerimage.html.twig on line 8
#: views/Pager/pagerimage.html.twig on line 9
#: views/Pager/pagerintervals.html.twig on line 4
#: views/Pager/pageritems.html.twig on line 5
#: views/Pager/pagerjs.html.twig on line 8
msgid "Previous page"
msgstr ""
#: views/Install/ajaxinstaller.html.twig on line 19
msgid "Progress bar"
msgstr ""
#: Form/Type/CreateAdminType.php on line 55
msgid "Repeat Password"
msgstr ""
#: Resources/views/installheader.html.twig on line 6
msgid "Select language"
msgstr ""
#: Resources/views/theme.html.twig on line 33
msgid "Support forums"
msgstr ""
#: views/Upgrade/notupgraded.html.twig on line 23
msgid "To version"
msgstr ""
#: views/Upgrade/notupgraded.html.twig on line 23
msgid "Upgrade Zikula!"
msgstr ""
#: Resources/views/upgradeheader.html.twig on line 3
msgid "Upgrader script"
msgstr ""
#: views/Upgrade/ajaxupgrader.html.twig on line 26
msgid "Upgrading Modules and Helpers"
msgstr ""
#: Resources/views/theme.html.twig on line 30
msgid "Useful resources"
msgstr ""
#: views/Install/notinstalled.html.twig on line 23
msgid "Version"
msgstr ""
#: views/Install/alreadyinstalled.html.twig on line 10
#: views/Install/notinstalled.html.twig on line 10
#: Resources/views/installheader.html.twig on line 2
#: views/Upgrade/notupgraded.html.twig on line 10
#: Resources/views/upgradeheader.html.twig on line 2
msgid "Zikula Application Framework"
msgstr ""
#: Resources/views/structure.html.twig on line 10
msgid "Zikula Core Installer"
msgstr ""
#: views/Install/alreadyinstalled.html.twig on line 11
msgid "Zikula Core is already installed!"
msgstr ""
#: views/Install/notinstalled.html.twig on line 11
msgid "Zikula Core is not installed!"
msgstr ""
#: views/Upgrade/notupgraded.html.twig on line 11
msgid "Zikula Core requires upgrade!"
msgstr ""
#: Resources/views/theme.html.twig on line 32
msgid "Zikula documentation"
msgstr ""
#: views/Install/alreadyinstalled.html.twig on line 3
msgid "Zikula is already installed!"
msgstr ""
#: views/Install/notinstalled.html.twig on line 30
#: views/Upgrade/notupgraded.html.twig on line 30
msgid "Zikula is free software released under the GPL license!"
msgstr ""
#: views/Install/ajaxinstaller.html.twig on line 12
msgid "Zikula is installing!"
msgstr ""
#: views/Install/notinstalled.html.twig on line 3
msgid "Zikula is not installed!"
msgstr ""
#: views/Upgrade/notupgraded.html.twig on line 3
msgid "Zikula is not upgraded!"
msgstr ""
#: views/Upgrade/ajaxupgrader.html.twig on line 12
msgid "Zikula is upgrading!"
msgstr ""
#: views/Upgrade/ajaxupgrader.html.twig on line 23
msgid "be patient!"
msgstr ""
#: Form/Type/RequestContextType.php on line 38
msgid "http"
msgstr ""
#: Form/Type/RequestContextType.php on line 39
msgid "https"
msgstr ""
#: Resources/views/installheader.html.twig on line 21
msgid "installation guide"
msgstr ""
#: views/Install/notinstalled.html.twig on line 15
msgid "installation instructions"
msgstr ""
#: views/Install/alreadyinstalled.html.twig on line 17
#: views/Install/notinstalled.html.twig on line 16
#: views/Upgrade/notupgraded.html.twig on line 16
msgid "online documentation"
msgstr ""
#: Resources/views/upgradeheader.html.twig on line 7
msgid "upgrade guide"
msgstr ""
#: views/Upgrade/notupgraded.html.twig on line 15
msgid "upgrade instructions"
msgstr ""
12 changes: 6 additions & 6 deletions src/app/Resources/translations/routes.template.pot
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ msgstr ""
msgid "zikulaextensionsmodule_admin_deactivateplugin"
msgstr ""
# Desc: /hooks/{moduleName}
# Meaning: Route Controller and method: Zikula\Module\ExtensionsModule\Controller\AdminController::hooksAction
# Meaning: Route Controller and method: Zikula\ExtensionsModule\Controller\AdminController::hooksAction
msgid "zikulaextensionsmodule_admin_hooks"
msgstr ""
# Desc: /
Expand All @@ -396,7 +396,7 @@ msgstr ""
msgid "zikulaextensionsmodule_admin_modifyconfig"
msgstr ""
# Desc: /moduleservices/{moduleName}
# Meaning: Route Controller and method: Zikula\Module\ExtensionsModule\Controller\AdminController::moduleServicesAction
# Meaning: Route Controller and method: Zikula\ExtensionsModule\Controller\AdminController::moduleServicesAction
msgid "zikulaextensionsmodule_admin_moduleservices"
msgstr ""
# Desc: /modules/remove
Expand Down Expand Up @@ -1124,15 +1124,15 @@ msgstr ""
msgid "zikulausersmodule_user_confirmchemail"
msgstr ""
# Desc: /useraccount
# Meaning: Route Controller and method: Zikula\Module\UsersModule\Controller\UserController::indexAction
# Meaning: Route Controller and method: Zikula\UsersModule\Controller\UserController::indexAction
msgid "zikulausersmodule_user_index"
msgstr ""
# Desc: /login
# Meaning: Route Controller and method: Zikula\Module\UsersModule\Controller\UserController::loginAction
# Meaning: Route Controller and method: Zikula\UsersModule\Controller\UserController::loginAction
msgid "zikulausersmodule_user_login"
msgstr ""
# Desc: /logout
# Meaning: Route Controller and method: Zikula\Module\UsersModule\Controller\UserController::logoutAction
# Meaning: Route Controller and method: Zikula\UsersModule\Controller\UserController::logoutAction
msgid "zikulausersmodule_user_logout"
msgstr ""
# Desc: /lost-password
Expand All @@ -1152,7 +1152,7 @@ msgstr ""
msgid "zikulausersmodule_user_lostuname"
msgstr ""
# Desc: /register
# Meaning: Route Controller and method: Zikula\Module\UsersModule\Controller\UserController::registerAction
# Meaning: Route Controller and method: Zikula\UsersModule\Controller\UserController::registerAction
msgid "zikulausersmodule_user_register"
msgstr ""
# Desc: /email/update
Expand Down
2 changes: 1 addition & 1 deletion src/app/Resources/translations/validators.template.pot
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-06-28 15:11+0200\n"
"POT-Creation-Date: 2015-08-22 15:23+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <EMAIL@ADDRESS>\n"
Expand Down
Loading