Skip to content

Commit 2645657

Browse files
Fixes because of changes regarding Metadata\FeatureAnalyzer.
1 parent a29c637 commit 2645657

5 files changed

Lines changed: 9 additions & 9 deletions

File tree

src/Magic/AbstractCallHandler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public function requiresObjectContext() : bool
3131

3232
protected function getMethodMetadata(string $methodName, ClassMetadata $classMetadata) : ?VirtualMethodMetadata
3333
{
34-
$virtualMethods = $classMetadata->features[VirtualMethods::FEATURES_KEY];
34+
$virtualMethods = $classMetadata->features[VirtualMethods::class];
3535

3636
// check for corresponding @method annotation
3737
if (! array_key_exists($methodName, $virtualMethods)) {

src/Magic/Dispatcher.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ private function assertGivenParametersMatchMethodSignature(
150150
ClassMetadata $classMetadata
151151
)
152152
{
153-
$methodMetadata = $classMetadata->features[VirtualMethods::FEATURES_KEY][$methodName];
153+
$methodMetadata = $classMetadata->features[VirtualMethods::class][$methodName];
154154
$expectedParameterCount = count($methodMetadata->parameters);
155155

156156
$givenParametersCount = count($parameters);
@@ -180,7 +180,7 @@ private function assertCorrectReturnType(
180180
)
181181
{
182182
/** @var VirtualMethodMetadata $virtualMethodMetadata */
183-
$virtualMethodMetadata = $classMetadata->features[VirtualMethods::FEATURES_KEY][$methodName];
183+
$virtualMethodMetadata = $classMetadata->features[VirtualMethods::class][$methodName];
184184
$returnType = $virtualMethodMetadata->returnType;
185185

186186
if (! is_null($returnType->declaration())) {

src/Magic/FixtureBuilder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ private function executeWith(
137137
private function getMetadataOfClassToBeBuilt(ClassMetadata $classMetadata) : ?ClassMetadata
138138
{
139139
// get name of class to be built
140-
$virtualBuildMethod = $classMetadata->features[VirtualMethods::FEATURES_KEY]['build'];
140+
$virtualBuildMethod = $classMetadata->features[VirtualMethods::class]['build'];
141141
$buildClassName = $virtualBuildMethod->returnType->declaration();
142142

143143
if (is_null($buildClassName)) {

tests/PhpUnit/Magic/FixtureBuilderTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public function it_cannot_handle_a_with_method_if_build_method_is_missing()
7777
// but the ClassMetadata has no build() method
7878
/** @var ClassMetadata $classMetadata */
7979
$classMetadata = clone $classMetadata;
80-
unset($classMetadata->features[VirtualMethods::FEATURES_KEY]['build']);
80+
unset($classMetadata->features[VirtualMethods::class]['build']);
8181

8282
// when checking if the handler can handle a with method
8383
$result = $callHandler->canHandle($methodName, $classMetadata, []);
@@ -104,10 +104,10 @@ public function it_cannot_handle_a_with_method_if_builder_method_has_no_return_t
104104
Assert::true($callHandler->canHandle($methodName, $classMetadata, []));
105105
// but the ClassMetadata's build() method has no return type
106106
$classMetadata = clone $classMetadata;
107-
$classMetadata->features[VirtualMethods::FEATURES_KEY]['build'] =
108-
clone $classMetadata->features[VirtualMethods::FEATURES_KEY]['build'];
107+
$classMetadata->features[VirtualMethods::class]['build'] =
108+
clone $classMetadata->features[VirtualMethods::class]['build'];
109109
Reflection::setPropertyValue(
110-
$classMetadata->features[VirtualMethods::FEATURES_KEY]['build'],
110+
$classMetadata->features[VirtualMethods::class]['build'],
111111
'returnType',
112112
new DataTypeMetadata(null)
113113
);

tests/Resources/TestCase.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ protected function analyzeFeatures(ClassMetadata $classMetadata)
2525
$featureAnalyzers = Configuration::featureAnalyzers();
2626

2727
foreach ($featureAnalyzers as $analyzer) {
28-
$key = $analyzer->name();
28+
$key = get_class($analyzer);
2929
$metadata = $analyzer->extractMetadata($classMetadata);
3030

3131
$classMetadata->features[$key] = $metadata;

0 commit comments

Comments
 (0)