BUG Fix incorrect include paths in tests and railsyml (#6279)

silverstripe · Nov 3, 2016 · eefecc2 · eefecc2
1 parent ce10530
commit eefecc2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/src/View/JSMinifier.php b/src/View/JSMinifier.php
@@ -15,7 +15,7 @@ public function minify($content, $type, $filename) {
 
 		// Combine JS
 		try {
-			require_once('thirdparty/jsmin/jsmin.php');
+			require_once('jsmin/jsmin.php');
 			increase_time_limit_to();
 			$content = JSMin::minify($content);
 		} catch(Exception $e) {

diff --git a/tests/view/SSViewerTest.php b/tests/view/SSViewerTest.php
@@ -193,7 +193,7 @@ public function testRequirementsCombine(){
 
 		// first make sure that our test js file causes an exception to be thrown
 		try{
-			require_once('thirdparty/jsmin/jsmin.php');
+			require_once('jsmin/jsmin.php');
 			JSMin::minify($jsFileContents);
 			$this->fail('JSMin did not throw exception on minify bad file: ');
 		} catch(Exception $e) {

diff --git a/thirdparty/zend_translate_railsyaml/library/Translate/Adapter/RailsYAML.php b/thirdparty/zend_translate_railsyaml/library/Translate/Adapter/RailsYAML.php
@@ -7,9 +7,15 @@
 require_once 'Zend/Translate/Adapter.php';
 
 // ischommer CUSTOM Check required because SS core also includes the lib, from a different location
-if(!class_exists('sfYaml')) require_once 'thirdparty/sfYaml/lib/sfYaml.php';
-if(!class_exists('sfYamlParser')) require_once 'thirdparty/sfYaml/lib/sfYamlParser.php';
-if(!class_exists('sfYamlDumper')) require_once 'thirdparty/sfYaml/lib/sfYamlDumper.php';
+if(!class_exists('sfYaml')) {
+	require_once __DIR__ .'/thirdparty/sfYaml/lib/sfYaml.php';
+}
+if(!class_exists('sfYamlParser')) {
+	require_once __DIR__ . '/thirdparty/sfYaml/lib/sfYamlParser.php';
+}
+if(!class_exists('sfYamlDumper')) {
+	require_once __DIR__ . '/thirdparty/sfYaml/lib/sfYamlDumper.php';
+}
 // ischommer END_CUSTOM
 
 class Translate_Adapter_RailsYaml extends Zend_Translate_Adapter {