Merge branch 'develop' into 10.0_accounting6

Dolibarr · Jun 24, 2019 · 229dd4d · 229dd4d
2 parents f66281d + 366efff
commit 229dd4d
Show file tree

Hide file tree

Showing 2,360 changed files with 52,158 additions and 70,801 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -1,7 +1,8 @@
-# EditorConfig is awesome: http://EditorConfig.org
+# EditorConfig is awesome: https://editorconfig.org
 
 # top-most EditorConfig file
 root = true
+
 # Unix-style newlines with a newline ending every file
 [*]
 charset = utf-8
@@ -11,9 +12,10 @@ insert_final_newline = true
 # PHP PSR-2 Coding Standards
 # http://www.php-fig.org/psr/psr-2/
 [*.php]
-indent_style = space
+indent_style = tab
 indent_size = 4
 trim_trailing_whitespace = true
+insert_final_newline = true
 [*.js]
 indent_style = tab
 [*.css]

diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -1,4 +1,7 @@
 # .scrutinizer.yml
+build:
+    - php-scrutinizer-run
+
 imports:
     - javascript
     - php

diff --git a/.travis.yml b/.travis.yml
@@ -164,12 +164,6 @@ before_script:
     echo
     echo "Set timezone"
     echo 'date.timezone = "Europe/Paris"' >> ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php.ini
-    if [ "$TRAVIS_PHP_VERSION" = '5.4' ]; then
-      # Documentation says it should be available for all PHP versions but it's not for 5.5 and 5.6, 7.0, 7.1, 7.2 and nightly!
-      echo
-      echo "Enabling Memcached for PHP <= 5.4"
-      echo 'extension = memcached.so' >> ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php.ini
-    fi
     phpenv rehash
     echo
 
@@ -350,6 +344,9 @@ script:
   php upgrade.php 9.0.0 10.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade9001000.log
   php upgrade2.php 9.0.0 10.0.0 > $TRAVIS_BUILD_DIR/upgrade9001000-2.log
   php step5.php 9.0.0 10.0.0 > $TRAVIS_BUILD_DIR/upgrade9001000-3.log
+  php upgrade.php 10.0.0 11.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade9001000.log
+  php upgrade2.php 10.0.0 11.0.0 > $TRAVIS_BUILD_DIR/upgrade9001000-2.log
+  php step5.php 10.0.0 11.0.0 > $TRAVIS_BUILD_DIR/upgrade9001000-3.log
   # Enable modules not enabled into original dump
   php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_API,MAIN_MODULE_SUPPLIERPROPOSAL,MAIN_MODULE_WEBSITE,MAIN_MODULE_TICKETSUP,MAIN_MODULE_ACCOUNTING > $TRAVIS_BUILD_DIR/enablemodule.log
   echo $?

diff --git a/COPYRIGHT b/COPYRIGHT
@@ -13,29 +13,28 @@ Component              Version       License                     GPL Compatible
 -------------------------------------------------------------------------------------
 PHP libraries:
 AdoDb-Date             0.36          Modified BSD License        Yes             Date convertion (not into rpm package)
-ChromePHP              4.1.0         Apache Software License 2.0 Yes             Return server log to chrome browser console
 CKEditor               4.11.4        LGPL-2.1+                   Yes             Editor WYSIWYG
-PHPDebugBar			   1.15.0		 MIT License	             Yes             Used only by the module "debugbar" for developers
 EvalMath               1.0           BSD                         Yes             Safe math expressions evaluation
 Escpos-php             ?             MIT License                 Yes             Thermal receipt printer library, for use with ESC/POS compatible printers
 GeoIP                  1.4           LGPL-2.1+                   Yes             Sample code to make geoip convert (not into deb package)
-Mobiledetect           2.8.17        MIT License                 Yes             Detect mobile devices browsers
+Mobiledetect           2.8.83        MIT License                 Yes             Detect mobile devices browsers
 NuSoap                 0.9.5         LGPL 2.1+                   Yes             Library to develop SOAP Web services (not into rpm and deb package)
 PEAR Mail_MIME         1.8.9         BSD                         Yes             NuSoap dependency
-odtPHP                 1.0.1         GPL-2+                      Yes             Library to build/edit ODT files
 ParseDown              1.6           MIT License                 Yes             Markdown parser
+PHPDebugBar			   1.15.0		 MIT License	             Yes             Used only by the module "debugbar" for developers
 PHPExcel               1.8.1         LGPL-2.1+                   Yes             Read/Write XLS files, read ODS files
 PHPSpreadSheet         ?             LGPL-2.1+                   Yes             Read/Write XLS files, read ODS files
 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
 PSR/Logs			   1.0										                 Library for logs (used by DebugBar)
-PSR/simple-cache												                 Library for cache (used by PHPSpreadSheet)
+PSR/simple-cache	   ?										                 Library for cache (used by PHPSpreadSheet)
 Restler                3.0.0RC6      LGPL-3+                     Yes             Library to develop REST Web services (+ swagger-ui js lib into dir explorer)
+Sabre                  3.2.2         BSD                         Yes             DAV support
+Swift Mailer           5.4.2-DEV     MIT license                 Yes             Comprehensive mailing tools for PHP
+Stripe                 6.35          MIT licence                 Yes             Library for Stripe module
 TCPDF                  6.2.25        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
-Stripe                 4.7.0         MIT licence                 Yes             Library for Stripe module
 
 JS libraries:
 jQuery                 3.3.1         MIT License                 Yes             JS library