From 55e9104d45b796cbb10cbafec263c4f3140b4358 Mon Sep 17 00:00:00 2001
From: Dennis Riehle <webmaster@riehle-web.com>
Date: Thu, 28 Nov 2024 17:03:16 +0100
Subject: [PATCH] drop PHP 7.4 and 8.1, add PHP 8.4

---
 .php-cs-fixer.php                      |  6 ++--
 composer.json                          | 39 +++++++++++---------------
 {library => src}/Md5Crypt/Md5Crypt.php |  0
 3 files changed, 21 insertions(+), 24 deletions(-)
 rename {library => src}/Md5Crypt/Md5Crypt.php (100%)

diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
index 12aedf8..a334ff3 100644
--- a/.php-cs-fixer.php
+++ b/.php-cs-fixer.php
@@ -5,7 +5,7 @@
     ->name('*.php')
     ->ignoreDotFiles(true)
     ->ignoreVCS(true)
-    ->in(__DIR__ . '/library/')
+    ->in(__DIR__ . '/src/')
     ->in(__DIR__ . '/tests/');
 
 return (new PhpCsFixer\Config())
@@ -15,7 +15,9 @@
         '@PSR2' => true,
         '@Symfony' => true,
         '@DoctrineAnnotation' => true,
-        '@PHP74Migration' => true,
+	'@PHP74Migration' => true,
+	'@PHP80Migration' => true,
+	'@PHP81Migration' => true,
         'align_multiline_comment' => ['comment_type' => 'phpdocs_like'],
         'concat_space' => ['spacing' => 'one'],
         'echo_tag_syntax' => ['format' => 'long'],
diff --git a/composer.json b/composer.json
index e8d1eb4..9b459c6 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,11 @@
 {
 	"name": "driehle/php-crypt-md5",
-	"type": "library",
 	"description": "A pure PHP implementation of an MD5-hashsum-based implementation of the crypt routine, which can be used to generate hashs for Apache's passwd files",
+	"license": [
+		"GPL-3.0+",
+		"LGPL-3.0+"
+	],
+	"type": "library",
 	"keywords": [
 		"Crypt",
 		"MD5",
@@ -9,43 +13,34 @@
 		"passwd",
 		"htaccess"
 	],
-	"homepage": "https://github.com/driehle/php-crypt-md5",
-	"license": [
-		"GPL-3.0+",
-		"LGPL-3.0+"
-	],
 	"authors": [
 		{
-			"name": "Dennis Riehle",
+			"name": "Dennis M. Riehle",
 			"role": "Developer"
 		}
 	],
+	"homepage": "https://github.com/driehle/php-crypt-md5",
 	"require": {
-		"php": ">=7.4 <8.4"
+		"php": ">=8.1 <8.5"
 	},
 	"require-dev": {
-		"ergebnis/composer-normalize": "^2.18.0",
-		"friendsofphp/php-cs-fixer": "^3.4.0",
-		"phpunit/phpunit": "^9.5.11"
-	},
-	"extra": {
-		"branch-alias": {
-			"dev-master": "3.4-dev"
-		}
+		"ergebnis/composer-normalize": "^2.44.0",
+		"friendsofphp/php-cs-fixer": "^3.65.0",
+		"phpunit/phpunit": "^10.5.38"
 	},
 	"autoload": {
 		"psr-0": {
-			"Md5Crypt\\": "library/"
+			"Md5Crypt\\": "src/"
 		}
 	},
-	"scripts": {
-		"cs-check": "php-cs-fixer fix --dry-run --verbose",
-		"cs-fix": "php-cs-fixer fix --verbose",
-		"test": "phpunit"
-	},
 	"config": {
 		"allow-plugins": {
 			"ergebnis/composer-normalize": true
 		}
+	},
+	"scripts": {
+		"cs-check": "php-cs-fixer fix --dry-run --verbose",
+		"cs-fix": "php-cs-fixer fix --verbose",
+		"test": "phpunit"
 	}
 }
diff --git a/library/Md5Crypt/Md5Crypt.php b/src/Md5Crypt/Md5Crypt.php
similarity index 100%
rename from library/Md5Crypt/Md5Crypt.php
rename to src/Md5Crypt/Md5Crypt.php