[BUGFIX] Adodb PHP7 Redefinition of parameter $owner 77/44477/2
authorChristian Kuhn <lolli@schwarzbu.ch>
Mon, 2 Nov 2015 11:47:02 +0000 (12:47 +0100)
committerAndreas Fernandez <typo3@scripting-base.de>
Mon, 2 Nov 2015 12:25:53 +0000 (13:25 +0100)
Adodb contains two methods that declare parameter $owner twice.
The PHP 7 linter fatals with this. A fix was merged to upstream
with commit ae85debec8 on https://github.com/ADOdb/ADOdb/ but not
released yet. The patch picks this part from the patch.

In result only linter warnings are left for old constructors in
openid and adodb, so travis-ci is green on PHP7 and can be removed
from "allowed_failures".

Resolves: #71244
Releases: master
Change-Id: I3b2fd4c7f9efcbe5bb0cf70df84dfe8d219dccd0
Reviewed-on: https://review.typo3.org/44477
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Mathias Schreiber <mathias.schreiber@wmdb.de>
Tested-by: Mathias Schreiber <mathias.schreiber@wmdb.de>
Reviewed-by: Andreas Fernandez <typo3@scripting-base.de>
Tested-by: Andreas Fernandez <typo3@scripting-base.de>
.travis.yml
typo3/sysext/adodb/Documentation/Index.rst
typo3/sysext/adodb/Documentation/typo3-adodb.diff
typo3/sysext/adodb/adodb/drivers/adodb-sqlite.inc.php
typo3/sysext/adodb/adodb/drivers/adodb-sqlite3.inc.php

index ff3e65f..503ad31 100644 (file)
@@ -2,8 +2,6 @@ language: php
 
 matrix:
   fast_finish: true
-  allow_failures:
-    - php: 7
 
   include:
     - php: 5.5
index 3c072bf..d1ef098 100644 (file)
@@ -24,6 +24,7 @@ updated to upstream.
 - ADOdb: mssqlnative driver does not properly define the port (63070_)
 - ADOdb: Allow setting NOT NULL/DEFAULT on blob and text columns (67442_) (Upstream pull request: [3]_)
 - ADOdb: Table names in sequences broken (64990_)
+- ADOdb: PHP7 redefinition of parameter (71244_)
 
 .. [2] https://github.com/ADOdb/ADOdb/commit/85f05a98974ea85ecae943faf230a27afdbaa746
 .. [3] https://github.com/ADOdb/ADOdb/pull/118
@@ -36,6 +37,7 @@ updated to upstream.
 .. _63070: https://forge.typo3.org/issues/63070
 .. _67442: https://forge.typo3.org/issues/67442
 .. _64990: https://forge.typo3.org/issues/64990
+.. _71244: https://forge.typo3.org/issues/71244
 
 
 Diff
index cb85d04..88b0726 100644 (file)
@@ -392,4 +392,30 @@ index e7b4c2b..3453d4c 100644
 +              }
 
                if (isset($tableoptions['REPLACE'])) $sql[] = "DROP SEQUENCE $seqname";
-               $seqCache = '';
\ No newline at end of file
+               $seqCache = '';
+diff --git a/drivers/adodb-sqlite.inc.php b/drivers/adodb-sqlite.inc.php
+index e7cf353..286f39c 100644
+--- a/drivers/adodb-sqlite.inc.php
++++ b/drivers/adodb-sqlite.inc.php
+@@ -262,7 +262,7 @@ class ADODB_sqlite extends ADOConnection {
+               return @sqlite_close($this->_connectionID);
+       }
+-      function MetaIndexes($table, $primary = FALSE, $owner=false, $owner = false)
++      function MetaIndexes($table, $primary = FALSE, $owner=false)
+       {
+               $false = false;
+               // save old fetch mode
+diff --git a/drivers/adodb-sqlite3.inc.php b/drivers/adodb-sqlite3.inc.php
+index af83517..f9f667c 100644
+--- a/drivers/adodb-sqlite3.inc.php
++++ b/drivers/adodb-sqlite3.inc.php
+@@ -282,7 +282,7 @@ class ADODB_sqlite3 extends ADOConnection {
+               return $this->_connectionID->close();
+       }
+-      function MetaIndexes($table, $primary = FALSE, $owner=false, $owner = false)
++      function MetaIndexes($table, $primary = FALSE, $owner=false)
+       {
+               $false = false;
+               // save old fetch mode
index e7cf353..286f39c 100644 (file)
@@ -262,7 +262,7 @@ class ADODB_sqlite extends ADOConnection {
                return @sqlite_close($this->_connectionID);
        }
 
-       function MetaIndexes($table, $primary = FALSE, $owner=false, $owner = false)
+       function MetaIndexes($table, $primary = FALSE, $owner=false)
        {
                $false = false;
                // save old fetch mode
index af83517..f9f667c 100644 (file)
@@ -282,7 +282,7 @@ class ADODB_sqlite3 extends ADOConnection {
                return $this->_connectionID->close();
        }
 
-       function MetaIndexes($table, $primary = FALSE, $owner=false, $owner = false)
+       function MetaIndexes($table, $primary = FALSE, $owner=false)
        {
                $false = false;
                // save old fetch mode