From 048812bb9a5bc84f2913ef0af26c2c778d0f5f59 Mon Sep 17 00:00:00 2001 From: Jan Lam Date: Wed, 10 Jun 2026 12:12:14 +0200 Subject: [PATCH 1/2] Remove unused doctrine/annotations dependency --- composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/composer.json b/composer.json index 068d69a..685e4f6 100644 --- a/composer.json +++ b/composer.json @@ -6,7 +6,6 @@ "require": { "php": "^8.1", "composer-plugin-api": "^2.0.0", - "doctrine/annotations": "^1.13.2", "phpdocumentor/type-resolver": "^1.4.0", "symfony/filesystem": "^5.4||^6.0", "twig/twig": "^3.0" From f4e0b264b8ae8114000a65bea881d3710499bda2 Mon Sep 17 00:00:00 2001 From: Jan Lam Date: Wed, 10 Jun 2026 12:18:38 +0200 Subject: [PATCH 2/2] Drop PHP <8.3 support --- .github/workflows/main.yaml | 2 +- composer.json | 2 +- src/Installer.php | 6 +++--- src/PackageContent.php | 4 ++-- src/ReflectionTypeInterface.php | 2 +- test/ReflectionParameterTest.php | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 468a4e4..c303f33 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -11,7 +11,7 @@ jobs: strategy: matrix: - php-versions: ['8.1', '8.2', '8.3'] + php-versions: ['8.3','8.4'] name: PHP ${{ matrix.php-versions }} steps: - uses: actions/checkout@v2 diff --git a/composer.json b/composer.json index 685e4f6..29447c1 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,7 @@ "description": "Installer for all the Hostnet Doctrine entity libraries", "license": "MIT", "require": { - "php": "^8.1", + "php": "^8.3", "composer-plugin-api": "^2.0.0", "phpdocumentor/type-resolver": "^1.4.0", "symfony/filesystem": "^5.4||^6.0", diff --git a/src/Installer.php b/src/Installer.php index 325b729..5eb9cce 100644 --- a/src/Installer.php +++ b/src/Installer.php @@ -23,9 +23,9 @@ */ class Installer extends LibraryInstaller implements PackagePathResolverInterface { - private const PACKAGE_TYPE = 'hostnet-entity'; - private const EXTRA_ENTITY_BUNDLE_DIR = 'entity-bundle-dir'; - public const GENERATE_INTERFACES = 'generate-interfaces'; + private const string PACKAGE_TYPE = 'hostnet-entity'; + private const string EXTRA_ENTITY_BUNDLE_DIR = 'entity-bundle-dir'; + public const string GENERATE_INTERFACES = 'generate-interfaces'; private $compound_generators; diff --git a/src/PackageContent.php b/src/PackageContent.php index a80d88b..8604484 100644 --- a/src/PackageContent.php +++ b/src/PackageContent.php @@ -11,8 +11,8 @@ */ class PackageContent implements PackageContentInterface { - public const ENTITY = '\\Entity\\'; - public const REPOSITORY = '\\Repository\\'; + public const string ENTITY = '\\Entity\\'; + public const string REPOSITORY = '\\Repository\\'; private $class_map; private $type; diff --git a/src/ReflectionTypeInterface.php b/src/ReflectionTypeInterface.php index dd67743..0c5ab40 100644 --- a/src/ReflectionTypeInterface.php +++ b/src/ReflectionTypeInterface.php @@ -8,7 +8,7 @@ interface ReflectionTypeInterface { - public const NON_QUALIFIED_TYPES = [ + public const array NON_QUALIFIED_TYPES = [ 'null', 'void', 'self', diff --git a/test/ReflectionParameterTest.php b/test/ReflectionParameterTest.php index feb8d33..2c7caed 100644 --- a/test/ReflectionParameterTest.php +++ b/test/ReflectionParameterTest.php @@ -14,7 +14,7 @@ */ class ReflectionParameterTest extends TestCase { - private const FOO = 'BAR'; + private const string FOO = 'BAR'; private function method($param, \Exception $param_2, array $param_3 = null, $param_4 = \DateTime::ATOM): void {