Merge branch 'QA_4_4'

phpmyadmin · Apr 15, 2015 · 1ad1a38 · 1ad1a38
2 parents e00ec30 + 77369e5
commit 1ad1a38
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -32,6 +32,7 @@ phpMyAdmin - ChangeLog
 - bug #4794 Server error viewing table content
 - bug       Fix issues related to number of decimal places in time
 - bug #4853 Relation view between 1600 and 1780 px
+- bug       PHP 7 compatibility in php-gettext
 
 4.4.2.0 (2015-04-13)
 - bug #4835 PMA_hideShowConnection not called after submit_num_fields

diff --git a/libraries/php-gettext/gettext.php b/libraries/php-gettext/gettext.php
@@ -98,7 +98,7 @@ function readintarray($count) {
    * @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) {
+  public 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/libraries/php-gettext/streams.php b/libraries/php-gettext/streams.php
@@ -49,7 +49,7 @@ class StringReader {
   var $_pos;
   var $_str;
 
-  function StringReader($str='') {
+  public function __construct($str='') {
     $this->_str = $str;
     $this->_pos = 0;
   }
@@ -86,7 +86,7 @@ class FileReader {
   var $_fd;
   var $_length;
 
-  function FileReader($filename) {
+  public function __construct($filename) {
     if (file_exists($filename)) {
 
       $this->_length=filesize($filename);
@@ -143,7 +143,7 @@ function close() {
 // 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) {
+  public function __construct($filename) {
     if (file_exists($filename)) {
 
       $length=filesize($filename);

diff --git a/test/libraries/php-gettext/PMA_FileReader_test.php b/test/libraries/php-gettext/PMA_FileReader_test.php
@@ -121,20 +121,22 @@ public function testClose()
     public function testForNonExistingFile()
     {
         $file = new FileReader('./path/for/no/file.txt');
+        // looking at the return value of a constructor is curious
+        // but the constructor returns a value
         $this->assertFalse(
-            $file->FileReader('./path/for/no/file.txt')
+            $file->__construct('./path/for/no/file.txt')
         );
     }
 
     public function testForCachedFileReader()
     {
         $reader = new CachedFileReader('./test/test_data/test.file');
         $this->assertEquals(
-            $reader->CachedFileReader('./test/test_data/test.file'),
+            $reader->__construct('./test/test_data/test.file'),
             null
         );
         $this->assertFalse(
-            $reader->CachedFileReader('./path/for/no/file.txt')
+            $reader->__construct('./path/for/no/file.txt')
         );
 
     }