Fix EZP-22592: Setup wizard should check for php-xsl and php-intl

ezsystems · Apr 9, 2014 · dafec43 · dafec43
1 parent fa63df7
commit dafec43
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 1 deletion.
diff --git a/design/standard/templates/setup/tests/intl_extension_error.tpl b/design/standard/templates/setup/tests/intl_extension_error.tpl
@@ -0,0 +1,8 @@
+{* DO NOT EDIT THIS FILE! Use an override template instead. *}
+<h3>{$result_number}. {"Missing intl extension"|i18n("design/standard/setup/tests")}</h3>
+<p>
+    {"The intl extension, required for internationalization, is not installed or enabled."|i18n("design/standard/setup/tests")}
+</p>
+<p>
+    {"More information on installing it is available at"|i18n("design/standard/setup/tests")} <a target="_other" href="http://php.net/intl.installation.php">php.net</a>.
+</p>
diff --git a/design/standard/templates/setup/tests/xsl_extension_error.tpl b/design/standard/templates/setup/tests/xsl_extension_error.tpl
@@ -0,0 +1,8 @@
+{* DO NOT EDIT THIS FILE! Use an override template instead. *}
+<h3>{$result_number}. {"Missing xsl extension"|i18n("design/standard/setup/tests")}</h3>
+<p>
+ {"The xsl extension, required by rich text handling, is not installed or enabled."|i18n("design/standard/setup/tests")}
+</p>
+<p>
+ {"More information on installing it is available at"|i18n("design/standard/setup/tests")} <a target="_other" href="http://php.net/xsl.installation.php">php.net</a>.
+</p>
diff --git a/kernel/setup/ezsetuptests.php b/kernel/setup/ezsetuptests.php
@@ -28,6 +28,8 @@ function eZSetupTestTable()
                   'zlib_extension' => array( 'eZSetupTestExtension' ),
                   'dom_extension' => array( 'eZSetupTestExtension' ),
                   'iconv_extension' => array( 'eZSetupTestExtension' ),
+                  'intl_extension' => array( 'eZSetupTestExtension' ),
+                  'xsl_extension' => array( 'eZSetupTestExtension' ),
                   'file_upload' => array( 'eZSetupTestFileUpload' ),
                   'open_basedir' => array( 'eZSetupTestOpenBasedir' ),
                   'safe_mode' => array( 'eZSetupTestSafeMode' ),

diff --git a/settings/setup.ini b/settings/setup.ini
@@ -78,6 +78,14 @@ Require=all
 Extensions=iconv
 Require=all
 
+[xsl_extension]
+Extension=xsl
+Require=all
+
+[intl_extension]
+Extension=intl
+Require=all
+
 [imagemagick_program]
 unix_Executable=convert
 unix_SearchPaths=/bin;/sbin;/usr/bin;/usr/sbin;/usr/local/bin;/usr/local/sbin

diff --git a/settings/site.ini b/settings/site.ini
@@ -876,7 +876,7 @@ DesignLocationCache=disabled
 # The pagelayout to use for first time setups
 PageLayout=setup_pagelayout.tpl
 # List of tests to be run, critical tests must pass for the setup to continue
-CriticalTests=directory_permissions;phpversion;database_extensions;image_conversion;safe_mode;memory_limit;execution_time;magic_quotes_runtime;allow_url_fopen;accept_path_info;php_session;file_upload;zlib_extension;dom_extension;iconv_extension;mbstring_extension;timezone;ezcversion
+CriticalTests=directory_permissions;phpversion;database_extensions;image_conversion;safe_mode;memory_limit;execution_time;magic_quotes_runtime;allow_url_fopen;accept_path_info;php_session;file_upload;zlib_extension;dom_extension;iconv_extension;mbstring_extension;intl_extension;xsl_extension;timezone;ezcversion
 OptionalTests=variables_order;php_magicquotes;curl_extension;imagegd_extension;imagemagick_program;database_all_extensions;php_register_globals;texttoimage_functions;open_basedir
 OverrideSiteDesign=standard