From e7385c9e4f943663edbf84749c704eed25732da2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 18 May 2016 11:57:13 +0200
Subject: [PATCH] Try to solve side effect of this fuck... autoload creating a
big mess in a lot of features.
---
.travis.yml | 10 ++--------
htdocs/.gitignore | 2 +-
.../restler/framework/Luracast/Restler/AutoLoader.php | 1 +
3 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 2c2e34eb4b8..3052d5ad84c 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 050707daf91..608ef55d106 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 c2e454346ee..9639ab44fb7 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;
--
GitLab