Merge pull request #847 from phalcon/3.2.x

v3.2.6
phalcon · Jan 6, 2018 · 7a51b8e · 7a51b8e
2 parents eb7d175 + 5571692
commit 7a51b8e
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 3 deletions.
diff --git a/tests/_support/Helper/CollectionTrait.php b/tests/_support/Helper/CollectionTrait.php
@@ -1,5 +1,22 @@
 <?php
 
+/*
+  +------------------------------------------------------------------------+
+  | Phalcon Framework                                                      |
+  +------------------------------------------------------------------------+
+  | Copyright (c) 2011-present Phalcon Team (https://www.phalconphp.com)   |
+  +------------------------------------------------------------------------+
+  | This source file is subject to the New BSD License that is bundled     |
+  | with this package in the file LICENSE.txt.                             |
+  |                                                                        |
+  | If you did not receive a copy of the license and are unable to         |
+  | obtain it through the world-wide-web, please send an email             |
+  | to license@phalconphp.com so we can send you a copy immediately.       |
+  +------------------------------------------------------------------------+
+  | Authors: Wojciech Ślawski <jurigag@gmail.com>                          |
+  +------------------------------------------------------------------------+
+*/
+
 namespace Helper;
 
 use Codeception\Actor;
@@ -20,7 +37,7 @@ trait CollectionTrait
     protected function setupMongo(Actor $I)
     {
         if (!extension_loaded('mongodb')) {
-            $I->markTestSkipped('mongodb extension not loaded');
+            throw new \PHPUnit_Framework_SkippedTestError('mongodb extension not loaded');
         }
 
         Di::reset();

diff --git a/tests/unit/Mvc/Collection/ValidationCest.php b/tests/unit/Mvc/Collection/ValidationCest.php
@@ -1,5 +1,22 @@
 <?php
 
+/*
+  +------------------------------------------------------------------------+
+  | Phalcon Framework                                                      |
+  +------------------------------------------------------------------------+
+  | Copyright (c) 2011-present Phalcon Team (https://www.phalconphp.com)   |
+  +------------------------------------------------------------------------+
+  | This source file is subject to the New BSD License that is bundled     |
+  | with this package in the file LICENSE.txt.                             |
+  |                                                                        |
+  | If you did not receive a copy of the license and are unable to         |
+  | obtain it through the world-wide-web, please send an email             |
+  | to license@phalconphp.com so we can send you a copy immediately.       |
+  +------------------------------------------------------------------------+
+  | Authors: Wojciech Ślawski <jurigag@gmail.com>                          |
+  +------------------------------------------------------------------------+
+*/
+
 namespace Phalcon\Test\Mvc\Collection;
 
 use DateTime;
@@ -13,7 +30,7 @@
  * \Phalcon\Test\Mvc\Collection\ValidationCest
  * Tests for Phalcon\Mvc\MongoCollection component
  *
- * @copyright (c) 2011-2017 Phalcon Team
+ * @copyright (c) 2011-present Phalcon Team
  * @link      https://www.phalconphp.com
  * @author    Wojciech Ślawski <[email protected]>
  * @package   Phalcon\Test\Mvc\Collection
@@ -105,4 +122,4 @@ public function mongoUniqueness(UnitTester $I)
         $this->testExceptMultipleFieldMultipleExcept($I);
         $this->testConvertArrayReturnsArray($I);
     }
-}
+}