1
0
mirror of https://github.com/danog/phpseclib.git synced 2024-12-16 02:47:05 +01:00
Commit Graph

2124 Commits

Author SHA1 Message Date
Andreas Fischer
8ef3a01b6e Base CodeSniffer ruleset on PEAR ruleset. 2013-12-01 03:40:08 +01:00
Andreas Fischer
bdf4f8f58c Merge branch 'master' into php5
* master:
  Add people from AUTHORS to composer.json.
2013-11-29 23:07:18 +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
4d37c36af7 Merge branch 'master' into php5
* master:
  Set the default timezone in tests bootstrap file.
2013-11-29 19:14:10 +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
2f3b6e3646 Update Travis CI build status image branch name to php5. 2013-11-26 21:06:28 +01:00
Andreas Fischer
7500eedfd6 Merge branch 'master' into php5
* master:
  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:35 +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
6e10eb195d Merge branch 'master' into php5
* master:
  Add Blowfish and Twofish as composer keywords.
2013-11-26 19:35:49 +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
Andreas Fischer
bc8615e4ba Merge branch 'master' into php5
* master:
  Only apply git ignores relative to repository root.
  Remove all ignores that belong to users global .gitignore file.
  The composer.lock file belongs to the repository. Do not ignore.
2013-11-26 09:27:43 +01:00
terrafrost
480bc5c277 Merge pull request #184 from bantu/gitignore-cleanup
Gitignore cleanup
2013-11-25 13:52:04 -08:00
Andreas Fischer
07c9f91cc6 Adjust "Code Coverage Report" branch in link: master -> php5 2013-11-23 22:00:01 +01:00
Andreas Fischer
83db832506 Merge branch 'master' into php5
* master:
  Correct "Code Coverage Report" link to include branch name (master).
2013-11-23 21:59:48 +01: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
603d1c9417 Merge branch 'master' into php5
* master:
  Updated LICENSE
2013-11-23 21:22:08 +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
924bec8058 Merge branch 'master' into php5
* master:
  Use a variable for subfolder string.
  Use branch name as a subfolder for code coverage reports.
2013-11-23 21:19:11 +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
e98325b369 Merge branch 'master' into php5
* master:
  Removed vim comments
2013-11-23 21:16:39 +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
d09c6c3e6f Merge pull request #185 from mpscholten/patch-1
Removed Php_Compat note in composer.json because we dropped php4 support

* mpscholten/patch-1:
  Removed Php_Compat note in composer.json because we dropped php4 support
2013-11-23 21:06:53 +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
mpscholten
c2d183d223 Removed Php_Compat note in composer.json because we dropped php4 support 2013-11-23 20:37:06 +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
e2fea7ca4b Merge pull request #177 from bantu/php5.3-minimum-requirement
Make PHP 5.3 the minimum requirement

* bantu/php5.3-minimum-requirement:
  Remove the PHP 5.2 travis environment.
  Require PHP 5.3 in composer.json
2013-11-23 20:04:59 +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
Andreas Fischer
71ad6b914f Merge remote-tracking branch 'phpseclib/master' into php5
* phpseclib/master:
  SSH2: Continue Subsystem Implementation.
2013-11-20 23:19:12 +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
6b1a817bbe Remove the PHP 5.2 travis environment. 2013-11-20 21:20:35 +01:00
Andreas Fischer
e0cbaedccf Require PHP 5.3 in composer.json 2013-11-20 21:18:51 +01: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