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
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
Martijn Smit
b3add4491d
Replace extension_loaded with forward compatible function exists check
2017-09-29 21:33:57 +01:00
terrafrost
8fb4c3363d
undo merging of master to 2.0 branch
2016-04-28 15:34:10 -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 ef04c870e9cd57bf31ae
2016-04-10 11:25:31 -05:00
terrafrost
d8b74a7ee0
SSH2: update unit test
2015-12-07 22:02:02 -06:00
Dmitry Balabka
70dd67c4d9
Connection reuse refactoring to rid of globals
2015-09-01 21:50:30 +03:00
Andreas Fischer
58f8affcad
SSH2: Add support for curve25519-sha256@libssh.org.txt via libsodium-php.
2015-07-27 22:58:59 +02:00
Andreas Fischer
d9e9504fba
Merge branch 'PSR2-1.0' into PSR2-2.0
...
* PSR2-1.0:
Fix indentation phpcbf did not fix.
Remove PSR2.Methods.FunctionCallSignature.SpaceAfterOpenBracket exception.
Use phpcbf to fix PHP code to ruleset.
Ignore coding guidelines in ANSI switch block.
Base code sniffer ruleset on PSR2 rather than PEAR.
Update PHP Code Sniffer to 2.3.3
Conflicts:
build/code-sniffer-ruleset-tests.xml
build/code-sniffer-ruleset.xml
composer.lock
phpseclib/Crypt/DES.php
phpseclib/Crypt/Hash.php
phpseclib/Crypt/RSA.php
phpseclib/File/X509.php
phpseclib/Math/BigInteger.php
phpseclib/Net/SFTP.php
phpseclib/Net/SSH1.php
phpseclib/Net/SSH2.php
tests/Functional/Net/SFTPUserStoryTest.php
tests/Unit/Crypt/TwofishTest.php
2015-07-17 13:41:59 +02:00
Andreas Fischer
2013a31ecd
Use phpcbf to fix PHP code to ruleset.
2015-07-17 12:57:41 +02:00
terrafrost
ebcb3130b7
Merge branch 'openssl-support' into 2.0
...
Conflicts:
phpseclib/Crypt/AES.php
phpseclib/Crypt/Base.php
phpseclib/Crypt/Blowfish.php
phpseclib/Crypt/DES.php
phpseclib/Crypt/RC2.php
phpseclib/Crypt/RC4.php
phpseclib/Crypt/Rijndael.php
phpseclib/Crypt/TripleDES.php
phpseclib/Crypt/Twofish.php
phpseclib/Net/SSH2.php
tests/Functional/Net/SFTPLargeFileTest.php
tests/Unit/Crypt/AES/InternalTest.php
tests/Unit/Crypt/AES/McryptTest.php
tests/Unit/Crypt/AES/TestCase.php
2015-04-02 05:32:31 -05:00
terrafrost
162e2f26cf
Tests/SSH2: syntax error
2014-12-30 00:57:01 -06:00
terrafrost
46f81c98ab
Tests/SSH2: update testGenerateIdentifier test
2014-12-30 00:27:27 -06:00
Clint Nelissen
628949fb73
Namespaced classes
2014-12-15 14:29:20 -08:00
Andreas Fischer
c4b103468c
Merge pull request #549 from bantu/fix-547
...
Change copyright years from roman numeral to decimal numbers.
* bantu/fix-547:
Change copyright years from roman numeral to decimal numbers.
Conflicts:
phpseclib/System/SSH_Agent.php
2014-12-10 00:06:08 +01:00
Andreas Fischer
0efae5a91e
Change copyright years from roman numeral to decimal numbers.
2014-12-10 00:04:08 +01:00
Andreas Fischer
970c55d6cc
Remove side-effect from Net/SFTP/Stream.php.
2014-06-27 14:22:47 +02:00
Andreas Fischer
f360932343
Add unit test for (to be added) Net_SFTP_Stream::register().
2014-06-27 00:21:55 +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
4af647f170
Split Unit/Functional Test Suites.
2014-06-01 21:13:20 +02:00
