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
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
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
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
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
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
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
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
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
Andreas Fischer
f63798b923
Merge pull request #233 from terrafrost/phar-fix
...
SSH2: better accomodate Phar's
* terrafrost/phar-fix:
SSH2: better accomodate Phar's
2013-12-26 19:43:26 +01:00
Andreas Fischer
9c7c01c337
Merge pull request #223 from mpscholten/fix-ssh1-php55
...
Fix Net_SSH1 on Php5.5 (/e preg_replace modifier)
* mpscholten/fix-ssh1-php55:
Fixed classname of test
Fixed some wrong @see annotations
Fixed /e preg_replace modifier exactly like in 0dc8b27a6a
Added Net_SSH1::_format_log test
2013-12-26 18:41:25 +01:00
Marc Philip Scholten
2a7b6e39fb
Fixed classname of test
2013-12-26 12:16:08 +01:00
Marc Philip Scholten
6d8c02c432
Fixed some wrong @see annotations
2013-12-26 12:09:40 +01:00
Andreas Fischer
b793286561
Merge pull request #229 from bantu/ssh-append-log-intendation
...
Fix indentation of _append_log in SSH1 and SSH2.
* bantu/ssh-append-log-intendation:
Fix indentation of _append_log in SSH1 and SSH2.
2013-12-26 12:00:33 +01:00
Andreas Fischer
0f69d35584
Fix indentation of _append_log in SSH1 and SSH2.
2013-12-26 11:45:24 +01:00
Andreas Fischer
2da2f5d29f
Merge pull request #227 from bantu/ssh2-constant-prefix-ssh1
...
Use NET_SSH1_ instead of NET_SSH2_ prefix in SSH1.
* bantu/ssh2-constant-prefix-ssh1:
Use NET_SSH1_ instead of NET_SSH2_ prefix in SSH1.
2013-12-26 11:42:11 +01:00
Andreas Fischer
0dd5a9ba9f
Merge pull request #228 from bantu/cs-whitespace
...
CS: Add useful whitespace CodeSniffer rules.
* bantu/cs-whitespace:
CS: Add useful whitespace CodeSniffer rules.
2013-12-26 11:38:17 +01:00
terrafrost
70b9a69c46
SSH2: better accomodate Phar's
2013-12-26 01:55:05 -06:00
terrafrost
b23a693ae5
RSA: update comments for _extractBER
2013-12-26 01:46:58 -06:00
Andreas Fischer
1f99fc3c3c
Merge pull request #221 from terrafrost/php-compat-fixes
...
Compatibility fixes
* terrafrost/php-compat-fixes:
SFTP: add explanation for use of 4294967296
SSH2: typos in last commit
Compatibility fixes
2013-12-26 00:37:00 +01:00
Andreas Fischer
8bb80b3df0
CS: Add useful whitespace CodeSniffer rules.
2013-12-26 00:33:08 +01:00
Andreas Fischer
4290a5c216
Use NET_SSH1_ instead of NET_SSH2_ prefix in SSH1.
2013-12-26 00:26:36 +01:00
terrafrost
172f15f5df
SFTP: add explanation for use of 4294967296
2013-12-24 23:44:21 -06:00
terrafrost
3a0193875a
RSA: more verbose RSA key handling
2013-12-24 18:37:43 -06:00
terrafrost
8424a464a6
SSH2: typos in last commit
2013-12-22 18:25:00 -06:00
terrafrost
0f5b3ea416
Compatibility fixes
...
- PHP4 doesn't allow method chaining
- $_SESSION isn't always defined
- on PHP5.1 and earlier using 0x100000000 instead of 4294967296 gives E_NOTICE
- array('Net_SSH2', 'func_name') doesn't work so we fix this by passing $this to it.
to make that work on PHP4 pass by call-time reference. normally this would result
in a fatal error on PHP5.4+ but doesn't seem to in this case. the following URL
elaborates:
http://stackoverflow.com/q/20732563/569976
2013-12-22 18:14:49 -06:00
terrafrost
4bd9a546ab
Merge branch 'master' of https://github.com/phpseclib/phpseclib
2013-12-22 11:53:35 -06:00
Marc Philip Scholten
ea8cadddad
Fixed /e preg_replace modifier exactly like in 0dc8b27a6a
2013-12-18 16:39:36 +01:00
Marc Philip Scholten
c5f8bab065
Added Net_SSH1::_format_log test
...
Conflicts:
tests/Net/SSH1Test.php
2013-12-18 16:39:20 +01:00
Andreas Fischer
0dc8b27a6a
Merge pull request #215 from terrafrost/preg-replace-callback
...
SSH2: fix E_DEPRECATED on PHP5.5
* terrafrost/preg-replace-callback:
SSH2: fix E_DEPRECATED on PHP5.5
2013-12-17 20:55:56 +01:00
Andreas Fischer
a35557f12a
Merge pull request #213 from mpscholten/test-for-ssh2-format-log
...
Added test for Net_SSH2::_format_log()
* mpscholten/test-for-ssh2-format-log:
Fixed typo and fixed bug with destructor being called in test on ssh object
Added test for Net_SSH2::_format_log()
2013-12-17 20:55:12 +01:00
Marc Philip Scholten
46a1a0c1c2
Fixed typo and fixed bug with destructor being called in test on ssh object
2013-12-17 20:09:26 +01:00
Marc Philip Scholten
f0b9f59bcc
Added test for Net_SSH2::_format_log()
2013-12-16 19:49:15 +01:00
terrafrost
6ac922726d
SSH2: fix E_DEPRECATED on PHP5.5
2013-12-16 11:27:12 -06:00
terrafrost
1599d2e8d1
SCP: use the new "mode" for _close_channel
2013-12-15 12:07:17 -06:00