fixed paths

CaboLabs · Mar 22, 2024 · 8b9cc5c · 8b9cc5c
1 parent bbc50cd
commit 8b9cc5c
Show file tree

Hide file tree

Showing 10 changed files with 547 additions and 22 deletions.
diff --git a/cli.php b/cli.php
@@ -1,10 +1,9 @@
 <?php
 
-$_BASE = __DIR__ . '/';
-
 // composer includes
 require __DIR__ . '/vendor/autoload.php';
 
+$PHP_TEST_BASE = __DIR__;
 
 //print_r($argv);
 //print_r($argc);
@@ -18,7 +17,7 @@
  * argv[5] -> -output="./output/out.html" (optional), if no path is specified it will be saved in the root
  * */
 
-$output = './';
+$output = '.'. DIRECTORY_SEPARATOR;
 $report = 'html';
 $output_index = 0;
 $report_index = 0;

diff --git a/composer.json b/composer.json
@@ -8,7 +8,7 @@
   ],
   "homepage": "https://github.com/ppazos/PhTest",
   "license": "Apache-2.0",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "repositories": [
     {
       "type": "vcs",

diff --git a/src/PhTestRun.php b/src/PhTestRun.php
@@ -454,7 +454,7 @@ public function render_reports_html($path)
          'menu_items'       => $menu_items
       ]);
 
-      if ($path == './')
+      if ($path == '.'. DIRECTORY_SEPARATOR)
       {
          $path = 'test_report.html';
       }
@@ -763,7 +763,8 @@ public function get_badge($item, $total_cases_failed, $total_cases_successful)
    }
    public static function template_email()
    {
-      global $_BASE;
-      return new \League\Plates\Engine($_BASE . 'views'. DIRECTORY_SEPARATOR .'html_reports');
+      global $PHP_TEST_BASE;
+      $path = $PHP_TEST_BASE . DIRECTORY_SEPARATOR .'views'. DIRECTORY_SEPARATOR .'templates';
+      return new \League\Plates\Engine($path);
    }
 }
diff --git a/test_report.html b/test_report.html
diff --git a/views/html_reports/body_report.php → views/templates/body_report.php b/views/html_reports/body_report.php → views/templates/body_report.php
diff --git a/views/html_reports/content_report.php → views/templates/content_report.php b/views/html_reports/content_report.php → views/templates/content_report.php
diff --git a/views/html_reports/failed_summary.php → views/templates/failed_summary.php b/views/html_reports/failed_summary.php → views/templates/failed_summary.php
diff --git a/views/html_reports/layout_report.php → views/templates/layout_report.php b/views/html_reports/layout_report.php → views/templates/layout_report.php
diff --git a/views/html_reports/menu_items.php → views/templates/menu_items.php b/views/html_reports/menu_items.php → views/templates/menu_items.php
diff --git a/views/html_reports/success_summary.php → views/templates/success_summary.php b/views/html_reports/success_summary.php → views/templates/success_summary.php