<NME> InjectablePropertyReflection.php
<BEF> ADDFILE
<MSG> Merge branch 'hotfix/4874' into develop

Forward port zendframework/zf2#4874

Conflicts:
	tests/ZendTest/Code/Reflection/MethodReflectionTest.php

<DFF> @@ -0,0 +1,20 @@
+<?php
+
+namespace ZendTest\Code\Reflection\TestAsset;
+
+use Zend\Code\Reflection\PropertyReflection;
+
+class InjectablePropertyReflection extends PropertyReflection
+{
+    protected $fileScanner;
+
+    public function setFileScanner($fileScanner)
+    {
+        $this->fileScanner = $fileScanner;
+    }
+
+    protected function createFileScanner($filename)
+    {
+        return $this->fileScanner;
+    }
+}

Merge branch 'hotfix/4874' into develop