diff --git a/.travis.yml b/.travis.yml
index 9fcd300e224..5d15e8843dc 100644
--- a/.travis.yml
+++ b/.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
diff --git a/dev/setup/codesniffer/ruleset.xml b/dev/setup/codesniffer/ruleset.xml
index 296c6cb9b6f..75d6c2c3c85 100644
--- a/dev/setup/codesniffer/ruleset.xml
+++ b/dev/setup/codesniffer/ruleset.xml
@@ -11,10 +11,8 @@
htdocs/conf.php
*/nltechno*
*/htdocs/includes
- *.min.css
- *.js
-
+
diff --git a/htdocs/core/js/lib_foot.js.php b/htdocs/core/js/lib_foot.js.php
index cfa05289f4b..fd13eb2fd26 100644
--- a/htdocs/core/js/lib_foot.js.php
+++ b/htdocs/core/js/lib_foot.js.php
@@ -21,13 +21,13 @@
* \brief File that include javascript functions (included if option use_javascript activated)
*/
-if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1');
-if (! defined('NOCSRFCHECK')) define('NOCSRFCHECK',1);
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL',1);
-if (! defined('NOLOGIN')) define('NOLOGIN',1);
-if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU',1);
-if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML',1);
-if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
+if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC', '1');
+if (! defined('NOCSRFCHECK')) define('NOCSRFCHECK', 1);
+if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1);
+if (! defined('NOLOGIN')) define('NOLOGIN', 1);
+if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU', 1);
+if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML', 1);
+if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX', '1');
session_cache_limiter('public');
@@ -159,4 +159,3 @@ print '
}
});
});'."\n";
-
diff --git a/htdocs/core/js/lib_gravatar.js.php b/htdocs/core/js/lib_gravatar.js.php
index dad6482460a..e1e900b6d00 100644
--- a/htdocs/core/js/lib_gravatar.js.php
+++ b/htdocs/core/js/lib_gravatar.js.php
@@ -22,16 +22,16 @@
* JQuery (providing object $) library must be loaded before this file.
*/
-//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language
-//if (! defined('NOREQUIREDB')) define('NOREQUIREDB','1');
-if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1');
-//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1'); // Not disabled cause need to do translations
-if (! defined('NOCSRFCHECK')) define('NOCSRFCHECK',1);
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL',1);
-if (! defined('NOLOGIN')) define('NOLOGIN',1);
-if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU',1);
-if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML',1);
-if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
+//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER', '1'); // Not disabled cause need to load personalized language
+//if (! defined('NOREQUIREDB')) define('NOREQUIREDB', '1');
+if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC', '1');
+//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN', '1'); // Not disabled cause need to do translations
+if (! defined('NOCSRFCHECK')) define('NOCSRFCHECK', 1);
+if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1);
+if (! defined('NOLOGIN')) define('NOLOGIN', 1);
+if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU', 1);
+if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML', 1);
+if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX', '1');
session_cache_limiter('public');
diff --git a/htdocs/core/js/lib_head.js.php b/htdocs/core/js/lib_head.js.php
index 5b909c6e148..07a47090792 100644
--- a/htdocs/core/js/lib_head.js.php
+++ b/htdocs/core/js/lib_head.js.php
@@ -24,13 +24,13 @@
* JQuery (providing object $) and JQuery-UI (providing $datepicker) libraries must be loaded before this file.
*/
-if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1');
-if (! defined('NOCSRFCHECK')) define('NOCSRFCHECK',1);
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL',1);
-if (! defined('NOLOGIN')) define('NOLOGIN',1);
-if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU',1);
-if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML',1);
-if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
+if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC', '1');
+if (! defined('NOCSRFCHECK')) define('NOCSRFCHECK', 1);
+if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1);
+if (! defined('NOLOGIN')) define('NOLOGIN', 1);
+if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU', 1);
+if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML', 1);
+if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX', '1');
session_cache_limiter('public');
diff --git a/htdocs/core/js/timepicker.js.php b/htdocs/core/js/timepicker.js.php
index 38c450b8e23..6acabbaf421 100644
--- a/htdocs/core/js/timepicker.js.php
+++ b/htdocs/core/js/timepicker.js.php
@@ -21,13 +21,13 @@
* \brief File that include javascript functions for timepicker
*/
-if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1');
-if (! defined('NOCSRFCHECK')) define('NOCSRFCHECK',1);
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL',1);
-if (! defined('NOLOGIN')) define('NOLOGIN',1);
-if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU',1);
-if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML',1);
-if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
+if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC', '1');
+if (! defined('NOCSRFCHECK')) define('NOCSRFCHECK', 1);
+if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1);
+if (! defined('NOLOGIN')) define('NOLOGIN', 1);
+if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU', 1);
+if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML', 1);
+if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX', '1');
session_cache_limiter('public');
diff --git a/htdocs/core/lib/json.lib.php b/htdocs/core/lib/json.lib.php
index f58d1b44dbf..7c9e9b66698 100644
--- a/htdocs/core/lib/json.lib.php
+++ b/htdocs/core/lib/json.lib.php
@@ -214,7 +214,7 @@ if (! function_exists('json_decode'))
* @param bool $assoc False return an object, true return an array
* @return mixed Object or Array
*/
- function json_decode($json, $assoc=false)
+ function json_decode($json, $assoc = false)
{
return dol_json_decode($json, $assoc);
}
@@ -229,7 +229,7 @@ if (! function_exists('json_decode'))
* @return mixed Object or Array or false on error
* @see json_decode()
*/
-function dol_json_decode($json, $assoc=false)
+function dol_json_decode($json, $assoc = false)
{
dol_syslog("For better performance, enable the native json in your PHP", LOG_WARNING);
@@ -242,8 +242,8 @@ function dol_json_decode($json, $assoc=false)
if (! $comment)
{
if (($json[$i] == '{') || ($json[$i] == '[')) $out.= 'array(';
- else if (($json[$i] == '}') || ($json[$i] == ']')) $out.= ')';
- else if ($json[$i] == ':') $out.= ' => ';
+ elseif (($json[$i] == '}') || ($json[$i] == ']')) $out.= ')';
+ elseif ($json[$i] == ':') $out.= ' => ';
else $out.=$json[$i];
}
else $out.= $json[$i];
@@ -282,19 +282,18 @@ function dol_json_decode($json, $assoc=false)
/**
* Return text according to type
*
- * @param string $val Value to decode
- * @return string Formated value
+ * @param string $val Value to decode
+ * @return string Formated value
*/
function _unval($val)
{
- while (preg_match('/\\\u([0-9A-F]{2})([0-9A-F]{2})/i', $val, $reg))
- {
- // single, escaped unicode character
- $utf16 = chr(hexdec($reg[1])) . chr(hexdec($reg[2]));
- $utf8 = utf162utf8($utf16);
- $val=preg_replace('/\\\u'.$reg[1].$reg[2].'/i',$utf8,$val);
- }
- return $val;
+ while (preg_match('/\\\u([0-9A-F]{2})([0-9A-F]{2})/i', $val, $reg)) {
+ // single, escaped unicode character
+ $utf16 = chr(hexdec($reg[1])) . chr(hexdec($reg[2]));
+ $utf8 = utf162utf8($utf16);
+ $val=preg_replace('/\\\u'.$reg[1].$reg[2].'/i', $utf8, $val);
+ }
+ return $val;
}
/**
@@ -310,7 +309,7 @@ function _unval($val)
function utf162utf8($utf16)
{
// oh please oh please oh please oh please oh please
- if(function_exists('mb_convert_encoding')) {
+ if (function_exists('mb_convert_encoding')) {
return mb_convert_encoding($utf16, 'UTF-8', 'UTF-16');
}
diff --git a/htdocs/modulebuilder/template/js/mymodule.js.php b/htdocs/modulebuilder/template/js/mymodule.js.php
index 6a3447625a5..3e5c0ca31ba 100644
--- a/htdocs/modulebuilder/template/js/mymodule.js.php
+++ b/htdocs/modulebuilder/template/js/mymodule.js.php
@@ -18,15 +18,15 @@
*/
if (!defined('NOREQUIREUSER')) define('NOREQUIREUSER', '1');
-if (!defined('NOREQUIREDB')) define('NOREQUIREDB','1');
+if (!defined('NOREQUIREDB')) define('NOREQUIREDB', '1');
if (!defined('NOREQUIRESOC')) define('NOREQUIRESOC', '1');
-if (!defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');
+if (!defined('NOREQUIRETRAN')) define('NOREQUIRETRAN', '1');
if (!defined('NOCSRFCHECK')) define('NOCSRFCHECK', 1);
if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1);
if (!defined('NOLOGIN')) define('NOLOGIN', 1);
if (!defined('NOREQUIREMENU')) define('NOREQUIREMENU', 1);
if (!defined('NOREQUIREHTML')) define('NOREQUIREHTML', 1);
-if (!defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
+if (!defined('NOREQUIREAJAX')) define('NOREQUIREAJAX', '1');
/**
diff --git a/htdocs/projet/jsgantt_language.js.php b/htdocs/projet/jsgantt_language.js.php
index 79280868ecb..99123cc45ef 100644
--- a/htdocs/projet/jsgantt_language.js.php
+++ b/htdocs/projet/jsgantt_language.js.php
@@ -20,13 +20,13 @@
* \brief Fichier de javascript de traduction pour JSGantt
*/
-if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1');
-if (! defined('NOCSRFCHECK')) define('NOCSRFCHECK',1);
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL',1);
-if (! defined('NOLOGIN')) define('NOLOGIN',1);
-if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU',1);
-if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML',1);
-if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
+if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC', '1');
+if (! defined('NOCSRFCHECK')) define('NOCSRFCHECK', 1);
+if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1);
+if (! defined('NOLOGIN')) define('NOLOGIN', 1);
+if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU', 1);
+if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML', 1);
+if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX', '1');
require_once __DIR__.'/../main.inc.php';
diff --git a/test/phpunit/JsonLibTest.php b/test/phpunit/JsonLibTest.php
index 113d263eca4..82f02133a98 100644
--- a/test/phpunit/JsonLibTest.php
+++ b/test/phpunit/JsonLibTest.php
@@ -18,9 +18,9 @@
/**
* \file test/phpunit/JsonLibTest.php
- * \ingroup test
+ * \ingroup test
* \brief PHPUnit test
- * \remarks To run this script as CLI: phpunit filename.php
+ * \remarks To run this script as CLI: phpunit filename.php
*/
global $conf,$user,$langs,$db;
@@ -28,16 +28,16 @@ global $conf,$user,$langs,$db;
//require_once 'PHPUnit/Autoload.php';
require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
-if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1');
-if (! defined('NOREQUIREDB')) define('NOREQUIREDB','1');
-if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1');
-if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');
-if (! defined('NOCSRFCHECK')) define('NOCSRFCHECK','1');
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');
-if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU','1'); // If there is no menu to show
-if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1'); // If we don't need to load the html.form.class.php
-if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
-if (! defined("NOLOGIN")) define("NOLOGIN",'1'); // If this page is public (can be called outside logged session)
+if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER', '1');
+if (! defined('NOREQUIREDB')) define('NOREQUIREDB', '1');
+if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC', '1');
+if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN', '1');
+if (! defined('NOCSRFCHECK')) define('NOCSRFCHECK', '1');
+if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1');
+if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU', '1'); // If there is no menu to show
+if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
+if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX', '1');
+if (! defined("NOLOGIN")) define("NOLOGIN", '1'); // If this page is public (can be called outside logged session)
/**
@@ -62,9 +62,9 @@ class JsonLibTest extends PHPUnit_Framework_TestCase
*/
function __construct()
{
- parent::__construct();
+ parent::__construct();
- //$this->sharedFixture
+ //$this->sharedFixture
global $conf,$user,$langs,$db;
$this->savconf=$conf;
$this->savuser=$user;
@@ -94,11 +94,11 @@ class JsonLibTest extends PHPUnit_Framework_TestCase
print __METHOD__."\n";
}
- /**
- * Init phpunit tests
- *
- * @return void
- */
+ /**
+ * Init phpunit tests
+ *
+ * @return void
+ */
protected function setUp()
{
global $conf,$user,$langs,$db;
@@ -109,11 +109,11 @@ class JsonLibTest extends PHPUnit_Framework_TestCase
print __METHOD__."\n";
}
- /**
- * End phpunit tests
- *
- * @return void
- */
+ /**
+ * End phpunit tests
+ *
+ * @return void
+ */
protected function tearDown()
{
print __METHOD__."\n";
@@ -122,7 +122,7 @@ class JsonLibTest extends PHPUnit_Framework_TestCase
/**
* testJsonEncode
*
- * @return void
+ * @return void
*/
public function testJsonEncode()
{
@@ -135,39 +135,39 @@ class JsonLibTest extends PHPUnit_Framework_TestCase
// Do a test with an array starting with 0
$arraytotest=array(0=>array('key'=>1,'value'=>'PRODREF','label'=>'Product ref with é and special chars \\ \' "'));
- $arrayencodedexpected='[{"key":1,"value":"PRODREF","label":"Product ref with \u00e9 and special chars \\\\ \' \""}]';
+ $arrayencodedexpected='[{"key":1,"value":"PRODREF","label":"Product ref with \u00e9 and special chars \\\\ \' \""}]';
$encoded=json_encode($arraytotest);
- $this->assertEquals($arrayencodedexpected,$encoded);
- $decoded=json_decode($encoded,true);
- $this->assertEquals($arraytotest,$decoded,'test for json_xxx');
+ $this->assertEquals($arrayencodedexpected, $encoded);
+ $decoded=json_decode($encoded, true);
+ $this->assertEquals($arraytotest, $decoded, 'test for json_xxx');
$encoded=dol_json_encode($arraytotest);
- $this->assertEquals($arrayencodedexpected,$encoded);
- $decoded=dol_json_decode($encoded,true);
- $this->assertEquals($arraytotest,$decoded,'test for dol_json_xxx');
+ $this->assertEquals($arrayencodedexpected, $encoded);
+ $decoded=dol_json_decode($encoded, true);
+ $this->assertEquals($arraytotest, $decoded, 'test for dol_json_xxx');
- // Same test but array start with 2 instead of 0
+ // Same test but array start with 2 instead of 0
$arraytotest=array(2=>array('key'=>1,'value'=>'PRODREF','label'=>'Product ref with é and special chars \\ \' "'));
- $arrayencodedexpected='{"2":{"key":1,"value":"PRODREF","label":"Product ref with \u00e9 and special chars \\\\ \' \""}}';
+ $arrayencodedexpected='{"2":{"key":1,"value":"PRODREF","label":"Product ref with \u00e9 and special chars \\\\ \' \""}}';
$encoded=json_encode($arraytotest);
- $this->assertEquals($arrayencodedexpected,$encoded);
- $decoded=json_decode($encoded,true);
- $this->assertEquals($arraytotest,$decoded,'test for json_xxx');
+ $this->assertEquals($arrayencodedexpected, $encoded);
+ $decoded=json_decode($encoded, true);
+ $this->assertEquals($arraytotest, $decoded, 'test for json_xxx');
$encoded=dol_json_encode($arraytotest);
- $this->assertEquals($arrayencodedexpected,$encoded);
- $decoded=dol_json_decode($encoded,true);
- $this->assertEquals($arraytotest,$decoded,'test for dol_json_xxx');
+ $this->assertEquals($arrayencodedexpected, $encoded);
+ $decoded=dol_json_decode($encoded, true);
+ $this->assertEquals($arraytotest, $decoded, 'test for dol_json_xxx');
// Test with object
- $now=gmmktime(12,0,0,1,1,1970);
+ $now=gmmktime(12, 0, 0, 1, 1, 1970);
$objecttotest=new stdClass();
$objecttotest->property1='abc';
$objecttotest->property2=1234;
$objecttotest->property3=$now;
$encoded=dol_json_encode($objecttotest);
- $this->assertEquals('{"property1":"abc","property2":1234,"property3":43200}',$encoded);
+ $this->assertEquals('{"property1":"abc","property2":1234,"property3":43200}', $encoded);
}
}