Merge pull request #247 from tedious/testing_changes

Dropped support for php 5.3, cleaned up travis script
tedious · Aug 2, 2015 · 35ee0c8 · 35ee0c8
2 parents ed87410 + 6ff12ef
commit 35ee0c8
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 97 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -15,7 +15,4 @@
             </exclude>
         </whitelist>
     </filter>
-    <logging>
-        <log type="coverage-text" target="php://stdout" showUncoveredFiles="true"/>
-    </logging>
 </phpunit>
diff --git a/src/Stash/Session.php b/src/Stash/Session.php
@@ -22,7 +22,7 @@
  * @package Stash
  * @author  Robert Hafner <tedivm@tedivm.com>
  */
-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
diff --git a/src/Stash/Session/SessionHandlerInterface_Legacy.php b/src/Stash/Session/SessionHandlerInterface_Legacy.php
diff --git a/src/Stash/Session/SessionHandlerInterface_Modern.php b/src/Stash/Session/SessionHandlerInterface_Modern.php
diff --git 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
@@ -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 ''