aboutsummaryrefslogtreecommitdiffstats
path: root/vendor/sabre/vobject/lib/VCardConverter.php
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2020-05-07 23:35:02 +0200
committerMario <mario@mariovavti.com>2020-05-07 23:35:02 +0200
commitfae70bf0a7f1b566d25e30064f60d58ab150951a (patch)
tree1714511edb85ed0e28034ed9371d5fc515504fd6 /vendor/sabre/vobject/lib/VCardConverter.php
parentffd2faf8a09a870e8dbecb3ad168e0a9b25941d3 (diff)
downloadvolse-hubzilla-fae70bf0a7f1b566d25e30064f60d58ab150951a.tar.gz
volse-hubzilla-fae70bf0a7f1b566d25e30064f60d58ab150951a.tar.bz2
volse-hubzilla-fae70bf0a7f1b566d25e30064f60d58ab150951a.zip
Revert "composer updates"
This reverts commit dbfe748d274f6843fc91a3071df7be45c4ab5b00
Diffstat (limited to 'vendor/sabre/vobject/lib/VCardConverter.php')
-rw-r--r--vendor/sabre/vobject/lib/VCardConverter.php25
1 files changed, 17 insertions, 8 deletions
diff --git a/vendor/sabre/vobject/lib/VCardConverter.php b/vendor/sabre/vobject/lib/VCardConverter.php
index 04932fe67..156b83b4e 100644
--- a/vendor/sabre/vobject/lib/VCardConverter.php
+++ b/vendor/sabre/vobject/lib/VCardConverter.php
@@ -26,7 +26,8 @@ class VCardConverter
*
* If input and output version are identical, a clone is returned.
*
- * @param int $targetVersion
+ * @param Component\VCard $input
+ * @param int $targetVersion
*/
public function convert(Component\VCard $input, $targetVersion)
{
@@ -61,7 +62,10 @@ class VCardConverter
/**
* Handles conversion of a single property.
*
- * @param int $targetVersion
+ * @param Component\VCard $input
+ * @param Component\VCard $output
+ * @param Property $property
+ * @param int $targetVersion
*/
protected function convertProperty(Component\VCard $input, Component\VCard $output, Property $property, $targetVersion)
{
@@ -79,9 +83,6 @@ class VCardConverter
if (!$valueType) {
$valueType = $property->getValueType();
}
- if (Document::VCARD30 !== $targetVersion && 'PHONE-NUMBER' === $valueType) {
- $valueType = null;
- }
$newProperty = $output->createProperty(
$property->name,
$property->getParts(),
@@ -226,7 +227,7 @@ class VCardConverter
// Lastly, we need to see if there's a need for a VALUE parameter.
//
- // We can do that by instantiating a empty property with that name, and
+ // We can do that by instantating a empty property with that name, and
// seeing if the default valueType is identical to the current one.
$tempProperty = $output->createProperty($newProperty->name);
if ($tempProperty->getValueType() !== $newProperty->getValueType()) {
@@ -241,7 +242,8 @@ class VCardConverter
*
* vCard 4.0 no longer supports BINARY properties.
*
- * @param Property\Uri $property the input property
+ * @param Component\VCard $output
+ * @param Property\Uri $property the input property
* @param $parameters list of parameters that will eventually be added to
* the new property
*
@@ -294,7 +296,8 @@ class VCardConverter
* be valid in vCard 3.0 as well, we should convert those to BINARY if
* possible, to improve compatibility.
*
- * @param Property\Uri $property the input property
+ * @param Component\VCard $output
+ * @param Property\Uri $property the input property
*
* @return Property\Binary|null
*/
@@ -341,6 +344,9 @@ class VCardConverter
/**
* Adds parameters to a new property for vCard 4.0.
+ *
+ * @param Property $newProperty
+ * @param array $parameters
*/
protected function convertParameters40(Property $newProperty, array $parameters)
{
@@ -377,6 +383,9 @@ class VCardConverter
/**
* Adds parameters to a new property for vCard 3.0.
+ *
+ * @param Property $newProperty
+ * @param array $parameters
*/
protected function convertParameters30(Property $newProperty, array $parameters)
{