Skip to content

Commit

Permalink
Merge branch '4.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
leofeyer committed Jan 23, 2018
2 parents 0d40993 + a929119 commit 21ce5ea
Show file tree
Hide file tree
Showing 3 changed files with 245 additions and 376 deletions.
28 changes: 28 additions & 0 deletions .travis.yml
@@ -0,0 +1,28 @@
language: php

git:
depth: 1

cache:
directories:
- $HOME/.composer/cache

sudo: false

env:
global:
- COMPOSER_ALLOW_XDEBUG=0

matrix:
include:
- php: 7.1
env: COMPOSER_COMMAND=install
- php: 7.2
env: COMPOSER_COMMAND=update
fast_finish: true

install:
- composer $COMPOSER_COMMAND --no-interaction

script:
- php vendor/bin/security-checker security:check --end-point=http://security.sensiolabs.org/check_lock
14 changes: 8 additions & 6 deletions composer.json
Expand Up @@ -2,7 +2,7 @@
"name": "contao/managed-edition",
"type": "project",
"description": "Contao Open Source CMS",
"license": "LGPL-3.0+",
"license": "LGPL-3.0-or-later",
"authors": [
{
"name": "Leo Feyer",
Expand All @@ -17,20 +17,22 @@
"contao/listing-bundle": "^4.5",
"contao/manager-bundle": "4.5.*",
"contao/news-bundle": "^4.5",
"contao/newsletter-bundle": "^4.5",
"roave/security-advisories": "dev-master"
"contao/newsletter-bundle": "^4.5"
},
"config": {
"component-dir": "assets"
},
"extra": {
"branch-alias": {
"dev-4.6": "4.6.x-dev"
}
},
"scripts": {
"post-install-cmd": [
"Contao\\ManagerBundle\\Composer\\ScriptHandler::initializeApplication"
],
"post-update-cmd": [
"Contao\\ManagerBundle\\Composer\\ScriptHandler::initializeApplication"
]
},
"minimum-stability": "beta",
"prefer-stable": true
}
}

0 comments on commit 21ce5ea

Please sign in to comment.