Julian/phpbb_board3-portal_tlw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #692 from marc1706/ticket/690

Browse Source 
[ticket/690] Change .yml files to use single quotes for arguments
This commit is contained in:
Marc Alexander
2017-01-15 12:54:44 +01:00
committed by GitHub
parent 070d25ca4b 719d0e9cfb
commit 3853fde6ed
6 changed files with 290 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.xml
View File

@@ -74,7 +74,7 @@
<exec command="CURRENT_BUILD_REV=$(git rev-parse --abbrev-ref HEAD)" passthru="true" />
<exec command="echo $GIT_BRANCH" passthru="true" />
<exec command="git clone -v --progress https://github.com/phpbb/phpbb.git phpbb" passthru="true" />
<exec dir="${build-directory}/../phpbb" command="git checkout master" passthru="true" />
<exec dir="${build-directory}/../phpbb" command="git checkout 3.2.x" passthru="true" />
<exec dir="${build-directory}/../phpbb/phpBB" command="php ../composer.phar install" passthru="true" />
<mkdir dir="phpbb/phpBB/ext/board3" />
<exec dir="${build-directory}/../phpbb/phpBB/ext/board3" command="git clone https://github.com/board3/Board3-Portal.git portal" passthru="true" />

334
config/modules.yml
View File

@@ -2,322 +2,322 @@ services:
board3.portal.module.announcements:
class: board3\portal\modules\announcements
arguments:
- @auth
- @cache
- @config
- @template
- @dbal.conn
- @pagination
- @board3.portal.modules_helper
- @request
- %core.php_ext%
- %core.root_path%
- @user
- @board3.portal.fetch_posts
- '@auth'
- '@cache'
- '@config'
- '@template'
- '@dbal.conn'
- '@pagination'
- '@board3.portal.modules_helper'
- '@request'
- '%core.php_ext%'
- '%core.root_path%'
- '@user'
- '@board3.portal.fetch_posts'
tags:
- { name: board3.portal.module }
board3.portal.module.attachments:
class: board3\portal\modules\attachments
arguments:
- @auth
- @config
- @board3.portal.modules_helper
- @template
- @dbal.conn
- @request
- %core.php_ext%
- %core.root_path%
- @user
- '@auth'
- '@config'
- '@board3.portal.modules_helper'
- '@template'
- '@dbal.conn'
- '@request'
- '%core.php_ext%'
- '%core.root_path%'
- '@user'
tags:
- { name: board3.portal.module }
board3.portal.module.birthday_list:
class: board3\portal\modules\birthday_list
arguments:
- @config
- @template
- @dbal.conn
- @user
- '@config'
- '@template'
- '@dbal.conn'
- '@user'
tags:
- { name: board3.portal.module }
board3.portal.module.calendar:
class: board3\portal\modules\calendar
arguments:
- @config
- @board3.portal.modules_helper
- @template
- @dbal.conn
- @request
- %core.root_path%
- %core.php_ext%
- @user
- @path_helper
- @log
- '@config'
- '@board3.portal.modules_helper'
- '@template'
- '@dbal.conn'
- '@request'
- '%core.root_path%'
- '%core.php_ext%'
- '@user'
- '@path_helper'
- '@log'
tags:
- { name: board3.portal.module }
board3.portal.module.clock:
class: board3\portal\modules\clock
arguments:
- @config
- @template
- '@config'
- '@template'
tags:
- { name: board3.portal.module }
board3.portal.module.custom:
class: board3\portal\modules\custom
arguments:
- @config
- @template
- @dbal.conn
- @request
- %core.root_path%
- %core.php_ext%
- @user
- @log
- '@config'
- '@template'
- '@dbal.conn'
- '@request'
- '%core.root_path%'
- '%core.php_ext%'
- '@user'
- '@log'
tags:
- { name: board3.portal.module }
board3.portal.module.donation:
class: board3\portal\modules\donation
arguments:
- @config
- @request
- @template
- @user
- @board3.portal.modules_helper
- '@config'
- '@request'
- '@template'
- '@user'
- '@board3.portal.modules_helper'
tags:
- { name: board3.portal.module }
board3.portal.module.forumlist:
class: board3\portal\modules\forumlist
arguments:
- @auth
- @config
- @template
- %core.root_path%
- %core.php_ext%
- @user
- '@auth'
- '@config'
- '@template'
- '%core.root_path%'
- '%core.php_ext%'
- '@user'
tags:
- { name: board3.portal.module }
board3.portal.module.friends:
class: board3\portal\modules\friends
arguments:
- @auth
- @config
- @dbal.conn
- @template
- @user
- '@auth'
- '@config'
- '@dbal.conn'
- '@template'
- '@user'
tags:
- { name: board3.portal.module }
board3.portal.module.latest_bots:
class: board3\portal\modules\latest_bots
arguments:
- @config
- @dbal.conn
- @template
- @user
- '@config'
- '@dbal.conn'
- '@template'
- '@user'
tags:
- { name: board3.portal.module }
board3.portal.module.latest_members:
class: board3\portal\modules\latest_members
arguments:
- @config
- @dbal.conn
- @template
- @user
- '@config'
- '@dbal.conn'
- '@template'
- '@user'
tags:
- { name: board3.portal.module }
board3.portal.module.leaders:
class: board3\portal\modules\leaders
arguments:
- @auth
- @config
- @dbal.conn
- @template
- %core.root_path%
- %core.php_ext%
- @user
- '@auth'
- '@config'
- '@dbal.conn'
- '@template'
- '%core.root_path%'
- '%core.php_ext%'
- '@user'
tags:
- { name: board3.portal.module }
board3.portal.module.link_us:
class: board3\portal\modules\link_us
arguments:
- @config
- @template
- @user
- '@config'
- '@template'
- '@user'
tags:
- { name: board3.portal.module }
board3.portal.module.links:
class: board3\portal\modules\links
arguments:
- @config
- @dbal.conn
- @request
- @template
- %core.root_path%
- %core.php_ext%
- @user
- @log
- '@config'
- '@dbal.conn'
- '@request'
- '@template'
- '%core.root_path%'
- '%core.php_ext%'
- '@user'
- '@log'
tags:
- { name: board3.portal.module }
board3.portal.module.main_menu:
class: board3\portal\modules\main_menu
arguments:
- @config
- @dbal.conn
- @request
- @template
- %core.root_path%
- %core.php_ext%
- @user
- @log
- '@config'
- '@dbal.conn'
- '@request'
- '@template'
- '%core.root_path%'
- '%core.php_ext%'
- '@user'
- '@log'
tags:
- { name: board3.portal.module }
board3.portal.module.news:
class: board3\portal\modules\news
arguments:
- @auth
- @cache
- @config
- @dbal.conn
- @pagination
- @board3.portal.modules_helper
- @request
- @template
- %core.root_path%
- %core.php_ext%
- @user
- @board3.portal.fetch_posts
- '@auth'
- '@cache'
- '@config'
- '@dbal.conn'
- '@pagination'
- '@board3.portal.modules_helper'
- '@request'
- '@template'
- '%core.root_path%'
- '%core.php_ext%'
- '@user'
- '@board3.portal.fetch_posts'
tags:
- { name: board3.portal.module }
board3.portal.module.poll:
class: board3\portal\modules\poll
arguments:
- @auth
- @config
- @dbal.conn
- @request
- @template
- %core.root_path%
- %core.php_ext%
- @user
- @board3.portal.modules_helper
- '@auth'
- '@config'
- '@dbal.conn'
- '@request'
- '@template'
- '%core.root_path%'
- '%core.php_ext%'
- '@user'
- '@board3.portal.modules_helper'
tags:
- { name: board3.portal.module }
board3.portal.module.random_member:
class: board3\portal\modules\random_member
arguments:
- @dbal.conn
- @template
- @user
- '@dbal.conn'
- '@template'
- '@user'
tags:
- { name: board3.portal.module }
board3.portal.module.recent:
class: board3\portal\modules\recent
arguments:
- @auth
- @config
- @dbal.conn
- @request
- @template
- %core.root_path%
- %core.php_ext%
- '@auth'
- '@config'
- '@dbal.conn'
- '@request'
- '@template'
- '%core.root_path%'
- '%core.php_ext%'
tags:
- { name: board3.portal.module }
board3.portal.module.search:
class: board3\portal\modules\search
arguments:
- @template
- %core.php_ext%
- %core.root_path%
- '@template'
- '%core.php_ext%'
- '%core.root_path%'
tags:
- { name: board3.portal.module }
board3.portal.module.statistics:
class: board3\portal\modules\statistics
arguments:
- @cache
- @config
- @dbal.conn
- @template
- @user
- '@cache'
- '@config'
- '@dbal.conn'
- '@template'
- '@user'
tags:
- { name: board3.portal.module }
board3.portal.module.stylechanger:
class: board3\portal\modules\stylechanger
arguments:
- @config
- @board3.portal.modules_helper
- @template
- @dbal.conn
- @request
- @user
- '@config'
- '@board3.portal.modules_helper'
- '@template'
- '@dbal.conn'
- '@request'
- '@user'
tags:
- { name: board3.portal.module }
board3.portal.module.topposters:
class: board3\portal\modules\topposters
arguments:
- @config
- @dbal.conn
- @template
- %core.root_path%
- %core.php_ext%
- '@config'
- '@dbal.conn'
- '@template'
- '%core.root_path%'
- '%core.php_ext%'
tags:
- { name: board3.portal.module }
board3.portal.module.user_menu:
class: board3\portal\modules\user_menu
arguments:
- @auth
- @config
- @controller.helper
- @dbal.conn
- @path_helper
- @template
- @user
- %core.root_path%
- %core.php_ext%
- '@auth'
- '@config'
- '@controller.helper'
- '@dbal.conn'
- '@path_helper'
- '@template'
- '@user'
- '%core.root_path%'
- '%core.php_ext%'
tags:
- { name: board3.portal.module }
board3.portal.module.welcome:
class: board3\portal\modules\welcome
arguments:
- @config
- @request
- @template
- @user
- %core.root_path%
- %core.php_ext%
- '@config'
- '@request'
- '@template'
- '@user'
- '%core.root_path%'
- '%core.php_ext%'
tags:
- { name: board3.portal.module }
board3.portal.module.whois_online:
class: board3\portal\modules\whois_online
arguments:
- @auth
- @config
- @dbal.conn
- @template
- @user
- %core.root_path%
- %core.php_ext%
- '@auth'
- '@config'
- '@dbal.conn'
- '@template'
- '@user'
- '%core.root_path%'
- '%core.php_ext%'
tags:
- { name: board3.portal.module }

26
config/routing.yml
View File

@@ -1,13 +1,13 @@
board3_portal_controller:
path: /portal
defaults: { _controller: board3.portal.main:handle }
# This is currently not supported yet
# board3_portal_pages_controller:
# pattern: /portal/{page}
# defaults: { _controller: board3.portal.main:handle_page, page: "portal" }
# Redirect to portal by default
board3_portal_redirect_controller:
path: /
defaults: { _controller: board3.portal.main:handle }
board3_portal_controller:
path: /portal
defaults: { _controller: board3.portal.main:handle }
# This is currently not supported yet
# board3_portal_pages_controller:
# pattern: /portal/{page}
# defaults: { _controller: board3.portal.main:handle_page, page: "portal" }
# Redirect to portal by default
board3_portal_redirect_controller:
path: /
defaults: { _controller: board3.portal.main:handle }

212
config/services.yml
View File

@@ -1,106 +1,106 @@
imports:
- { resource: modules.yml }
parameters:
board3.portal.config.table: %core.table_prefix%portal_config
board3.portal.modules.table: %core.table_prefix%portal_modules
services:
board3.portal.main:
class: board3\portal\controller\main
arguments:
- @board3.portal.columns
- @config
- @board3.portal.controller_helper
- @template
- @user
- @path_helper
- %core.root_path%
- .%core.php_ext%
- %board3.portal.config.table%
- %board3.portal.modules.table%
board3.portal.controller_helper:
class: board3\portal\controller\helper
arguments:
- @auth
- @board3.portal.columns
- @config
- @language
- @template
- @user
- @path_helper
- @board3.portal.helper
- %core.root_path%
- .%core.php_ext%
board3.portal.module_collection:
class: phpbb\di\service_collection
arguments:
- @service_container
tags:
- { name: service_collection, tag: board3.portal.module }
board3.portal.helper:
class: board3\portal\includes\helper
arguments:
- @board3.portal.module_collection
board3.portal.modules_helper:
class: board3\portal\includes\modules_helper
arguments:
- @auth
- @config
- @controller.helper
- @request
board3.portal.columns:
class: board3\portal\portal\columns
board3.portal.fetch_posts:
class: board3\portal\portal\fetch_posts
arguments:
- @auth
- @cache
- @config
- @dbal.conn
- @board3.portal.modules_helper
- @user
board3.portal.listener:
class: board3\portal\event\listener
arguments:
- @board3.portal.main
- @auth
- @config
- @controller.helper
- @path_helper
- @template
- @user
- %core.php_ext%
tags:
- { name: event.listener }
board3.portal.modules.manager:
class: board3\portal\portal\modules\manager
arguments:
- @cache
- @dbal.conn
- @board3.portal.controller_helper
- @board3.portal.columns
- @board3.portal.helper
- @board3.portal.modules.constraints_handler
- @board3.portal.modules.database_handler
- @request
- @user
board3.portal.modules.database_handler:
class: board3\portal\portal\modules\database_handler
arguments:
- @dbal.conn
board3.portal.modules.constraints_handler:
class: board3\portal\portal\modules\constraints_handler
arguments:
- @board3.portal.columns
- @user
imports:
- { resource: modules.yml }
parameters:
board3.portal.config.table: %core.table_prefix%portal_config
board3.portal.modules.table: %core.table_prefix%portal_modules
services:
board3.portal.main:
class: board3\portal\controller\main
arguments:
- '@board3.portal.columns'
- '@config'
- '@board3.portal.controller_helper'
- '@template'
- '@user'
- '@path_helper'
- '%core.root_path%'
- '.%core.php_ext%'
- '%board3.portal.config.table%'
- '%board3.portal.modules.table%'
board3.portal.controller_helper:
class: board3\portal\controller\helper
arguments:
- '@auth'
- '@board3.portal.columns'
- '@config'
- '@language'
- '@template'
- '@user'
- '@path_helper'
- '@board3.portal.helper'
- '%core.root_path%'
- '.%core.php_ext%'
board3.portal.module_collection:
class: phpbb\di\service_collection
arguments:
- '@service_container'
tags:
- { name: service_collection, tag: board3.portal.module }
board3.portal.helper:
class: board3\portal\includes\helper
arguments:
- '@board3.portal.module_collection'
board3.portal.modules_helper:
class: board3\portal\includes\modules_helper
arguments:
- '@auth'
- '@config'
- '@controller.helper'
- '@request'
board3.portal.columns:
class: board3\portal\portal\columns
board3.portal.fetch_posts:
class: board3\portal\portal\fetch_posts
arguments:
- '@auth'
- '@cache'
- '@config'
- '@dbal.conn'
- '@board3.portal.modules_helper'
- '@user'
board3.portal.listener:
class: board3\portal\event\listener
arguments:
- '@board3.portal.main'
- '@auth'
- '@config'
- '@controller.helper'
- '@path_helper'
- '@template'
- '@user'
- '%core.php_ext%'
tags:
- { name: event.listener }
board3.portal.modules.manager:
class: board3\portal\portal\modules\manager
arguments:
- '@cache'
- '@dbal.conn'
- '@board3.portal.controller_helper'
- '@board3.portal.columns'
- '@board3.portal.helper'
- '@board3.portal.modules.constraints_handler'
- '@board3.portal.modules.database_handler'
- '@request'
- '@user'
board3.portal.modules.database_handler:
class: board3\portal\portal\modules\database_handler
arguments:
- '@dbal.conn'
board3.portal.modules.constraints_handler:
class: board3\portal\portal\modules\constraints_handler
arguments:
- '@board3.portal.columns'
- '@user'

2
language/de/permissions_portal.php
View File

@@ -34,6 +34,6 @@ if (empty($lang) || !is_array($lang))
$lang = array_merge($lang, array(
// Adding the permissions
'ACL_A_MANAGE_PORTAL' => 'Kann Portal-Einstellungen <20>ndern',
'ACL_A_MANAGE_PORTAL' => 'Kann Portal-Einstellungen <20>ndern',
'ACL_U_VIEW_PORTAL' => 'Kann das Portal sehen',
));

4
language/it/permissions_portal.php
View File

@@ -34,6 +34,6 @@ if (empty($lang) || !is_array($lang))
$lang = array_merge($lang, array(
// Adding the permissions
'ACL_A_MANAGE_PORTAL' => 'Pu<50> modificare le impostazioni del portale',
'ACL_U_VIEW_PORTAL' => 'Pu<50> visualizzare il portale',
'ACL_A_MANAGE_PORTAL' => 'Pu<50> modificare le impostazioni del portale',
'ACL_U_VIEW_PORTAL' => 'Pu<50> visualizzare il portale',
));