From 17a94ee1f244cbf0c728f37d1628eb28955465ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-S=C3=A9bastien=20Hedde?= Date: Mon, 27 Jan 2014 11:32:19 +0100 Subject: [PATCH 1/3] Non-static method System::tmpdir() should not be called statically, assuming from incompatible context --- OLE/PPS/File.php | 3 ++- OLE/PPS/Root.php | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/OLE/PPS/File.php b/OLE/PPS/File.php index 8fb1acd..553627e 100644 --- a/OLE/PPS/File.php +++ b/OLE/PPS/File.php @@ -47,7 +47,8 @@ class OLE_PPS_File extends OLE_PPS */ function OLE_PPS_File($name) { - $this->_tmp_dir = System::tmpdir(); + $system = new System(); + $this->_tmp_dir = $system->tmpdir(); $this->OLE_PPS( null, $name, diff --git a/OLE/PPS/Root.php b/OLE/PPS/Root.php index 387c3b3..9da6330 100755 --- a/OLE/PPS/Root.php +++ b/OLE/PPS/Root.php @@ -53,7 +53,8 @@ class OLE_PPS_Root extends OLE_PPS */ function OLE_PPS_Root($time_1st, $time_2nd, $raChild) { - $this->_tmp_dir = System::tmpdir(); + $system = new System(); + $this->_tmp_dir = $system->tmpdir(); $this->OLE_PPS( null, OLE::Asc2Ucs('Root Entry'), From 482239c562cc66959fc8c04e8308d812196d56f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-S=C3=A9bastien=20Hedde?= Date: Mon, 27 Jan 2014 11:35:00 +0100 Subject: [PATCH 2/3] OLE::LocalDate2OLE, OLE::OLE2LocalDate are static methods. These functions are called staticly and don't use $this. --- OLE.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OLE.php b/OLE.php index d7dced7..2a5da73 100755 --- a/OLE.php +++ b/OLE.php @@ -493,7 +493,7 @@ function Asc2Ucs($ascii) * @param integer $date A timestamp * @return string The string for the OLE container */ - function LocalDate2OLE($date = null) + static function LocalDate2OLE($date = null) { if (!isset($date)) { return "\x00\x00\x00\x00\x00\x00\x00\x00"; @@ -538,7 +538,7 @@ function LocalDate2OLE($date = null) * @access public * @static */ - function OLE2LocalDate($string) + static function OLE2LocalDate($string) { if (strlen($string) != 8) { return new PEAR_Error("Expecting 8 byte string"); From af1b260a8bd0a5fc337f96f5b84b2accbb75f650 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-S=C3=A9bastien=20Hedde?= Date: Mon, 27 Jan 2014 11:38:34 +0100 Subject: [PATCH 3/3] Asc2Ucs is a static method. --- OLE.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OLE.php b/OLE.php index 2a5da73..e0cec8f 100755 --- a/OLE.php +++ b/OLE.php @@ -475,7 +475,7 @@ function getDataLength($index) * @param string $ascii The ASCII string to transform * @return string The string in Unicode */ - function Asc2Ucs($ascii) + static function Asc2Ucs($ascii) { $rawname = ''; for ($i = 0; $i < strlen($ascii); $i++) {