[master]: Merge remote-tracking branch 'origin/PLATFORM-8138_fix_yeld…

…ing'

# Conflicts:
#	src/QA/SoftMocks.php

CHANGELOG.md

@@ -6,6 +6,7 @@ There are next changes:
 
 - PHP 7.1 support (mostly nullable and void return type declarations);
 - update nikic/php-parser to 3.0.6;
+- fix bug with throwing from generators;
 - added tests for constants redefine.
 
 ## v1.2.0

src/Badoo/SoftMocks.php

@@ -1722,6 +1722,7 @@ public static function ignoreFunction($function)
     private $disable_const_rewrite_level = 0;
 
     private $in_interface = false;
+    private $in_closure_level = 0;
     private $has_yield = false;
     private $cur_class = '';
 
@@ -1869,17 +1870,33 @@ public function rewriteExpr_Exit(\PhpParser\Node\Expr\Exit_ $Node)
 
     public function beforeStmt_ClassMethod()
     {
+        $this->in_closure_level = 0;
         $this->has_yield = false;
     }
 
+    public function beforeExpr_Closure()
+    {
+        $this->in_closure_level++;
+    }
+
+    public function rewriteExpr_Closure(\PhpParser\Node\Expr\Closure $Node)
+    {
+        $this->in_closure_level--;
+        return $Node;
+    }
+
     public function beforeExpr_Yield()
     {
-        $this->has_yield = true;
+        if ($this->in_closure_level === 0) {
+            $this->has_yield = true;
+        }
     }
 
     public function beforeExpr_YieldFrom()
     {
-        $this->has_yield = true;
+        if ($this->in_closure_level === 0) {
+            $this->has_yield = true;
+        }
     }
 
     public function beforeStmt_Class(\PhpParser\Node\Stmt\Class_ $Node)

tests/unit/Badoo/SoftMocksTest.php

@@ -380,4 +380,22 @@ public function testRewrite($filename)
         //file_put_contents(__DIR__ . '/fixtures/expected/' . $filename, file_get_contents($result));
         $this->assertEquals(file_get_contents(__DIR__ . '/fixtures/expected/' . $filename), file_get_contents($result));
     }
+
+    /**
+     * @expectedException \RuntimeException
+     * @expectedExceptionMessage You will never see this message
+     */
+    public function testNotOk()
+    {
+        throw new \RuntimeException("You will never see this message");
+
+        $Mock = $this->getMock(MyTest::class, ['stubFunction']);
+        $Mock->expects($this->any())->method('stubFunction')->willReturn(
+            function () {
+                yield 10;
+            }
+        );
+    }
+
+    public function stubFunction() {}
 }