From eefecc21fc79a383c9b354cc5cb46e114810d4ff Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Thu, 3 Nov 2016 14:41:19 +1300 Subject: [PATCH] BUG Fix incorrect include paths in tests and railsyml (#6279) --- src/View/JSMinifier.php | 2 +- tests/view/SSViewerTest.php | 2 +- .../library/Translate/Adapter/RailsYAML.php | 12 +++++++++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/View/JSMinifier.php b/src/View/JSMinifier.php index 37abf97d3ac..14c8e6e9341 100644 --- 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 index ddf13feffcb..e552bc85cd3 100644 --- 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 index 47561950563..a3675039473 100644 --- 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 {