Skip to content

Fix travis build + switch to psr-4 #83

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.

Sign up for GitHub

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix travis build + switch to psr-4 #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f2d7f37
Shorten package path (claroline/DevBundle@319ab1db80dfe44ef0021bb3f96…
stefk Jan 25, 2016
aa18e31
Raise travis memory_limit
stefk Jan 25, 2016
5feb7c8
Raise minimal php version + switch to psr-4
stefk Jan 25, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ before_script:
- php pre-composer.php
- BUNDLE_DIR=`cat bundle_dir.txt`
- cd $BUNDLE_DIR
- echo "memory_limit=2048M" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
- echo "memory_limit=3072M" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
- COMPOSER=composer_travis.json composer update --prefer-source
- cd $ROOT_DIR
- cp -R vendor/claroline/dev-bundle/Claroline/DevBundle/Resources/travis/app/* app
- cp -R vendor/claroline/dev-bundle/Resources/travis/app/* app
- php app/register-bundle.php `cat package_dir.txt`
- rm -rf app/cache/*
- mysql -e 'create database claroline_test_travis;'
Expand Down
9 changes: 3 additions & 6 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
}
],
"require": {
"php": ">=5.4.1",
"php": ">=5.5",
"claroline/core-bundle": "~6.0",
"claroline/message-bundle": "~6.0",
"icap/notification-bundle": "~6.0"
Expand All @@ -22,9 +22,6 @@
"claroline/dev-bundle": "dev-master"
},
"autoload": {
"psr-0": { "Claroline\\ForumBundle": "" }
},
"target-dir": "Claroline/ForumBundle",
"minimum-stability": "dev",
"prefer-stable": true
"psr-4": { "Claroline\\ForumBundle\\": "" }
}
}