[FEATURE] Add config and use composer autoloader.
We use composer already to install SabreDAV. Include config composer.(json|lock) to install and manage more dependencies in future. Also provide PSR-4 autoloading for our namespaced classes, e.g. "Zotlabs\". To regenerate autoloader maps use: $ composer install --optimize-autoloader --no-dev We could also remove the whole vendor/ folder from our repository, but that would need changes in deployment and how to install hubs and needs more discussion first.
This commit is contained in:
@@ -260,21 +260,39 @@ class Recur extends Property {
|
||||
|
||||
foreach ($values as $key => $value) {
|
||||
|
||||
if (empty($value)) {
|
||||
if ($value === '') {
|
||||
$warnings[] = [
|
||||
'level' => $repair ? 3 : 1,
|
||||
'level' => $repair ? 1 : 3,
|
||||
'message' => 'Invalid value for ' . $key . ' in ' . $this->name,
|
||||
'node' => $this
|
||||
];
|
||||
if ($repair) {
|
||||
unset($values[$key]);
|
||||
}
|
||||
} elseif ($key == 'BYMONTH') {
|
||||
$byMonth = (array)$value;
|
||||
foreach ($byMonth as $i => $v) {
|
||||
if (!is_numeric($v) || (int)$v < 1 || (int)$v > 12) {
|
||||
$warnings[] = [
|
||||
'level' => $repair ? 1 : 3,
|
||||
'message' => 'BYMONTH in RRULE must have value(s) between 1 and 12!',
|
||||
'node' => $this
|
||||
];
|
||||
if ($repair) {
|
||||
if (is_array($value)) {
|
||||
unset($values[$key][$i]);
|
||||
} else {
|
||||
unset($values[$key]);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
if (!isset($values['FREQ'])) {
|
||||
$warnings[] = [
|
||||
'level' => $repair ? 3 : 1,
|
||||
'level' => $repair ? 1 : 3,
|
||||
'message' => 'FREQ is required in ' . $this->name,
|
||||
'node' => $this
|
||||
];
|
||||
|
||||
2
vendor/sabre/vobject/lib/Property/Text.php
vendored
2
vendor/sabre/vobject/lib/Property/Text.php
vendored
@@ -397,7 +397,7 @@ class Text extends Property {
|
||||
if (count($parts) < $minimum) {
|
||||
$warnings[] = [
|
||||
'level' => $options & self::REPAIR ? 1 : 3,
|
||||
'message' => 'The ' . $this->name . ' property must have at least ' . $minimum . ' values. It only has ' . count($parts),
|
||||
'message' => 'The ' . $this->name . ' property must have at least ' . $minimum . ' values. It only has ' . count($parts),
|
||||
'node' => $this,
|
||||
];
|
||||
if ($options & self::REPAIR) {
|
||||
|
||||
Reference in New Issue
Block a user