Revert changes since Standardized file headers merge

The conflicts resolution applied when merging the Standardized file
headers (commit e9dcce3df24912ad869d0193f0b419f2309101fc) was seriously
messed up, actually overwriting a number of changes in the master
branch.

Rather than trying to go and fix things one by one which has a high risk
of messing things further, it's easier to redo the merge from a clean
slate, so this commit reverts the following:

- "Merge branch 'hotfix/5.21' Standardized file headers",
  e9dcce3df24912ad869d0193f0b419f2309101fc
- "Merge tag 'v5.21.1'",
  5f437df3104159d5d659f60e31bef8d33c34995f
- "Reset version to 5.22.0-dev"
  af9234a525c3255af051a330164486d73be4c63a
- "Fix incorrect resolution of merge conflicts"
  a6733f61b0165b366c8d2c70d9af82edc3881951.
- "Fix syntax error in toexport.inc.php"
  20b01e83cb61b6b2460f64c7d1277c5f4cc28574.

Fixes #751

1 files changed, 0 insertions, 4 deletions

diff --git a/composer.json b/composer.json
index 807866b6..133210ee 100644
--- a/composer.json
+++ b/composer.json
@@ -30,10 +30,6 @@
 		"php" : "^5.5.9 || ^7.0 || ^8.0"
 	},
 
-	"require-dev" : {
-		"phpunit/phpunit": "^8.5"
-	},
-
 	"autoload" : {
 		"files" : ["adodb.inc.php"]
 	}