Commit Graph

46 Commits

Author SHA1 Message Date
terrafrost ca2c9588ea Merge branch '3.0' 2023-02-05 23:47:08 -06:00
terrafrost 508eaa7197 Tests: PHPUnit 10 updates 2023-02-05 17:33:16 -06:00
Jack Worman 97902d4bd3 Upgrade to PHP 7.0 2022-07-02 16:26:15 -05:00
Jack Worman 746e9eef57 Clean Up Tests 2022-04-22 18:41:59 -05:00
Jack Worman 0a69972571 Clean Up Tests 2022-03-15 18:49:38 -05:00
Jack Worman 574953061a PSR4 for tests and added fall-through for switches
PSR4 for tests and added fall-through for switches
2022-02-27 01:26:31 -06:00
Jack Worman ef66d9f7dd php-cs-fixer ci
php-cs-fixer ci
2022-02-01 20:29:48 -06:00
terrafrost 01cdf396b2 Merge branch '2.0' into 3.0 2021-10-13 22:00:32 -05:00
terrafrost 3da069570c Merge branch '1.0' into 2.0 2021-10-13 22:00:20 -05:00
terrafrost 30a9a1541c Tests/SSH2: fix intermittently failing unit test 2021-10-13 21:03:54 -05:00
terrafrost 2ec8356121 Merge branch '2.0' into 3.0 2021-10-12 20:37:34 -05:00
terrafrost a684f12065 Merge branch '1.0' into 2.0 2021-10-12 20:37:27 -05:00
terrafrost 6f8d12ffc7 Tests: tests were being skipped because their deps had no asserts 2021-10-12 20:35:38 -05:00
terrafrost c25dff2ef0 Merge branch '2.0-class-rename' into 3.0-class-rename 2020-12-12 22:26:03 -06:00
terrafrost 0676524dfd Merge branch '1.0-class-rename' into 2.0-class-rename 2020-12-12 21:41:10 -06:00
terrafrost e6abc61f45 rm adding of dupe classes (they break annotations) 2020-12-12 21:39:58 -06:00
terrafrost 7237c0f803 fix bad merge 2020-12-12 19:34:38 -06:00
terrafrost e4bf7b111a Merge branch '2.0' into 3.0 2020-12-12 19:22:36 -06:00
terrafrost 5701295017 Merge branch '1.0' into 2.0 2020-12-12 17:13:41 -06:00
terrafrost 266f16816a enable unit tests for PHP 8 / PHPUnit 9 2020-12-12 15:11:04 -06:00
terrafrost 653dbd7f94 rename phpseclib/phpseclib to phpseclib/phpseclib3 for 3.0 branch 2019-11-21 19:38:03 -06:00
terrafrost ce8ad063c7 Merge branch '2.0' 2017-12-14 23:52:18 -06:00
terrafrost b02d78e92a Merge branch '1.0' into 2.0 2017-12-14 23:49:10 -06:00
Remi Collet 8dc8642473 allow PHPUnit 4, 5 and 6 2017-12-14 23:25:30 -06:00
Gabriel Caruso 8eb7f3a798 Refactoring tests 2017-12-07 18:08:19 -02:00
Sokolovskyy Roman 966ee7f170 Long array() to short [] syntax 2017-11-27 09:30:14 +01:00
terrafrost 74d3a51183 Merge branch 'ssh2-fix-multi-channel-1.0' into ssh2-fix-multi-channel-2.0 2017-09-06 00:27:52 -05:00
terrafrost ed3846a7a2 Tests/SSH2: add unit test for #1167 2017-09-06 00:27:07 -05:00
terrafrost 5e2afe3a73 Merge branch '1.0' into 2.0 2017-05-28 09:10:58 -05:00
terrafrost 9bccc01b97 Tests/SSH2: add unit test for #1009 2017-05-28 08:58:00 -05:00
terrafrost b4cf10fc94 Revert "Merge branch '2.0'"
This reverts commit be5f4ef6b19c82f6c898708cc8e1828b05e3d4e8, reversing
changes made to 638fe6971c.
2016-04-10 11:30:59 -05:00
terrafrost 4b69dcb1ca Revert "Merge remote-tracking branch 'bantu/bootstrap'"
This reverts commit ef04c870e9, reversing
changes made to cd57bf31ae.
2016-04-10 11:25:31 -05:00
terrafrost d17aeffc04 Merge branch 'authenticated-1.0' into authenticated-2.0 2015-12-16 09:20:27 -06:00
terrafrost 57063f3604 SSH2: add isAuthenticated() method 2015-12-15 23:19:05 -06:00
terrafrost 4d086bee86 Merge branch 'ssh-custom-socket-1.0' into ssh-custom-socket-2.0
Conflicts:
	phpseclib/Net/SSH2.php
2015-07-17 12:43:50 -05:00
terrafrost 33a97391bc SSH2: make it so you can connect using open sockets 2015-07-17 12:30:44 -05:00
terrafrost d00e20a140 Merge remote-tracking branch 'graham/1.0-phpdoc' into 2.0-phpdoc
Conflicts:
	phpseclib/Crypt/Base.php
	phpseclib/Net/SCP.php
	tests/Unit/File/ASN1Test.php
2015-04-16 00:42:53 -05:00
Graham Campbell e50cbacd4e Fixed some phpdocs 2015-03-29 17:07:17 +01:00
Andreas Fischer 257d44331e Merge branch 'master' into php5
* master:
  .scrutinizer.yml: Use large timeout to prevent coverage receiver from timing out.
  Reenable SSH Functional Tests on Travis CI (PHP 5.3.3 and below).
2015-01-28 23:03:31 +01:00
Andreas Fischer f908040d20 Reenable SSH Functional Tests on Travis CI (PHP 5.3.3 and below). 2015-01-28 13:37:21 +01:00
Clint Nelissen 628949fb73 Namespaced classes 2014-12-15 14:29:20 -08:00
Andreas Fischer 0efae5a91e Change copyright years from roman numeral to decimal numbers. 2014-12-10 00:04:08 +01:00
Andreas Fischer d614274ed2 Add a few SSH2 preLogin tests. 2014-07-21 23:58:17 +02:00
terrafrost 2e06a14a8a SSH2: rm redundant part of SSH2 unit test 2014-06-16 23:58:00 -05:00
terrafrost bbce7c4762 SSH2: add unit test for getServerPublicHostKey 2014-06-16 18:54:26 -05:00
Andreas Fischer 4af647f170 Split Unit/Functional Test Suites. 2014-06-01 21:13:20 +02:00