diff --git a/.travis.yml b/.travis.yml
index 6ffd0426..8803b6c9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,26 +1,30 @@
language: php
php:
- - 5.3
- 5.4
- 5.5
- 5.6
- 7.0
- hhvm
+before_install:
+ - composer self-update
+
+install:
+ - composer install
+
before_script:
- - composer self-update && composer install
- tests/travis/php_setup.sh
- tests/travis/redis_setup.sh
script: ./tests/runTests.sh
after_script:
- - php vendor/bin/coveralls -v
+ - php vendor/bin/coveralls -v
services:
- - redis-server
- - memcached
+ - redis-server
+ - memcached
matrix:
fast_finish: true
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f714c589..394f8eaf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## Stash v0.13 Changelog
+
+### 0.13.1
+
+* Dropped support for PHP 5.3.
+
## Stash v0.12 Changelog
diff --git a/README.md b/README.md
index 0320dd90..bfb5385b 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ backwards compatible.
```
"require": {
- "tedivm/stash": "0.12.*"
+ "tedivm/stash": "0.13.*"
}
```
@@ -107,7 +107,7 @@ drivers that use a variety of back ends.
The [Stash Bundle](https://github.com/tedious/TedivmStashBundle) makes using
Stash inside of Symfony projects significantly easier. This bundle exposes
Stash as a Service for developers to use, and allows Symfony to use Stash
-as a session handler.
+as a session handler.
## License
diff --git a/composer.json b/composer.json
index fb45fa60..06c749a6 100644
--- a/composer.json
+++ b/composer.json
@@ -23,11 +23,11 @@
}
],
"require": {
- "php": ">=5.3.0"
+ "php": ">=5.4.0"
},
"require-dev": {
"fabpot/php-cs-fixer": "^1.9",
- "phpunit/phpunit": "4.5.*",
+ "phpunit/phpunit": "4.7.*",
"satooshi/php-coveralls": "dev-master"
},
"autoload": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 4408b564..1e207029 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -15,7 +15,4 @@
-
-
-
diff --git a/src/Stash/Session.php b/src/Stash/Session.php
index ed69cf6c..206d5014 100644
--- a/src/Stash/Session.php
+++ b/src/Stash/Session.php
@@ -22,7 +22,7 @@
* @package Stash
* @author Robert Hafner
*/
-class Session implements SessionHandlerInterface
+class Session implements \SessionHandlerInterface
{
/**
* The Stash\Pool generates the individual cache items corresponding to each
diff --git a/src/Stash/Session/SessionHandlerInterface.php b/src/Stash/Session/SessionHandlerInterface.php
deleted file mode 100644
index b7ec60d8..00000000
--- a/src/Stash/Session/SessionHandlerInterface.php
+++ /dev/null
@@ -1,30 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Stash\Session;
-
-/**
- * This is a filthy hack to deal with the differences between php5.3 and php5.4.
- *
- * @package Stash
- * @author Robert Hafner
- */
-
-// It's impossible to get complete code coverage because of the different
-// php versions involved.
-
-// @codeCoverageIgnoreStart
-if (version_compare(phpversion(), '5.4.0', '>=')) {
- include('SessionHandlerInterface_Modern.php');
-} else {
- include('SessionHandlerInterface_Legacy.php');
-}
-// @codeCoverageIgnoreEnd
diff --git a/src/Stash/Session/SessionHandlerInterface_Legacy.php b/src/Stash/Session/SessionHandlerInterface_Legacy.php
deleted file mode 100644
index b7167a10..00000000
--- a/src/Stash/Session/SessionHandlerInterface_Legacy.php
+++ /dev/null
@@ -1,26 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Stash\Session;
-
-/**
- * This is a filthy hack to deal with the differences between php5.3 and php5.4.
- *
- * @package Stash
- * @author Robert Hafner
- */
-
-// It's impossible to get complete code coverage because of the different
-// php versions involved.
-
-// @codeCoverageIgnoreStart
-interface SessionHandlerInterface {}
-//@codeCoverageIgnoreStart
diff --git a/src/Stash/Session/SessionHandlerInterface_Modern.php b/src/Stash/Session/SessionHandlerInterface_Modern.php
deleted file mode 100644
index 9e19a3d9..00000000
--- a/src/Stash/Session/SessionHandlerInterface_Modern.php
+++ /dev/null
@@ -1,26 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Stash\Session;
-
-/**
- * This is a filthy hack to deal with the differences between php5.3 and php5.4.
- *
- * @package Stash
- * @author Robert Hafner
- */
-
-// It's impossible to get complete code coverage because of the different
-// php versions involved.
-
-// @codeCoverageIgnoreStart
-interface SessionHandlerInterface extends \SessionHandlerInterface {}
-//@codeCoverageIgnoreStart
diff --git a/tests/Stash/Test/AbstractItemTest.php b/tests/Stash/Test/AbstractItemTest.php
index 755844aa..5c07ed03 100644
--- a/tests/Stash/Test/AbstractItemTest.php
+++ b/tests/Stash/Test/AbstractItemTest.php
@@ -221,7 +221,7 @@ public function testInvalidation()
$sleepTime = ($end - $start) * 1000;
$this->assertGreaterThan(500, $sleepTime, 'Sleep method sleeps for required time.');
- $this->assertLessThan(510, $sleepTime, 'Sleep method does not oversleep.');
+ $this->assertLessThan(520, $sleepTime, 'Sleep method does not oversleep.');
unset($sleepStash);
diff --git a/tests/runTests.sh b/tests/runTests.sh
index 1c642cce..47f410af 100755
--- a/tests/runTests.sh
+++ b/tests/runTests.sh
@@ -2,7 +2,12 @@
set -e
echo 'Running unit tests.'
-./vendor/bin/phpunit --verbose --coverage-clover build/logs/clover.xml
+
+if [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then
+ ./vendor/bin/phpunit --verbose --coverage-clover build/logs/clover.xml --coverage-text
+else
+ ./vendor/bin/phpunit --verbose
+fi
echo ''
echo ''