Page MenuHomePhabricator
Files F15336894

D19436.diff
No OneTemporary
Actions

D19436.diff
View Options

diff --git a/src/applications/auth/provider/PhabricatorLDAPAuthProvider.php b/src/applications/auth/provider/PhabricatorLDAPAuthProvider.php
--- a/src/applications/auth/provider/PhabricatorLDAPAuthProvider.php
+++ b/src/applications/auth/provider/PhabricatorLDAPAuthProvider.php
@@ -261,7 +261,7 @@
'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'));
}
}
diff --git a/src/applications/config/check/PhabricatorPHPConfigSetupCheck.php b/src/applications/config/check/PhabricatorPHPConfigSetupCheck.php
--- a/src/applications/config/check/PhabricatorPHPConfigSetupCheck.php
+++ b/src/applications/config/check/PhabricatorPHPConfigSetupCheck.php
@@ -83,7 +83,7 @@
// 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 @@
'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')
diff --git a/src/applications/config/view/PhabricatorSetupIssueView.php b/src/applications/config/view/PhabricatorSetupIssueView.php
--- a/src/applications/config/view/PhabricatorSetupIssueView.php
+++ b/src/applications/config/view/PhabricatorSetupIssueView.php
@@ -78,12 +78,12 @@
phutil_tag('tt', array(), 'apt-get'),
phutil_tag('tt', array(), 'yum'),
hsprintf('<tt>php-<em>%s</em></tt>', pht('extname')),
- hsprintf('<tt>php5-<em>%s</em></tt>', pht('extname')));
+ hsprintf('<tt>php-<em>%s</em></tt>', 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-<em>extname</em> ".
+ "\$ sudo apt-get install php-<em>extname</em> ".
"# Debian / Ubuntu\n".
"\$ sudo yum install php-<em>extname</em> ".
"# Red Hat / Derivatives");
diff --git a/src/applications/phragment/storage/PhragmentFragment.php b/src/applications/phragment/storage/PhragmentFragment.php
--- a/src/applications/phragment/storage/PhragmentFragment.php
+++ b/src/applications/phragment/storage/PhragmentFragment.php
@@ -155,7 +155,7 @@
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;
}
diff --git a/src/docs/user/configuration/configuration_guide.diviner b/src/docs/user/configuration/configuration_guide.diviner
--- a/src/docs/user/configuration/configuration_guide.diviner
+++ b/src/docs/user/configuration/configuration_guide.diviner
@@ -138,7 +138,7 @@
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.
diff --git a/src/docs/user/field/restarting.diviner b/src/docs/user/field/restarting.diviner
--- a/src/docs/user/field/restarting.diviner
+++ b/src/docs/user/field/restarting.diviner
@@ -112,5 +112,5 @@
```
$ sudo /etc/init.d/php-fpm restart
-$ sudo service php5-fpm reload
+$ sudo service php-fpm reload
```
diff --git a/src/docs/user/installation_guide.diviner b/src/docs/user/installation_guide.diviner
--- a/src/docs/user/installation_guide.diviner
+++ b/src/docs/user/installation_guide.diviner
@@ -123,7 +123,7 @@
- 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)

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 10, 3:25 AM (3 w, 5 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7394025
Default Alt Text
D19436.diff (4 KB)

Event Timeline

Phabricator · Built by Phacility