Merge pull request #452 from Ocramius/fix/revert-void-return-type-bc-…

…break Revert BC break - `: void` cannot be added as return type to open classes
Ocramius · Mar 19, 2019 · 3be0722 · 3be0722
2 parents 10e0eb0 + b6214b9
commit 3be0722
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 7 deletions.
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
@@ -21,5 +21,8 @@
         <exclude name="SlevomatCodingStandard.Classes.SuperfluousInterfaceNaming.SuperfluousSuffix"/>
         <exclude name="SlevomatCodingStandard.Classes.SuperfluousExceptionNaming.SuperfluousSuffix"/>
         <exclude name="SlevomatCodingStandard.Classes.SuperfluousAbstractClassNaming.SuperfluousPrefix"/>
+
+        <!-- we cannot enforce the " : void" return type hint due to BC compliance, for now -->
+        <exclude name="SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingReturnTypeHint"/>
     </rule>
 </ruleset>
diff --git a/src/ProxyManager/ProxyGenerator/AccessInterceptorScopeLocalizerGenerator.php b/src/ProxyManager/ProxyGenerator/AccessInterceptorScopeLocalizerGenerator.php
@@ -42,10 +42,12 @@ class AccessInterceptorScopeLocalizerGenerator implements ProxyGeneratorInterfac
     /**
      * {@inheritDoc}
      *
+     * @return void
+     *
      * @throws InvalidArgumentException
      * @throws InvalidProxiedClassException
      */
-    public function generate(ReflectionClass $originalClass, ClassGenerator $classGenerator) : void
+    public function generate(ReflectionClass $originalClass, ClassGenerator $classGenerator)
     {
         CanProxyAssertion::assertClassCanBeProxied($originalClass, false);
 

diff --git a/src/ProxyManager/ProxyGenerator/AccessInterceptorValueHolderGenerator.php b/src/ProxyManager/ProxyGenerator/AccessInterceptorValueHolderGenerator.php
@@ -47,10 +47,12 @@ class AccessInterceptorValueHolderGenerator implements ProxyGeneratorInterface
     /**
      * {@inheritDoc}
      *
+     * @return void
+     *
      * @throws InvalidArgumentException
      * @throws InvalidProxiedClassException
      */
-    public function generate(ReflectionClass $originalClass, ClassGenerator $classGenerator) : void
+    public function generate(ReflectionClass $originalClass, ClassGenerator $classGenerator)
     {
         CanProxyAssertion::assertClassCanBeProxied($originalClass);
 

diff --git a/src/ProxyManager/ProxyGenerator/LazyLoadingGhostGenerator.php b/src/ProxyManager/ProxyGenerator/LazyLoadingGhostGenerator.php
@@ -47,10 +47,12 @@ class LazyLoadingGhostGenerator implements ProxyGeneratorInterface
     /**
      * {@inheritDoc}
      *
+     * @return void
+     *
      * @throws InvalidProxiedClassException
      * @throws InvalidArgumentException
      */
-    public function generate(ReflectionClass $originalClass, ClassGenerator $classGenerator, array $proxyOptions = []) : void
+    public function generate(ReflectionClass $originalClass, ClassGenerator $classGenerator, array $proxyOptions = [])
     {
         CanProxyAssertion::assertClassCanBeProxied($originalClass, false);
 

diff --git a/src/ProxyManager/ProxyGenerator/LazyLoadingValueHolderGenerator.php b/src/ProxyManager/ProxyGenerator/LazyLoadingValueHolderGenerator.php
@@ -47,10 +47,12 @@ class LazyLoadingValueHolderGenerator implements ProxyGeneratorInterface
     /**
      * {@inheritDoc}
      *
+     * @return void
+     *
      * @throws InvalidProxiedClassException
      * @throws InvalidArgumentException
      */
-    public function generate(ReflectionClass $originalClass, ClassGenerator $classGenerator) : void
+    public function generate(ReflectionClass $originalClass, ClassGenerator $classGenerator)
     {
         CanProxyAssertion::assertClassCanBeProxied($originalClass);
 

diff --git a/src/ProxyManager/ProxyGenerator/ProxyGeneratorInterface.php b/src/ProxyManager/ProxyGenerator/ProxyGeneratorInterface.php
@@ -15,6 +15,8 @@ interface ProxyGeneratorInterface
 {
     /**
      * Apply modifications to the provided $classGenerator to proxy logic from $originalClass
+     *
+     * @return void
      */
-    public function generate(ReflectionClass $originalClass, ClassGenerator $classGenerator) : void;
+    public function generate(ReflectionClass $originalClass, ClassGenerator $classGenerator);
 }
diff --git a/src/ProxyManager/ProxyGenerator/RemoteObjectGenerator.php b/src/ProxyManager/ProxyGenerator/RemoteObjectGenerator.php
@@ -35,10 +35,12 @@ class RemoteObjectGenerator implements ProxyGeneratorInterface
     /**
      * {@inheritDoc}
      *
+     * @return void
+     *
      * @throws InvalidProxiedClassException
      * @throws InvalidArgumentException
      */
-    public function generate(ReflectionClass $originalClass, ClassGenerator $classGenerator) : void
+    public function generate(ReflectionClass $originalClass, ClassGenerator $classGenerator)
     {
         CanProxyAssertion::assertClassCanBeProxied($originalClass);
 

diff --git a/src/ProxyManager/Signature/SignatureCheckerInterface.php b/src/ProxyManager/Signature/SignatureCheckerInterface.php
@@ -18,8 +18,10 @@ interface SignatureCheckerInterface
      *
      * @param mixed[] $parameters
      *
+     * @return void
+     *
      * @throws InvalidSignatureException
      * @throws MissingSignatureException
      */
-    public function checkSignature(ReflectionClass $class, array $parameters) : void;
+    public function checkSignature(ReflectionClass $class, array $parameters);
 }