update sabre/vobject
This commit is contained in:
35
vendor/sabre/vobject/lib/Splitter/ICalendar.php
vendored
35
vendor/sabre/vobject/lib/Splitter/ICalendar.php
vendored
@@ -19,8 +19,8 @@ use Sabre\VObject\Component\VCalendar;
|
||||
* @author Armin Hackmann
|
||||
* @license http://sabre.io/license/ Modified BSD License
|
||||
*/
|
||||
class ICalendar implements SplitterInterface {
|
||||
|
||||
class ICalendar implements SplitterInterface
|
||||
{
|
||||
/**
|
||||
* Timezones.
|
||||
*
|
||||
@@ -38,13 +38,13 @@ class ICalendar implements SplitterInterface {
|
||||
/**
|
||||
* Constructor.
|
||||
*
|
||||
* The splitter should receive an readable file stream as it's input.
|
||||
* The splitter should receive an readable file stream as its input.
|
||||
*
|
||||
* @param resource $input
|
||||
* @param int $options Parser options, see the OPTIONS constants.
|
||||
* @param int $options parser options, see the OPTIONS constants
|
||||
*/
|
||||
function __construct($input, $options = 0) {
|
||||
|
||||
public function __construct($input, $options = 0)
|
||||
{
|
||||
$data = VObject\Reader::read($input, $options);
|
||||
|
||||
if (!$data instanceof VObject\Component\VCalendar) {
|
||||
@@ -57,16 +57,16 @@ class ICalendar implements SplitterInterface {
|
||||
}
|
||||
|
||||
// Get all timezones
|
||||
if ($component->name === 'VTIMEZONE') {
|
||||
$this->vtimezones[(string)$component->TZID] = $component;
|
||||
if ('VTIMEZONE' === $component->name) {
|
||||
$this->vtimezones[(string) $component->TZID] = $component;
|
||||
continue;
|
||||
}
|
||||
|
||||
// Get component UID for recurring Events search
|
||||
if (!$component->UID) {
|
||||
$component->UID = sha1(microtime()) . '-vobjectimport';
|
||||
$component->UID = sha1(microtime()).'-vobjectimport';
|
||||
}
|
||||
$uid = (string)$component->UID;
|
||||
$uid = (string) $component->UID;
|
||||
|
||||
// Take care of recurring events
|
||||
if (!array_key_exists($uid, $this->objects)) {
|
||||
@@ -75,7 +75,6 @@ class ICalendar implements SplitterInterface {
|
||||
|
||||
$this->objects[$uid]->add(clone $component);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -84,15 +83,14 @@ class ICalendar implements SplitterInterface {
|
||||
*
|
||||
* When the end is reached, null will be returned.
|
||||
*
|
||||
* @return Sabre\VObject\Component|null
|
||||
* @return \Sabre\VObject\Component|null
|
||||
*/
|
||||
function getNext() {
|
||||
|
||||
public function getNext()
|
||||
{
|
||||
if ($object = array_shift($this->objects)) {
|
||||
|
||||
// create our baseobject
|
||||
$object->version = '2.0';
|
||||
$object->prodid = '-//Sabre//Sabre VObject ' . VObject\Version::VERSION . '//EN';
|
||||
$object->prodid = '-//Sabre//Sabre VObject '.VObject\Version::VERSION.'//EN';
|
||||
$object->calscale = 'GREGORIAN';
|
||||
|
||||
// add vtimezone information to obj (if we have it)
|
||||
@@ -101,13 +99,8 @@ class ICalendar implements SplitterInterface {
|
||||
}
|
||||
|
||||
return $object;
|
||||
|
||||
} else {
|
||||
|
||||
return;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -15,16 +15,16 @@ namespace Sabre\VObject\Splitter;
|
||||
* @author Dominik Tobschall (http://tobschall.de/)
|
||||
* @license http://sabre.io/license/ Modified BSD License
|
||||
*/
|
||||
interface SplitterInterface {
|
||||
|
||||
interface SplitterInterface
|
||||
{
|
||||
/**
|
||||
* Constructor.
|
||||
*
|
||||
* The splitter should receive an readable file stream as it's input.
|
||||
* The splitter should receive an readable file stream as its input.
|
||||
*
|
||||
* @param resource $input
|
||||
*/
|
||||
function __construct($input);
|
||||
public function __construct($input);
|
||||
|
||||
/**
|
||||
* Every time getNext() is called, a new object will be parsed, until we
|
||||
@@ -32,8 +32,7 @@ interface SplitterInterface {
|
||||
*
|
||||
* When the end is reached, null will be returned.
|
||||
*
|
||||
* @return Sabre\VObject\Component|null
|
||||
* @return \Sabre\VObject\Component|null
|
||||
*/
|
||||
function getNext();
|
||||
|
||||
public function getNext();
|
||||
}
|
||||
|
||||
22
vendor/sabre/vobject/lib/Splitter/VCard.php
vendored
22
vendor/sabre/vobject/lib/Splitter/VCard.php
vendored
@@ -19,8 +19,8 @@ use Sabre\VObject\Parser\MimeDir;
|
||||
* @author Armin Hackmann
|
||||
* @license http://sabre.io/license/ Modified BSD License
|
||||
*/
|
||||
class VCard implements SplitterInterface {
|
||||
|
||||
class VCard implements SplitterInterface
|
||||
{
|
||||
/**
|
||||
* File handle.
|
||||
*
|
||||
@@ -38,16 +38,15 @@ class VCard implements SplitterInterface {
|
||||
/**
|
||||
* Constructor.
|
||||
*
|
||||
* The splitter should receive an readable file stream as it's input.
|
||||
* The splitter should receive an readable file stream as its input.
|
||||
*
|
||||
* @param resource $input
|
||||
* @param int $options Parser options, see the OPTIONS constants.
|
||||
* @param int $options parser options, see the OPTIONS constants
|
||||
*/
|
||||
function __construct($input, $options = 0) {
|
||||
|
||||
public function __construct($input, $options = 0)
|
||||
{
|
||||
$this->input = $input;
|
||||
$this->parser = new MimeDir($input, $options);
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -56,23 +55,20 @@ class VCard implements SplitterInterface {
|
||||
*
|
||||
* When the end is reached, null will be returned.
|
||||
*
|
||||
* @return Sabre\VObject\Component|null
|
||||
* @return \Sabre\VObject\Component|null
|
||||
*/
|
||||
function getNext() {
|
||||
|
||||
public function getNext()
|
||||
{
|
||||
try {
|
||||
$object = $this->parser->parse();
|
||||
|
||||
if (!$object instanceof VObject\Component\VCard) {
|
||||
throw new VObject\ParseException('The supplied input contained non-VCARD data.');
|
||||
}
|
||||
|
||||
} catch (VObject\EofException $e) {
|
||||
return;
|
||||
}
|
||||
|
||||
return $object;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user