diff --git a/.travis.yml b/.travis.yml index 2c2e34eb4b821b2806aadde851afdfa6dca8cb37..3052d5ad84c755ad032da49e6f5a5d942967c035 100644 --- a/.travis.yml +++ b/.travis.yml @@ -103,11 +103,6 @@ install: composer require squizlabs/php_codesniffer ^2 echo -- | - echo "Adding Composer binaries to the path" - export PATH="$TRAVIS_BUILD_DIR/htdocs/includes/bin:$PATH" - echo - before_script: - | echo Start travis @@ -286,9 +281,8 @@ script: cd - set +e echo - echo Log for upgrade2.php 3.9.0 4.0.0 MAIN_MODULE_API - cat $TRAVIS_BUILD_DIR/upgrade390400-2.log - cat /tmp/dolibarr_install.log + #cat $TRAVIS_BUILD_DIR/upgrade390400-2.log + #cat /tmp/dolibarr_install.log - | echo "Unit testing" diff --git a/htdocs/.gitignore b/htdocs/.gitignore index 050707daf917c6691cea4051c764e39a868afb4d..608ef55d1066e0d29e68a187cc420eee1d539f59 100644 --- a/htdocs/.gitignore +++ b/htdocs/.gitignore @@ -20,5 +20,5 @@ /allscreens* /ecommerce/ /cabinetmed* -/conf/conf.php /webmail* +/conf/conf.php diff --git a/htdocs/includes/restler/framework/Luracast/Restler/AutoLoader.php b/htdocs/includes/restler/framework/Luracast/Restler/AutoLoader.php index c2e454346eec440cd3a16a688659e49526e16ecb..9639ab44fb7f34e58a66ab81d158ee2e439ae28c 100644 --- a/htdocs/includes/restler/framework/Luracast/Restler/AutoLoader.php +++ b/htdocs/includes/restler/framework/Luracast/Restler/AutoLoader.php @@ -307,6 +307,7 @@ class AutoLoader */ private function alias($className, $currentClass) { + // DOL_LDR if ($className == 'Luracast\Restler\string') return; if ($className == 'Luracast\Restler\mixed') return;