Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMichal Čihař <mcihar@suse.cz>2012-05-14 17:22:55 +0400
committerMichal Čihař <mcihar@suse.cz>2012-05-14 17:22:55 +0400
commit3bc02735ca219dfa49c457fad3d9454bc0dfb72a (patch)
tree9c2aed839164e6ad3238765b31056a3b1996d470 /test
parent92e763a574b0e67da2bbc71239985ee209a30673 (diff)
Document and coding style for SSL rewriting test
Diffstat (limited to 'test')
-rw-r--r--test/classes/PMA_Config_test.php23
1 files changed, 19 insertions, 4 deletions
diff --git a/test/classes/PMA_Config_test.php b/test/classes/PMA_Config_test.php
index 32e45bc597..14934f29a7 100644
--- a/test/classes/PMA_Config_test.php
+++ b/test/classes/PMA_Config_test.php
@@ -682,7 +682,10 @@ class PMA_ConfigTest extends PHPUnit_Framework_TestCase
}
/**
+ * Tests for rewriting URL to SSL variant
*
+ * @param string $original Original URL
+ * @param string $expected Expected URL rewritten to SSL
*
* @dataProvider sslUris
*/
@@ -695,10 +698,22 @@ class PMA_ConfigTest extends PHPUnit_Framework_TestCase
public function sslUris()
{
return array(
- array('http://server.foo/path/', 'https://server.foo:443/path/'),
- array('http://server.foo:80/path/', 'https://server.foo:443/path/'),
- array('http://server.foo.bar:123/path/', 'https://server.foo.bar:443/path/'),
- array('http://[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]:80/', 'https://[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]:443/'),
+ array(
+ 'http://server.foo/path/',
+ 'https://server.foo:443/path/'
+ ),
+ array(
+ 'http://server.foo:80/path/',
+ 'https://server.foo:443/path/'
+ ),
+ array(
+ 'http://server.foo.bar:123/path/',
+ 'https://server.foo.bar:443/path/'
+ ),
+ array(
+ 'http://[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]:80/',
+ 'https://[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]:443/'
+ ),
);
}
}