Commit Graph

30 Commits

Author SHA1 Message Date
terrafrost
004aec954f Merge branch '3.0' 2022-02-19 18:08:40 -06:00
Jack Worman
ea9f6540f3 PSR12 fixes
PSR12 fixes
2022-02-19 17:06:13 -06:00
terrafrost
b5a3b05574 Merge branch '2.0' 2022-02-14 17:35:58 -06:00
Jack Worman
b96fc26dbc Psalm coverage to everywhere except phpseclib/Crypt/, phpseclib/Math/ and tests/
Revert "Removed remaining tabs"

This reverts commit 31c077d6b1.

Revert "Whitespace php-cs-fixer.php rules added"

This reverts commit 25e336614d.

Addressing comments
2022-02-14 17:30:41 -06:00
Jack Worman
61f2bc1c06 Remove Dynamic Constants
Remove Dynamic Constants
2022-02-02 19:43:32 -06:00
Jack Worman
9b1c218664 psalm ci
psalm-ci

psalm-ci

psalm-ci
2022-02-01 20:45:53 -06:00
Jack Worman
ef66d9f7dd php-cs-fixer ci
php-cs-fixer ci
2022-02-01 20:29:48 -06:00
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
a25d4980f1 Merge branch '1.0' into 2.0
* 1.0:
  Remove api from build target
2020-08-21 19:35:49 +02:00
William Desportes
3fe698e9ae
Remove api from build target 2020-08-21 18:46:51 +02:00
Andreas Fischer
901382d724 Merge branch '1.0' into 2.0
* 1.0:
  Move Doctum config files to phpseclib/api-docs
2020-08-21 18:19:41 +02:00
William Desportes
ceab38e0b8
Move Doctum config files to phpseclib/api-docs
Fixes: #1365
Closes: #416
Closes: #1506
2020-08-21 18:06:03 +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
5eb205b237 Remove PSR2.Methods.FunctionCallSignature.SpaceAfterOpenBracket exception. 2015-07-17 12:57:41 +02:00
Andreas Fischer
9283aaa36b Base code sniffer ruleset on PSR2 rather than PEAR. 2015-07-17 12:57:04 +02:00
Andreas Fischer
eca3bb9724 Merge branch '1.0' into 2.0
* 1.0:
  Adjust sami.conf.php to new branch names.
2015-02-04 18:16:50 +01:00
Andreas Fischer
51580c0cb7 Adjust sami.conf.php to new branch names. 2015-02-04 16:53:39 +01:00
Andreas Fischer
218f151693 Do not require test classes to be namespaced. 2014-12-17 04:06:36 +01:00
Andreas Fischer
b5227ddb67 Add code sniffer rules for 2.0 goals. 2014-12-17 04:06:36 +01:00
Andreas Fischer
01a176b3d3 Merge branch 'master' into php5
* master:
  Add api target to phing build script.
  Add sami configuration file.
  Add sami/sami 1.* as a development dependency.

Conflicts:
	composer.lock
2014-07-20 21:22:19 +02:00
Andreas Fischer
ffccec59cb Add api target to phing build script. 2014-07-19 01:10:30 +02:00
Andreas Fischer
d86a17271f Add sami configuration file. 2014-07-19 01:04:18 +02:00
Andreas Fischer
4ada8675ba Check for old-style constructor names via Code Sniffer. 2014-06-16 17:06:18 +02:00
Andreas Fischer
c0bdf1bd90 CS: Fix "PEAR.Functions.FunctionCallSignature.Indent" sniff. 2014-04-24 00:26:02 +02:00
Andreas Fischer
81982ef86e Make build script exit with non-zero status when sniff fails. 2014-04-19 15:27:59 +02:00
Andreas Fischer
4a064a0506 Run Code Sniffer via phing. 2014-04-12 07:48:32 +02:00
Andreas Fischer
ef528ea879 Apply coding guidelines (with exceptions) to the tests directory. 2014-02-15 20:05:30 +01:00
Andreas Fischer
6e851baca0 Use exclude instead of changing severity. 2014-02-15 19:16:21 +01:00
Andreas Fischer
6fc22d5405 Add build directory. 2014-02-15 18:51:09 +01:00