[Pkg-owncloud-commits] [php-sabredav] 05/64: Removed deprecated Client methods.

[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 633d572c2b554ea12a7ababacf96e5077abd9a3d
Author: Evert Pot <me at evertpot.com>
Date:   Thu Oct 23 22:54:59 2014 -0400

    Removed deprecated Client methods.
---
 ChangeLog.md                   |  2 ++
 lib/DAV/Client.php             | 28 ----------------------------
 tests/Sabre/DAV/ClientTest.php | 22 ----------------------
 3 files changed, 2 insertions(+), 50 deletions(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index 05b6931..75b6035 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -14,6 +14,8 @@ ChangeLog
   * `Sabre\DAV\Locks\Backend\FS`
   * `Sabre\DAV\PartialUpdate\IFile`
   * `Sabre\DAV\URLUtil`
+* Removed: `Sabre\DAV\Client::addTrustedCertificates` and
+  `Sabre\DAV\Client::setVerifyPeer`.
 
 2.1.0-alpha2 (2014-10-23)
 -------------------------
diff --git a/lib/DAV/Client.php b/lib/DAV/Client.php
index d4af1d1..5c1b17d 100644
--- a/lib/DAV/Client.php
+++ b/lib/DAV/Client.php
@@ -148,34 +148,6 @@ class Client extends HTTP\Client {
 
     }
 
-
-    /**
-     * Add trusted root certificates to the webdav client.
-     *
-     * The parameter certificates should be a absolute path to a file
-     * which contains all trusted certificates
-     *
-     * @deprecated This method will be removed in the future, use
-     *             addCurlSetting instead.
-     * @param string $certificates
-     * @return void
-     */
-    function addTrustedCertificates($certificates) {
-        $this->addCurlSetting(CURLOPT_CAINFO, $certificates);
-    }
-
-    /**
-     * Enables/disables SSL peer verification
-     *
-     * @deprecated This method will be removed in the future, use
-     *             addCurlSetting instead.
-     * @param bool $value
-     * @return void
-     */
-    function setVerifyPeer($value) {
-        $this->addCurlSetting(CURLOPT_SSL_VERIFYPEER, $value);
-    }
-
     /**
      * Does a PROPFIND request
      *
diff --git a/tests/Sabre/DAV/ClientTest.php b/tests/Sabre/DAV/ClientTest.php
index 6ca88b3..8e19c3f 100644
--- a/tests/Sabre/DAV/ClientTest.php
+++ b/tests/Sabre/DAV/ClientTest.php
@@ -91,28 +91,6 @@ class ClientTest extends \PHPUnit_Framework_TestCase {
 
     }
 
-
-    function testCAInfo() {
-
-        $client = new ClientMock([
-            'baseUri' => '/',
-        ]);
-        $client->addTrustedCertificates('foo.txt');
-        $this->assertEquals("foo.txt", $client->curlSettings[CURLOPT_CAINFO]);
-
-    }
-
-
-    function testSetVerifyPeer() {
-
-        $client = new ClientMock([
-            'baseUri' => '/',
-        ]);
-        $client->setVerifyPeer(false);
-        $this->assertEquals(false, $client->curlSettings[CURLOPT_SSL_VERIFYPEER]);
-
-    }
-
     function testPropFind() {
 
         $client = new ClientMock([

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