Merge pull request #66 from laminas/renovate/lock-file-maintenance

Add undeclared property to Laminas\Server\Reflection\Prototype
laminas · Dec 27, 2022 · 7f48629 · 7f48629
2 parents ce7c8c9 + adb8a84
commit 7f48629
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 25 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
          bootstrap="vendor/autoload.php"
+         convertDeprecationsToExceptions="true"
          colors="true">
     <testsuites>
         <testsuite name="laminas-server Test Suite">

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="4.21.0@d8bec4c7aaee111a532daec32fb09de5687053d1">
+<files psalm-version="4.30.0@d0bc6e25d89f649e4f36a534f330f8bb4643dd69">
   <file src="src/AbstractServer.php">
     <ArgumentTypeCoercion occurrences="1">
       <code>$class</code>
@@ -253,24 +253,11 @@
     </UnsafeInstantiation>
   </file>
   <file src="src/Reflection/Prototype.php">
-    <MixedInferredReturnType occurrences="2">
-      <code>ReflectionReturnValue</code>
-      <code>string</code>
-    </MixedInferredReturnType>
-    <MixedMethodCall occurrences="1">
-      <code>getType</code>
-    </MixedMethodCall>
-    <MixedReturnStatement occurrences="2">
-      <code>$this-&gt;return</code>
-      <code>$this-&gt;return-&gt;getType()</code>
-    </MixedReturnStatement>
-    <UndefinedThisPropertyAssignment occurrences="1">
+    <DeprecatedProperty occurrences="3">
       <code>$this-&gt;return</code>
-    </UndefinedThisPropertyAssignment>
-    <UndefinedThisPropertyFetch occurrences="2">
       <code>$this-&gt;return</code>
       <code>$this-&gt;return</code>
-    </UndefinedThisPropertyFetch>
+    </DeprecatedProperty>
   </file>
   <file src="src/Reflection/ReflectionClass.php">
     <ArgumentTypeCoercion occurrences="1">

diff --git a/src/Reflection/Prototype.php b/src/Reflection/Prototype.php
@@ -6,8 +6,6 @@
 
 namespace Laminas\Server\Reflection;
 
-use Laminas\Server\Reflection\ReflectionReturnValue;
-
 /**
  * Method/Function prototypes
  *
@@ -18,6 +16,14 @@ class Prototype
     /** @var ReflectionParameter[] */
     protected $params;
 
+    /**
+     * @deprecated This property was previously undeclared therefore it requires public access to maintain BC.
+     *             It will be declared private in the next major version of this component.
+     *
+     * @var ReflectionReturnValue
+     */
+    public $return;
+
     /**
      * Constructor
      *