Marc Philip Scholten
19be15c4c4
Fixed typos
2013-12-28 18:16:09 +01: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
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
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
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
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
terrafrost
c01b8fc4ed
SCP: Tweaks
...
sending the close channel packet right after the eof seems to make some scp transfers terminate prematurely.
unfortunately, sometimes this behavior is undesirable as it is in this case:
http://www.frostjedi.com/phpbb3/viewtopic.php?f=46&t=29457
hence the $want_reply parameter
also, this commit makes the scp packet length account for the length portion
2013-12-15 00:43:20 -06:00
Andreas Fischer
df8c3723aa
Merge pull request #208 from bantu/cs-classcomment-wrongtagorder
...
CS: Fix "PEAR.Commenting.ClassComment.WrongTagOrder" sniff.
* bantu/cs-classcomment-wrongtagorder:
CS: Fix "PEAR.Commenting.ClassComment.WrongTagOrder" sniff.
2013-12-11 23:30:13 +01:00
Andreas Fischer
f0f029b2c1
CS: Fix "PEAR.Commenting.ClassComment.WrongTagOrder" sniff.
2013-12-11 18:33:18 +01:00
Andreas Fischer
b1cf3aeb0a
Merge pull request #207 from bantu/cs-file-comment-tag-indent
...
CS: Fix "PEAR.Commenting.FileComment.TagIndent" sniff.
* bantu/cs-file-comment-tag-indent:
CS: Fix "PEAR.Commenting.FileComment.TagIndent" sniff.
2013-12-10 22:29:05 +01:00
Andreas Fischer
3db1fbb072
CS: Fix "PEAR.Commenting.FileComment.TagIndent" sniff.
2013-12-10 20:10:37 +01:00
Andreas Fischer
ffa1393a4c
Merge pull request #204 from bantu/cs-multiline-assign-equal
...
CS: Fix "PEAR.Formatting.MultiLineAssignment.EqualSignLine" sniff.
* bantu/cs-multiline-assign-equal:
CS: Fix "PEAR.Formatting.MultiLineAssignment.EqualSignLine" sniff.
2013-12-10 12:42:19 +01:00
Andreas Fischer
cee0f3343b
CS: Fix "PEAR.Formatting.MultiLineAssignment.EqualSignLine" sniff.
2013-12-07 20:47:30 +01:00
Andreas Fischer
10b47a1e5a
Merge pull request #203 from bantu/cs-include-once
...
CS: Fix "PEAR.Files.IncludingFile.UseIncludeOnce" sniff.
* bantu/cs-include-once:
CS: Fix "PEAR.Files.IncludingFile.UseIncludeOnce" sniff.
2013-12-06 12:20:36 +01:00
Andreas Fischer
6d1fb9f7db
CS: Fix "PEAR.Files.IncludingFile.UseIncludeOnce" sniff.
2013-12-06 01:03:34 +01:00
Andreas Fischer
52e85604e5
Merge pull request #202 from bantu/cs-include-para
...
Fix "PEAR.Files.IncludingFile.BracketsNotRequired" sniff.
* bantu/cs-include-para:
Fix "PEAR.Files.IncludingFile.BracketsNotRequired" sniff.
2013-12-06 00:57:54 +01:00
Andreas Fischer
bc6ff96292
Fix "PEAR.Files.IncludingFile.BracketsNotRequired" sniff.
2013-12-05 23:17:40 +01:00
Andreas Fischer
8271f0fd29
Merge pull request #200 from bantu/cs-else-no-newline
...
CodeSniffer: Fix PEAR.ControlStructures.ControlSignature sniff.
* bantu/cs-else-no-newline:
Ignore coding style for "HAC 4.49" block in Math/BigInteger.php.
CS: Fix PEAR.ControlStructures.ControlSignature sniff.
2013-12-03 21:39:17 +01:00
Andreas Fischer
ef2c50f9e0
Ignore coding style for "HAC 4.49" block in Math/BigInteger.php.
2013-12-03 21:04:13 +01:00
Andreas Fischer
161bb7d362
CS: Fix PEAR.ControlStructures.ControlSignature sniff.
2013-12-03 21:04:13 +01:00
Andreas Fischer
bdaf590d27
Merge pull request #199 from bantu/cs-space-after-comma
...
CS: Fix Generic.Functions.FunctionCallArgumentSpacing.NoSpaceAfterComma sniff
* bantu/cs-space-after-comma:
CS: Fix Generic.Functions.FunctionCallArgumentSpacing.NoSpaceAfterComma sniff.
2013-12-03 21:03:49 +01:00
Andreas Fischer
9ca5f83dec
CS: Fix Generic.Functions.FunctionCallArgumentSpacing.NoSpaceAfterComma sniff.
2013-12-03 20:52:08 +01:00
Andreas Fischer
b6dd1f92bf
Merge pull request #198 from bantu/cs-openbrace-class
...
CodeSniffer: Fix PEAR.Classes.ClassDeclaration.OpenBraceNewLine sniff.
* bantu/cs-openbrace-class:
CodeSniffer: Fix PEAR.Classes.ClassDeclaration.OpenBraceNewLine sniff.
2013-12-03 20:46:31 +01:00
Andreas Fischer
e09f1b730e
CodeSniffer: Fix PEAR.Classes.ClassDeclaration.OpenBraceNewLine sniff.
2013-12-03 19:34:41 +01:00
Andreas Fischer
78b5084bf5
Merge pull request #197 from bantu/cs-lowercase-constant
...
CodeSniffer: Fix Generic.PHP.LowerCaseConstant.Found sniff.
* bantu/cs-lowercase-constant:
CodeSniffer: Fix Generic.PHP.LowerCaseConstant.Found sniff.
2013-12-03 19:25:30 +01:00
Andreas Fischer
ca9c8b107b
CodeSniffer: Fix Generic.PHP.LowerCaseConstant.Found sniff.
2013-12-03 18:54:43 +01:00
Andreas Fischer
ecd58b6a03
Merge pull request #195 from bantu/code-sniffer-pear
...
Base CodeSniffer ruleset on PEAR ruleset.
* bantu/code-sniffer-pear:
Base CodeSniffer ruleset on PEAR ruleset.
2013-12-01 12:49:17 +01:00
Andreas Fischer
8ef3a01b6e
Base CodeSniffer ruleset on PEAR ruleset.
2013-12-01 03:40:08 +01:00
Andreas Fischer
c85aa97d5e
Merge pull request #182 from bantu/composer-json-authors
...
Add people from AUTHORS to composer.json.
* bantu/composer-json-authors:
Add people from AUTHORS to composer.json.
2013-11-29 23:07:12 +01:00
Andreas Fischer
03f290b050
Merge pull request #193 from bantu/tests-default-date
...
Set the default timezone in tests bootstrap file.
* bantu/tests-default-date:
Set the default timezone in tests bootstrap file.
2013-11-29 19:13:59 +01:00
Andreas Fischer
fccf3e8c8a
Set the default timezone in tests bootstrap file.
2013-11-29 09:22:08 +01:00
Andreas Fischer
399407fdef
Merge pull request #186 from bantu/code-sniffer
...
Introducing Code Sniffer / Ensuring coding standard
* bantu/code-sniffer:
Only install composer dependencies in PHP 5.5 environment.
Run code sniffer on PHP 5.5 environment on Travis CI.
Add ruleset for phpseclib coding standard.
Install composer dependencies on Travis CI.
Add composer.lock file.
Add CodeSniffer as composer development dependency.
2013-11-26 20:09:30 +01:00