Skip to content

Commit

Permalink
Finally adapt standard edition for current Bartacus v0.3 code
Browse files Browse the repository at this point in the history
  • Loading branch information
QuingKhaos committed Sep 14, 2016
1 parent 04b0db5 commit 7f4604a
Show file tree
Hide file tree
Showing 6 changed files with 47 additions and 14 deletions.
20 changes: 11 additions & 9 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
### Composer
composer.phar
Packages/Libraries
/bin/
/Packages/Libraries/

### Typo3
# Ignore serveral upload and file directories.
fileadmin/user_upload/
fileadmin/_processed_/
fileadmin/_temp_/
uploads/
/fileadmin/user_upload/
/fileadmin/_processed_/
/fileadmin/_temp_/
/uploads/
# Ignore system folders and files, you should have them symlinked.
/index.php
typo3
typo3_src
/typo3
/typo3_src
# Ignore temp directory.
typo3temp/
/typo3temp/
# Ignore the deprecation log
typo3conf/deprecation_*.log
/typo3conf/deprecation_*.log
/typo3conf/ENABLE_INSTALL_TOOL

### Symfony
# Parameters
Expand Down
4 changes: 2 additions & 2 deletions .htaccess
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Environments configuration. Choose from Production, Production/Staging and Development
<IfModule mod_setenvif.c>
SetEnvIf Host "example\.com$" TYPO3_CONTEXT=Production
SetEnvIf Host "example\.staging$" TYPO3_CONTEXT=Production/Staging
SetEnvIf Host "example\.dev" TYPO3_CONTEXT=Development
SetEnvIf Host "staging\.example\.com" TYPO3_CONTEXT=Production/Staging
SetEnvIf Host "development\.example\.com" TYPO3_CONTEXT=Development
</IfModule>

# Set composer autoloading
Expand Down
5 changes: 3 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
],
"require": {
"php": ">=5.4.0",
"bartacus/bartacus-bundle": "~0.2.2",
"bartacus/bartacus-bundle": "^0.3",
"cocur/slugify": "^2.0",

"incenteev/composer-parameter-handler": "~2.0",
"roave/security-advisories": "dev-master"
Expand All @@ -37,7 +38,7 @@
"file": "fileadmin/app/config/parameters.yml"
},
"branch-alias": {
"dev-master": "0.2.x-dev"
"dev-master": "0.3.x-dev"
}
}
}
32 changes: 31 additions & 1 deletion fileadmin/app/config/config.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,33 @@
imports:
- { resource: parameters.yml }
- { resource: @BartacusBundle/Resources/config/config.yml }
- { resource: services.yml }

parameters:
locale: en

framework:
default_locale: "%locale%"
translator: { fallbacks: ["%locale%"] }
secret: "%secret%"
router:
resource: "%kernel.root_dir%/config/routing.yml"
strict_requirements: ~
form: ~
csrf_protection: ~
validation: { enable_annotations: true }
templating:
engines: ['twig']
session:
storage_id: session.storage.php_bridge
handler_id: ~

bartacus:
plugins:
resource: "%kernel.root_dir%/config/plugins.yml"
strict_requirements: ~
# dispatch_uris:
# - /.../

twig:
debug: "%kernel.debug%"
strict_variables: "%kernel.debug%"
Empty file.
Empty file.

0 comments on commit 7f4604a

Please sign in to comment.