Merge branch 'master' of github.com:yiisoft/yii2 into email-swift-2

tests/unit/bootstrap.php

@@ -1,5 +1,8 @@
 <?php
 
+// ensure we get report on all possible php errors
+error_reporting(-1);
+
 define('YII_ENABLE_ERROR_HANDLER', false);
 define('YII_DEBUG', true);
 $_SERVER['SCRIPT_NAME'] = '/' . __DIR__;

tests/unit/framework/caching/MemCacheTest.php

@@ -26,4 +26,12 @@ class MemCacheTest extends CacheTestCase
 		}
 		return $this->_cacheInstance;
 	}
+
+	public function testExpire()
+	{
+		if (getenv('TRAVIS') == 'true') {
+			$this->markTestSkipped('Can not reliably test memcache expiry on travis-ci.');
+		}
+		parent::testExpire();
+	}
 }

tests/unit/framework/caching/MemCachedTest.php

@@ -26,4 +26,12 @@ class MemCachedTest extends CacheTestCase
 		}
 		return $this->_cacheInstance;
 	}
+
+	public function testExpire()
+	{
+		if (getenv('TRAVIS') == 'true') {
+			$this->markTestSkipped('Can not reliably test memcached expiry on travis-ci.');
+		}
+		parent::testExpire();
+	}
 }