From 84345eca4961be9c248c26b0ba7e88a801220ae7 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Aug 28 2020 09:30:13 +0000 Subject: no more used, see php-sabre-dav --- diff --git a/.gitignore b/.gitignore deleted file mode 100644 index ef711d3..0000000 --- a/.gitignore +++ /dev/null @@ -1,13 +0,0 @@ -clog -/sabre-dav-1.8.7.tar.gz -/sabre-dav-1.8.8.tar.gz -/sabre-dav-1.8.9.tar.gz -/sabre-dav-1.8.10.tar.gz -/sabre-dav-1.8.12.tar.gz -/sabre-dav-2.1.5-cab5ab4.tar.gz -/sabre-dav-2.1.6-cab5ab4.tar.gz -/sabre-dav-2.1.10-9f8c193.tar.gz -/sabre-dav-3.0.9-b425939.tar.gz -/sabre-dav-3.2.2-e987775.tar.gz -/php-sabre-dav-3.2.2-e987775.tar.gz -/php-sabre-dav-3.2.3-a9780ce.tar.gz diff --git a/1006.patch b/1006.patch deleted file mode 100644 index b20ebb0..0000000 --- a/1006.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 89914212677c23e680a9de57b56801062aed0f3f Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Fri, 6 Oct 2017 15:51:42 +0200 -Subject: [PATCH] fix "count(): Parameter must be an array or an object that - implements Countable" (7.2) - ---- - lib/DAVACL/Plugin.php | 2 +- - tests/Sabre/CalDAV/ICSExportPluginTest.php | 12 ++++++------ - 2 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/lib/DAVACL/Plugin.php b/lib/DAVACL/Plugin.php -index a2aa118d70..a5c8ac5c20 100644 ---- a/lib/DAVACL/Plugin.php -+++ b/lib/DAVACL/Plugin.php -@@ -1400,7 +1400,7 @@ protected function expandProperties($path, array $requestedProperties, $depth) { - foreach ($requestedProperties as $propertyName => $childRequestedProperties) { - - // We're only traversing if sub-properties were requested -- if (count($childRequestedProperties) === 0) continue; -+ if (!is_array($childRequestedProperties) || count($childRequestedProperties) === 0) continue; - - // We only have to do the expansion if the property was found - // and it contains an href element. -diff --git a/tests/Sabre/CalDAV/ICSExportPluginTest.php b/tests/Sabre/CalDAV/ICSExportPluginTest.php -index 75412577e9..1df0dfac58 100644 ---- a/tests/Sabre/CalDAV/ICSExportPluginTest.php -+++ b/tests/Sabre/CalDAV/ICSExportPluginTest.php -@@ -212,8 +212,8 @@ function testFilterStartEnd() { - - $obj = VObject\Reader::read($response->getBody()); - -- $this->assertEquals(0, count($obj->VTIMEZONE)); -- $this->assertEquals(0, count($obj->VEVENT)); -+ $this->assertNull($obj->VTIMEZONE); -+ $this->assertNull($obj->VEVENT); - - } - -@@ -237,7 +237,7 @@ function testExpand() { - - $obj = VObject\Reader::read($response->getBody()); - -- $this->assertEquals(0, count($obj->VTIMEZONE)); -+ $this->assertNull($obj->VTIMEZONE); - $this->assertEquals(1, count($obj->VEVENT)); - - } -@@ -292,7 +292,7 @@ function testFilterComponentVEVENT() { - $obj = VObject\Reader::read($response->body); - $this->assertEquals(1, count($obj->VTIMEZONE)); - $this->assertEquals(1, count($obj->VEVENT)); -- $this->assertEquals(0, count($obj->VTODO)); -+ $this->assertNull($obj->VTODO); - - } - -@@ -307,8 +307,8 @@ function testFilterComponentVTODO() { - - $obj = VObject\Reader::read($response->body); - -- $this->assertEquals(0, count($obj->VTIMEZONE)); -- $this->assertEquals(0, count($obj->VEVENT)); -+ $this->assertNull($obj->VTIMEZONE); -+ $this->assertNull($obj->VEVENT); - $this->assertEquals(1, count($obj->VTODO)); - - } diff --git a/5eb5d74514230b11c80b67c7e147242757ccc660.patch b/5eb5d74514230b11c80b67c7e147242757ccc660.patch deleted file mode 100644 index d7c31f8..0000000 --- a/5eb5d74514230b11c80b67c7e147242757ccc660.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 5eb5d74514230b11c80b67c7e147242757ccc660 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Thomas=20M=C3=BCller?= -Date: Wed, 26 Sep 2018 10:05:14 +0200 -Subject: [PATCH] Fix for php7.3 + adjusting PHPDoc - ---- - lib/CalDAV/ICSExportPlugin.php | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/lib/CalDAV/ICSExportPlugin.php b/lib/CalDAV/ICSExportPlugin.php -index eafb583620..6f84746cae 100644 ---- a/lib/CalDAV/ICSExportPlugin.php -+++ b/lib/CalDAV/ICSExportPlugin.php -@@ -76,6 +76,9 @@ function initialize(DAV\Server $server) { - * - * @param RequestInterface $request - * @param ResponseInterface $response -+ * @throws BadRequest -+ * @throws DAV\Exception\NotFound -+ * @throws VObject\InvalidDataException - * @return bool - */ - function httpGet(RequestInterface $request, ResponseInterface $response) { -@@ -166,6 +169,8 @@ function httpGet(RequestInterface $request, ResponseInterface $response) { - * @param string $format - * @param array $properties - * @param ResponseInterface $response -+ * @throws DAV\Exception\NotFound -+ * @throws VObject\InvalidDataException - */ - protected function generateResponse($path, $start, $end, $expand, $componentType, $format, $properties, ResponseInterface $response) { - -@@ -318,7 +323,9 @@ function mergeObjects(array $properties, array $inputObjects) { - // VTIMEZONE is special, because we need to filter out the duplicates - case 'VTIMEZONE' : - // Naively just checking tzid. -- if (in_array((string)$child->TZID, $collectedTimezones)) continue; -+ if (in_array((string)$child->TZID, $collectedTimezones)) { -+ break; -+ } - - $timezones[] = clone $child; - $collectedTimezones[] = $child->TZID; diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..a4067fc --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +no more used, see php-sabre-dav diff --git a/php-sabre-dav-autoload.patch b/php-sabre-dav-autoload.patch deleted file mode 100644 index 4e7c252..0000000 --- a/php-sabre-dav-autoload.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php ---- ./tests/bootstrap.php.rpm 2017-01-17 14:58:57.986380935 +0100 -+++ ./tests/bootstrap.php 2017-01-17 15:00:56.261957259 +0100 -@@ -1,22 +1,21 @@ - add('Sabre\\', __DIR__); -+\Fedora\Autoloader\Autoload::addPsr0('Sabre\\', __DIR__); - // VObject tests auto loading --$autoLoader->addPsr4('Sabre\\VObject\\', __DIR__ . '/../vendor/sabre/vobject/tests/VObject'); --$autoLoader->addPsr4('Sabre\\Xml\\', __DIR__ . '/../vendor/sabre/xml/tests/Sabre/Xml'); -+//$autoLoader->addPsr4('Sabre\\VObject\\', __DIR__ . '/../vendor/sabre/vobject/tests/VObject'); -+//$autoLoader->addPsr4('Sabre\\Xml\\', __DIR__ . '/../vendor/sabre/xml/tests/Sabre/Xml'); - - date_default_timezone_set('UTC'); - - $config = [ - 'SABRE_TEMPDIR' => dirname(__FILE__) . '/temp/', - 'SABRE_HASSQLITE' => in_array('sqlite', PDO::getAvailableDrivers()), -- 'SABRE_HASMYSQL' => in_array('mysql', PDO::getAvailableDrivers()), -- 'SABRE_HASPGSQL' => in_array('pgsql', PDO::getAvailableDrivers()), -+ 'SABRE_HASMYSQL' => false, -+ 'SABRE_HASPGSQL' => false, - 'SABRE_MYSQLDSN' => 'mysql:host=127.0.0.1;dbname=sabredav_test', - 'SABRE_MYSQLUSER' => 'sabredav', - 'SABRE_MYSQLPASS' => '', diff --git a/php-sabre-dav-autoload.php b/php-sabre-dav-autoload.php deleted file mode 100644 index 3336b5c..0000000 --- a/php-sabre-dav-autoload.php +++ /dev/null @@ -1,19 +0,0 @@ -hrefs[0]; -+ return (isset($this->hrefs[0]) ? $this->hrefs[0] : null); - - } - diff --git a/php-sabre-dav.spec b/php-sabre-dav.spec deleted file mode 100644 index d8247d5..0000000 --- a/php-sabre-dav.spec +++ /dev/null @@ -1,311 +0,0 @@ -# remirepo/fedora spec file for php-sabre-dav -# -# Copyright (c) 2013-2019 Remi Collet -# License: CC-BY-SA -# http://creativecommons.org/licenses/by-sa/4.0/ -# -# Please, preserve the changelog entries -# -%global gh_commit a9780ce4f35560ecbd0af524ad32d9d2c8954b80 -%global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_owner sabre-io -%global gh_project dav -%if 0%{?rhel} == 5 -%global with_tests 0%{?_with_tests:1} -%else -%global with_tests 0%{!?_without_tests:1} -%endif - -Name: php-sabre-%{gh_project} -Summary: WebDAV Framework for PHP -Version: 3.2.3 -Release: 8%{?dist} - -URL: https://github.com/%{gh_owner}/%{gh_project} -License: BSD -Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz -Source1: %{name}-autoload.php - -# replace composer autoloader -Patch0: %{name}-autoload.patch -# For PHP 7.2 -Patch1: https://patch-diff.githubusercontent.com/raw/fruux/sabre-dav/pull/1006.patch -# For PHP 7.3 -Patch2: https://github.com/sabre-io/dav/commit/5eb5d74514230b11c80b67c7e147242757ccc660.patch -# For PHP 7.4 -Patch3: %{name}-php74.patch - -BuildArch: noarch -%if %{with_tests} -BuildRequires: php(language) >= 5.5 -BuildRequires: (php-composer(sabre/vobject) >= 4.1.0 with php-composer(sabre/vobject) < 5) -BuildRequires: (php-composer(sabre/event) >= 2.0 with php-composer(sabre/event) < 3) -BuildRequires: (php-composer(sabre/xml) >= 1.4.0 with php-composer(sabre/xml) < 2) -BuildRequires: (php-composer(sabre/http) >= 4.2.1 with php-composer(sabre/http) < 5) -BuildRequires: (php-composer(sabre/uri) >= 1.0.1 with php-composer(sabre/uri) < 2) -BuildRequires: (php-composer(psr/log) >= 1.0.1 with php-composer(psr/log) < 2) -BuildRequires: (php-composer(psr/log) >= 1.0.1 with php-composer(psr/log) < 2) -BuildRequires: (php-composer(phpunit/phpunit) >= 4.8 with php-composer(phpunit/phpunit) < 6) -BuildRequires: (php-composer(monolog/monolog) >= 1.18 with php-composer(monolog/monolog) < 2) -BuildRequires: php-dom -BuildRequires: php-pcre -BuildRequires: php-spl -BuildRequires: php-simplexml -BuildRequires: php-mbstring -BuildRequires: php-ctype -BuildRequires: php-date -BuildRequires: php-iconv -BuildRequires: php-libxml -BuildRequires: php-curl -BuildRequires: php-pdo -# From composer.json, "require-dev" : { -# "phpunit/phpunit" : "> 4.8, <6.0.0", -# "evert/phpdoc-md" : "~0.1.0", -# "squizlabs/php_codesniffer": "~1.5.3" -# "sabre/cs" : "^1.0.0", -# "monolog/monolog": "^1.18" - -# Autoloader -BuildRequires: php-composer(fedora/autoloader) -BuildRequires: php-pdo_sqlite -%endif - -# From composer.json, "require": { -# "php": ">=5.5.0", -# "sabre/vobject": "^4.1.0", -# "sabre/event" : ">=2.0.0, <4.0.0", -# "sabre/xml" : "^1.4.0", -# "sabre/http" : "^4.2.1", -# "sabre/uri" : "^1.0.1", -# "ext-dom": "*", -# "ext-pcre": "*", -# "ext-spl": "*", -# "ext-simplexml": "*", -# "ext-mbstring" : "*", -# "ext-ctype" : "*", -# "ext-date" : "*", -# "ext-iconv" : "*", -# "lib-libxml" : ">=2.7.0", -# "psr/log": "^1.0" -Requires: php(language) >= 5.5 -Requires: (php-composer(sabre/vobject) >= 4.1.0 with php-composer(sabre/vobject) < 5) -Requires: (php-composer(sabre/event) >= 2.0 with php-composer(sabre/event) < 3) -Requires: (php-composer(sabre/xml) >= 1.4.0 with php-composer(sabre/xml) < 2) -Requires: (php-composer(sabre/http) >= 4.2.1 with php-composer(sabre/http) < 5) -Requires: (php-composer(sabre/uri) >= 1.0.1 with php-composer(sabre/uri) < 2) -Requires: (php-composer(psr/log) >= 1.0.1 with php-composer(psr/log) < 2) -Requires: php-dom -Requires: php-pcre -Requires: php-spl -Requires: php-simplexml -Requires: php-mbstring -Requires: php-ctype -Requires: php-date -Requires: php-iconv -Requires: php-libxml -# From composer.json, "suggest" : { -# "ext-curl" : "*", -# "ext-pdo" : "*" -Requires: php-curl -Requires: php-pdo -# Autoloader -Requires: php-composer(fedora/autoloader) - -Provides: php-composer(sabre/dav) = %{version} - - -%description -What is SabreDAV - -SabreDAV allows you to easily add WebDAV support to a PHP application. -SabreDAV is meant to cover the entire standard, and attempts to allow -integration using an easy to understand API. - -Feature list: -* Fully WebDAV compliant -* Supports Windows XP, Windows Vista, Mac OS/X, DavFSv2, Cadaver, Netdrive, - Open Office, and probably more. -* Passing all Litmus tests. -* Supporting class 1, 2 and 3 Webdav servers. -* Locking support. -* Custom property support. -* CalDAV (tested with Evolution, iCal, iPhone and Lightning). -* CardDAV (tested with OS/X addressbook, the iOS addressbook and Evolution). -* Over 97% unittest code coverage. - -Autoloader: %{_datadir}/php/Sabre/DAV/autoload.php - - -%prep -%setup -q -n %{gh_project}-%{gh_commit} - -%patch0 -p1 -b .rpm -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 - -cp %{SOURCE1} lib/DAV/autoload.php - -# drop executable as only provided as doc -chmod -x bin/* - - -%build -# nothing to build - - -%install -# Install as a PSR-0 library -mkdir -p %{buildroot}%{_datadir}/php -cp -pr lib %{buildroot}%{_datadir}/php/Sabre - - -%check -%if %{with_tests} -%if 0%{?rhel} == 5 -sed -e 's/testMove/SKIP_testMove/' \ - -i tests/Sabre/DAV/PropertyStorage/Backend/AbstractPDOTest.php -%endif - -: Fix bootstrap -cd tests -sed -e 's:@BUILDROOT@:%{buildroot}:' -i bootstrap.php - -: Run upstream test suite against installed library -ret=0 -for cmd in php php71 php72 php73 php74; do - if which $cmd; then - $cmd %{_bindir}/phpunit \ - --filter '^((?!(testRequireAuth)).)*$' \ - || ret=1 - fi -done -exit $ret -%else -: Skip upstream test suite -%endif - - -%files -%license LICENSE -%doc *md -%doc composer.json -%doc examples bin -%{_datadir}/php/Sabre/DAV -%{_datadir}/php/Sabre/DAVACL -%{_datadir}/php/Sabre/CalDAV -%{_datadir}/php/Sabre/CardDAV - - -%changelog -* Sat Aug 01 2020 Fedora Release Engineering - 3.2.3-8 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 3.2.3-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Thu Jan 30 2020 Fedora Release Engineering - 3.2.3-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Oct 11 2019 Remi Collet - 3.2.3-5 -- add patch for PHP 7.4 backported from v4 - -* Fri Jul 26 2019 Fedora Release Engineering - 3.2.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Mon Jul 1 2019 Remi Collet - 3.2.3-3 -- change autoloader order to ensure same versions are used - -* Sat Feb 02 2019 Fedora Release Engineering - 3.2.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Wed Jan 9 2019 Remi Collet - 3.2.3-1 -- update to 3.2.3 - -* Mon Oct 15 2018 Remi Collet - 3.2.2-7 -- add upstream patch for PHP 7.3 - -* Fri Jul 13 2018 Fedora Release Engineering - 3.2.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Jun 5 2018 Remi Collet - 3.2.2-5 -- use range dependencies on F27+ -- ignore 1 test failing with sabre/http 4.2.4 -- fix project URL - -* Fri Feb 09 2018 Fedora Release Engineering - 3.2.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Fri Oct 6 2017 Remi Collet - 3.2.2-3 -- add patch for PHP 7.2 from https://github.com/fruux/sabre-dav/pull/1006 - -* Thu Jul 27 2017 Fedora Release Engineering - 3.2.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Wed Feb 15 2017 Remi Collet - 3.2.2-1 -- update to 3.2.2 -- raise dependency on PHP version 5.5 -- raise dependency on sabre/vobject version 4.1 -- raise dependency on sabre/xml version 1.4 -- raise dependency on sabre/http version 4.2.1 -- raise dependency on sabre/uri version 1.0.1 -- add dependency on psr/log - -* Sat Feb 11 2017 Fedora Release Engineering - 3.0.9-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Nov 23 2016 Remi Collet - 3.0.9-3 -- add upstream patch to fix FTBFS with php 7.1 - -* Sat Oct 29 2016 Remi Collet - 3.0.9-2 -- switch from symfony/class-loader to fedora/autoloader - -* Thu Apr 7 2016 Remi Collet - 3.0.9-1 -- update to 3.0.9 - -* Wed Mar 23 2016 Remi Collet - 3.0.8-1 -- update to 3.0.8 - -* Mon Mar 21 2016 Remi Collet - 3.0.7-2 -- provide missing php-composer(sabre/dav) - -* Fri Mar 11 2016 Remi Collet - 3.0.7-1 -- update to 3.0.7 -- add dependency on sabre/xml -- add dependency on sabre/uri -- raise dependency on sabre/http >= 4 -- run test suite with both PHP 5 and 7 when available - -* Wed Feb 24 2016 James Hogarth - 2.1.6-1 -- update to 2.1.6 - -* Wed Feb 24 2016 Remi Collet - 2.1.5-1 -- update to 2.1.5 - -* Thu Feb 04 2016 Fedora Release Engineering - 1.8.12-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Thu Jun 18 2015 Fedora Release Engineering - 1.8.12-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Fri Mar 06 2015 Adam Williamson - 1.8.12-1 -- update to 1.8.12 (bugfix release, no bc breaks) - -* Sat Jun 07 2014 Fedora Release Engineering - 1.8.10-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu May 22 2014 Remi Collet - 1.8.10-1 -- update to 1.8.10 - -* Sun Mar 2 2014 Remi Collet - 1.8.9-1 -- update to 1.8.9 - -* Thu Feb 20 2014 Remi Collet - 1.8.8-2 -- drop max version for VObject - -* Tue Feb 11 2014 Remi Collet - 1.8.8-1 -- update to 1.8.8 - -* Tue Dec 31 2013 Remi Collet - 1.8.7-1 -- Initial packaging diff --git a/sources b/sources deleted file mode 100644 index bcdb78f..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (php-sabre-dav-3.2.3-a9780ce.tar.gz) = 842056d243147da2a359b5bd86d32a484888aa0f54d6b55b45e8ac03a4f417bb2e2c13854557a2d91afe039b4fb43d42a7c55be6cd91741be10758a0dee90f55