Use application/ as base path

PointedEars · Mar 27, 2014 · 494b514 · 494b514
1 parent 307b757
commit 494b514
Show file tree

Hide file tree

Showing 19 changed files with 91 additions and 59 deletions.
diff --git a/.settings/org.eclipse.php.core.prefs b/.settings/org.eclipse.php.core.prefs
@@ -1,3 +1,2 @@
-#Thu Dec 02 21:15:19 CET 2010
 eclipse.preferences.version=1
-include_path=0;/ECMAScript Support Matrix
+include_path=0;/ECMAScript Support Matrix\u00050;/ECMAScript Support Matrix/application
diff --git a/application/controllers/FeatureController.php b/application/controllers/FeatureController.php
@@ -1,8 +1,8 @@
 <?php
 
-require_once 'application/views/IndexView.php';
-require_once 'application/models/FeatureModel.php';
-require_once 'application/models/mappers/FeatureMapper.php';
+require_once 'views/IndexView.php';
+require_once 'models/FeatureModel.php';
+require_once 'models/mappers/FeatureMapper.php';
 
 use \PointedEars\PHPX\Application;
 
@@ -51,7 +51,7 @@ protected function editAction (FeatureModel $feature = null)
 
     $this->assign('feature', $feature);
     $this->assign('features', $features);
-    $this->render(null, 'application/layouts/feature/edit.phtml');
+    $this->render(null, 'layouts/feature/edit.phtml');
   }
 
   /**

diff --git a/application/controllers/ImplementationController.php b/application/controllers/ImplementationController.php
@@ -1,9 +1,9 @@
 <?php
 
-require_once 'application/views/IndexView.php';
-require_once 'application/models/ImplementationModel.php';
-require_once 'application/models/mappers/ImplementationMapper.php';
-require_once 'application/models/mappers/VersionMapper.php';
+require_once 'views/IndexView.php';
+require_once 'models/ImplementationModel.php';
+require_once 'models/mappers/ImplementationMapper.php';
+require_once 'models/mappers/VersionMapper.php';
 
 use \PointedEars\PHPX\Application;
 
@@ -57,7 +57,7 @@ protected function editAction(ImplementationModel $impl = null)
     $this->assign('implementation', $impl);
     $this->assign('implementations', $all_impls);
     $this->assign('all_versions', $all_versions);
-    $this->render(null, 'application/layouts/implementation/edit.phtml');
+    $this->render(null, 'layouts/implementation/edit.phtml');
   }
 
   /**

diff --git a/application/controllers/IndexController.php b/application/controllers/IndexController.php
@@ -1,13 +1,13 @@
 <?php
 
-require_once 'lib/footnotes.class.php';
+require_once '../lib/footnotes.class.php';
 
-require_once 'application/views/IndexView.php';
-require_once 'application/models/mappers/FeatureMapper.php';
-// require_once 'application/models/mappers/TestcaseMapper.php';
-require_once 'application/models/mappers/ImplementationMapper.php';
-require_once 'application/models/mappers/ResultMapper.php';
-require_once 'application/models/mappers/EnvironmentMapper.php';
+require_once 'views/IndexView.php';
+require_once 'models/mappers/FeatureMapper.php';
+// require_once 'models/mappers/TestcaseMapper.php';
+require_once 'models/mappers/ImplementationMapper.php';
+require_once 'models/mappers/ResultMapper.php';
+require_once 'models/mappers/EnvironmentMapper.php';
 
 use \PointedEars\PHPX\Application;
 
@@ -26,7 +26,7 @@ public function __construct()
     parent::__construct('IndexView');
   }
 
-  protected function indexAction($template = null, $content = null)
+  protected function indexAction ($template = null, $content = null)
   {
     $implementations = ImplementationMapper::getInstance()->fetchAll();
 
@@ -54,7 +54,7 @@ protected function indexAction($template = null, $content = null)
 
     if (is_null($template))
     {
-      $this->render(null, 'application/layouts/index/index.phtml');
+      $this->render(null, 'layouts/index/index.phtml');
     }
     else
     {
@@ -65,8 +65,8 @@ protected function indexAction($template = null, $content = null)
   protected function indexLatexAction ()
   {
     $this->indexAction(
-      'application/layouts/text.phtml',
-      'application/layouts/index/index-latex.phtml');
+      'layouts/text.phtml',
+      'layouts/index/index-latex.phtml');
   }
 
   protected function testcasesLatexAction ()
@@ -76,15 +76,15 @@ protected function testcasesLatexAction ()
     $this->assign('features', $features);
 
     $this->render(
-        'application/layouts/text.phtml',
-        'application/layouts/index/testcases-latex.phtml');
+        'layouts/text.phtml',
+        'layouts/index/testcases-latex.phtml');
   }
 
   protected function resultsLatexAction ()
   {
     $this->indexAction(
-        'application/layouts/text.phtml',
-        'application/layouts/index/results-latex.phtml');
+        'layouts/text.phtml',
+        'layouts/index/results-latex.phtml');
   }
 
   protected function importAction ()

diff --git a/application/models/EnvironmentModel.php b/application/models/EnvironmentModel.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once 'application/models/databases/es-matrix/tables/EnvironmentTable.php';
+require_once 'models/databases/es-matrix/tables/EnvironmentTable.php';
 
 /**
  * Model class for test environments

diff --git a/application/models/FeatureModel.php b/application/models/FeatureModel.php
@@ -1,10 +1,10 @@
 <?php
 
-require_once 'lib/global.inc';
+require_once '../lib/global.inc';
 
-require_once 'application/models/databases/es-matrix/tables/FeatureTable.php';
-require_once 'application/models/TestcaseModel.php';
-require_once 'application/models/mappers/TestcaseMapper.php';
+require_once 'models/databases/es-matrix/tables/FeatureTable.php';
+require_once 'models/TestcaseModel.php';
+require_once 'models/mappers/TestcaseMapper.php';
 
 /**
  * Data model for a language feature

diff --git a/application/models/ImplementationModel.php b/application/models/ImplementationModel.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once 'application/models/databases/es-matrix/tables/ImplementationTable.php';
+require_once 'models/databases/es-matrix/tables/ImplementationTable.php';
 
 /**
  * Model class for tested implementations

diff --git a/application/models/ResultModel.php b/application/models/ResultModel.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once 'application/models/databases/es-matrix/tables/ResultTable.php';
+require_once 'models/databases/es-matrix/tables/ResultTable.php';
 
 /**
  * Model class for test results

diff --git a/application/models/TestcaseModel.php b/application/models/TestcaseModel.php
@@ -1,8 +1,8 @@
 <?php
 
-require_once 'lib/global.inc';
+require_once '../lib/global.inc';
 
-require_once 'application/models/databases/es-matrix/tables/TestcaseTable.php';
+require_once 'models/databases/es-matrix/tables/TestcaseTable.php';
 
 /**
  * Data model for a testcase

diff --git a/application/models/adapters/MatrixAdapter.php b/application/models/adapters/MatrixAdapter.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once 'application/models/databases/es-matrix/MatrixDb.php';
+require_once 'models/databases/es-matrix/MatrixDb.php';
 
 require_once 'lib/Db/MySQLAdapter.php';
 

diff --git a/application/models/databases/es-matrix/tables/TestcaseTable.php b/application/models/databases/es-matrix/tables/TestcaseTable.php
@@ -1,6 +1,6 @@
 <?php
 
-// require_once 'application/models/databases/es-matrix/MatrixDb.php';
+// require_once 'models/databases/es-matrix/MatrixDb.php';
 
 class TestcaseTable extends \PointedEars\PHPX\Db\Table
 {

diff --git a/application/models/mappers/EnvironmentMapper.php b/application/models/mappers/EnvironmentMapper.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once 'application/models/EnvironmentModel.php';
+require_once 'models/EnvironmentModel.php';
 
 class EnvironmentTestedException extends Exception
 {

diff --git a/application/models/mappers/FeatureMapper.php b/application/models/mappers/FeatureMapper.php
@@ -1,9 +1,9 @@
 <?php
 
-require_once 'application/models/FeatureModel.php';
-require_once 'application/models/mappers/TestcaseMapper.php';
+require_once 'models/FeatureModel.php';
+require_once 'models/mappers/TestcaseMapper.php';
 
-require_once 'lib/features.class.php';
+require_once '../lib/features.class.php';
 
 /**
  * Mapper class for features

diff --git a/application/models/mappers/ImplementationMapper.php b/application/models/mappers/ImplementationMapper.php
@@ -1,7 +1,7 @@
 <?php
 
-require_once 'application/models/ImplementationModel.php';
-require_once 'application/models/mappers/VersionMapper.php';
+require_once 'models/ImplementationModel.php';
+require_once 'models/mappers/VersionMapper.php';
 
 /**
  * Mapper class for tested implementations

diff --git a/application/models/mappers/ResultMapper.php b/application/models/mappers/ResultMapper.php
@@ -2,10 +2,10 @@
 
 use \PointedEars\PHPX\Application;
 
-require_once 'application/models/ResultModel.php';
-require_once 'application/models/mappers/ImplementationMapper.php';
-require_once 'application/models/mappers/EnvironmentMapper.php';
-require_once 'application/models/mappers/VersionMapper.php';
+require_once 'models/ResultModel.php';
+require_once 'models/mappers/ImplementationMapper.php';
+require_once 'models/mappers/EnvironmentMapper.php';
+require_once 'models/mappers/VersionMapper.php';
 
 /**
  * Mapper class for tested implementation versions

diff --git a/application/models/mappers/TestcaseMapper.php b/application/models/mappers/TestcaseMapper.php
@@ -1,11 +1,11 @@
 <?php
 
-require_once 'lib/features.class.php';
+require_once '../lib/features.class.php';
 
-require_once 'application/models/TestcaseModel.php';
-require_once 'application/models/FeatureModel.php';
-require_once 'application/models/mappers/ImplementationMapper.php';
-require_once 'application/models/mappers/EnvironmentMapper.php';
+require_once 'models/TestcaseModel.php';
+require_once 'models/FeatureModel.php';
+require_once 'models/mappers/ImplementationMapper.php';
+require_once 'models/mappers/EnvironmentMapper.php';
 
 /**
  * Mapper class for testcases

diff --git a/application/models/mappers/VersionMapper.php b/application/models/mappers/VersionMapper.php
@@ -1,7 +1,7 @@
 <?php
 
-require_once 'application/models/databases/es-matrix/tables/VersionTable.php';
-require_once 'application/models/VersionModel.php';
+require_once 'models/databases/es-matrix/tables/VersionTable.php';
+require_once 'models/VersionModel.php';
 
 /**
  * Mapper class for tested implementation versions

diff --git a/application/views/IndexView.php b/application/views/IndexView.php
@@ -12,7 +12,7 @@ class IndexView extends \PointedEars\PHPX\View
    *
    * @var string
    */
-  protected $_template = 'application/layouts/layout.phtml';
+  protected $_template = 'layouts/layout.phtml';
 
   /**
    * Creates a new view
@@ -28,10 +28,42 @@ public function __construct($template = null)
     $this->assign('encoding', $encoding);
   }
 
+  /**
+   *
+   * @param int $feature_id
+   */
   public function isSafe($feature_id)
   {
     return isset($this->results['safeFeatures'][$feature_id]);
   }
+
+  /**
+   * Maps test case code to a formatted version
+   *
+   * @param TestcaseModel $e
+   *   Testcase
+   * @param int $i
+   *   Testcase index
+   * @return string
+   */
+  private function _mapTestcaseCode ($e, $i)
+  {
+    return "•&nbsp;Test&nbsp;" . ($i + 1) . ": " . $this->escape($e->code);
+  }
+
+  /**
+   * Returns the escaped bullet list of testcase codes
+   *
+   * @param array $testcases
+   * @return string
+   */
+  public function getEscapedTestcaseCodes ($testcases)
+  {
+    return implode("\n",
+      array_map(
+        array($this, '_mapTestcaseCode'),
+        $testcases, array_keys($testcases)));
+  }
 }
 
 ?>
diff --git a/index.php b/index.php
@@ -18,16 +18,17 @@
 header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 86400) . ' GMT');
 
 require_once 'lib/Application.php';
-require_once 'application/models/databases/es-matrix/MatrixDb.php';
+chdir('application');
+require_once 'models/databases/es-matrix/MatrixDb.php';
 
 $db = new MatrixDb();
 $modi = max(array_merge(
   array_map('filemtime', array(
     __FILE__,
     //   'es-matrix.inc.php',
-    'style.css',
-    'table.js',
-    'application',
+    '../style.css',
+    '../table.js',
+    '.',
   )),
   array($db->getLastModified())
 ));