Merge branch '2.5' into 3.0

Author: DavertMik

src/Codeception/Module/WebDriver.php

@@ -2133,16 +2133,16 @@ protected function getSubmissionFormFieldName($name)
      *      'field1' => 'value',
      *      'checkbox' => [
      *          'value of first checkbox',
-     *          'value of second checkbox,
+     *          'value of second checkbox',
      *      ],
      *      'otherCheckboxes' => [
      *          true,
      *          false,
-     *          false
+     *          false,
      *      ],
      *      'multiselect' => [
      *          'first option value',
-     *          'second option value'
+     *          'second option value',
      *      ]
      * ]);
      * ?>
@@ -3117,7 +3117,7 @@ public function loadSessionSnapshot($name)
         }
 
         foreach ($this->sessionSnapshots[$name] as $cookie) {
-            $this->setCookie($cookie->getName(), $cookie->getValue(), $cookie->toArray());
+            $this->setCookie($cookie['name'], $cookie['value'], (array)$cookie);
         }
         $this->debugSection('Snapshot', "Restored \"$name\" session snapshot");
         return true;

tests/web/WebDriverTest.php

@@ -677,17 +677,17 @@ public function testSaveSessionSnapshotsExcludeInvalidCookieDomains()
         $fakeWdOptions = Stub::make('\Facebook\WebDriver\WebDriverOptions', [
             'getCookies' => Stub::atLeastOnce(function () {
                 return [
-                    Cookie::createFromArray([
+                    [
                         'name' => 'PHPSESSID',
                         'value' => '123456',
                         'path' => '/',
-                    ]),
-                    Cookie::createFromArray([
+                    ],
+                    [
                         'name' => '3rdParty',
                         'value' => '_value_',
                         'path' => '/',
                         'domain' => '.3rd-party.net',
-                    ]),
+                    ],
                 ];
             }),
         ]);