Commit Graph

806 Commits

Author SHA1 Message Date
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
Andreas Fischer
e74744c620 Add CodeSniffer as composer development dependency. 2013-11-23 20:30:25 +01:00
Andreas Fischer
de16c37c82 Use a variable for subfolder string. 2013-11-23 20:02:41 +01:00
Andreas Fischer
fa229bb186 Use branch name as a subfolder for code coverage reports. 2013-11-23 20:00:44 +01:00
Andreas Fischer
cc08a59b4b Add people from AUTHORS to composer.json. 2013-11-23 19:46:04 +01:00
Marc Philip Scholten
3bfd884813 Removed vim comments
Reformated files
2013-11-23 19:42:26 +01:00
terrafrost
14a52fd747 Merge pull request #178 from phonzie/patch-5
SSH2: Continue Subsystem Implementation.
2013-11-20 13:42:11 -08:00
phonzie
3afa655f57 SSH2: Continue Subsystem Implementation.
Removed unused piece of code @2352.
Added $this->_get_interactive_channel() to reset(). Unless we don't want to close the subsystem channel?? Leaving that decision up to you.
2013-11-20 16:17:23 -05:00
Andreas Fischer
62aafecccc Merge pull request #176 from phonzie/patch-4
SFTP: Removed dead code

* phonzie/patch-4:
  SFTP: Removed dead code
2013-11-20 21:13:46 +01:00
phonzie
702ade7d12 SFTP: Removed dead code
variable: $initialize = true, ironically - is initialized but never used.
Feel free to deny if this is reserved for future implementation(s).
2013-11-20 15:02:04 -05:00
terrafrost
fcfc0e2c00 SFTP: don't do $dir[-1] check if $dir === '' 2013-11-20 09:33:47 -06:00
terrafrost
187f40a247 Merge pull request #173 from h4cc/patch-1
Making Net_SFTP::chdir capable of handling the empty string.
2013-11-20 07:29:16 -08:00
terrafrost
478dd38e8f SFTP/Stream: log when constructor is called 2013-11-20 09:11:14 -06:00
terrafrost
f3c71faee0 Merge pull request #172 from PVince81/sftp-stream-feof-fix
Initing eof to false
2013-11-20 07:09:38 -08:00
Julius Beckmann
44078e5f40 Making Net_SFTP::chdir capable of handling the empty string.
Updated patch after hint from bantu.
2013-11-20 15:08:50 +01:00
Julius Beckmann
9ea67f9edb Making Net_SFTP::chdir capable of handling the empty string.
Fixing a ugly notice when using the empty string as parameter for chdir:
  Notice: Uninitialized string offset: -1 in Net/SFTP.php line 617
2013-11-20 14:49:16 +01:00
Vincent Petry
2517dd4a61 Initing eof to false
The call _stream_eof() must return a boolean, not null.
Returning null makes PHP believe that the method wasn't implemented.

Fixes #170
2013-11-19 23:13:10 +01:00
Andreas Fischer
6f56dfc80b Merge pull request #168 from phonzie/patch-3
SFTP_Stream: Fixed typo in _parse_path

* phonzie/patch-3:
  SFTP_Stream: Fixed typo in _parse_path
2013-11-19 20:30:23 +01:00
phonzie
8dd12ed467 SFTP_Stream: Fixed typo in _parse_path
typo: isset($this->contenxt)
should be $this->context
2013-11-19 14:23:54 -05:00
terrafrost
f9aa658309 Merge pull request #167 from phonzie/patch-2
SSH2.php: Use of undefined property: "$this->bitmask"
2013-11-15 13:07:14 -08:00
phonzie
eb3bffaa00 Update SSH2.php
Use of undefined property: "$this->bitmask".

In context, it seems that it should reference the "bitmap" property.
2013-11-15 13:34:31 -05:00
terrafrost
300a3afe8d Merge branch 'master' of https://github.com/phpseclib/phpseclib 2013-11-10 22:38:36 -06:00
terrafrost
755f0f17a5 RSA: putty keys weren't being formatted correctly 2013-11-10 22:27:48 -06:00
terrafrost
5c5616523d Merge pull request #164 from bantu/master
Partial revert of 9f1108e52e.
2013-11-06 14:24:18 -08:00
Andreas Fischer
2241d0e6f4 Partial revert of 9f1108e52e.
This change should not be necessary.
2013-11-06 23:12:00 +01:00
Andreas Fischer
b55a0a1f1a Merge pull request #162 from FrenkyNet/master
Check wether CRYPT_RANDOM_IS_WINDOWS is defined before defining it.

* FrenkyNet/master:
  Fixed coding style to comply with other not defined statements
  Check wether CRYPT_RANDOM_IS_WINDOWS is defined before defining it.
2013-11-05 13:28:50 +01:00
Frank de Jonge
4976cd1622 Fixed coding style to comply with other not defined statements 2013-11-05 13:01:03 +01:00
Frank de Jonge
9f1108e52e Check wether CRYPT_RANDOM_IS_WINDOWS is defined before defining it. 2013-11-05 11:27:16 +01:00
Andreas Fischer
ccfe02a44e Merge pull request #161 from jesseschalken/master
Fixed typo in object class name comparison

* jesseschalken/master:
  Fixed typo in object class name comparison
2013-11-04 09:24:50 +01:00
Jesse Schalken
71ae795460 Fixed typo in object class name comparison 2013-11-04 17:48:01 +11:00
terrafrost
c3197e98db Merge pull request #160 from briannesbitt/patch-1
Added a callable to put for progress updates
2013-11-01 11:04:34 -07:00