1
0
mirror of https://github.com/danog/phpseclib.git synced 2024-12-15 18:37:33 +01:00
phpseclib/build
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
..
build.xml Add api target to phing build script. 2014-07-19 01:10:30 +02:00
code-sniffer-ruleset-tests.xml Merge branch 'PSR2-1.0' into PSR2-2.0 2015-07-17 13:41:59 +02:00
code-sniffer-ruleset.xml Merge branch 'PSR2-1.0' into PSR2-2.0 2015-07-17 13:41:59 +02:00
sami.conf.php Adjust sami.conf.php to new branch names. 2015-02-04 16:53:39 +01:00