Running test using phpunit from composer

.gitignore

@@ -0,0 +1,2 @@
+vendor
+composer.lock

.travis.yml

@@ -4,5 +4,6 @@ php:
   - 5.4
 env:
   - DB=sqlite
-before_install:
-  git submodule init && git submodule --quiet update
+before_script:
+  - composer install --dev --no-interaction
+  - make test

README.md

@@ -58,6 +58,16 @@ NoSQLite is simple key-value store using SQLite as raw data store. Mainly for sm
 
         count($store);
 
+## Running tests
+
+PHPUnit is required as dev package in ```composer.json``` so test should be run using
+
+        ./vendor/bin/phpunit
+
+or simply
+
+        make test
+
 ## License
 
 (The MIT License)

composer.json

@@ -15,6 +15,9 @@
     "require": {
         "php": ">=5.3.2"
     },
+    "require-dev": {
+        "phpunit/phpunit": "3.7.*@stable"
+    },
     "autoload": {
         "psr-0": { "NoSQLite": "src/" }
     }

makefile

@@ -0,0 +1,4 @@
+test:
+	@./vendor/bin/phpunit
+
+.PHONY: test

phpunit.xml.dist

@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="tests/bootstrap.php">
+<phpunit>
     <testsuites>
         <testsuite name="nosqlite-php Test Suite">
-            <directory>./tests/</directory>
+            <directory>./test</directory>
         </testsuite>
     </testsuites>
+    <filter>
+        <whitelist>
+            <directory suffix=".php">./src/NoSQLite</directory>
+        </whitelist>
+    </filter>
     <logging>
         <log type="coverage-text" target="php://stdout" showUncoveredFiles="false"/>
     </logging>

src/NoSQLite/Store.php

@@ -13,6 +13,8 @@
  */
 
 namespace NoSQLite;
+use PDO;
+use PDOStatement;
 
 /**
  * Class Store
@@ -106,7 +108,7 @@ protected function createTable()
      *
      * @param string $key key
      *
-     * @throws InvalidArgumentException
+     * @throws \InvalidArgumentException
      * @return string|null
      */
     public function get($key)
@@ -160,7 +162,7 @@ public function getAll()
      * @param string $value value
      *
      * @return string value stored
-     * @throws InvalidArgumentException
+     * @throws \InvalidArgumentException
      */
     public function set($key, $value)
     {

tests/NoSQLite/Tests/StoreTest.php → test/NoSQLite/Tests/StoreTest.php

@@ -32,12 +32,12 @@ class StoreTest extends \PHPUnit_Framework_TestCase
     const DB_FILE = 'storeTest.db';
 
     /**
-     * @var NoSQLite\NoSQLite
+     * @var NoSQLite
      */
     protected $nsl;
 
     /**
-     * @var NoSQLite\Store
+     * @var Store
      */
     protected $store;
 
@@ -125,7 +125,7 @@ public function testUpdateValue()
      * @param string $value value
      *
      * @dataProvider invalidSetData
-     * @expectedException InvalidArgumentException
+     * @expectedException \InvalidArgumentException
      * @return void
      */
     public function testSetExceptions($key, $value)
@@ -140,7 +140,7 @@ public function testSetExceptions($key, $value)
      * @param string $key key
      *
      * @dataProvider invalidGetData
-     * @expectedException InvalidArgumentException
+     * @expectedException \InvalidArgumentException
      * @return void
      */
     public function testGetExceptions($key)