Description: Refer to php-* named packages rather than php5-* Author: Nishanth Aravamudan Bug-Ubuntu: https://launchpad.net/bugs/1544352 Index: phabricator-0~git20180509/arcanist/scripts/arcanist.php =================================================================== --- phabricator-0~git20180509.orig/arcanist/scripts/arcanist.php +++ phabricator-0~git20180509/arcanist/scripts/arcanist.php @@ -471,9 +471,8 @@ function sanity_check_environment() { $need_functions = array( 'curl_init' => array( 'text', - "You need to install the cURL PHP extension, maybe with ". - "'apt-get install php5-curl' or 'yum install php53-curl' or ". - "something similar.", + "You need to install the cURL PHP extension, with ". + "'apt-get install php-curl'.", ), 'json_decode' => array('flag', '--without-json'), ); Index: phabricator-0~git20180509/phabricator/src/applications/auth/provider/PhabricatorLDAPAuthProvider.php =================================================================== --- phabricator-0~git20180509.orig/phabricator/src/applications/auth/provider/PhabricatorLDAPAuthProvider.php +++ phabricator-0~git20180509/phabricator/src/applications/auth/provider/PhabricatorLDAPAuthProvider.php @@ -261,7 +261,7 @@ final class PhabricatorLDAPAuthProvider 'talk to LDAP. Usually you can install it with '. '`%s`, `%s`, or a similar package manager command.', 'yum install php-ldap', - 'apt-get install php5-ldap')); + 'apt-get install php-ldap')); } } Index: phabricator-0~git20180509/phabricator/src/applications/config/view/PhabricatorSetupIssueView.php =================================================================== --- phabricator-0~git20180509.orig/phabricator/src/applications/config/view/PhabricatorSetupIssueView.php +++ phabricator-0~git20180509/phabricator/src/applications/config/view/PhabricatorSetupIssueView.php @@ -73,20 +73,16 @@ final class PhabricatorSetupIssueView ex 'Install these %d PHP extension(s):', count($extensions)); $install_info = pht( - 'You can usually install a PHP extension using %s or %s. Common '. - 'package names are %s or %s. Try commands like these:', + 'You can usually install a PHP extension using %s. Common '. + 'package names are %s. Try commands like these:', phutil_tag('tt', array(), 'apt-get'), - phutil_tag('tt', array(), 'yum'), - hsprintf('php-%s', pht('extname')), - hsprintf('php5-%s', pht('extname'))); + hsprintf('php-%s', pht('extname'))); // TODO: We should do a better job of detecting how to install extensions // on the current system. $install_commands = hsprintf( - "\$ sudo apt-get install php5-extname ". - "# Debian / Ubuntu\n". - "\$ sudo yum install php-extname ". - "# Red Hat / Derivatives"); + "\$ sudo apt-get install php-extname ". + "# Debian / Ubuntu\n"); $fallback_info = pht( "If those commands don't work, try Google. The process of installing ". Index: phabricator-0~git20180509/phabricator/src/applications/phragment/storage/PhragmentFragment.php =================================================================== --- phabricator-0~git20180509.orig/phabricator/src/applications/phragment/storage/PhragmentFragment.php +++ phabricator-0~git20180509/phabricator/src/applications/phragment/storage/PhragmentFragment.php @@ -155,7 +155,7 @@ final class PhragmentFragment extends Ph try { $zip = new ZipArchive(); } catch (Exception $e) { - // The server doesn't have php5-zip, so we can't do recursive updates. + // The server doesn't have php-zip, so we can't do recursive updates. return; } Index: phabricator-0~git20180509/phabricator/src/docs/user/configuration/configuration_guide.diviner =================================================================== --- phabricator-0~git20180509.orig/phabricator/src/docs/user/configuration/configuration_guide.diviner +++ phabricator-0~git20180509/phabricator/src/docs/user/configuration/configuration_guide.diviner @@ -138,7 +138,7 @@ server.modules list: Finally, you should run the following commands to enable php support: - $ sudo apt-get install php5-cgi # for Ubuntu; other distros should be similar + $ sudo apt-get install php-cgi # for Ubuntu; other distros should be similar $ sudo lighty-enable-mod fastcgi-php Restart lighttpd after making your edits, then continue below. Index: phabricator-0~git20180509/phabricator/src/docs/user/field/restarting.diviner =================================================================== --- phabricator-0~git20180509.orig/phabricator/src/docs/user/field/restarting.diviner +++ phabricator-0~git20180509/phabricator/src/docs/user/field/restarting.diviner @@ -112,5 +112,5 @@ like one of these on your system, or a d ``` $ sudo /etc/init.d/php-fpm restart -$ sudo service php5-fpm reload +$ sudo service php-fpm reload ``` Index: phabricator-0~git20180509/phabricator/src/docs/user/installation_guide.diviner =================================================================== --- phabricator-0~git20180509.orig/phabricator/src/docs/user/installation_guide.diviner +++ phabricator-0~git20180509/phabricator/src/docs/user/installation_guide.diviner @@ -123,7 +123,7 @@ Otherwise, here's a general description - MySQL Server (usually "mysqld" or "mysql-server") - PHP (usually "php") - Required PHP extensions: mbstring, iconv, mysql (or mysqli), curl, pcntl - (these might be something like "php-mysql" or "php5-mysqlnd") + (these might be something like "php-mysql" or "php-mysqlnd") - Optional PHP extensions: gd, apc (special instructions for APC are available below if you have difficulty installing it), xhprof (instructions below, you only need this if you are developing Phabricator) Index: phabricator-0~git20180509/phabricator/src/applications/config/check/PhabricatorPHPConfigSetupCheck.php =================================================================== --- phabricator-0~git20180509.orig/phabricator/src/applications/config/check/PhabricatorPHPConfigSetupCheck.php +++ phabricator-0~git20180509/phabricator/src/applications/config/check/PhabricatorPHPConfigSetupCheck.php @@ -83,7 +83,7 @@ final class PhabricatorPHPConfigSetupChe // NOTE: We're intentionally telling you to install "mysqlnd" here; on // Ubuntu, there's no separate "mysqli" package. - phutil_tag('tt', array(), 'sudo apt-get install php5-mysqlnd')); + phutil_tag('tt', array(), 'sudo apt-get install php-mysqlnd')); $this->newIssue('php.mysqli') ->setName(pht('MySQLi Extension Not Available')) @@ -103,7 +103,7 @@ final class PhabricatorPHPConfigSetupChe 'native driver is recommended.'. "\n\n". 'You may be able to install the native driver with a command like: %s', - phutil_tag('tt', array(), 'sudo apt-get install php5-mysqlnd')); + phutil_tag('tt', array(), 'sudo apt-get install php-mysqlnd')); $this->newIssue('php.myqlnd')