restructure testing and update support files

auraphp · Mar 26, 2015 · 7d74054 · 7d74054
1 parent 8e167c9
commit 7d74054
Show file tree

Hide file tree

Showing 35 changed files with 25 additions and 47 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+/composer.lock
+/vendor
diff --git a/.travis.yml b/.travis.yml
@@ -5,8 +5,12 @@ php:
   - 5.5
   - 5.6
   - hhvm
+  - 7
 script:
-  - phpunit -c tests/unit/ --coverage-clover=coverage.clover
+  - phpunit --coverage-clover=coverage.clover
 after_script:
   - wget https://scrutinizer-ci.com/ocular.phar
   - php ocular.phar code-coverage:upload --format=php-clover coverage.clover
+tools:
+    external_code_coverage:
+        runs: 6
diff --git a/README.md b/README.md
@@ -26,7 +26,7 @@ Finally, please note that this package is intended for use as a **dependency inj
 
 ### Installation
 
-This library requires PHP 5.3 or later, and has no userland dependencies.
+This library requires PHP 5.3 or later; we recommend using the latest available version of PHP as a matter of principle. It has no userland dependencies.
 
 It is installable and autoloadable via Composer as [aura/di](https://packagist.org/packages/aura/di).
 
@@ -38,9 +38,10 @@ Alternatively, [download a release](https://github.com/auraphp/Aura.Di/releases)
 [![Code Coverage](https://scrutinizer-ci.com/g/auraphp/Aura.Di/badges/coverage.png?b=develop-2)](https://scrutinizer-ci.com/g/auraphp/Aura.Di/)
 [![Build Status](https://travis-ci.org/auraphp/Aura.Di.png?branch=develop-2)](https://travis-ci.org/auraphp/Aura.Di)
 
-To run the unit tests at the command line, issue `phpunit -c tests/unit/`. (This requires [PHPUnit][] to be available as `phpunit`.)
+To run the unit tests at the command line, issue `phpunit` at the package root. (This requires [PHPUnit][] to be available as `phpunit` and [Composer][] to be available as `composer`.)
 
 [PHPUnit]: http://phpunit.de/manual/
+[Composer]: http://getcomposer.org/
 
 This library attempts to comply with [PSR-1][], [PSR-2][], and [PSR-4][]. If
 you notice compliance oversights, please send a patch via pull request.

diff --git a/composer.json b/composer.json
@@ -25,6 +25,11 @@
             "Aura\\Di\\": "src/"
         }
     },
+    "autoload-dev": {
+        "psr-4": {
+            "Aura\\Di\\": "tests/"
+        }
+    },
     "extra": {
         "aura": {
             "type": "library"

diff --git a/phpunit.php b/phpunit.php
@@ -0,0 +1,7 @@
+<?php
+error_reporting(E_ALL);
+$autoloader = __DIR__ . '/vendor/autoload.php';
+if (! file_exists($autoloader)) {
+    passthru('composer install');
+}
+require $autoloader;
diff --git a/tests/unit/phpunit.xml → phpunit.xml.dist b/tests/unit/phpunit.xml → phpunit.xml.dist
@@ -1,7 +1,7 @@
-<phpunit bootstrap="./bootstrap.php">
+<phpunit bootstrap="./phpunit.php">
     <testsuites>
         <testsuite>
-            <directory>./src</directory>
+            <directory>./tests</directory>
         </testsuite>
     </testsuites>
 </phpunit>
diff --git a/...s/container/src/AbstractContainerTest.php → tests/AbstractContainerTest.php b/...s/container/src/AbstractContainerTest.php → tests/AbstractContainerTest.php
diff --git a/tests/unit/src/ContainerBuilderTest.php → tests/ContainerBuilderTest.php b/tests/unit/src/ContainerBuilderTest.php → tests/ContainerBuilderTest.php
diff --git a/tests/container/src/ContainerTest.php → tests/ContainerConfigTest.php b/tests/container/src/ContainerTest.php → tests/ContainerConfigTest.php
@@ -1,7 +1,7 @@
 <?php
 namespace Aura\Di\_Config;
 
-class ContainerTest extends AbstractContainerTest
+class ContainerConfigTest extends AbstractContainerTest
 {
     protected function getConfigClasses()
     {

diff --git a/tests/unit/src/ContainerTest.php → tests/ContainerTest.php b/tests/unit/src/ContainerTest.php → tests/ContainerTest.php
diff --git a/tests/unit/src/FactoryTest.php → tests/FactoryTest.php b/tests/unit/src/FactoryTest.php → tests/FactoryTest.php
diff --git a/tests/unit/src/FakeChildClass.php → tests/FakeChildClass.php b/tests/unit/src/FakeChildClass.php → tests/FakeChildClass.php
diff --git a/tests/unit/src/FakeChildTrait.php → tests/FakeChildTrait.php b/tests/unit/src/FakeChildTrait.php → tests/FakeChildTrait.php
diff --git a/tests/unit/src/FakeClassWithParentTrait.php → tests/FakeClassWithParentTrait.php b/tests/unit/src/FakeClassWithParentTrait.php → tests/FakeClassWithParentTrait.php
diff --git a/tests/unit/src/FakeClassWithTrait.php → tests/FakeClassWithTrait.php b/tests/unit/src/FakeClassWithTrait.php → tests/FakeClassWithTrait.php
diff --git a/tests/unit/src/FakeGrandchildTrait.php → tests/FakeGrandchildTrait.php b/tests/unit/src/FakeGrandchildTrait.php → tests/FakeGrandchildTrait.php
diff --git a/tests/unit/src/FakeInterface.php → tests/FakeInterface.php b/tests/unit/src/FakeInterface.php → tests/FakeInterface.php
diff --git a/tests/unit/src/FakeInterfaceClass.php → tests/FakeInterfaceClass.php b/tests/unit/src/FakeInterfaceClass.php → tests/FakeInterfaceClass.php
diff --git a/tests/unit/src/FakeInterfaceClass1.php → tests/FakeInterfaceClass1.php b/tests/unit/src/FakeInterfaceClass1.php → tests/FakeInterfaceClass1.php
diff --git a/tests/unit/src/FakeInterfaceClass2.php → tests/FakeInterfaceClass2.php b/tests/unit/src/FakeInterfaceClass2.php → tests/FakeInterfaceClass2.php
diff --git a/tests/unit/src/FakeInterfaceClass3.php → tests/FakeInterfaceClass3.php b/tests/unit/src/FakeInterfaceClass3.php → tests/FakeInterfaceClass3.php
diff --git a/tests/unit/src/FakeLibraryConfig.php → tests/FakeLibraryConfig.php b/tests/unit/src/FakeLibraryConfig.php → tests/FakeLibraryConfig.php
diff --git a/tests/unit/src/FakeOtherClass.php → tests/FakeOtherClass.php b/tests/unit/src/FakeOtherClass.php → tests/FakeOtherClass.php
diff --git a/tests/unit/src/FakeParamsClass.php → tests/FakeParamsClass.php b/tests/unit/src/FakeParamsClass.php → tests/FakeParamsClass.php
diff --git a/tests/unit/src/FakeParentClass.php → tests/FakeParentClass.php b/tests/unit/src/FakeParentClass.php → tests/FakeParentClass.php
diff --git a/tests/unit/src/FakeProjectConfig.php → tests/FakeProjectConfig.php b/tests/unit/src/FakeProjectConfig.php → tests/FakeProjectConfig.php
diff --git a/tests/unit/src/FakeResolveClass.php → tests/FakeResolveClass.php b/tests/unit/src/FakeResolveClass.php → tests/FakeResolveClass.php
diff --git a/tests/unit/src/FakeTrait.php → tests/FakeTrait.php b/tests/unit/src/FakeTrait.php → tests/FakeTrait.php
diff --git a/tests/unit/src/InstanceFactoryTest.php → tests/InstanceFactoryTest.php b/tests/unit/src/InstanceFactoryTest.php → tests/InstanceFactoryTest.php
diff --git a/tests/unit/src/SerializationTest.php → tests/SerializationTest.php b/tests/unit/src/SerializationTest.php → tests/SerializationTest.php
diff --git a/tests/container/bootstrap.php b/tests/container/bootstrap.php
diff --git a/tests/container/phpunit.sh b/tests/container/phpunit.sh
diff --git a/tests/container/phpunit.xml b/tests/container/phpunit.xml
diff --git a/tests/unit/src/lazy_array.php → tests/lazy_array.php b/tests/unit/src/lazy_array.php → tests/lazy_array.php
diff --git a/tests/unit/bootstrap.php b/tests/unit/bootstrap.php