Merge branch '2.3' of github.com:Codeception/Codeception into 2.3

alefcastelo · Aug 10, 2017 · 851aa33 · 851aa33
2 parents 5d0af26 + dcc26ac
commit 851aa33
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/src/Codeception/Lib/Connector/Symfony.php b/src/Codeception/Lib/Connector/Symfony.php
@@ -75,12 +75,12 @@ public function rebootKernel()
         $this->kernel->boot();
         $this->container = $this->kernel->getContainer();
 
-        if ($this->container->has('profiler')) {
-            $this->container->get('profiler')->enable();
-        }
-
         foreach ($this->persistentServices as $serviceName => $service) {
             $this->container->set($serviceName, $service);
         }
+
+        if ($this->container->has('profiler')) {
+            $this->container->get('profiler')->enable();
+        }
     }
 }
diff --git a/src/Codeception/Module/MongoDb.php b/src/Codeception/Module/MongoDb.php
@@ -267,7 +267,7 @@ public function haveInCollection($collection, array $data)
             return $data['_id'];
         } else {
             $response = $collection->insertOne($data);
-            return $response->getInsertedId()->__toString();
+            return (string) $response->getInsertedId();
         }
     }
 

diff --git a/src/Codeception/Step.php b/src/Codeception/Step.php
@@ -295,7 +295,10 @@ protected function addMetaStep($step, $stack)
                 continue;
             }
 
-            $this->metaStep = new Step\Meta($step['function'], array_values($step['args']));
+            // in case arguments were passed by reference, copy args array to ensure dereference.  array_values() does not dereference values
+            $this->metaStep = new Step\Meta($step['function'], array_map(function ($i) {
+                return $i;
+            }, array_values($step['args'])));
             $this->metaStep->setTraceInfo($step['file'], $step['line']);
 
             // pageobjects or other classes should not be included with "I"