Dev Removed test code from em_core_helper.

Dev Created first unit tests in application/tests!
LimeSurvey · Sep 20, 2013 · ad5eef2 · ad5eef2
1 parent bd705f5
commit ad5eef2
Show file tree

Hide file tree

Showing 6 changed files with 1,040 additions and 953 deletions.
diff --git a/application/core/LSHttpRequest.php b/application/core/LSHttpRequest.php
@@ -37,7 +37,7 @@ class LSHttpRequest extends CHttpRequest {
     protected function normalizeRequest(){
         parent::normalizeRequest();
 
-        if($_SERVER['REQUEST_METHOD'] != 'POST') return;
+        if(!isset($_SERVER['REQUEST_METHOD']) || $_SERVER['REQUEST_METHOD'] != 'POST') return;
 
         $route = Yii::app()->getUrlManager()->parseUrl($this);
         if($this->enableCsrfValidation){

diff --git a/application/core/LSYii_Application.php b/application/core/LSYii_Application.php
@@ -50,7 +50,7 @@ public function __construct($config = null)
     {
         if (is_string($config) && !file_exists($config))
         {
-            $config = APPPATH . 'config/config-sample-mysql' . EXT;
+            $config = __DIR__ . '/../config/config-sample-mysql' . EXT;
         } 
         if(is_string($config)) {
             $config = require($config);
@@ -123,14 +123,14 @@ public function __construct($config = null)
         parent::__construct($config);
         Yii::setPathOfAlias('bootstrap' , Yii::getPathOfAlias('ext.bootstrap'));
         // Load the default and environmental settings from different files into self.
-        $ls_config = require(APPPATH . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'config-defaults.php');
-        $email_config = require(APPPATH . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'email.php');
-        $version_config = require(APPPATH . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'version.php');
+        $ls_config = require(__DIR__ . '/../config/config-defaults.php');
+        $email_config = require(__DIR__ . '/../config/email.php');
+        $version_config = require(__DIR__ . '/../config/version.php');
         $settings = array_merge($ls_config, $version_config, $email_config);
 
-        if(file_exists(APPPATH . DIRECTORY_SEPARATOR. 'config' . DIRECTORY_SEPARATOR . 'config.php'))
+        if(file_exists(__DIR__ . '/../config/config.php'))
         {
-            $ls_config = require(APPPATH . DIRECTORY_SEPARATOR. 'config' . DIRECTORY_SEPARATOR . 'config.php');
+            $ls_config = require(__DIR__ . '/../config/config.php');
             if(is_array($ls_config['config']))
             {
                 $settings = array_merge($settings, $ls_config['config']);