diff --git a/.gitignore b/.gitignore index 792142d2..2306b20b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,9 +2,9 @@ /.idea/ /.tmp-package/ /build/ -/doc/apigen/html -/doc/jsdoc/html -/doc/plato/html +/docs/apigen/html +/docs/jsdoc/html +/docs/plato/html /docker/.env* !/docker/.env.example /node_modules/ diff --git a/doc/apigen/apigen.phar b/docs/apigen/apigen.phar similarity index 100% rename from doc/apigen/apigen.phar rename to docs/apigen/apigen.phar diff --git a/doc/docker.md b/docs/docker.md similarity index 100% rename from doc/docker.md rename to docs/docker.md diff --git a/doc/faq.md b/docs/faq.md similarity index 100% rename from doc/faq.md rename to docs/faq.md diff --git a/doc/get-involved.md b/docs/get-involved.md similarity index 100% rename from doc/get-involved.md rename to docs/get-involved.md diff --git a/doc/google-calendar-sync.md b/docs/google-calendar-sync.md similarity index 100% rename from doc/google-calendar-sync.md rename to docs/google-calendar-sync.md diff --git a/doc/images/git-banner.png b/docs/images/git-banner.png similarity index 100% rename from doc/images/git-banner.png rename to docs/images/git-banner.png diff --git a/doc/images/installation-banner.png b/docs/images/installation-banner.png similarity index 100% rename from doc/images/installation-banner.png rename to docs/images/installation-banner.png diff --git a/doc/images/logo.png b/docs/images/logo.png similarity index 100% rename from doc/images/logo.png rename to docs/images/logo.png diff --git a/doc/installation-guide.md b/docs/installation-guide.md similarity index 100% rename from doc/installation-guide.md rename to docs/installation-guide.md diff --git a/doc/jsdoc/jsdoc.md b/docs/jsdoc/jsdoc.md similarity index 100% rename from doc/jsdoc/jsdoc.md rename to docs/jsdoc/jsdoc.md diff --git a/doc/manage-translations.md b/docs/manage-translations.md similarity index 100% rename from doc/manage-translations.md rename to docs/manage-translations.md diff --git a/doc/plato/plato.md b/docs/plato/plato.md similarity index 100% rename from doc/plato/plato.md rename to docs/plato/plato.md diff --git a/doc/readme.md b/docs/readme.md similarity index 100% rename from doc/readme.md rename to docs/readme.md diff --git a/doc/rest-api.md b/docs/rest-api.md similarity index 100% rename from doc/rest-api.md rename to docs/rest-api.md diff --git a/doc/update-guide.md b/docs/update-guide.md similarity index 100% rename from doc/update-guide.md rename to docs/update-guide.md diff --git a/gulpfile.js b/gulpfile.js index b558a532..867991c5 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -86,21 +86,21 @@ gulp.task('build', function(done) { * Generate code documentation. */ gulp.task('doc', function(done) { - fs.removeSync('doc/apigen/html'); - fs.mkdirSync('doc/apigen/html'); - fs.removeSync('doc/jsdoc/html'); - fs.mkdirSync('doc/jsdoc/html'); - fs.removeSync('doc/plato/html'); - fs.mkdirSync('doc/plato/html'); + fs.removeSync('docs/apigen/html'); + fs.mkdirSync('docs/apigen/html'); + fs.removeSync('docs/jsdoc/html'); + fs.mkdirSync('docs/jsdoc/html'); + fs.removeSync('docs/plato/html'); + fs.mkdirSync('docs/plato/html'); const commands = [ - 'php doc/apigen/apigen.phar generate ' + + 'php docs/apigen/apigen.phar generate ' + '-s "src/application/controllers,src/application/models,src/application/libraries" ' + - '-d "doc/apigen/html" --exclude "*external*" --tree --todo --template-theme "bootstrap"', + '-d "docs/apigen/html" --exclude "*external*" --tree --todo --template-theme "bootstrap"', path.join('.', 'node_modules', '.bin', 'jsdoc') + ' "src/assets/js" -d "doc/jsdoc/html"', - path.join('.', 'node_modules', '.bin', 'plato') + ' -r -d "doc/plato/html" "src/assets/js"' + path.join('.', 'node_modules', '.bin', 'plato') + ' -r -d "docs/plato/html" "src/assets/js"' ]; commands.forEach(function(command) { diff --git a/phpunit.xml b/phpunit.xml index 07bfd98e..ff157b56 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -3,7 +3,7 @@ xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.5/phpunit.xsd" backupGlobals="true" backupStaticAttributes="false" - bootstrap="test/php/bootstrap.php" + bootstrap="tests/phpunit/bootstrap.php" cacheTokens="false" colors="false" convertErrorsToExceptions="true" @@ -28,5 +28,4 @@ src/engine - diff --git a/test/php/bootstrap.php b/tests/phpunit/bootstrap.php similarity index 100% rename from test/php/bootstrap.php rename to tests/phpunit/bootstrap.php diff --git a/test/php/engine/Api/V1/AuthorizationTest.php b/tests/phpunit/engine/Api/V1/AuthorizationTest.php similarity index 100% rename from test/php/engine/Api/V1/AuthorizationTest.php rename to tests/phpunit/engine/Api/V1/AuthorizationTest.php diff --git a/test/php/engine/Api/V1/FilterTest.php b/tests/phpunit/engine/Api/V1/FilterTest.php similarity index 100% rename from test/php/engine/Api/V1/FilterTest.php rename to tests/phpunit/engine/Api/V1/FilterTest.php diff --git a/test/php/engine/Api/V1/MinimizeTest.php b/tests/phpunit/engine/Api/V1/MinimizeTest.php similarity index 100% rename from test/php/engine/Api/V1/MinimizeTest.php rename to tests/phpunit/engine/Api/V1/MinimizeTest.php diff --git a/test/php/engine/Api/V1/PaginationTest.php b/tests/phpunit/engine/Api/V1/PaginationTest.php similarity index 100% rename from test/php/engine/Api/V1/PaginationTest.php rename to tests/phpunit/engine/Api/V1/PaginationTest.php diff --git a/test/php/engine/Api/V1/ResponseTest.php b/tests/phpunit/engine/Api/V1/ResponseTest.php similarity index 100% rename from test/php/engine/Api/V1/ResponseTest.php rename to tests/phpunit/engine/Api/V1/ResponseTest.php diff --git a/test/php/engine/Api/V1/SearchTest.php b/tests/phpunit/engine/Api/V1/SearchTest.php similarity index 100% rename from test/php/engine/Api/V1/SearchTest.php rename to tests/phpunit/engine/Api/V1/SearchTest.php diff --git a/test/php/engine/Api/V1/SortTest.php b/tests/phpunit/engine/Api/V1/SortTest.php similarity index 100% rename from test/php/engine/Api/V1/SortTest.php rename to tests/phpunit/engine/Api/V1/SortTest.php diff --git a/test/php/engine/Api/V1/fixtures/admin.json b/tests/phpunit/engine/Api/V1/fixtures/admin.json similarity index 100% rename from test/php/engine/Api/V1/fixtures/admin.json rename to tests/phpunit/engine/Api/V1/fixtures/admin.json diff --git a/test/php/engine/Api/V1/fixtures/appointment.json b/tests/phpunit/engine/Api/V1/fixtures/appointment.json similarity index 100% rename from test/php/engine/Api/V1/fixtures/appointment.json rename to tests/phpunit/engine/Api/V1/fixtures/appointment.json diff --git a/test/php/engine/Api/V1/fixtures/category.json b/tests/phpunit/engine/Api/V1/fixtures/category.json similarity index 100% rename from test/php/engine/Api/V1/fixtures/category.json rename to tests/phpunit/engine/Api/V1/fixtures/category.json diff --git a/test/php/engine/Api/V1/fixtures/customer.json b/tests/phpunit/engine/Api/V1/fixtures/customer.json similarity index 100% rename from test/php/engine/Api/V1/fixtures/customer.json rename to tests/phpunit/engine/Api/V1/fixtures/customer.json diff --git a/test/php/engine/Api/V1/fixtures/provider.json b/tests/phpunit/engine/Api/V1/fixtures/provider.json similarity index 100% rename from test/php/engine/Api/V1/fixtures/provider.json rename to tests/phpunit/engine/Api/V1/fixtures/provider.json diff --git a/test/php/engine/Api/V1/fixtures/secretary.json b/tests/phpunit/engine/Api/V1/fixtures/secretary.json similarity index 100% rename from test/php/engine/Api/V1/fixtures/secretary.json rename to tests/phpunit/engine/Api/V1/fixtures/secretary.json diff --git a/test/php/engine/Api/V1/fixtures/service.json b/tests/phpunit/engine/Api/V1/fixtures/service.json similarity index 100% rename from test/php/engine/Api/V1/fixtures/service.json rename to tests/phpunit/engine/Api/V1/fixtures/service.json diff --git a/test/php/engine/Api/V1/fixtures/setting.json b/tests/phpunit/engine/Api/V1/fixtures/setting.json similarity index 100% rename from test/php/engine/Api/V1/fixtures/setting.json rename to tests/phpunit/engine/Api/V1/fixtures/setting.json diff --git a/test/php/engine/Api/V1/fixtures/unavailability.json b/tests/phpunit/engine/Api/V1/fixtures/unavailability.json similarity index 100% rename from test/php/engine/Api/V1/fixtures/unavailability.json rename to tests/phpunit/engine/Api/V1/fixtures/unavailability.json diff --git a/test/php/engine/Types/BooleanTest.php b/tests/phpunit/engine/Types/BooleanTest.php similarity index 100% rename from test/php/engine/Types/BooleanTest.php rename to tests/phpunit/engine/Types/BooleanTest.php diff --git a/test/php/engine/Types/DecimalTest.php b/tests/phpunit/engine/Types/DecimalTest.php similarity index 100% rename from test/php/engine/Types/DecimalTest.php rename to tests/phpunit/engine/Types/DecimalTest.php diff --git a/test/php/engine/Types/EmailTest.php b/tests/phpunit/engine/Types/EmailTest.php similarity index 100% rename from test/php/engine/Types/EmailTest.php rename to tests/phpunit/engine/Types/EmailTest.php diff --git a/test/php/engine/Types/IntegerTest.php b/tests/phpunit/engine/Types/IntegerTest.php similarity index 100% rename from test/php/engine/Types/IntegerTest.php rename to tests/phpunit/engine/Types/IntegerTest.php diff --git a/test/php/engine/Types/NonEmptyTextTest.php b/tests/phpunit/engine/Types/NonEmptyTextTest.php similarity index 100% rename from test/php/engine/Types/NonEmptyTextTest.php rename to tests/phpunit/engine/Types/NonEmptyTextTest.php diff --git a/test/php/engine/Types/TextTest.php b/tests/phpunit/engine/Types/TextTest.php similarity index 100% rename from test/php/engine/Types/TextTest.php rename to tests/phpunit/engine/Types/TextTest.php diff --git a/test/php/engine/Types/UnsignedIntegerTest.php b/tests/phpunit/engine/Types/UnsignedIntegerTest.php similarity index 100% rename from test/php/engine/Types/UnsignedIntegerTest.php rename to tests/phpunit/engine/Types/UnsignedIntegerTest.php diff --git a/test/php/engine/Types/UrlTest.php b/tests/phpunit/engine/Types/UrlTest.php similarity index 100% rename from test/php/engine/Types/UrlTest.php rename to tests/phpunit/engine/Types/UrlTest.php