Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge remote-tracking branch 'upstream/develop' into camelCaps

Browse Source
This commit is contained in:
Frédéric FRANCE
2018-08-28 09:34:53 +02:00
parent d8bf4a0ecf 50d50c2e10
commit fe4260a014
335 changed files with 3278 additions and 1248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
test/phpunit/ChargeSocialesTest.php
View File

@@ -117,7 +117,7 @@ class ChargeSocialesTest extends PHPUnit_Framework_TestCase
/**
* testChargeSocialesCreate
*
*
* @return void
*/
public function testChargeSocialesCreate()
@@ -139,10 +139,10 @@ class ChargeSocialesTest extends PHPUnit_Framework_TestCase
/**
* testChargeSocialesFetch
*
*
* @param int $id Id of social contribution
* @return void
*
*
* @depends testChargeSocialesCreate
* The depends says test is run only if previous is ok
*/
@@ -164,10 +164,10 @@ class ChargeSocialesTest extends PHPUnit_Framework_TestCase
/**
* testChargeSocialesValid
*
*
* @param Object $localobject Social contribution
* @return void
*
*
* @depends testChargeSocialesFetch
* The depends says test is run only if previous is ok
*/
@@ -188,10 +188,10 @@ class ChargeSocialesTest extends PHPUnit_Framework_TestCase
/**
* testChargeSocialesOther
*
*
* @param Object $localobject Social contribution
* @return void
*
*
* @depends testChargeSocialesValid
* The depends says test is run only if previous is ok
*/
@@ -216,10 +216,10 @@ class ChargeSocialesTest extends PHPUnit_Framework_TestCase
/**
* testChargeSocialesDelete
*
*
* @param int $id Social contribution
* @return void
*
*
* @depends testChargeSocialesOther
* The depends says test is run only if previous is ok
*/

16
test/phpunit/CoreTest.php
View File

@@ -264,14 +264,14 @@ class CoreTest extends PHPUnit_Framework_TestCase
// For SQL Injection (only GET and POST are used to be included into bad escaped SQL requests)
if ($type != 2)
{
$inj += preg_match('/delete\s+from/i', $val);
$inj += preg_match('/create\s+table/i', $val);
$inj += preg_match('/update.+set.+=/i', $val);
$inj += preg_match('/insert\s+into/i', $val);
$inj += preg_match('/select.+from/i', $val);
$inj += preg_match('/union.+select/i', $val);
$inj += preg_match('/into\s+(outfile|dumpfile)/i', $val);
$inj += preg_match('/(\.\.%2f)+/i', $val);
$inj += preg_match('/delete\s+from/i', $val);
$inj += preg_match('/create\s+table/i', $val);
$inj += preg_match('/update.+set.+=/i', $val);
$inj += preg_match('/insert\s+into/i', $val);
$inj += preg_match('/select.+from/i', $val);
$inj += preg_match('/union.+select/i', $val);
$inj += preg_match('/into\s+(outfile|dumpfile)/i', $val);
$inj += preg_match('/(\.\.%2f)+/i', $val);
}
// For XSS Injection done by adding javascript with script
// This is all cases a browser consider text is javascript:

14
test/phpunit/UserGroupTest.php
View File

@@ -117,7 +117,7 @@ class UserGroupTest extends PHPUnit_Framework_TestCase
/**
* testUserGroupCreate
*
*
* @return void
*/
public function testUserGroupCreate()
@@ -139,7 +139,7 @@ class UserGroupTest extends PHPUnit_Framework_TestCase
/**
* testUserGroupFetch
*
*
* @param int $id Id of group
* @return void
* @depends testUserGroupCreate
@@ -163,7 +163,7 @@ class UserGroupTest extends PHPUnit_Framework_TestCase
/**
* testUserGroupUpdate
*
*
* @param Object $localobject Group
* @return void
* @depends testUserGroupFetch
@@ -187,7 +187,7 @@ class UserGroupTest extends PHPUnit_Framework_TestCase
/**
* testUserGroupAddRight
*
*
* @param Object $localobject Object to show
* @return void
* @depends testUserGroupUpdate
@@ -210,7 +210,7 @@ class UserGroupTest extends PHPUnit_Framework_TestCase
/**
* testUserGroupDelRight
*
*
* @param Object $localobject Object
* @return void
* @depends testUserGroupAddRight
@@ -233,7 +233,7 @@ class UserGroupTest extends PHPUnit_Framework_TestCase
/**
* testUserGroupOther
*
*
* @param Object $localobject Object
* @return void
* @depends testUserGroupDelRight
@@ -261,7 +261,7 @@ class UserGroupTest extends PHPUnit_Framework_TestCase
/**
* testUserGroupDelete
*
*
* @param int $id Id of object
* @return void
* @depends testUserGroupOther