From 342c1613e37a80f6c20198acf648e3bf9e36b033 Mon Sep 17 00:00:00 2001
From: Dan Poltawski <dan@moodle.com>
Date: Thu, 8 Jun 2017 11:15:55 +0100
Subject: [PATCH] MDL-57432 environment: raise Moodle 3.4 requirements

1) PHP minimum version raised to 7.0.0
2) Intl extension raised from optional to required
---
 admin/environment.xml | 6 +++---
 lang/en/admin.php     | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/admin/environment.xml b/admin/environment.xml
index b420be3d5f0..3492941c23d 100644
--- a/admin/environment.xml
+++ b/admin/environment.xml
@@ -2094,7 +2094,7 @@
       <VENDOR name="mssql" version="10.0" />
       <VENDOR name="oracle" version="10.2" />
     </DATABASE>
-    <PHP version="5.6.5" level="required">
+    <PHP version="7.0.0" level="required">
     </PHP>
     <PCREUNICODE level="optional">
       <FEEDBACK>
@@ -2172,9 +2172,9 @@
       </PHP_EXTENSION>
       <PHP_EXTENSION name="xmlreader" level="required">
       </PHP_EXTENSION>
-      <PHP_EXTENSION name="intl" level="optional">
+      <PHP_EXTENSION name="intl" level="required">
         <FEEDBACK>
-          <ON_CHECK message="intlrecommended" />
+          <ON_ERROR message="intlrequired" />
         </FEEDBACK>
       </PHP_EXTENSION>
       <PHP_EXTENSION name="json" level="required">
diff --git a/lang/en/admin.php b/lang/en/admin.php
index 70defe30c56..63b32c7d49f 100644
--- a/lang/en/admin.php
+++ b/lang/en/admin.php
@@ -610,6 +610,7 @@ $string['indexinginfo'] = 'The recommended way to index your site\'s contents is
 $string['installhijacked'] = 'Installation must be finished from the original IP address, sorry.';
 $string['installsessionerror'] = 'Can not initialise PHP session, please verify that your browser accepts cookies.';
 $string['intlrecommended'] = 'Intl extension is used to improve internationalization support, such as locale aware sorting.';
+$string['intlrequired'] = 'Intl extension is required to improve internationalization support, such as locale aware sorting and international domain names.';
 $string['invalidsection'] = 'Invalid section.';
 $string['invaliduserchangeme'] = 'Username "changeme" is reserved -- you cannot create an account with it.';
 $string['ipblocked'] = 'This site is not available currently.';