v4.2.0

(cherry picked from commit b6eac285fe)
2019-02-20 07:35:47 +01:00
5 changed files with 20 additions and 111 deletions
--- a/.gitignore
+++ b/.gitignore
@ -4,3 +4,4 @@ clog
 /php-sabre-vobject4-4.1.4-6484b9d.tar.gz
 /php-sabre-vobject4-4.1.5-0928660.tar.gz
 /php-sabre-vobject4-4.1.6-122cacb.tar.gz
+/php-sabre-vobject4-4.2.0-bd50001.tar.gz
--- a/c533d42e17e058237f0350ca56c7f01903bb035e.patch
+++ b/c533d42e17e058237f0350ca56c7f01903bb035e.patch
@ -1,90 +0,0 @@
-From c533d42e17e058237f0350ca56c7f01903bb035e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Thomas=20M=C3=BCller?=
- <DeepDiver1975@users.noreply.github.com>
-Date: Tue, 25 Sep 2018 20:42:40 +0200
-Subject: [PATCH] Test with php 7.3 on travis (#424)
-
---
- .travis.yml                                     | 13 ++++++++++++-
- lib/Component/VCard.php                         |  2 +-
- lib/FreeBusyGenerator.php                       |  2 +-
- tests/VObject/BirthdayCalendarGeneratorTest.php |  4 ++--
- 4 files changed, 16 insertions(+), 5 deletions(-)
-
-diff --git a/.travis.yml b/.travis.yml
-index 531ad5be..1637f2e2 100644
--- a/.travis.yml
-+++ b/.travis.yml
-@@ -1,12 +1,19 @@
- language: php
-+sudo: required
-+dist: xenial
- php:
-   - 5.5
-   - 5.6
-   - 7.0
-   - 7.1
-   - 7.2
-+  - 7.3snapshot
- 
-sudo: false
-+addons:
-+  apt:
-+    packages:
-+      # required for php7.3
-+      - libzip4
- 
- script:
-   - ./bin/phpunit --configuration tests/phpunit.xml
-@@ -18,3 +25,7 @@ before_script:
- cache:
-   directories:
-     - $HOME/.composer/cache
-+
-+matrix:
-+  allow_failures:
-+    - php: 5.5
-diff --git a/lib/Component/VCard.php b/lib/Component/VCard.php
-index bca623d5..2a2851f4 100644
--- a/lib/Component/VCard.php
-+++ b/lib/Component/VCard.php
-@@ -511,7 +511,7 @@ function xmlSerialize(Xml\Writer $writer) {
-                 switch ($property->name) {
- 
-                     case 'VERSION':
-                        continue;
-+                        break;
- 
-                     case 'XML':
-                         $value = $property->getParts();
-diff --git a/lib/FreeBusyGenerator.php b/lib/FreeBusyGenerator.php
-index e30b136c..ca77cb91 100644
--- a/lib/FreeBusyGenerator.php
-+++ b/lib/FreeBusyGenerator.php
-@@ -430,7 +430,7 @@ protected function calculateBusy(FreeBusyData $fbData, array $objects) {
-                                 // instance. We are skipping this event from the output
-                                 // entirely.
-                                 unset($this->objects[$key]);
-                                continue;
-+                                break;
-                             }
- 
-                             if ($this->start) {
-diff --git a/tests/VObject/BirthdayCalendarGeneratorTest.php b/tests/VObject/BirthdayCalendarGeneratorTest.php
-index 6d729b65..812641fc 100644
--- a/tests/VObject/BirthdayCalendarGeneratorTest.php
-+++ b/tests/VObject/BirthdayCalendarGeneratorTest.php
-@@ -475,11 +475,11 @@ function testVcardStringWithEmptyBirthdayProperty() {
-     function testParseException() {
- 
-         $generator = new BirthdayCalendarGenerator();
-        $input = <<<FOO
-+        $input = <<<EOT
- BEGIN:FOO
- FOO:Bar
- END:FOO
-FOO;
-+EOT;
- 
-         $generator->setObjects($input);
- 
--- a/php-sabre-vobject4-bin.patch
+++ b/php-sabre-vobject4-bin.patch
@ -1,6 +1,6 @@
 diff -up ./bin/generate_vcards.rpm ./bin/generate_vcards
--- ./bin/generate_vcards.rpm	2017-01-17 14:09:13.368837753 +0100
-+++ ./bin/generate_vcards	2017-01-17 14:12:49.417890498 +0100
+--- ./bin/generate_vcards.rpm	2019-02-19 14:05:37.000000000 +0100
+++ ./bin/generate_vcards	2019-02-20 07:21:38.282053251 +0100
@@ -6,8 +6,7 @@ namespace Sabre\VObject;
 // This sucks.. we have to try to find the composer autoloader. But chances
 // are, we can't find it this way. So we'll do our bestest
@ -21,8 +21,8 @@ diff -up ./bin/generate_vcards.rpm ./bin/generate_vcards
 }
 
 diff -up ./bin/vobject.rpm ./bin/vobject
--- ./bin/vobject.rpm	2017-01-17 14:12:09.586696412 +0100
-+++ ./bin/vobject	2017-01-17 14:12:40.301846078 +0100
+--- ./bin/vobject.rpm	2019-02-19 14:05:37.000000000 +0100
+++ ./bin/vobject	2019-02-20 07:21:38.282053251 +0100
@@ -6,8 +6,7 @@ namespace Sabre\VObject;
 // This sucks.. we have to try to find the composer autoloader. But chances
 // are, we can't find it this way. So we'll do our bestest
@ -43,14 +43,14 @@ diff -up ./bin/vobject.rpm ./bin/vobject
 }
 
 diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php
--- ./tests/bootstrap.php.rpm	2016-12-06 05:14:09.000000000 +0100
-+++ ./tests/bootstrap.php	2017-01-17 14:14:50.960482740 +0100
+--- ./tests/bootstrap.php.rpm	2019-02-20 07:21:38.282053251 +0100
+++ ./tests/bootstrap.php	2019-02-20 07:22:58.069649015 +0100
@@ -3,8 +3,7 @@
 date_default_timezone_set('UTC');
 
 $try = [
-    __DIR__ . '/../vendor/autoload.php',
-    __DIR__ . '/../../../autoload.php',
+-    __DIR__.'/../vendor/autoload.php',
+-    __DIR__.'/../../../autoload.php',
 +    '@BUILDROOT@/usr/share/php/Sabre/VObject4/autoload.php',  // RPM installation
 ];
 
@ -59,8 +59,8 @@ diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php
     }
 }
 
-$autoLoader->addPsr4('Sabre\\VObject\\', __DIR__ . '/VObject');
+-$autoLoader->addPsr4('Sabre\\VObject\\', __DIR__.'/VObject');
 +\Fedora\Autoloader\Autoload::addPsr4('Sabre\\VObject\\', __DIR__ . '/VObject');
 
 if (!defined('SABRE_TEMPDIR')) {
-   define('SABRE_TEMPDIR', __DIR__ . '/temp/');
+     define('SABRE_TEMPDIR', __DIR__.'/temp/');
--- a/php-sabre-vobject4.spec
+++ b/php-sabre-vobject4.spec
@ -1,6 +1,6 @@
 # remirepo/fedora spec file for php-sabre-vobject4
 #
-# Copyright (c) 2013-2018 Remi Collet
+# Copyright (c) 2013-2019 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs

-%global gh_commit    122cacbdea2c6133ac04db86ec05854beef75adf
+%global gh_commit    bd500019764e434ff65872d426f523e7882a0739
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     sabre-io
 %global gh_project   vobject
@ -24,8 +24,8 @@

 Name:           php-sabre-vobject4
 Summary:        Library to parse and manipulate iCalendar and vCard objects
-Version:        4.1.6
-Release:        3%{?dist}
+Version:        4.2.0
+Release:        1%{?dist}

 URL:            http://sabre.io/vobject/
 License:        BSD
@ -34,8 +34,6 @@ Source1:        %{name}-autoload.php

 # replace composer autloader
 Patch0:         %{name}-bin.patch
-# Upstream patch
-Patch1:         https://github.com/remicollet/vobject/commit/c533d42e17e058237f0350ca56c7f01903bb035e.patch

 BuildArch:      noarch
 %if %{with_tests}
@ -53,9 +51,7 @@ BuildRequires:  php-pcre
 BuildRequires:  php-spl
 BuildRequires:  php-xml
 # From composer.json, "require-dev"
-#        "phpunit/phpunit" : "> 4.8.35, <6.0.0",
-#        "squizlabs/php_codesniffer": "*"
-#        "sabre/cs"        : "^1.0.0"
+#        "phpunit/phpunit" : "> 4.8.35, <6.0.0"
 BuildRequires:  php-composer(phpunit/phpunit) > 4.8.35
 # Autoloader
 BuildRequires:  php-composer(fedora/autoloader)
@ -103,7 +99,6 @@ Autoloader: %{_datadir}/php/Sabre/VObject4/autoload.php
 %setup -q -n %{gh_project}-%{gh_commit}

 %patch0 -p1 -b .rpm
-%patch1 -p1

 cp %{SOURCE1} lib/autoload.php

@ -157,6 +152,9 @@ exit $ret
 %endif

 %changelog
+* Wed Feb 20 2019 Remi Collet <remi@remirepo.net> - 4.2.0-1
+- update to 4.2.0
+
 * Mon Oct 15 2018 Remi Collet <remi@remirepo.net> - 4.1.6-3
 - add upstream patch for PHP 7.3

--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (php-sabre-vobject4-4.1.6-122cacb.tar.gz) = 6f3233bdf7c079949e6003df68f0ca0b1a946374e3bc676370eecc853e7cca51924b286ebf04facfd0793a2de6b3ede2e82f40de2fce9d38979a2769e0089218
+SHA512 (php-sabre-vobject4-4.2.0-bd50001.tar.gz) = 5045330bf3b77812e4f3bd4492be615cc48c12f650554cc10385c3a490746deb797560f3b4208400865229d6f9380cf106a302ba9f3fd7c59ca0cb51ccdd2644