From d56601b0cc89bdaed0e652c1ccb088017bb2923d Mon Sep 17 00:00:00 2001 From: Joshua Ramon Enslin Date: Sat, 31 Oct 2020 00:00:26 +0100 Subject: [PATCH] Move public files to /public subdirectory phpcs-errors:221 phpunit-status:successful phpstan-errors:0 --- {assets => public/assets}/css/csvxml.css | 0 {assets => public/assets}/css/csvxml.min.css | 0 {assets => public/assets}/css/editMenu.css | 0 .../assets}/fonts/SourceSansPro-Light.ttf | Bin .../assets}/fonts/SourceSansPro-Regular.ttf | Bin .../assets}/fonts/SourceSansPro-Regular.woff2 | Bin {assets => public/assets}/img/mdlogo-code.svg | 0 .../assets}/img/mdlogo-csvxml.svg | 0 .../assets}/js/csvxml-overview.js | 0 .../assets}/js/csvxml-overview.min.js | 0 {assets => public/assets}/js/newToolTip.js | 0 csv.php => public/csv.php | 4 +-- index.php => public/index.php | 4 +-- index3.php => public/index3.php | 8 ++--- index6.php => public/index6.php | 12 +++---- upload.php => public/upload.php | 4 +-- zipit.php => public/zipit.php | 9 +++-- tests/csvTest.php | 33 ++++++++++++++++++ tests/startPageTest.php | 18 ++++++---- 19 files changed, 62 insertions(+), 30 deletions(-) rename {assets => public/assets}/css/csvxml.css (100%) rename {assets => public/assets}/css/csvxml.min.css (100%) rename {assets => public/assets}/css/editMenu.css (100%) rename {assets => public/assets}/fonts/SourceSansPro-Light.ttf (100%) rename {assets => public/assets}/fonts/SourceSansPro-Regular.ttf (100%) rename {assets => public/assets}/fonts/SourceSansPro-Regular.woff2 (100%) rename {assets => public/assets}/img/mdlogo-code.svg (100%) rename {assets => public/assets}/img/mdlogo-csvxml.svg (100%) rename {assets => public/assets}/js/csvxml-overview.js (100%) rename {assets => public/assets}/js/csvxml-overview.min.js (100%) rename {assets => public/assets}/js/newToolTip.js (100%) rename csv.php => public/csv.php (95%) rename index.php => public/index.php (97%) rename index3.php => public/index3.php (98%) rename index6.php => public/index6.php (89%) rename upload.php => public/upload.php (84%) rename zipit.php => public/zipit.php (88%) create mode 100644 tests/csvTest.php diff --git a/assets/css/csvxml.css b/public/assets/css/csvxml.css similarity index 100% rename from assets/css/csvxml.css rename to public/assets/css/csvxml.css diff --git a/assets/css/csvxml.min.css b/public/assets/css/csvxml.min.css similarity index 100% rename from assets/css/csvxml.min.css rename to public/assets/css/csvxml.min.css diff --git a/assets/css/editMenu.css b/public/assets/css/editMenu.css similarity index 100% rename from assets/css/editMenu.css rename to public/assets/css/editMenu.css diff --git a/assets/fonts/SourceSansPro-Light.ttf b/public/assets/fonts/SourceSansPro-Light.ttf similarity index 100% rename from assets/fonts/SourceSansPro-Light.ttf rename to public/assets/fonts/SourceSansPro-Light.ttf diff --git a/assets/fonts/SourceSansPro-Regular.ttf b/public/assets/fonts/SourceSansPro-Regular.ttf similarity index 100% rename from assets/fonts/SourceSansPro-Regular.ttf rename to public/assets/fonts/SourceSansPro-Regular.ttf diff --git a/assets/fonts/SourceSansPro-Regular.woff2 b/public/assets/fonts/SourceSansPro-Regular.woff2 similarity index 100% rename from assets/fonts/SourceSansPro-Regular.woff2 rename to public/assets/fonts/SourceSansPro-Regular.woff2 diff --git a/assets/img/mdlogo-code.svg b/public/assets/img/mdlogo-code.svg similarity index 100% rename from assets/img/mdlogo-code.svg rename to public/assets/img/mdlogo-code.svg diff --git a/assets/img/mdlogo-csvxml.svg b/public/assets/img/mdlogo-csvxml.svg similarity index 100% rename from assets/img/mdlogo-csvxml.svg rename to public/assets/img/mdlogo-csvxml.svg diff --git a/assets/js/csvxml-overview.js b/public/assets/js/csvxml-overview.js similarity index 100% rename from assets/js/csvxml-overview.js rename to public/assets/js/csvxml-overview.js diff --git a/assets/js/csvxml-overview.min.js b/public/assets/js/csvxml-overview.min.js similarity index 100% rename from assets/js/csvxml-overview.min.js rename to public/assets/js/csvxml-overview.min.js diff --git a/assets/js/newToolTip.js b/public/assets/js/newToolTip.js similarity index 100% rename from assets/js/newToolTip.js rename to public/assets/js/newToolTip.js diff --git a/csv.php b/public/csv.php similarity index 95% rename from csv.php rename to public/csv.php index 63e79b4..263f893 100644 --- a/csv.php +++ b/public/csv.php @@ -5,7 +5,7 @@ * @author Joshua Ramon Enslin */ declare(strict_types = 1); -require_once __DIR__ . "/functions/functions.php"; +require_once __DIR__ . "/../functions/functions.php"; if (session_status() != PHP_SESSION_ACTIVE) { session_start(); @@ -31,7 +31,7 @@ if (!empty($_POST) and !empty($_POST['selectedFields'])) { } else $selectionActive = false; -require __DIR__ . "/values/availableFields.php"; +require __DIR__ . "/../values/availableFields.php"; $line1 = $line2 = $line3 = $line4 = []; diff --git a/index.php b/public/index.php similarity index 97% rename from index.php rename to public/index.php index fdc737d..a4dcada 100644 --- a/index.php +++ b/public/index.php @@ -7,7 +7,7 @@ * @author Joshua Ramon Enslin */ declare(strict_types = 1); -require_once __DIR__ . "/functions/functions.php"; +require_once __DIR__ . "/../functions/functions.php"; if (session_status() != PHP_SESSION_ACTIVE) { session_start(); @@ -57,7 +57,7 @@ echo ' '; -require __DIR__ . "/values/availableFields.php"; +require __DIR__ . "/../values/availableFields.php"; $tooltips = []; foreach ($availableFields as $headline => $fields) { diff --git a/index3.php b/public/index3.php similarity index 98% rename from index3.php rename to public/index3.php index 8781059..df5e23d 100644 --- a/index3.php +++ b/public/index3.php @@ -1,6 +1,6 @@ setComment("Example Zip file.\nCreated on " . date('l jS \of F Y h:i:s A')); @@ -40,5 +39,5 @@ header("Content-Transfer-Encoding: binary"); header("Content-Length: " . $length); echo $zipData; -rrmdir(__DIR__ . '/xml'); +rrmdir(__DIR__ . '/../xml'); diff --git a/tests/csvTest.php b/tests/csvTest.php new file mode 100644 index 0000000..6fad1b6 --- /dev/null +++ b/tests/csvTest.php @@ -0,0 +1,33 @@ + + */ +declare(strict_types = 1); + +// phpcs:disable + +use PHPUnit\Framework\TestCase; + +/** + * Test class for the start page. + */ +final class CsvTest extends TestCase { + + /** + * Test for HTML output. + * + * @return void + */ + public function testHTMLOutput():void { + + include __DIR__ . "/../public/csv.php"; + $output = $this->getActualOutput(); + + self::assertIsString($output); + ob_clean(); + + } + +} diff --git a/tests/startPageTest.php b/tests/startPageTest.php index 86f9a35..c0e4098 100644 --- a/tests/startPageTest.php +++ b/tests/startPageTest.php @@ -4,24 +4,28 @@ * * @author Joshua Ramon Enslin */ -declare(strict_types=1); +declare(strict_types = 1); // phpcs:disable use PHPUnit\Framework\TestCase; +/** + * Test class for the start page. + */ final class StartPageTest extends TestCase { + /** + * Test for HTML output. + * + * @return void + */ public function testHTMLOutput():void { - include __DIR__ . "/../index.php"; + include __DIR__ . "/../public/index.php"; $output = $this->getActualOutput(); - self::assertEquals( - true, - is_string($output) - ); - + self::assertIsString($output); ob_clean(); }