Andreas Fischer
8dc659d694
Merge pull request #269 from bantu/code-sniffer-tests
...
Apply Code Sniffer to tests folder
* bantu/code-sniffer-tests:
Apply coding guidelines (with exceptions) to the tests directory.
Update PHP_CodeSniffer from 1.4.7 to 1.5.2. This fixes a rule inheritance bug.
Use exclude instead of changing severity.
Add build directory.
2014-02-17 18:53:54 +01:00
Andreas Fischer
ef528ea879
Apply coding guidelines (with exceptions) to the tests directory.
2014-02-15 20:05:30 +01:00
Andreas Fischer
9cb25c3032
Update PHP_CodeSniffer from 1.4.7 to 1.5.2. This fixes a rule inheritance bug.
2014-02-15 19:40:19 +01:00
Andreas Fischer
6e851baca0
Use exclude instead of changing severity.
2014-02-15 19:16:21 +01:00
Andreas Fischer
6fc22d5405
Add build directory.
2014-02-15 18:51:09 +01:00
Andreas Fischer
757018d4aa
Merge branch 'master' into php5
...
* master:
Add Travis CI PHP 5.6 environment.
2014-02-13 23:34:17 +01:00
Andreas Fischer
b03100601b
Merge pull request #268 from bantu/travis/php-5.6
...
Add Travis CI PHP 5.6 environment.
* bantu/travis/php-5.6:
Add Travis CI PHP 5.6 environment.
2014-02-13 23:34:10 +01:00
Andreas Fischer
741d638447
Add Travis CI PHP 5.6 environment.
2014-02-13 22:50:04 +01:00
Andreas Fischer
51d30ed66f
Merge branch 'master' into php5
...
* master:
CS: Each file MUST end with exactly one newline character
2014-02-11 01:00:52 +01:00
Andreas Fischer
a7106a737e
Merge pull request #266 from bantu/cs-endfile-newline
...
CS: Each file MUST end with exactly one newline character
* bantu/cs-endfile-newline:
CS: Each file MUST end with exactly one newline character
2014-02-11 01:00:44 +01:00
Andreas Fischer
56f1ada5c1
CS: Each file MUST end with exactly one newline character
2014-02-10 14:51:35 +01:00
terrafrost
e90648c7a5
SSH2: add ssh-agent support
2014-02-10 00:04:16 -06:00
Andreas Fischer
addd2ac320
Merge branch 'master' into php5
...
* master:
SSH2: ignore exit_status channel requests
2014-02-03 16:56:46 +01:00
Andreas Fischer
f4dbcb1b78
Merge pull request #264 from terrafrost/exit-status
...
SSH2: ignore exit_status channel requests
* terrafrost/exit-status:
SSH2: ignore exit_status channel requests
2014-02-03 16:56:36 +01:00
terrafrost
cd9801db8a
SSH2: ignore exit_status channel requests
...
Fixes #258
2014-02-02 23:42:06 -06:00
Andreas Fischer
34e3aef6aa
Merge branch 'master' into php5
...
* master:
PHP_Compat is required when the PHP version below 4.3.3 (not above or equal).
Conflicts:
composer.json
2014-01-30 15:22:26 +01:00
Andreas Fischer
8664b69e10
Merge pull request #256 from bantu/fix-php-compat-description
...
PHP_Compat is required when the PHP version below 4.3.3 (not above or eq...
* bantu/fix-php-compat-description:
PHP_Compat is required when the PHP version below 4.3.3 (not above or equal).
2014-01-30 15:21:47 +01:00
Andreas Fischer
f79d662401
PHP_Compat is required when the PHP version below 4.3.3 (not above or equal).
2014-01-30 03:11:43 +01:00
Andreas Fischer
52fa1df044
Merge branch 'master' into php5
...
* master:
The HHVM environment does not know phpize, so we can not install extensions.
Run travis tests on HipHop Virtual Machine (hhvm).
2014-01-22 04:16:42 +01:00
Andreas Fischer
8876c820c3
Merge pull request #211 from bantu/travis/hhvm
...
Run travis tests on HipHop Virtual Machine (hhvm).
* bantu/travis/hhvm:
The HHVM environment does not know phpize, so we can not install extensions.
Run travis tests on HipHop Virtual Machine (hhvm).
2014-01-22 04:16:33 +01:00
Andreas Fischer
4f0fbe065a
Merge branch 'master' into php5
...
* master:
Put PHP extension installation into a shell script.
Add a folder for travis.
2014-01-22 04:15:13 +01:00
Andreas Fischer
80310d61b4
Merge pull request #252 from bantu/travis/reorganisation
...
Reorganise travis configuration
* bantu/travis/reorganisation:
Put PHP extension installation into a shell script.
Add a folder for travis.
2014-01-22 04:14:46 +01:00
Andreas Fischer
b74a81e074
The HHVM environment does not know phpize, so we can not install extensions.
2014-01-22 03:54:32 +01:00
Andreas Fischer
ff9a23227a
Run travis tests on HipHop Virtual Machine (hhvm).
2014-01-22 03:54:32 +01:00
Andreas Fischer
3084a30615
Put PHP extension installation into a shell script.
2014-01-22 03:54:02 +01:00
Andreas Fischer
0a639cd7f5
Add a folder for travis.
2014-01-22 03:41:24 +01:00
Andreas Fischer
0c4cc0bd0e
Merge branch 'master' into php5
...
* master:
Cleaned up whitespace
Conflicts:
composer.json
2014-01-18 18:58:55 +01:00
Andreas Fischer
211e237090
Merge pull request #250 from GrahamCampbell/whitespace-fixes
...
Cleaned Up Whitespace
* GrahamCampbell/whitespace-fixes:
Cleaned up whitespace
2014-01-18 18:51:33 +01:00
Graham Campbell
1c2796e3eb
Cleaned up whitespace
2014-01-18 17:29:25 +00:00
terrafrost
777db22709
Merge branch 'php5' of https://github.com/phpseclib/phpseclib into php5
2013-12-28 13:56:27 -06:00
terrafrost
05077cf0f3
Merge branch 'ssh2-identifier' into php5
2013-12-28 13:50:05 -06:00
terrafrost
268ec2e5d1
Merge branch 'ssh2-identifier'
2013-12-28 13:49:05 -06:00
terrafrost
0ccac2c998
SSH2: add new line in docblock comment
2013-12-28 13:47:24 -06:00
Marc Philip Scholten
19be15c4c4
Fixed typos
2013-12-28 18:16:09 +01:00
Andreas Fischer
df69d479db
Merge branch 'master' into php5
...
* master:
RSA: add unit test for $rsa->loadKey()
2013-12-28 13:42:34 +01:00
Andreas Fischer
28573d63f5
Merge pull request #236 from terrafrost/rsa-loadkey-unittest
...
RSA: add unit test for $rsa->loadKey()
* terrafrost/rsa-loadkey-unittest:
RSA: add unit test for $rsa->loadKey()
2013-12-28 13:41:58 +01:00
Andreas Fischer
d48e284cae
Merge branch 'master' into php5
...
* master:
SFTP: make get() return correctly sized strings
2013-12-28 13:41:09 +01:00
Andreas Fischer
b82478b48f
Merge pull request #237 from terrafrost/sftp-get-size-fix
...
SFTP: make get() return correctly sized strings
* terrafrost/sftp-get-size-fix:
SFTP: make get() return correctly sized strings
2013-12-28 13:41:03 +01:00
Andreas Fischer
b9e785f292
Merge branch 'master' into php5
...
* master:
RSA: remove unit test for time being - it's going to be renamed and rewritten
RSA: update comments for _extractBER
RSA: more verbose RSA key handling
2013-12-28 13:40:49 +01:00
terrafrost
466f9354df
SFTP: make get() return correctly sized strings
2013-12-27 11:08:33 -06:00
terrafrost
40bf0b1e59
RSA: add unit test for $rsa->loadKey()
2013-12-27 10:41:07 -06:00
terrafrost
a1b749a0a0
Merge branch 'master' into php5
2013-12-27 10:25:19 -06:00
terrafrost
d2c4ccfc28
Merge branch 'master' of https://github.com/phpseclib/phpseclib
2013-12-27 10:24:47 -06:00
terrafrost
48ab947fe1
RSA: remove unit test for time being - it's going to be renamed and
...
rewritten
2013-12-27 10:22:36 -06:00
Marc Philip Scholten
3d5262156d
Fixed missing dataProvider in test
2013-12-26 21:03:00 +01:00
Marc Philip Scholten
ad0c7c52bd
Fixed cs
2013-12-26 21:02:18 +01:00
Marc Philip Scholten
b0de383f95
Replaced else { if ()...} with elseif() {}
2013-12-26 21:02:17 +01:00
Marc Philip Scholten
699ac0b0e9
Rewritten test to just check for possible combinations
2013-12-26 21:02:17 +01:00
Marc Philip Scholten
357d4253ee
Fixed typo
2013-12-26 21:00:58 +01:00
Marc Philip Scholten
4817d28a54
Refactored Net_SSH2::$identifier and added unit tests
...
Added return tag
2013-12-26 21:00:58 +01:00
