Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into

develop

Conflicts:
	htdocs/core/lib/json.lib.php
	test/phpunit/JsonLibTest.php

.travis.yml

@@ -309,7 +309,7 @@ script:
   set -e
   # Exclusions are defined in the ruleset.xml file
   #phpcs -s -n -p -d memory_limit=-1 --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 .
-  phpcs -s -p -d memory_limit=-1 --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 --runtime-set ignore_warnings_on_exit true .
+  phpcs -s -p -d memory_limit=-1 --extensions=php --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 --runtime-set ignore_warnings_on_exit true .
   set +e
   echo
 

dev/setup/codesniffer/ruleset.xml

@@ -11,8 +11,6 @@
 	<exclude-pattern type="relative">htdocs/conf.php</exclude-pattern>
 	<exclude-pattern type="relative">*/nltechno*</exclude-pattern>
 	<exclude-pattern type="relative">*/htdocs/includes</exclude-pattern>
-	<exclude-pattern type="relative">*.min.css</exclude-pattern>
-	<exclude-pattern type="relative">*.js</exclude-pattern>
 
 	<!-- List of all tests -->
 

htdocs/accountancy/class/bookkeeping.class.php

@@ -167,10 +167,10 @@ class BookKeeping extends CommonObject
 			$this->doc_ref = trim($this->doc_ref);
 		}
 		if (isset($this->fk_doc)) {
-			$this->fk_doc = trim($this->fk_doc);
+			$this->fk_doc = (int) $this->fk_doc;
 		}
 		if (isset($this->fk_docdet)) {
-			$this->fk_docdet = trim($this->fk_docdet);
+			$this->fk_docdet = (int) $this->fk_docdet;
 		}
 		if (isset($this->thirdparty_code)) {
 			$this->thirdparty_code = trim($this->thirdparty_code);
@@ -487,10 +487,10 @@ class BookKeeping extends CommonObject
 			$this->doc_ref = trim($this->doc_ref);
 		}
 		if (isset($this->fk_doc)) {
-			$this->fk_doc = trim($this->fk_doc);
+			$this->fk_doc = (int) $this->fk_doc;
 		}
 		if (isset($this->fk_docdet)) {
-			$this->fk_docdet = trim($this->fk_docdet);
+			$this->fk_docdet = (int) $this->fk_docdet;
 		}
 		if (isset($this->thirdparty_code)) {
 			$this->thirdparty_code = trim($this->thirdparty_code);
@@ -1104,10 +1104,10 @@ class BookKeeping extends CommonObject
 			$this->doc_ref = trim($this->doc_ref);
 		}
 		if (isset($this->fk_doc)) {
-			$this->fk_doc = trim($this->fk_doc);
+			$this->fk_doc = (int) $this->fk_doc;
 		}
 		if (isset($this->fk_docdet)) {
-			$this->fk_docdet = trim($this->fk_docdet);
+			$this->fk_docdet = (int) $this->fk_docdet;
 		}
 		if (isset($this->thirdparty_code)) {
 			$this->thirdparty_code = trim($this->thirdparty_code);
@@ -1473,8 +1473,8 @@ class BookKeeping extends CommonObject
 		$this->doc_date = $now;
 		$this->doc_type = '';
 		$this->doc_ref = '';
-		$this->fk_doc = '';
+		$this->fk_doc = 0;
-		$this->fk_docdet = '';
+		$this->fk_docdet = 0;
 		$this->thirdparty_code = 'CU001';
 		$this->subledger_account = '41100001';
 		$this->subledger_label = 'My customer company';

htdocs/compta/facture/class/facture-rec.class.php

@@ -323,6 +323,8 @@ class FactureRec extends CommonInvoice
 	{
 	    global $conf;
 
+        $error = 0;
+
 	    $sql = "UPDATE ".MAIN_DB_PREFIX."facture_rec SET";
 	    $sql.= " fk_soc = ".$this->fk_soc;
         // TODO Add missing fields

htdocs/core/class/CMailFile.class.php

@@ -352,31 +352,15 @@ class CMailFile
 		elseif ($this->sendmode == 'swiftmailer')
 		{
 			// Use Swift Mailer library
-			// ------------------------------------------
-
             $host = dol_getprefix('email');
 
             require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lexer/lib/Doctrine/Common/Lexer/AbstractLexer.php';
 
-            require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/InvalidEmail.php';
+            // egulias autoloader lib
-            require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/NoDomainPart.php';
+            require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/autoload.php';
-            require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/EmailParser.php';
-			require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/EmailLexer.php';
-			require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/EmailValidator.php';
-			require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/Warning.php';
-			require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/LocalTooLong.php';
-			require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/Parser/Parser.php';
-			require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/Parser/DomainPart.php';
-			require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/Parser/LocalPart.php';
-			require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/EmailValidation.php';
-			require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/RFCValidation.php';
 
-            require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lib/classes/Swift/InputByteStream.php';
-			require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lib/classes/Swift/Signer.php';
-			require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lib/classes/Swift/Signers/HeaderSigner.php';
-			require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php';
-			//require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lib/classes/Swift/SignedMessage.php';
             require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lib/swift_required.php';
+
             // Create the message
             //$this->message = Swift_Message::newInstance();
             $this->message = new Swift_Message();
@@ -430,10 +414,8 @@ class CMailFile
                 $this->errors[] =  $e->getMessage();
             }
 
-			if (! empty($this->html))
+            if (! empty($this->html)) {
-			{
+				if (!empty($css)) {
-				if (!empty($css))
-				{
 					$this->css = $css;
 					$this->buildCSS();
 				}

htdocs/includes/swiftmailer/autoload.php

@@ -0,0 +1,13 @@
+<?php
+
+/*
+ * Bootstrap the library.
+ */
+
+namespace Egulias;
+
+require_once __DIR__ . '/egulias/email-validator/AutoLoader.php';
+
+$autoloader = new EguliasAutoLoader(__NAMESPACE__, dirname(__DIR__));
+
+$autoloader->register();

htdocs/includes/swiftmailer/egulias/email-validator/AutoLoader.php

@@ -0,0 +1,82 @@
+<?php
+
+namespace Egulias;
+
+/**
+ * PSR-0 Autoloader
+ *
+ * @author ieter Hordijk <info@pieterhordijk.com>
+ */
+class EguliasAutoLoader
+{
+    /**
+     * @var string The namespace prefix for this instance.
+     */
+    protected $namespace = '';
+
+    /**
+     * @var string The filesystem prefix to use for this instance
+     */
+    protected $path = '';
+
+    /**
+     * Build the instance of the autoloader
+     *
+     * @param string $namespace The prefixed namespace this instance will load
+     * @param string $path      The filesystem path to the root of the namespace
+     */
+    public function __construct($namespace, $path)
+    {
+        $this->namespace = ltrim($namespace, '\\');
+        $this->path = rtrim($path, '/\\') . DIRECTORY_SEPARATOR;
+    }
+
+    /**
+     * Try to load a class
+     *
+     * @param string $class The class name to load
+     *
+     * @return boolean If the loading was successful
+     */
+    public function load($class)
+    {
+        $class = ltrim($class, '\\');
+        if (strpos($class, $this->namespace) === 0) {
+            $nsparts = explode('\\', $class);
+            $class = array_pop($nsparts);
+            $path = $this->path . 'swiftmailer/egulias/email-validator/EmailValidator/';
+            $max=count($nsparts);
+            for ($i=2; $i<$max;$i++) {
+                $path .= $nsparts[$i].'/';
+            }
+            $nsparts = array();
+            $path .= str_replace('_', DIRECTORY_SEPARATOR, $class) . '.php';
+            if (file_exists($path)) {
+                require $path;
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Register the autoloader to PHP
+     *
+     * @return boolean The status of the registration
+     */
+    public function register()
+    {
+        return spl_autoload_register(array($this, 'load'));
+    }
+
+    /**
+     * Unregister the autoloader to PHP
+     *
+     * @return boolean The status of the unregistration
+     */
+    public function unregister()
+    {
+        return spl_autoload_unregister(array($this, 'load'));
+    }
+}