Change GLOBAL name

MikeDombo · Mar 8, 2018 · 3cfcbf3 · 3cfcbf3
1 parent ba60c40
commit 3cfcbf3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/sonar-project.properties b/sonar-project.properties
@@ -1,11 +1,11 @@
 sonar.projectKey=MikeDombrowski:AudioDidact
 # this is the name displayed in the SonarQube UI
 sonar.projectName=AudioDidact
-sonar.projectVersion=.7
+sonar.projectVersion=.8
 
 sonar.sources=src/
-sonar.exclusions=src/temp/*,src/vendor/*,src/vendor/**,src/public/js/jquery*,test/*,test/**,tests/*,tests/**
-sonar.tests=test/,tests/
+sonar.exclusions=src/temp/*,src/vendor/*,src/vendor/**,src/public/js/jquery*,test/*,test/**,src/Feeds/*,src/pug-cache/*
+sonar.tests=test/
 sonar.php.coverage.reportPaths=build/logs/clover.xml
 sonar.php.tests.reportPath=build/logs/junit.xml
 

diff --git a/src/classes/GlobalFunctions.php b/src/classes/GlobalFunctions.php
@@ -220,7 +220,7 @@ public static function mb_str_split($string){
 	 * @return \AudioDidact\DB\DAL
 	 */
 	public static function getDAL(){
-		$myDalClass = ChosenDAL;
+		$myDalClass = CHOSEN_DAL;
 
 		return new $myDalClass(PDO_STR);
 	}

diff --git a/src/config.php b/src/config.php
@@ -60,7 +60,7 @@
 	$e = getenv($k);
 	if($e !== false){
 		if($v["type"] == "boolean"){
-			$e = mb_strtolower($e) == "true" ? true : false;
+			$e = mb_strtolower($e) == "true";
 		}
 		$ymlConfig = \AudioDidact\GlobalFunctions::deepSetDictionaryValues($ymlConfig, $kk, $e);
 	}
@@ -101,17 +101,17 @@ function is_ssl(){
 $dbData = $ymlConfig["database"];
 switch(strtolower($dbData["driver"])){
 	case("mysql"):
-		define("ChosenDAL", "\\AudioDidact\\DB\\MySQLDAL");
+		define("CHOSEN_DAL", "\\AudioDidact\\DB\\MySQLDAL");
 		define("DB_USER", $dbData["user"]);
 		define("DB_PASSWORD", $dbData["password"]);
 		define("PDO_STR", $dbData["connection-string"]);
 		break;
 	case("sqlite"):
-		define("ChosenDAL", "\\AudioDidact\\DB\\SQLite");
+		define("CHOSEN_DAL", "\\AudioDidact\\DB\\SQLite");
 		define("PDO_STR", $dbData["connection-string"]);
 		break;
 	case("mongodb"):
-		define("ChosenDAL", "\\AudioDidact\\DB\\MongoDBDAL");
+		define("CHOSEN_DAL", "\\AudioDidact\\DB\\MongoDBDAL");
 		define("DB_DATABASE", $dbData["database-name"]);
 		define("PDO_STR", $dbData["connection-string"]);
 		break;