[Pkg-owncloud-commits] [php-sabredav] 02/64: Removed all $tableName arguments from PDO backends.

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to tag 2.2.0alpha1
in repository php-sabredav.

commit e937ee8a68003681276ddf3f9325e0a9a45abbd2
Author: Evert Pot <me at evertpot.com>
Date:   Thu Oct 23 22:34:29 2014 -0400

    Removed all $tableName arguments from PDO backends.
---
 ChangeLog.md                        |  3 +++
 lib/CalDAV/Backend/PDO.php          | 14 +-------------
 lib/CardDAV/Backend/PDO.php         | 10 +---------
 lib/DAV/Auth/Backend/PDO.php        |  6 +-----
 lib/DAV/Locks/Backend/PDO.php       |  6 +-----
 lib/DAVACL/PrincipalBackend/PDO.php |  8 +-------
 6 files changed, 8 insertions(+), 39 deletions(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index e808b70..d1c4d3b 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -4,6 +4,9 @@ ChangeLog
 2.2.0-alpha1 (????-??-??)
 -------------------------
 
+* Removed: all `$tableName` arguments from every PDO backend. This was already
+  deprecated, but has now been fully removed. All of these have been replaced
+  with public properties.
 
 2.1.0-alpha2 (2014-10-23)
 -------------------------
diff --git a/lib/CalDAV/Backend/PDO.php b/lib/CalDAV/Backend/PDO.php
index 001d1b2..548ad5e 100644
--- a/lib/CalDAV/Backend/PDO.php
+++ b/lib/CalDAV/Backend/PDO.php
@@ -107,22 +107,10 @@ class PDO extends AbstractBackend implements SyncSupport, SubscriptionSupport, S
      * Creates the backend
      *
      * @param \PDO $pdo
-     * @param string $calendarTableName
-     * @param string $calendarObjectTableName
-     * @param string $calendarChangesTable
-     * @param string $schedulingObjectTable
-     * @param string $calendarSubscriptionsTableName
-     * @deprecated We are going to remove all the 'tableName' arguments and
-     *             move to public properties for those. Stop relying on them!
      */
-    function __construct(\PDO $pdo, $calendarTableName = 'calendars', $calendarObjectTableName = 'calendarobjects', $calendarChangesTableName = 'calendarchanges', $calendarSubscriptionsTableName = "calendarsubscriptions", $schedulingObjectTableName = "schedulingobjects") {
+    function __construct(\PDO $pdo) {
 
         $this->pdo = $pdo;
-        $this->calendarTableName = $calendarTableName;
-        $this->calendarObjectTableName = $calendarObjectTableName;
-        $this->calendarChangesTableName = $calendarChangesTableName;
-        $this->schedulingObjectTableName = $schedulingObjectTableName;
-        $this->calendarSubscriptionsTableName = $calendarSubscriptionsTableName;
 
     }
 
diff --git a/lib/CardDAV/Backend/PDO.php b/lib/CardDAV/Backend/PDO.php
index 13fdfeb..d43abf5 100644
--- a/lib/CardDAV/Backend/PDO.php
+++ b/lib/CardDAV/Backend/PDO.php
@@ -44,18 +44,10 @@ class PDO extends AbstractBackend implements SyncSupport {
      * Sets up the object
      *
      * @param \PDO $pdo
-     * @param string $addressBooksTableName
-     * @param string $cardsTableName
-     * @deprecated We are going to remove all the tableName arguments in a
-     *             future version, and rely on the public properties instead.
-     *             Stop relying on them!
      */
-    function __construct(\PDO $pdo, $addressBooksTableName = 'addressbooks', $cardsTableName = 'cards', $addressBookChangesTableName = 'addressbookchanges') {
+    function __construct(\PDO $pdo) {
 
         $this->pdo = $pdo;
-        $this->addressBooksTableName = $addressBooksTableName;
-        $this->cardsTableName = $cardsTableName;
-        $this->addressBookChangesTableName = $addressBookChangesTableName;
 
     }
 
diff --git a/lib/DAV/Auth/Backend/PDO.php b/lib/DAV/Auth/Backend/PDO.php
index f7183d5..7f11035 100644
--- a/lib/DAV/Auth/Backend/PDO.php
+++ b/lib/DAV/Auth/Backend/PDO.php
@@ -32,14 +32,10 @@ class PDO extends AbstractDigest {
      * If the filename argument is passed in, it will parse out the specified file fist.
      *
      * @param PDO $pdo
-     * @param string $tableName The PDO table name to use
-     * @deprecated The tableName argument will be removed from a future version
-     *             of sabredav. Use the public property instead.
      */
-    function __construct(\PDO $pdo, $tableName = 'users') {
+    function __construct(\PDO $pdo) {
 
         $this->pdo = $pdo;
-        $this->tableName = $tableName;
 
     }
 
diff --git a/lib/DAV/Locks/Backend/PDO.php b/lib/DAV/Locks/Backend/PDO.php
index bb6828e..22cd887 100644
--- a/lib/DAV/Locks/Backend/PDO.php
+++ b/lib/DAV/Locks/Backend/PDO.php
@@ -34,14 +34,10 @@ class PDO extends AbstractBackend {
      * Constructor
      *
      * @param PDO $pdo
-     * @param string $tableName
-     * @deprecated We are removing the tableName property in a future version
-     *             of sabredav. Use the public property instead.
      */
-    function __construct(\PDO $pdo, $tableName = 'locks') {
+    function __construct(\PDO $pdo) {
 
         $this->pdo = $pdo;
-        $this->tableName = $tableName;
 
     }
 
diff --git a/lib/DAVACL/PrincipalBackend/PDO.php b/lib/DAVACL/PrincipalBackend/PDO.php
index 7456835..4e7db96 100644
--- a/lib/DAVACL/PrincipalBackend/PDO.php
+++ b/lib/DAVACL/PrincipalBackend/PDO.php
@@ -78,16 +78,10 @@ class PDO extends AbstractBackend {
      * Sets up the backend.
      *
      * @param PDO $pdo
-     * @param string $tableName
-     * @param string $groupMembersTableName
-     * @deprecated We are removing the tableName arguments in a future version
-     *             of sabredav. Use the public properties instead.
      */
-    function __construct(\PDO $pdo, $tableName = 'principals', $groupMembersTableName = 'groupmembers') {
+    function __construct(\PDO $pdo) {
 
         $this->pdo = $pdo;
-        $this->tableName = $tableName;
-        $this->groupMembersTableName = $groupMembersTableName;
 
     }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/php-sabredav.git