summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorMarcel Korpel <marcel.korpel@gmail.com>2016-01-17 23:14:58 +0100
committerLukas Fleischer <lfleischer@archlinux.org>2016-01-28 22:55:32 +0100
commit2121982862f25488a0e0fae58b387c2cd4b1f208 (patch)
tree7f47d1b9cb71e1e1a71846597a20a8074c6fb657 /web
parentb3a6809bada24c35dad7772b3b91685a2e24cb42 (diff)
downloadaurweb-2121982862f25488a0e0fae58b387c2cd4b1f208.tar.xz
Rename constructors to __construct
In PHP 7, constructor methods that have the same name as the class they are defined in are deprecated. Use __construct instead. http://php.net/manual/en/migration70.deprecated.php Signed-off-by: Marcel Korpel <marcel.korpel@gmail.com> Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
Diffstat (limited to 'web')
-rw-r--r--web/lib/gettext.php2
-rw-r--r--web/lib/streams.php6
2 files changed, 4 insertions, 4 deletions
diff --git a/web/lib/gettext.php b/web/lib/gettext.php
index 4ccd75d..098f0e5 100644
--- a/web/lib/gettext.php
+++ b/web/lib/gettext.php
@@ -98,7 +98,7 @@ class gettext_reader {
* @param object Reader the StreamReader object
* @param boolean enable_cache Enable or disable caching of strings (default on)
*/
- function gettext_reader($Reader, $enable_cache = true) {
+ function __construct($Reader, $enable_cache = true) {
// If there isn't a StreamReader, turn on short circuit mode.
if (! $Reader || isset($Reader->error) ) {
$this->short_circuit = true;
diff --git a/web/lib/streams.php b/web/lib/streams.php
index 3cdc158..00cf6cc 100644
--- a/web/lib/streams.php
+++ b/web/lib/streams.php
@@ -49,7 +49,7 @@ class StringReader {
var $_pos;
var $_str;
- function StringReader($str='') {
+ function __construct($str='') {
$this->_str = $str;
$this->_pos = 0;
}
@@ -86,7 +86,7 @@ class FileReader {
var $_fd;
var $_length;
- function FileReader($filename) {
+ function __construct($filename) {
if (file_exists($filename)) {
$this->_length=filesize($filename);
@@ -143,7 +143,7 @@ class FileReader {
// Preloads entire file in memory first, then creates a StringReader
// over it (it assumes knowledge of StringReader internals)
class CachedFileReader extends StringReader {
- function CachedFileReader($filename) {
+ function __construct($filename) {
if (file_exists($filename)) {
$length=filesize($filename);