update testing and autoloading

auraphp · Oct 11, 2015 · 17aeedb · 17aeedb
1 parent 14e9d35
commit 17aeedb
Show file tree

Hide file tree

Showing 34 changed files with 19 additions and 21 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,2 @@
-/tests/container/vendor
-/tests/container/composer.*
+/vendor
+/composer.lock
diff --git a/autoload.php b/autoload.php
@@ -12,7 +12,7 @@
         ),
         "{$ns}\\" => array(
             __DIR__ . '/src',
-            __DIR__ . '/tests/unit/src',
+            __DIR__ . '/tests',
         ),
     );
 

diff --git a/composer.json b/composer.json
@@ -36,5 +36,10 @@
         "ext/ldap": "For LDAP integration.",
         "ext/imap": "For IMAP/POP/NNTP integration.",
         "ircmaxell/password-compat": "Provides password_verify() for PHP versions earlier than 5.5"
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Aura\\Auth\\": "tests/"
+        }
     }
 }
diff --git a/tests/container/bootstrap.php → container-tests/bootstrap.php b/tests/container/bootstrap.php → container-tests/bootstrap.php
diff --git a/tests/container/phpunit.sh → container-tests/phpunit.sh b/tests/container/phpunit.sh → container-tests/phpunit.sh
diff --git a/tests/container/phpunit.xml → container-tests/phpunit.xml b/tests/container/phpunit.xml → container-tests/phpunit.xml
diff --git a/tests/container/src/CommonTest.php → container-tests/src/CommonTest.php b/tests/container/src/CommonTest.php → container-tests/src/CommonTest.php
diff --git a/tests/container/src/FakePdo.php → container-tests/src/FakePdo.php b/tests/container/src/FakePdo.php → container-tests/src/FakePdo.php
diff --git a/phpunit.php b/phpunit.php
@@ -0,0 +1,9 @@
+<?php
+error_reporting(E_ALL);
+$autoloader = __DIR__ . '/vendor/autoload.php';
+if (! file_exists($autoloader)) {
+    echo "Composer autoloader not found: $autoloader" . PHP_EOL;
+    echo "Please issue 'composer install' and try again." . PHP_EOL;
+    exit(1);
+}
+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/tests/unit/src/Adapter/FakeAdapter.php → tests/Adapter/FakeAdapter.php b/tests/unit/src/Adapter/FakeAdapter.php → tests/Adapter/FakeAdapter.php
diff --git a/.../unit/src/Adapter/HtpasswdAdapterTest.php → tests/Adapter/HtpasswdAdapterTest.php b/.../unit/src/Adapter/HtpasswdAdapterTest.php → tests/Adapter/HtpasswdAdapterTest.php
diff --git a/tests/unit/src/Adapter/ImapAdapterTest.php → tests/Adapter/ImapAdapterTest.php b/tests/unit/src/Adapter/ImapAdapterTest.php → tests/Adapter/ImapAdapterTest.php
diff --git a/tests/unit/src/Adapter/LdapAdapterTest.php → tests/Adapter/LdapAdapterTest.php b/tests/unit/src/Adapter/LdapAdapterTest.php → tests/Adapter/LdapAdapterTest.php
diff --git a/tests/unit/src/Adapter/NullAdapterTest.php → tests/Adapter/NullAdapterTest.php b/tests/unit/src/Adapter/NullAdapterTest.php → tests/Adapter/NullAdapterTest.php
diff --git a/tests/unit/src/Adapter/PdoAdapterTest.php → tests/Adapter/PdoAdapterTest.php b/tests/unit/src/Adapter/PdoAdapterTest.php → tests/Adapter/PdoAdapterTest.php
diff --git a/tests/unit/src/AuthFactoryTest.php → tests/AuthFactoryTest.php b/tests/unit/src/AuthFactoryTest.php → tests/AuthFactoryTest.php
diff --git a/tests/unit/src/AuthTest.php → tests/AuthTest.php b/tests/unit/src/AuthTest.php → tests/AuthTest.php
diff --git a/tests/unit/src/PhpfuncTest.php → tests/PhpfuncTest.php b/tests/unit/src/PhpfuncTest.php → tests/PhpfuncTest.php
diff --git a/tests/unit/src/Service/LoginServiceTest.php → tests/Service/LoginServiceTest.php b/tests/unit/src/Service/LoginServiceTest.php → tests/Service/LoginServiceTest.php
diff --git a/tests/unit/src/Service/LogoutServiceTest.php → tests/Service/LogoutServiceTest.php b/tests/unit/src/Service/LogoutServiceTest.php → tests/Service/LogoutServiceTest.php
diff --git a/tests/unit/src/Service/ResumeServiceTest.php → tests/Service/ResumeServiceTest.php b/tests/unit/src/Service/ResumeServiceTest.php → tests/Service/ResumeServiceTest.php
diff --git a/tests/unit/src/Session/FakeSegment.php → tests/Session/FakeSegment.php b/tests/unit/src/Session/FakeSegment.php → tests/Session/FakeSegment.php
diff --git a/tests/unit/src/Session/FakeSession.php → tests/Session/FakeSession.php b/tests/unit/src/Session/FakeSession.php → tests/Session/FakeSession.php
diff --git a/tests/unit/src/Session/NullSegmentTest.php → tests/Session/NullSegmentTest.php b/tests/unit/src/Session/NullSegmentTest.php → tests/Session/NullSegmentTest.php
diff --git a/tests/unit/src/Session/NullSessionTest.php → tests/Session/NullSessionTest.php b/tests/unit/src/Session/NullSessionTest.php → tests/Session/NullSessionTest.php
diff --git a/tests/unit/src/Session/SegmentTest.php → tests/Session/SegmentTest.php b/tests/unit/src/Session/SegmentTest.php → tests/Session/SegmentTest.php
diff --git a/tests/unit/src/Session/SessionTest.php → tests/Session/SessionTest.php b/tests/unit/src/Session/SessionTest.php → tests/Session/SessionTest.php
diff --git a/tests/unit/src/Session/TimerTest.php → tests/Session/TimerTest.php b/tests/unit/src/Session/TimerTest.php → tests/Session/TimerTest.php
diff --git a/tests/unit/src/Verifier/FakeVerifier.php → tests/Verifier/FakeVerifier.php b/tests/unit/src/Verifier/FakeVerifier.php → tests/Verifier/FakeVerifier.php
diff --git a/...nit/src/Verifier/HtpasswdVerifierTest.php → tests/Verifier/HtpasswdVerifierTest.php b/...nit/src/Verifier/HtpasswdVerifierTest.php → tests/Verifier/HtpasswdVerifierTest.php
diff --git a/...nit/src/Verifier/PasswordVerifierTest.php → tests/Verifier/PasswordVerifierTest.php b/...nit/src/Verifier/PasswordVerifierTest.php → tests/Verifier/PasswordVerifierTest.php
diff --git a/tests/unit/src/fake.htpasswd → tests/fake.htpasswd b/tests/unit/src/fake.htpasswd → tests/fake.htpasswd
diff --git a/tests/unit/bootstrap.php b/tests/unit/bootstrap.php