From f2d7f3714bee018aa02a5d99477173bbfe47fbb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Klein?= Date: Mon, 25 Jan 2016 16:44:17 +0100 Subject: [PATCH 1/3] Shorten package path (claroline/DevBundle@319ab1db80dfe44ef0021bb3f96ab66721c243d9) --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0156dbd..3a5956b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ before_script: - echo "memory_limit=2048M" >> ~/.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;' From aa18e3196c29e9c90033d9619f46795944f781dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Klein?= Date: Mon, 25 Jan 2016 16:44:58 +0100 Subject: [PATCH 2/3] Raise travis memory_limit --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3a5956b..ec87cbb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ 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/Resources/travis/app/* app From 5feb7c83c99b6926ea5665c86ab3b3e3b6df367d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Klein?= Date: Mon, 25 Jan 2016 16:47:50 +0100 Subject: [PATCH 3/3] Raise minimal php version + switch to psr-4 --- composer.json | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 8a0ed7e..7ef9101 100644 --- a/composer.json +++ b/composer.json @@ -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" @@ -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\\": "" } + } }