diff --git a/.gitattributes b/.gitattributes index 82dde02..a7b9800 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4,10 +4,12 @@ /.php_cs* export-ignore /.travis.yml export-ignore /composer.lock export-ignore +/coverage export-ignore /docker export-ignore -/docker-compose.yml export-ignore +/docker-compose* export-ignore /docs export-ignore -/test export-ignore -/phpunit.xml.dist export-ignore -/psalm.xnk export-ignore +/tests export-ignore +/phpunit.xml* export-ignore +/psalm.xml export-ignore /public export-ignore +/vendor export-ignore \ No newline at end of file diff --git a/.gitignore b/.gitignore index fe38263..b64fb9a 100644 --- a/.gitignore +++ b/.gitignore @@ -26,4 +26,5 @@ notes # Local overrides .env -docker-compose.override.yml \ No newline at end of file +docker-compose.override.yml +phpunit.xml \ No newline at end of file diff --git a/.php_cs.dist b/.php_cs.dist index 09ee1bf..d9747c8 100644 --- a/.php_cs.dist +++ b/.php_cs.dist @@ -3,7 +3,7 @@ $finder = PhpCsFixer\Finder::create() ->files() ->in(__DIR__ . '/src') - ->in(__DIR__ . '/test'); + ->in(__DIR__ . '/tests'); return PhpCsFixer\Config::create() ->setFinder($finder) diff --git a/composer.json b/composer.json index 7415688..ab39b4b 100644 --- a/composer.json +++ b/composer.json @@ -30,9 +30,8 @@ }, "autoload-dev": { "psr-4": { - "WellRESTed\\": "test/tests/unit/", - "WellRESTed\\Test\\": "test/src/", - "WellRESTed\\Test\\Integration\\": "test/tests/integration/" + "WellRESTed\\": "tests", + "WellRESTed\\Test\\": "tests" } } } diff --git a/docker/nginx/site.conf b/docker/nginx/site.conf index 8270b24..453d502 100644 --- a/docker/nginx/site.conf +++ b/docker/nginx/site.conf @@ -13,6 +13,11 @@ server { try_files $uri $uri/ /index.php?$args; } + # Generated Code Coverage Report + location /coverage { + alias /usr/local/src/wellrested/coverage; + } + # Generated Documentation location /docs { alias /usr/local/src/wellrested/docs/build/html; diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 35a3533..08b894e 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -14,15 +14,12 @@ ./src - + - ./test/tests/unit - - - ./test/tests/integration + ./tests diff --git a/test/tests/unit/Dispatching/DispatchStackTest.php b/tests/Dispatching/DispatchStackTest.php similarity index 100% rename from test/tests/unit/Dispatching/DispatchStackTest.php rename to tests/Dispatching/DispatchStackTest.php diff --git a/test/tests/unit/Dispatching/DispatcherTest.php b/tests/Dispatching/DispatcherTest.php similarity index 100% rename from test/tests/unit/Dispatching/DispatcherTest.php rename to tests/Dispatching/DispatcherTest.php diff --git a/test/src/Doubles/MiddlewareMock.php b/tests/Doubles/MiddlewareMock.php similarity index 100% rename from test/src/Doubles/MiddlewareMock.php rename to tests/Doubles/MiddlewareMock.php diff --git a/test/src/Doubles/NextMock.php b/tests/Doubles/NextMock.php similarity index 100% rename from test/src/Doubles/NextMock.php rename to tests/Doubles/NextMock.php diff --git a/test/tests/unit/Message/HeaderCollectionTest.php b/tests/Message/HeaderCollectionTest.php similarity index 100% rename from test/tests/unit/Message/HeaderCollectionTest.php rename to tests/Message/HeaderCollectionTest.php diff --git a/test/tests/unit/Message/MessageTest.php b/tests/Message/MessageTest.php similarity index 100% rename from test/tests/unit/Message/MessageTest.php rename to tests/Message/MessageTest.php diff --git a/test/tests/unit/Message/NullStreamTest.php b/tests/Message/NullStreamTest.php similarity index 100% rename from test/tests/unit/Message/NullStreamTest.php rename to tests/Message/NullStreamTest.php diff --git a/test/tests/unit/Message/RequestTest.php b/tests/Message/RequestTest.php similarity index 100% rename from test/tests/unit/Message/RequestTest.php rename to tests/Message/RequestTest.php diff --git a/test/tests/unit/Message/ResponseTest.php b/tests/Message/ResponseTest.php similarity index 100% rename from test/tests/unit/Message/ResponseTest.php rename to tests/Message/ResponseTest.php diff --git a/test/tests/unit/Message/ServerRequestMarshallerTest.php b/tests/Message/ServerRequestMarshallerTest.php similarity index 100% rename from test/tests/unit/Message/ServerRequestMarshallerTest.php rename to tests/Message/ServerRequestMarshallerTest.php diff --git a/test/tests/unit/Message/ServerRequestTest.php b/tests/Message/ServerRequestTest.php similarity index 100% rename from test/tests/unit/Message/ServerRequestTest.php rename to tests/Message/ServerRequestTest.php diff --git a/test/tests/unit/Message/StreamTest.php b/tests/Message/StreamTest.php similarity index 100% rename from test/tests/unit/Message/StreamTest.php rename to tests/Message/StreamTest.php diff --git a/test/tests/unit/Message/UploadedFileTest.php b/tests/Message/UploadedFileTest.php similarity index 100% rename from test/tests/unit/Message/UploadedFileTest.php rename to tests/Message/UploadedFileTest.php diff --git a/test/tests/unit/Message/UriTest.php b/tests/Message/UriTest.php similarity index 100% rename from test/tests/unit/Message/UriTest.php rename to tests/Message/UriTest.php diff --git a/test/tests/unit/Routing/Route/MethodMapTest.php b/tests/Routing/Route/MethodMapTest.php similarity index 100% rename from test/tests/unit/Routing/Route/MethodMapTest.php rename to tests/Routing/Route/MethodMapTest.php diff --git a/test/tests/unit/Routing/Route/PrefixRouteTest.php b/tests/Routing/Route/PrefixRouteTest.php similarity index 100% rename from test/tests/unit/Routing/Route/PrefixRouteTest.php rename to tests/Routing/Route/PrefixRouteTest.php diff --git a/test/tests/unit/Routing/Route/RegexRouteTest.php b/tests/Routing/Route/RegexRouteTest.php similarity index 100% rename from test/tests/unit/Routing/Route/RegexRouteTest.php rename to tests/Routing/Route/RegexRouteTest.php diff --git a/test/tests/unit/Routing/Route/RouteFactoryTest.php b/tests/Routing/Route/RouteFactoryTest.php similarity index 100% rename from test/tests/unit/Routing/Route/RouteFactoryTest.php rename to tests/Routing/Route/RouteFactoryTest.php diff --git a/test/tests/unit/Routing/Route/RouteTest.php b/tests/Routing/Route/RouteTest.php similarity index 100% rename from test/tests/unit/Routing/Route/RouteTest.php rename to tests/Routing/Route/RouteTest.php diff --git a/test/tests/unit/Routing/Route/StaticRouteTest.php b/tests/Routing/Route/StaticRouteTest.php similarity index 100% rename from test/tests/unit/Routing/Route/StaticRouteTest.php rename to tests/Routing/Route/StaticRouteTest.php diff --git a/test/tests/unit/Routing/Route/TemplateRouteTest.php b/tests/Routing/Route/TemplateRouteTest.php similarity index 100% rename from test/tests/unit/Routing/Route/TemplateRouteTest.php rename to tests/Routing/Route/TemplateRouteTest.php diff --git a/test/tests/unit/Routing/RouterTest.php b/tests/Routing/RouterTest.php similarity index 100% rename from test/tests/unit/Routing/RouterTest.php rename to tests/Routing/RouterTest.php diff --git a/test/tests/integration/RoutingTest.php b/tests/Routing/RoutingTest.php similarity index 98% rename from test/tests/integration/RoutingTest.php rename to tests/Routing/RoutingTest.php index 4be0791..e7a7037 100644 --- a/test/tests/integration/RoutingTest.php +++ b/tests/Routing/RoutingTest.php @@ -1,6 +1,6 @@