Merge pull request #691 from nextras/php84

Add PHP 8.4 to CI/CD
nextras · Nov 9, 2024 · eec97f6 · eec97f6
2 parents e4e0fa5 + 020b4dc
commit eec97f6
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 26 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -24,7 +24,7 @@ jobs:
 
     strategy:
       matrix:
-        php-version: [ '8.1', '8.2', '8.3' ]
+        php-version: [ '8.1', '8.2', '8.3', '8.4' ]
 
     steps:
       - name: Checkout
@@ -58,13 +58,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: [ '8.1', '8.2', '8.3' ]
+        php-version: [ '8.1', '8.2', '8.3', '8.4' ]
         deps: [ 'lowest', 'newest' ]
         exclude:
           - php-version: '8.2'
             deps: lowest
           - php-version: '8.3'
             deps: lowest
+          - php-version: '8.4'
+            deps: lowest
     runs-on: ubuntu-latest
 
     services:

diff --git a/src/Collection/ArrayCollection.php b/src/Collection/ArrayCollection.php
@@ -125,7 +125,7 @@ public function resetOrderBy(): ICollection
 	}
 
 
-	public function limitBy(int $limit, int $offset = null): ICollection
+	public function limitBy(int $limit, int|null $offset = null): ICollection
 	{
 		$collection = clone $this;
 		$collection->collectionLimit = [$limit, $offset];
@@ -165,7 +165,7 @@ public function fetchAll(): array
 	}
 
 
-	public function fetchPairs(string $key = null, string $value = null): array
+	public function fetchPairs(string|null $key = null, string|null $value = null): array
 	{
 		return FetchPairsHelper::process($this->getIterator(), $key, $value);
 	}
@@ -232,10 +232,9 @@ public function toMemoryCollection(): MemoryCollection
 	}
 
 
-	public function setRelationshipMapper(IRelationshipMapper $mapper = null, IEntity $parent = null): ICollection
+	public function setRelationshipMapper(IRelationshipMapper|null $mapper): ICollection
 	{
 		$this->relationshipMapper = $mapper;
-		$this->relationshipParent = $parent;
 		return $this;
 	}
 

diff --git a/src/Collection/DbalCollection.php b/src/Collection/DbalCollection.php
@@ -130,7 +130,7 @@ public function resetOrderBy(): ICollection
 	}
 
 
-	public function limitBy(int $limit, int $offset = null): ICollection
+	public function limitBy(int $limit, int|null $offset = null): ICollection
 	{
 		$collection = clone $this;
 		$collection->queryBuilder->limitBy($limit, $offset);
@@ -170,7 +170,7 @@ public function fetchAll(): array
 	}
 
 
-	public function fetchPairs(string $key = null, string $value = null): array
+	public function fetchPairs(string|null $key = null, string|null $value = null): array
 	{
 		return FetchPairsHelper::process($this->getIterator(), $key, $value);
 	}
@@ -242,10 +242,9 @@ public function toMemoryCollection(): MemoryCollection
 	}
 
 
-	public function setRelationshipMapper(IRelationshipMapper $mapper = null, IEntity $parent = null): ICollection
+	public function setRelationshipMapper(IRelationshipMapper|null $mapper): ICollection
 	{
 		$this->relationshipMapper = $mapper;
-		$this->relationshipParent = $parent;
 		return $this;
 	}
 

diff --git a/src/Collection/EmptyCollection.php b/src/Collection/EmptyCollection.php
@@ -62,7 +62,7 @@ public function resetOrderBy(): ICollection
 	}
 
 
-	public function limitBy(int $limit, int $offset = null): ICollection
+	public function limitBy(int $limit, int|null $offset = null): ICollection
 	{
 		return clone $this;
 	}
@@ -86,7 +86,7 @@ public function fetchAll(): array
 	}
 
 
-	public function fetchPairs(string $key = null, string $value = null): array
+	public function fetchPairs(string|null $key = null, string|null $value = null): array
 	{
 		return [];
 	}
@@ -98,7 +98,7 @@ public function getIterator(): Iterator
 	}
 
 
-	public function setRelationshipMapper(IRelationshipMapper $mapper = null, IEntity $parent = null): ICollection
+	public function setRelationshipMapper(IRelationshipMapper|null $mapper): ICollection
 	{
 		$this->relationshipMapper = $mapper;
 		return $this;

diff --git a/src/Collection/HasManyCollection.php b/src/Collection/HasManyCollection.php
@@ -112,7 +112,7 @@ public function resetOrderBy(): ICollection
 	}
 
 
-	public function limitBy(int $limit, int $offset = null): ICollection
+	public function limitBy(int $limit, int|null $offset = null): ICollection
 	{
 		$collection = clone $this;
 		$collection->storageCollection = $this->storageCollection->limitBy($limit, $offset);
@@ -153,7 +153,7 @@ public function fetchAll(): array
 	}
 
 
-	public function fetchPairs(string $key = null, string $value = null): array
+	public function fetchPairs(string|null $key = null, string|null $value = null): array
 	{
 		return FetchPairsHelper::process($this->getIterator(), $key, $value);
 	}
@@ -212,7 +212,7 @@ public function toMemoryCollection(): MemoryCollection
 	}
 
 
-	public function setRelationshipMapper(IRelationshipMapper $mapper = null): ICollection
+	public function setRelationshipMapper(IRelationshipMapper|null $mapper): ICollection
 	{
 		$this->storageCollection->setRelationshipMapper($mapper);
 		$this->inMemoryCollection->setRelationshipMapper($mapper);

diff --git a/src/Collection/ICollection.php b/src/Collection/ICollection.php
@@ -158,7 +158,7 @@ public function resetOrderBy(): ICollection;
 	 * Limits number of rows.
 	 * @return static
 	 */
-	public function limitBy(int $limit, int $offset = null): ICollection;
+	public function limitBy(int $limit, int|null $offset = null): ICollection;
 
 
 	/**
@@ -189,7 +189,7 @@ public function fetchAll(): array;
 	 * @param string|null $value value
 	 * @return array<int|string, mixed>
 	 */
-	public function fetchPairs(?string $key = null, ?string $value = null): array;
+	public function fetchPairs(string|null $key = null, string|null $value = null): array;
 
 
 	/**
@@ -210,7 +210,7 @@ public function toMemoryCollection(): MemoryCollection;
 	 * @return static
 	 * @internal
 	 */
-	public function setRelationshipMapper(?IRelationshipMapper $mapper): ICollection;
+	public function setRelationshipMapper(IRelationshipMapper|null $mapper): ICollection;
 
 
 	/**

diff --git a/src/Entity/AbstractEntity.php b/src/Entity/AbstractEntity.php
@@ -61,7 +61,7 @@ public function getMetadata(): EntityMetadata
 	}
 
 
-	public function isModified(string $name = null): bool
+	public function isModified(string|null $name = null): bool
 	{
 		if ($name === null) {
 			return (bool) $this->modified;
@@ -72,7 +72,7 @@ public function isModified(string $name = null): bool
 	}
 
 
-	public function setAsModified(string $name = null): void
+	public function setAsModified(string|null $name = null): void
 	{
 		$this->modified[$name] = true;
 	}

diff --git a/src/Entity/IEntity.php b/src/Entity/IEntity.php
@@ -93,13 +93,13 @@ public function getMetadata(): EntityMetadata;
 	/**
 	 * Returns true if the entity is modified or the column $name is modified.
 	 */
-	public function isModified(string $name = null): bool;
+	public function isModified(string|null $name = null): bool;
 
 
 	/**
 	 * Sets the entity or the column as modified.
 	 */
-	public function setAsModified(string $name = null): void;
+	public function setAsModified(string|null $name = null): void;
 
 
 	/**

diff --git a/src/Repository/IRepository.php b/src/Repository/IRepository.php
@@ -71,7 +71,7 @@ public static function getEntityClassNames(): array;
 	 * @template F of E
 	 * @param class-string<F>|null $entityClass for STI (must extend a base class)
 	 */
-	public function getEntityMetadata(string $entityClass = null): EntityMetadata;
+	public function getEntityMetadata(string|null $entityClass = null): EntityMetadata;
 
 
 	/**

diff --git a/src/Repository/Repository.php b/src/Repository/Repository.php
@@ -301,7 +301,7 @@ public function hydrateEntity(array $data): ?IEntity
 	}
 
 
-	public function getEntityMetadata(string $entityClass = null): EntityMetadata
+	public function getEntityMetadata(string|null $entityClass = null): EntityMetadata
 	{
 		$classNames = static::getEntityClassNames();
 		if ($entityClass !== null && !in_array($entityClass, $classNames, true)) {

diff --git a/tests/inc/TestCase.php b/tests/inc/TestCase.php
@@ -100,7 +100,7 @@ protected function setUp()
 	/**
 	 * @param array<mixed>|null $args
 	 */
-	public function runTest(string $method, array $args = null): void
+	public function runTest(string $method, array|null $args = null): void
 	{
 		$this->testId = get_class($this) . '_' . $method;
 		parent::runTest($method, $args);