[Pkg-owncloud-commits] [php-sabre-vobject] 28/341: Merge branch '3.3'

[David Prévot]

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

taffit pushed a commit to branch master
in repository php-sabre-vobject.

commit c69e0603f17bdbfcbfa9412d9a83fd32d68a9d6c
Merge: 98b0d5f c5a7b9f
Author: Evert Pot <me at evertpot.com>
Date:   Thu Nov 13 12:56:16 2014 -0500

    Merge branch '3.3'
    
    Conflicts:
    	ChangeLog.md
    	lib/VCardConverter.php

 ChangeLog.md                         |  13 ++-
 lib/Component.php                    |  10 +-
 lib/StringUtil.php                   |   9 +-
 lib/VCardConverter.php               | 137 +++++++++++++++---------
 lib/Version.php                      |   2 +-
 tests/VObject/TestCase.php           |  50 +++++++++
 tests/VObject/VCardConverterTest.php | 199 ++++++++++++++++++++++++-----------
 7 files changed, 296 insertions(+), 124 deletions(-)

diff --cc ChangeLog.md
index 2120740,9574629..401e1af
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@@ -1,18 -1,18 +1,29 @@@
  ChangeLog
  =========
  
 +3.4.0-alpha1
 +------------
 +
 +* sabre/vobject now requires PHP 5.5.
 +* #139: We now accept `DateTimeInterface` whereever it accepted `DateTime`
 +   before in arguments. This means that either `DateTime` or
 +  `DateTimeImmutable` may be used everywhere.
 +* #139: We now _always_ return `DateTimeImmutable` from any method. This could
 +  potentially have big implications if you manipulate Date objects anywhere.
 +
 +
- 3.3.3 (2014-??-??)
+ 3.3.4 (2014-??-??)
+ ------------------
+ 
+ * #154: Converting `ANNIVERSARY` to `X-ANNIVERSARY` and `X-ABDATE` and
+   vice-versa when converting to/from vCard 4.
+ * #154: It's now possible to easily select all vCard properties belonging to
+   a single group with `$vcard->{'ITEM1.'}` syntax. (@armin-hackmann)
+ * #156: Simpler way to check if a string is UTF-8. (@Hywan)
+ * Unittest improvements.
+ 
+ 
+ 3.3.3 (2014-10-09)
  ------------------
  
  * #142: `CANCEL` and `REPLY` messages now include the `DTSTART` from the
diff --cc lib/StringUtil.php
index d6bc0b7,bca717a..f30fb8b
--- a/lib/StringUtil.php
+++ b/lib/StringUtil.php
@@@ -17,15 -17,10 +17,10 @@@ class StringUtil 
       * @param string $str
       * @return bool
       */
 -    static public function isUTF8($str) {
 +    static function isUTF8($str) {
  
-         // First check.. mb_check_encoding
-         if (!mb_check_encoding($str, 'UTF-8')) {
-             return false;
-         }
- 
          // Control characters
-         if (preg_match('%(?:[\x00-\x08\x0B-\x0C\x0E\x0F])%', $str)) {
+         if (preg_match('%[\x00-\x08\x0B-\x0C\x0E\x0F]%', $str)) {
              return false;
          }
  
diff --cc lib/VCardConverter.php
index e78f088,87d6c14..119cc77
--- a/lib/VCardConverter.php
+++ b/lib/VCardConverter.php
@@@ -89,10 -94,9 +94,9 @@@ class VCardConverter 
  
          if ($targetVersion===Document::VCARD30) {
  
 -            if ($property instanceof Property\Uri && in_array($property->name, array('PHOTO','LOGO','SOUND'))) {
 +            if ($property instanceof Property\Uri && in_array($property->name, ['PHOTO','LOGO','SOUND'])) {
  
-                 $newProperty = $this->convertUriToBinary($output, $property, $parameters);
+                 $newProperty = $this->convertUriToBinary($output, $newProperty, $parameters);
  
              } elseif ($property instanceof Property\VCard\DateAndOrTime) {
  
@@@ -231,12 -268,13 +268,13 @@@
       *                    the new property.
       * @return Property\Uri
       */
-     protected function convertBinaryToUri(Component\VCard $output, Property\Binary $property, array &$parameters) {
+     protected function convertBinaryToUri(Component\VCard $output, Property\Binary $newProperty, array &$parameters) {
  
+         $value = $newProperty->getValue();
          $newProperty = $output->createProperty(
-             $property->name,
+             $newProperty->name,
              null, // no value
 -            array(), // no parameters yet
 +            [], // no parameters yet
              'URI' // Forcing the BINARY type
          );
  
@@@ -296,9 -333,9 +333,9 @@@
          }
  
          $newProperty = $output->createProperty(
-             $property->name,
+             $newProperty->name,
              null, // no value
 -            array(), // no parameters yet
 +            [], // no parameters yet
              'BINARY'
          );
  

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