This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, 6.1 has been updated
via 84d51af69ddaa24dd45b268aefc9ac1a92e60bc6 (commit)
from 110af94c6e3f0a584e08b90f868cb6c66e08f968 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=84d51af69ddaa24dd45b268aefc9ac1a92e60bc6
commit 84d51af69ddaa24dd45b268aefc9ac1a92e60bc6
Author: Roland Mas <[email protected]>
Date: Tue Dec 8 21:35:14 2020 +0100
assertRegExp() is deprecated, use assertMatchesRegularExpression()
diff --git a/tests/func/10_Site/loginTest.php b/tests/func/10_Site/loginTest.php
index 5d413f0..9a4c4d7 100644
--- a/tests/func/10_Site/loginTest.php
+++ b/tests/func/10_Site/loginTest.php
@@ -67,7 +67,7 @@ class loginTest extends FForge_SeleniumTestCase
$location=$this->getLocation();
$url_regexp = str_replace('.', '\.', HOST);
$url_regexp = '/https?:\/\/'. $url_regexp .'\//';
- $this->assertRegExp($url_regexp, $location,
+ $this->assertMatchesRegularExpression($url_regexp, $location,
"You may need to set 'HOST' setting in test
suite's config file to something compatible with 'web_host' defined in ini
file");
$this->type("form_loginname", FORGE_ADMIN_USERNAME);
diff --git a/tests/func/70_SOAP/soapTest.php b/tests/func/70_SOAP/soapTest.php
index 68f4e02..c52ca47 100644
--- a/tests/func/70_SOAP/soapTest.php
+++ b/tests/func/70_SOAP/soapTest.php
@@ -50,7 +50,7 @@ class SoapTest extends FForge_SeleniumTestCase
// Check version number
$version = $this->soapclient->version();
- $this->assertRegexp('/^[-0-9.+a-z~]*$/', $version);
+ $this->assertMatchesRegularExpression('/^[-0-9.+a-z~]*$/',
$version);
// Check login
$response = $this->soapclient->login($userid, $passwd);
diff --git a/tests/unit/common/account.php b/tests/unit/common/account.php
index 845a0b7..e1d758c 100644
--- a/tests/unit/common/account.php
+++ b/tests/unit/common/account.php
@@ -38,30 +38,30 @@ class Account_Tests extends PHPUnit\Framework\TestCase
forge_reset_config_item('unix_cipher', 'core', 'DES');
$salt = account_gensalt();
$this->assertSame(2, strlen($salt));
- $this->assertRegExp(',[./0-9a-zA-Z]+,', $salt);
+ $this->assertMatchesRegularExpression(',[./0-9a-zA-Z]+,',
$salt);
// $1$abcdefgh
forge_reset_config_item('unix_cipher', 'core', 'MD5');
$salt = account_gensalt();
$this->assertSame('$1$', substr($salt, 0, 3));
$this->assertSame(8, strlen(explode('$', $salt)[2]));
- $this->assertRegExp(',[./0-9a-zA-Z]+,', explode('$', $salt)[2]);
+ $this->assertMatchesRegularExpression(',[./0-9a-zA-Z]+,',
explode('$', $salt)[2]);
// $5$rounds=5000$abcdefghij123456
forge_reset_config_item('unix_cipher', 'core', 'SHA256');
$salt = account_gensalt();
$this->assertSame('$5$', substr($salt, 0, 3));
- $this->assertRegExp('/rounds=[0-9]+/', explode('$', $salt)[2]);
+ $this->assertMatchesRegularExpression('/rounds=[0-9]+/',
explode('$', $salt)[2]);
$this->assertSame(16, strlen(explode('$', $salt)[3]));
- $this->assertRegExp(',[./0-9a-zA-Z]+,', explode('$', $salt)[3]);
+ $this->assertMatchesRegularExpression(',[./0-9a-zA-Z]+,',
explode('$', $salt)[3]);
// $6$rounds=5000$abcdefghij123456
forge_reset_config_item('unix_cipher', 'core', 'SHA512');
$salt = account_gensalt();
$this->assertSame('$6$', substr($salt, 0, 3));
- $this->assertRegExp('/rounds=[0-9]+/', explode('$', $salt)[2]);
+ $this->assertMatchesRegularExpression('/rounds=[0-9]+/',
explode('$', $salt)[2]);
$this->assertSame(16, strlen(explode('$', $salt)[3]));
- $this->assertRegExp(',[./0-9a-zA-Z]+,', explode('$', $salt)[3]);
+ $this->assertMatchesRegularExpression(',[./0-9a-zA-Z]+,',
explode('$', $salt)[3]);
$this->assertLessThanOrEqual(128, strlen($salt)); // or else
update the DB schema
// $2y$10$abcdefghij123456789012
@@ -75,6 +75,6 @@ class Account_Tests extends PHPUnit\Framework\TestCase
$this->assertGreaterThanOrEqual(4, intval($cost));
$this->assertLessThanOrEqual(31, intval($cost));
$this->assertSame(22, strlen(explode('$', $salt)[3]));
- $this->assertRegExp(',[./0-9a-zA-Z]+,', explode('$', $salt)[3]);
+ $this->assertMatchesRegularExpression(',[./0-9a-zA-Z]+,',
explode('$', $salt)[3]);
}
}
-----------------------------------------------------------------------
Summary of changes:
tests/func/10_Site/loginTest.php | 2 +-
tests/func/70_SOAP/soapTest.php | 2 +-
tests/unit/common/account.php | 14 +++++++-------
3 files changed, 9 insertions(+), 9 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
