Skip to content
  • Andreas Fischer's avatar
    Merge branch 'PSR2-1.0' into PSR2-2.0 · d9e9504f
    Andreas Fischer authored
    * 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
    d9e9504f