danog/phpseclib
1
0
Fork 0
mirror of https://github.com/danog/phpseclib.git synced 2024-11-27 04:46:26 +01:00
Code Issues Projects Releases Wiki Activity
886 Commits 6 Branches 31 Tags 19 MiB
6fc22d5405
Commit Graph

886 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Andreas Fischer
1832c1743c Merge pull request #188 from bantu/more-composer-keywords 
Add Blowfish and Twofish as composer keywords.

* bantu/more-composer-keywords:
  Add Blowfish and Twofish as composer keywords.
 2013-11-26 19:35:33 +01:00
terrafrost
480bc5c277 Merge pull request #184 from bantu/gitignore-cleanup 
Gitignore cleanup
 2013-11-25 13:52:04 -08:00
Andreas Fischer
82c0bb4b9d Correct "Code Coverage Report" link to include branch name (master). 2013-11-23 21:59:15 +01:00
Andreas Fischer
28b2ae7849 Add Blowfish and Twofish as composer keywords. 2013-11-23 21:25:26 +01:00
Andreas Fischer
c9f516dedd Merge pull request #187 from mpscholten/patch-2 
Updated LICENSE

* mpscholten/patch-2:
  Updated LICENSE
 2013-11-23 21:21:55 +01:00
Andreas Fischer
367947d897 Merge pull request #183 from bantu/code-coverage-branch-name 
Use branch name as a subfolder for code coverage reports

* bantu/code-coverage-branch-name:
  Use a variable for subfolder string.
  Use branch name as a subfolder for code coverage reports.
 2013-11-23 21:19:02 +01:00
mpscholten
0a7c5f90d0 Updated LICENSE 2013-11-23 21:18:24 +01:00
Andreas Fischer
399308f98a Merge pull request #180 from mpscholten/removed-vim-comments 
Removed vim comments

* mpscholten/removed-vim-comments:
  Removed vim comments
 2013-11-23 21:16:25 +01:00
Andreas Fischer
552459d55e Only install composer dependencies in PHP 5.5 environment. 
There is currently no point in installing in any other environment.
 2013-11-23 21:08:37 +01:00
Andreas Fischer
e6be743fe2 Run code sniffer on PHP 5.5 environment on Travis CI. 2013-11-23 21:02:23 +01:00
Andreas Fischer
dc0fc84bd0 Add ruleset for phpseclib coding standard. 2013-11-23 21:01:26 +01:00
Andreas Fischer
f0dcc74c29 Install composer dependencies on Travis CI. 2013-11-23 20:38:11 +01:00
Andreas Fischer
6f16e5ae8e Only apply git ignores relative to repository root. 2013-11-23 20:33:37 +01:00
Andreas Fischer
79d3709def Remove all ignores that belong to users global .gitignore file. 2013-11-23 20:32:44 +01:00
Andreas Fischer
021ca1b9ad The composer.lock file belongs to the repository. Do not ignore. 2013-11-23 20:31:50 +01:00
Andreas Fischer
6ed4e3c92e Add composer.lock file. 2013-11-23 20:31:06 +01:00