Added support of cloning private properties of class that uses the Specify trait

Author: ischenko

src/Codeception/Specify.php

@@ -223,10 +223,16 @@ private function specifyRestoreProperties($properties)
      */
     private function getSpecifyObjectProperties()
     {
+        $objectReflection = new \ReflectionObject($this);
+        $propertiesToClone = $objectReflection->getProperties();
+
+        if (($classProperties = $this->specifyGetClassPrivateProperties()) !== []) {
+            $propertiesToClone = array_merge($propertiesToClone, $classProperties);
+        }
+
         $properties = [];
-        $myReflection = new \ReflectionObject($this);
 
-        foreach ($myReflection->getProperties() as $property) {
+        foreach ($propertiesToClone as $property) {
             if ($this->specifyConfig->propertyIgnored($property->getName())) {
                 continue;
             }
@@ -256,6 +262,20 @@ private function specifyCheckMockObjects()
         }
     }
 
+    private function specifyGetClassPrivateProperties()
+    {
+        static $properties = [];
+
+        if (!isset($properties[__CLASS__])) {
+            $reflection = new \ReflectionClass(__CLASS__);
+
+            $properties[__CLASS__] = (get_class($this) !== __CLASS__)
+                ? $reflection->getProperties(\ReflectionProperty::IS_PRIVATE) : [];
+        }
+
+        return $properties[__CLASS__];
+    }
+
     /**
      * @return \ReflectionClass|null
      */

tests/SpecifyTest.php

@@ -4,7 +4,8 @@ class SpecifyTest extends \SpecifyUnitTest
 {
     protected $user;
     protected $a;
-    protected $private = false;
+
+    private $private = false;
 
     public function testSpecification()
     {
@@ -231,12 +232,16 @@ function testPropertyRestore()
 
         $this->assertEquals(['hello', 'world'], $this->testOne->prop);
         $this->assertFalse($this->private);
+        $this->assertTrue($this->getPrivateProperty());
 
         $this->specify('property $private should be restored properly', function() {
             $this->private = 'i\'m protected';
+            $this->setPrivateProperty('i\'m private');
+            $this->assertEquals('i\'m private', $this->getPrivateProperty());
         });
 
         $this->assertFalse($this->private);
+        $this->assertTrue($this->getPrivateProperty());
     }
 
     public function testExamplesIndexInName()

tests/_support/SpecifyUnitTest.php

@@ -5,4 +5,19 @@ class SpecifyUnitTest extends \PHPUnit_Framework_TestCase
     use Codeception\Specify;
 
     private $private = true;
+
+    /**
+     * @param mixed $private
+     */
+    protected function setPrivateProperty($private)
+    {
+        $this->private = $private;
+    }
+    /**
+     * @return mixed
+     */
+    protected function getPrivateProperty()
+    {
+        return $this->private;
+    }
 }