Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into dev…

…elop

.travis.yml

@@ -50,7 +50,6 @@ env:
 matrix:
   fast_finish: true
   allow_failures:
-  - php: '7.0'
   - php: nightly
   # FIXME
   #- env: DB=postgresql
@@ -79,7 +78,11 @@ before_install:
 install:
 - |
   echo "Updating Composer"
+  rm $TRAVIS_BUILD_DIR/composer.json
+  rm $TRAVIS_BUILD_DIR/composer.lock
   composer self-update
+  composer -n init
+  composer -n config vendor-dir htdocs/includes
   echo
 
 - |
@@ -100,13 +103,14 @@ install:
 
 - |
   echo "Installing PHP CodeSniffer"
-  composer require squizlabs/php_codesniffer ^2
+  composer -n require squizlabs/php_codesniffer ^2
   echo
 
 - |
-  echo "Adding Composer binaries to the path"
+  echo "Adding path of binaries tools installed by composer to the PATH"
   export PATH="$TRAVIS_BUILD_DIR/htdocs/includes/bin:$PATH"
   echo
+  
 
 before_script:
 - |
@@ -269,29 +273,31 @@ script:
   set +e
   cd htdocs/install
   php upgrade.php 3.5.0 3.6.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade350360.log
-  php upgrade2.php 3.5.0 3.6.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade350360-2.log
-  php step5.php 3.5.0 3.6.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade350360-3.log
+  php upgrade2.php 3.5.0 3.6.0 > $TRAVIS_BUILD_DIR/upgrade350360-2.log
+  php step5.php 3.5.0 3.6.0 > $TRAVIS_BUILD_DIR/upgrade350360-3.log
   php upgrade.php 3.6.0 3.7.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade360370.log
-  php upgrade2.php 3.6.0 3.7.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade360370-2.log
-  php step5.php 3.6.0 3.7.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade360370-3.log
+  php upgrade2.php 3.6.0 3.7.0 > $TRAVIS_BUILD_DIR/upgrade360370-2.log
+  php step5.php 3.6.0 3.7.0 > $TRAVIS_BUILD_DIR/upgrade360370-3.log
   php upgrade.php 3.7.0 3.8.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade370380.log
-  php upgrade2.php 3.7.0 3.8.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade370380-2.log
-  php step5.php 3.7.0 3.8.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade370380-3.log
+  php upgrade2.php 3.7.0 3.8.0 > $TRAVIS_BUILD_DIR/upgrade370380-2.log
+  php step5.php 3.7.0 3.8.0 > $TRAVIS_BUILD_DIR/upgrade370380-3.log
   php upgrade.php 3.8.0 3.9.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade380390.log
-  php upgrade2.php 3.8.0 3.9.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade380390-2.log
-  php step5.php 3.8.0 3.9.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade380390-3.log
+  php upgrade2.php 3.8.0 3.9.0 > $TRAVIS_BUILD_DIR/upgrade380390-2.log
+  php step5.php 3.8.0 3.9.0 > $TRAVIS_BUILD_DIR/upgrade380390-3.log
   php upgrade.php 3.9.0 4.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade390400.log
-  php upgrade2.php 3.9.0 4.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade390400-2.log
-  php step5.php 3.9.0 4.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade390400-3.log
+  php upgrade2.php 3.9.0 4.0.0 MAIN_MODULE_API > $TRAVIS_BUILD_DIR/upgrade390400-2.log
+  php step5.php 3.9.0 4.0.0 > $TRAVIS_BUILD_DIR/upgrade390400-3.log
   cd -
   set +e
   echo
-
+  #cat $TRAVIS_BUILD_DIR/upgrade390400-2.log
+  #cat /tmp/dolibarr_install.log
+  
 - |
   echo "Unit testing"
   # Ensure we catch errors. Set this to +e if you want to go to the end to see log file.
   set -e
-  #phpunit -d memory_limit=-1 -c test/phpunit/phpunittest.xml test/phpunit/AllTests.php
+  phpunit -d memory_limit=-1 -c test/phpunit/phpunittest.xml test/phpunit/AllTests.php
   set +e
 
 - |

COPYRIGHT

@@ -27,7 +27,7 @@ PHPExcel               1.8.1         LGPL-2.1+                   Yes
 php-iban               1.4.7         LGPL-3+                     Yes             Parse and validate IBAN (and IIBAN) bank account information in PHP
 PHPoAuthLib            0.8.2         MIT License                 Yes             Library to provide oauth1 and oauth2 to different service
 PHPPrintIPP            1.3           GPL-2+                      Yes             Library to send print IPP requests
-Restler                3.0           LGPL-3+                     Yes             Library to develop REST Web services
+Restler                3.0.0RC6      LGPL-3+                     Yes             Library to develop REST Web services
 TCPDF                  6.2.12        LGPL-3+                     Yes             PDF generation
 TCPDI                  1.0.0         LGPL-3+ / Apache 2.0        Yes             FPDI replacement
 Swift Mailer           5.4.2-DEV     MIT license                 Yes             Comprehensive mailing tools for PHP

build/composer/README

@@ -0,0 +1,10 @@
+
+To test upgrade of a lib with composer:
+
+composer update --no-dev --no-autoloader --dry-run ccampbell/chromephp
+
+To upgrade a lib with composer:
+
+composer update --no-dev --no-autoloader ccampbell/chromephp
+
+

composer.json

@@ -12,15 +12,18 @@
         "irc": "irc://chat.freenode.net/dolibarr",
         "source": "https://github.com/Dolibarr/dolibarr"
     },
+    "config": {
+        "vendor-dir": "htdocs/includes"
+    },
     "require": {
         "php": ">=5.3.0",
         "ext-curl": "*",
-        "ccampbell/chromephp": "^4.1",
+        "ccampbell/chromephp": "4.1.0",
         "ckeditor/ckeditor": "dev-full/stable",
-        "mike42/escpos-php": "dev-master",
+        "mike42/escpos-php": "1.2.1",
         "mobiledetect/mobiledetectlib": "2.8.17",
         "phpoffice/phpexcel": "1.8.1",
-        "restler/framework": "^3.0",
+        "restler/framework": "3.0.0-RC6",
         "tecnickcom/tcpdf": "6.2.12"
     },
     "require-dev": {
@@ -45,8 +48,5 @@
         "ext-xml": "Excel support",
         "firephp/firephp-core": "Logging to Firebug console support",
         "raven/raven": "Sentry logging server support"
-    },
-    "config": {
-        "vendor-dir": "htdocs/includes"
     }
 }

dev/dolibarr_changes.txt

@@ -116,8 +116,15 @@ JQUERYFILETREE:
 RESTLER:
 --------
 
-   if ($className == 'Luracast\Restler\string') return;
-   if ($className == 'Luracast\Restler\mixed') return;
-
+* Add 2 lines into function     
+	private function alias($className, $currentClass)
+    {
+		...
+to get 
 
+	private function alias($className, $currentClass)
+    {
+        if ($className == 'Luracast\Restler\string') return;
+        if ($className == 'Luracast\Restler\mixed') return;
+		...
 

dev/skeletons/build_class_from_table.php

@@ -180,7 +180,7 @@
 }
 
 // Define output variables
-$outfile='out.'.$classmin.'.class.php';
+$outfile=$classmin.'.class.php';
 $targetcontent=$sourcecontent;
 
 // Substitute module name
@@ -259,7 +259,7 @@
 	if ($addfield)
 	{
 		$varprop.="\t\t\$sql.= '".$prop['field'];
-		if ($i <= count($property)-$no_output_field) $varprop.=",";
+		if ($i < (count($property)-$no_output_field)) $varprop.=",";
 		$varprop.="';";
 		$varprop.="\n";
 	}
@@ -455,9 +455,9 @@
 //--------------------------------------------------------------------
 
 $skeletonfiles=array(
-    $path.'skeleton_script.php' => 'out.'.$classmin.'_script.php', 
-    $path.'skeleton_list.php' => 'out.'.$classmin.'_list.php', 
-    $path.'skeleton_card.php' => 'out.'.$classmin.'_card.php'
+    $path.'skeleton_script.php' => $classmin.'_script.php', 
+    $path.'skeleton_list.php' => $classmin.'_list.php', 
+    $path.'skeleton_card.php' => $classmin.'_card.php'
     );
 
 foreach ($skeletonfiles as $skeletonfile => $outfile)
@@ -670,5 +670,5 @@
 
 // -------------------- END OF BUILD_CLASS_FROM_TABLE SCRIPT --------------------
 
-print "You can now rename generated files by removing the 'out.' prefix in their name and store them into directory /yourmodule/class (for .class.php file) or /yourmodule.\n";
+print "You can now move generated files to store them into directory /yourmodule/class (for .class.php file) or /yourmodule.\n";
 return $error;

dev/skeletons/skeleton_list.php

@@ -266,7 +266,8 @@ function init_myfunc()
     $num = $db->num_rows($resql);
 
     $params='';
-	if ($search_field1 != '') $params.= '&search_field1='.urlencode($search_field1);
+    if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
+    if ($search_field1 != '') $params.= '&search_field1='.urlencode($search_field1);
 	if ($search_field2 != '') $params.= '&search_field2='.urlencode($search_field2);
     if ($optioncss != '') $param.='&optioncss='.$optioncss;
     // Add $param from extra fields
@@ -280,7 +281,7 @@ function init_myfunc()
     print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $params, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_companies', 0, '', '', $limit);
 
 
-	print '<form method="GET" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
     if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';

htdocs/.gitignore

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