Commit Graph

1142 Commits

Author SHA1 Message Date
Andreas Fischer
02e06a2c55 Merge branch 'master' into php5
* master:
  RSA: update unit test file
  RSA: auto-detect public keys vs private keys
2014-06-01 22:17:38 +02:00
Andreas Fischer
07e1f954de Merge pull request #325 from terrafrost/rsa-public-key
RSA: auto-detect public keys vs private keys

* terrafrost/rsa-public-key:
  RSA: update unit test file
  RSA: auto-detect public keys vs private keys
2014-06-01 22:17:38 +02:00
Andreas Fischer
6dbcdb8174 Merge pull request #357 from bantu/tests-composer-autoloader-php5
[php5] Use composer autoloader in test bootstrap.

* bantu/tests-composer-autoloader-php5:
  PHP 5.3+: Replace custom autoloader with composer autoloader.
2014-06-01 22:01:31 +02:00
Andreas Fischer
c7d4fd937e Merge pull request #358 from bantu/ticket/321
Reimplement testGenerateIdentifier

* bantu/ticket/321:
  Reimplement testGenerateIdentifier to fix #321
2014-06-01 22:00:08 +02:00
Andreas Fischer
89aab25362 Merge branch 'master' into php5
* master:
  Reimplement testGenerateIdentifier to fix #321
2014-06-01 22:00:08 +02:00
Andreas Fischer
602606d966 Merge pull request #356 from bantu/test-directory-reorganisation
Split Unit/Functional Test Suites.

* bantu/test-directory-reorganisation:
  Split Unit/Functional Test Suites.
2014-06-01 21:56:57 +02:00
Andreas Fischer
00e2d8d959 Merge branch 'master' into php5
* master:
  Split Unit/Functional Test Suites.
2014-06-01 21:56:57 +02:00
Andreas Fischer
bb3c2ca28d Merge pull request #355 from bantu/scrutinizer-coverage
Scrutinizer CI code coverage

* bantu/scrutinizer-coverage:
  Specify the runs option for external code coverage.
  No Scrutinizer Code Coverage on HHVM either.
  Extract into upload-code-coverage-scrutinizer.sh
  Add -html suffix to existing code-coverage shell script.
  Configure Scrutinizer CI to expect external code coverage data.
  Upload clover.xml from Travis CI into Scrutinizer CI.
  Produce a clover.xml code coverage file.
2014-06-01 21:55:25 +02:00
Andreas Fischer
453f883a89 Merge branch 'master' into php5
* master:
  Specify the runs option for external code coverage.
  No Scrutinizer Code Coverage on HHVM either.
  Extract into upload-code-coverage-scrutinizer.sh
  Add -html suffix to existing code-coverage shell script.
  Configure Scrutinizer CI to expect external code coverage data.
  Upload clover.xml from Travis CI into Scrutinizer CI.
  Produce a clover.xml code coverage file.
2014-06-01 21:55:25 +02:00
Andreas Fischer
83ddfe09a6 Reimplement testGenerateIdentifier to fix #321 2014-06-01 21:49:40 +02:00
Andreas Fischer
dcff8a4f5a PHP 5.3+: Replace custom autoloader with composer autoloader. 2014-06-01 21:18:49 +02:00
Andreas Fischer
4af647f170 Split Unit/Functional Test Suites. 2014-06-01 21:13:20 +02:00
Andreas Fischer
3cda317862 Specify the runs option for external code coverage. 2014-06-01 13:52:24 +02:00
Andreas Fischer
825cd124aa No Scrutinizer Code Coverage on HHVM either.
Fatal error: Uncaught exception 'PharException' with message 'Corrupt phar, can't read 4 bytes starting at offset 1663508419' in :
Stack trace:
0 (): Phar::bytesToInt()
1 (): Phar->parsePhar()
2 (): Phar->__construct()
3 /home/travis/build/phpseclib/phpseclib/ocular.phar(9): Phar::mapPhar()
4 {main}
2014-06-01 13:50:54 +02:00
Andreas Fischer
33e62401c3 Extract into upload-code-coverage-scrutinizer.sh 2014-06-01 13:49:15 +02:00
Andreas Fischer
b5fed807f3 Add -html suffix to existing code-coverage shell script. 2014-06-01 13:45:51 +02:00
Andreas Fischer
2c00f074e5 Configure Scrutinizer CI to expect external code coverage data. 2014-06-01 13:29:37 +02:00
Andreas Fischer
a29b46693c Upload clover.xml from Travis CI into Scrutinizer CI. 2014-06-01 13:29:37 +02:00
Andreas Fischer
8aa17c285c Produce a clover.xml code coverage file. 2014-06-01 13:12:42 +02:00
Andreas Fischer
eb12b347b7 Merge pull request #353 from terrafrost/biginteger-function-exists
BigInteger: "be less overly clever loading Crypt/Random"

* terrafrost/biginteger-function-exists:
  BigInteger: "be less overly clever loading Crypt/Random"
2014-05-30 15:50:36 +02:00
Andreas Fischer
4a89349615 Merge branch 'master' into php5
* master:
  BigInteger: "be less overly clever loading Crypt/Random"
2014-05-30 15:50:36 +02:00
Andreas Fischer
7e2289656a Merge branch 'master' into php5
* master:
  SFTP/Stream: fix capatilization
  SFTP/Stream: add explanation as to why nlist() is used here
  SFTP/Stream: use $scheme instead of 'sftp'
2014-05-30 00:00:05 +02:00
Andreas Fischer
6805704b4f Merge pull request #352 from terrafrost/sftp-stream-changes
SFTP Stream changes

* terrafrost/sftp-stream-changes:
  SFTP/Stream: fix capatilization
  SFTP/Stream: add explanation as to why nlist() is used here
  SFTP/Stream: use $scheme instead of 'sftp'
2014-05-30 00:00:04 +02:00
terrafrost
7252017268 SFTP/Stream: fix capatilization 2014-05-29 16:49:04 -05:00
terrafrost
7c08ab71d3 BigInteger: "be less overly clever loading Crypt/Random"
pretty much the same as this commit:

28f18f83ec
2014-05-29 16:31:26 -05:00
terrafrost
c0e3795319 SFTP/Stream: add explanation as to why nlist() is used here 2014-05-29 16:23:28 -05:00
terrafrost
3dd92e56e4 SFTP/Stream: use $scheme instead of 'sftp'
This makes it easier for someone to change the scheme (which can be
done by changng the stream_wrapper_register call at the bottom
of the file)
2014-05-29 16:14:03 -05:00
Andreas Fischer
712f820a26 Merge branch 'master' into php5
* master:
  SSH2: 0x7FFFFFFF -> $this->window_size in one more place
  SSH2: make it so callback functions can make exec() return early
2014-05-28 00:39:40 +02:00
Andreas Fischer
aa5f9b77ec Merge pull request #349 from terrafrost/ssh2-exec-callback-termination
SSH2: make it so callback functions can make exec() return early

* terrafrost/ssh2-exec-callback-termination:
  SSH2: 0x7FFFFFFF -> $this->window_size in one more place
  SSH2: make it so callback functions can make exec() return early
2014-05-28 00:39:40 +02:00
Andreas Fischer
5ff1c9a349 Merge branch 'master' into php5
* master:
  SFTP: NULL -> null
  SFTP: fix syntax error
  SFTP: add more stat functions
2014-05-28 00:02:23 +02:00
Andreas Fischer
fc57e3f9c9 Merge pull request #348 from terrafrost/more-sftp-changes
More sftp changes

* terrafrost/more-sftp-changes:
  SFTP: NULL -> null
  SFTP: fix syntax error
  SFTP: add more stat functions
2014-05-28 00:02:20 +02:00
Andreas Fischer
958430b5a8 Merge branch 'master' into php5
* master:
  Random: wrap crypt_random_string in a function_exists call
2014-05-27 12:24:52 +02:00
Andreas Fischer
05b265d791 Merge pull request #350 from terrafrost/crypt-random-string-function-exists
Random: wrap crypt_random_string in a function_exists call

* terrafrost/crypt-random-string-function-exists:
  Random: wrap crypt_random_string in a function_exists call
2014-05-27 12:24:52 +02:00
terrafrost
015d628183 Random: wrap crypt_random_string in a function_exists call 2014-05-26 18:32:36 -05:00
terrafrost
db32efb276 SSH2: 0x7FFFFFFF -> $this->window_size in one more place 2014-05-26 17:57:14 -05:00
terrafrost
0dd929341b SSH2: make it so callback functions can make exec() return early 2014-05-26 17:37:32 -05:00
terrafrost
c100264b65 SFTP: NULL -> null 2014-05-26 16:32:57 -05:00
terrafrost
46ae0da314 SFTP: fix syntax error 2014-05-26 15:42:14 -05:00
terrafrost
a7fa4cc4ff SFTP: add more stat functions
also don't use stat cache for SFTP/Stream.php
2014-05-26 15:39:30 -05:00
Andreas Fischer
30de331eb4 Merge pull request #347 from bantu/wrong-stat-cache-property
SFTP: Use the correct stat cache property: stat_cache

* bantu/wrong-stat-cache-property:
  SFTP: Use the correct stat cache property: stat_cache
2014-05-22 15:27:56 +02:00
Andreas Fischer
518eb861e9 Merge branch 'master' into php5
* master:
  SFTP: Use the correct stat cache property: stat_cache
2014-05-22 15:27:56 +02:00
Andreas Fischer
f1fbf9c5ae SFTP: Use the correct stat cache property: stat_cache 2014-05-22 13:32:39 +02:00
Andreas Fischer
39b9ffffdf Merge branch 'master' into php5
* master:
  SFTP: last commit had a few ommissions
  SFTP Functional tests: Make use of assertNotSame
  SFTP Functional tests: Keep story linear.
  SFTP: add more unit tests
2014-05-22 13:25:57 +02:00
Andreas Fischer
4e0b3a5c3c Merge pull request #344 from bantu/sftp-unit-test-updates
Sftp functional test updates

* bantu/sftp-unit-test-updates:
  SFTP: last commit had a few ommissions
  SFTP Functional tests: Make use of assertNotSame
  SFTP Functional tests: Keep story linear.
  SFTP: add more unit tests
2014-05-22 13:25:42 +02:00
Andreas Fischer
623f17893b Merge pull request #346 from terrafrost/sftp-fix-last-commit-ommissions
SFTP: last commit had a few ommissions

* terrafrost/sftp-fix-last-commit-ommissions:
  SFTP: last commit had a few ommissions
2014-05-22 13:15:57 +02:00
terrafrost
1ddcd6d873 SFTP: last commit had a few ommissions 2014-05-21 19:55:12 -05:00
Andreas Fischer
5afc865775 SFTP Functional tests: Make use of assertNotSame 2014-05-22 00:40:49 +02:00
Andreas Fischer
8a43f02ae9 SFTP Functional tests: Keep story linear. 2014-05-22 00:40:49 +02:00
terrafrost
6e8e44b120 SFTP: add more unit tests 2014-05-22 00:40:49 +02:00
Andreas Fischer
4524b9f663 Merge branch 'master' into php5
* master:
  SFTP: stat cache updates
  SFTP: Rudimentary tests for file_exists(), is_file(), is_dir().
2014-05-21 17:55:42 +02:00