Switch to updated TravisCI config

Author: ircmaxell

.gitignore

@@ -0,0 +1 @@
+vendor

.travis.yml

@@ -0,0 +1,11 @@
+language: php
+
+php:
+  - 5.5
+  - 5.4
+  - 5.3
+
+before_script:
+  - composer install --dev
+
+script: phpunit --configuration phpunit.xml.dist test

build/phing/test.xml

@@ -17,7 +17,7 @@
             passthru="true"
             checkreturn="true"
             command="phpunit --log-junit "${path.logs}/vectors.xml"
-                       --configuration "${path.tests}/phpunit.xml.dist"
+                       --configuration "${project.basedir}/phpunit.xml.dist"
                        "${path.tests}/Vectors""
             />
     </target>
@@ -28,7 +28,7 @@
             passthru="true"
             checkreturn="true"
             command="phpunit --log-junit &quot;${path.logs}/junit.xml&quot;
-                       --configuration &quot;${path.tests}/phpunit.xml.dist&quot;
+                       --configuration &quot;${project.basedir}/phpunit.xml.dist&quot;
                        &quot;${path.tests}/Unit&quot;"
         />
     </target>
@@ -43,7 +43,7 @@
             command="phpunit --log-junit &quot;${path.logs}/junit.xml&quot;
                        --coverage-clover &quot;${path.logs}/clover.xml&quot;
                        --coverage-html &quot;${path.results}/coverage&quot;
-                       --configuration &quot;${path.tests}/phpunit.xml.dist&quot;"
+                       --configuration &quot;${project.basedir}/phpunit.xml.dist&quot;"
         />
         <phingcall target="vectors" />
     </target>

composer.json

@@ -0,0 +1,27 @@
+{
+    "name": "CryptLib/CryptLib",
+    "type": "library",
+	"version": "0.0.1-alpha1",
+    "description": "A General Purpose Cryptography Library",
+    "keywords": ["encryption", "cryptography", "cipher"],
+    "homepage": "https://github.com/ircmaxell/PHP-CryptLib",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Anthony Ferrara",
+            "email": "[email protected]",
+            "homepage": "http://blog.ircmaxell.com"
+        }
+    ],
+    "require-dev": {
+        "mikey179/vfsStream": "1.1.*"
+    },
+    "require": {
+        "php": ">=5.3.2"
+    },
+    "autoload": {
+        "psr-0": {
+            "CryptLib": "lib"
+        }
+    }
+}

composer.lock

@@ -154,7 +154,7 @@ public function generateString($length, $characters = '') {
                           'ABCDEFGHIJKLMNOPQRSTUVWXYZ./';
         }
         //determine how many bytes to generate
-        $bytes  = ceil($length * floor(log(strlen($characters), 2) + 1) / 8);
+        $bytes  = ceil($length * floor(log(strlen($characters), 2) + 1.01) / 8);
         $rand   = $this->generate($bytes);
         $result = BaseConverter::convertFromBinary($rand, $characters);
         if (strlen($result) < $length) {

lib/CryptLib/Random/Generator.php

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit backupGlobals="true"
          backupStaticAttributes="false"
-         bootstrap="./bootstrap.php"
+         bootstrap="test/bootstrap.php"
          colors="false"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
@@ -18,12 +18,12 @@
          verbose="false">
     <testsuites>
         <testsuite name="Unit">
-            <directory>./Unit</directory>
+            <directory>test/Unit</directory>
         </testsuite>
     </testsuites>
     <filter>
         <whitelist>
-            <directory suffix=".php">../lib/</directory>
+            <directory suffix=".php">lib/</directory>
         </whitelist>
     </filter>
 </phpunit>

test/phpunit.xml.dist renamed to phpunit.xml.dist

@@ -1,9 +1,9 @@
 <?php
 
-require_once 'vfsStream/vfsStream.php';
-
 use CryptLibTest\Mocks\Core\Factory;
 
+use org\bovigo\vfs\vfsStream;
+
 class Unit_Core_AbstractFactoryTest extends PHPUnit_Framework_TestCase {
 
     protected function setUp() {

test/Unit/Core/AbstractFactoryTest.php

@@ -49,5 +49,5 @@ function getTestDataFile($file) {
     return __DIR__ . '/Data/' . $file;
 }
 
-require_once dirname(__DIR__) . '/lib/CryptLib/bootstrap.php';
+require_once dirname(__DIR__) . '/vendor/autoload.php';