1
0
mirror of https://github.com/danog/phpseclib.git synced 2024-12-05 13:38:50 +01:00
Commit Graph

6 Commits

Author SHA1 Message Date
terrafrost
61d885630f CS adjustment 2020-12-12 22:32:46 -06:00
terrafrost
95432478c0 fix bad merge 2020-12-12 17:39:32 -06: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
9283aaa36b Base code sniffer ruleset on PSR2 rather than PEAR. 2015-07-17 12:57:04 +02:00
Andreas Fischer
218f151693 Do not require test classes to be namespaced. 2014-12-17 04:06:36 +01:00
Andreas Fischer
ef528ea879 Apply coding guidelines (with exceptions) to the tests directory. 2014-02-15 20:05:30 +01:00