Merge pull request #1493 from torchello/add-php-8.4

MarcelloDuarte · web-flow · commit b84e344a1f56 · 2025-09-06T19:30:23.000+01:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,7 +14,7 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php: ["8.2", "8.3"]
+                php: ["8.2", "8.3", "8.4"]
                 operating-system: [ ubuntu-latest, macOS-latest, windows-latest ]
                 composer-flags: [""]
                 composer-extras: [""]
diff --git a/CHANGES-v8.md b/CHANGES-v8.md
@@ -4,6 +4,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [8.0.0](https://github.com/phpspec/phpspec/compare/7.6.0...8.0.0)
 
-[Unreleased]: https://github.com/phpspec/phpspec/compare/7.5...main
+### Added
+- PHP 8.4 compatibility [@jrfnl](https://github.com/jrfnl) [@andypost](https://github.com/andypost) 
diff --git a/integration/PhpSpec/Console/Prompter/QuestionTest.php b/integration/PhpSpec/Console/Prompter/QuestionTest.php
@@ -64,7 +64,11 @@ function it_can_ask_a_question_and_return_the_result()
                            ->with(
                                $this->identicalTo($this->input),
                                $this->identicalTo($this->output),
-                               $this->equalTo(new ConfirmationQuestion('Are you sure?', true))
+                               $this->callback(function ($question) {
+                                   return $question instanceof ConfirmationQuestion
+                                       && $question->getQuestion() === 'Are you sure?'
+                                       && $question->getDefault() === true;
+                               }),
                            )
                            ->willReturn(true);
 
diff --git a/src/PhpSpec/Loader/Node/SpecificationNode.php b/src/PhpSpec/Loader/Node/SpecificationNode.php
@@ -27,6 +27,11 @@ class SpecificationNode implements \Countable
      */
     private array $examples = [];
 
+    /**
+     * @param string $title
+     * @param ReflectionClass<Specification> $class
+     * @param Resource $resource
+     */
     public function __construct(
         private string $title,
         private ReflectionClass $class,
diff --git a/src/PhpSpec/Loader/ResourceLoader.php b/src/PhpSpec/Loader/ResourceLoader.php
@@ -105,6 +105,7 @@ private function lineIsInsideMethod(int $line, ReflectionMethod $method): bool
     private function addErrorThrowingExampleToSuite(Resource $resource, Suite $suite, \Error $error) : void
     {
         $reflection = new ReflectionClass(ErrorSpecification::class);
+        /** @var ReflectionClass<Specification> $reflection */
         $spec = new Node\SpecificationNode($resource->getSrcClassname(), $reflection, $resource);
 
         $errorFunction = new \ReflectionFunction(
diff --git a/src/PhpSpec/Runner/Maintainer/CollaboratorsMaintainer.php b/src/PhpSpec/Runner/Maintainer/CollaboratorsMaintainer.php
@@ -77,6 +77,14 @@ public function getPriority(): int
         return 50;
     }
 
+    /**
+     * @param CollaboratorManager $collaborators
+     * @param \ReflectionFunctionAbstract $function
+     * @param \ReflectionClass<Specification> $classRefl
+     * @return void
+     * @throws CollaboratorNotFoundException
+     * @throws InvalidCollaboratorTypeException
+     */
     private function generateCollaborators(CollaboratorManager $collaborators, \ReflectionFunctionAbstract $function, \ReflectionClass $classRefl): void
     {
         foreach ($function->getParameters() as $parameter) {
@@ -136,7 +144,11 @@ private function throwCollaboratorNotFound(\Exception $e, ?\ReflectionParameter
         );
     }
 
-    /** @return ?class-string */
+    /**
+     * @param \ReflectionClass<Specification> $classRefl
+     * @param \ReflectionParameter $parameter
+     * @return ?class-string
+     */
     private function getParameterTypeFromIndex(\ReflectionClass $classRefl, \ReflectionParameter $parameter): ?string
     {
         return $this->typeHintIndex->lookup(

Original file line number	Diff line number	Diff line change
`@@ -105,6 +105,7 @@ private function lineIsInsideMethod(int $line, ReflectionMethod $method): bool`
`105`	`105`	`private function addErrorThrowingExampleToSuite(Resource $resource, Suite $suite, \Error $error) : void`
`106`	`106`	`{`
`107`	`107`	`$reflection = new ReflectionClass(ErrorSpecification::class);`
	`108`	`+ /** @var ReflectionClass<Specification> $reflection */`
`108`	`109`	`$spec = new Node\SpecificationNode($resource->getSrcClassname(), $reflection, $resource);`
`109`	`110`
`110`	`111`	`$errorFunction = new \ReflectionFunction(`