Browse Source

Try to solve side effect of this fuck... autoload creating a big mess in
a lot of features.

Laurent Destailleur 9 years ago
parent
commit
e7385c9e4f

+ 2 - 8
.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"

+ 1 - 1
htdocs/.gitignore

@@ -20,5 +20,5 @@
 /allscreens*
 /ecommerce/
 /cabinetmed*
-/conf/conf.php
 /webmail*
+/conf/conf.php

+ 1 - 0
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;