Skip to content

Commit

Permalink
Feat/merge upstream 2022 05 (#56)
Browse files Browse the repository at this point in the history 
* fix  Bad file descriptor (7.4) (sabre-io#469)

* travis: allow failure for phpstan for now (sabre-io#470)

* travis: add php 7.4snapshot build (sabre-io#471)

* reduce phpstan level back to 0, as level 1 is failing right now (sabre-io#472)

* reduce phpstan level back to 0, as level 1 is failing right now

* travis: no longer allow failures for phpstan

* Fixed typo in vobject CLI help (sabre-io#477)

* Release 4.2.1 (sabre-io#479)

* Release 4.2.1

* Update CHANGELOG.md

* Prepare next iteration (sabre-io#480)

* Run phpstan on PHP >= 7.1 (sabre-io#483)

* Add TZ in iTip REPLY messages

* Added phpstan for tests folder (sabre-io#485)

* Add PHONE-NUMBER value type (used for TEL in vCard 3.0) (sabre-io#486)

Signed-off-by: Christian Kraus <hanzi@hanzi.cc>

* use latest phpstan 0.12.5 in CI

* Add PHPstorm .idea to .gitignore

* Fix various typos

* Release 4.2.2 (sabre-io#490)

* Release 4.2.2

* Update CHANGELOG.md

* Prepare next iteration

* Update dependencies and code style tools

* Remove unneeded 'bootstrap' line from phpstan.neon

* Apply php-cs-fixer code style changes

* run php-cs-fixer in CI

* php-cs-fixer must be at least 2.16.1 for PHP 7.4

* Use phpunit8 where possible

* Fixed phpstan level 1 errors

* Make sure there is no logic change

* Prevent setting foreach key beforehand

* Refactored fqcn strings to ::class to allow checking with phpstan (sabre-io#495)

* Release 4.3.0 (sabre-io#497)

* Update CHANGELOG.md

* Update Version.php

* Added phpstan to dev dependencies

* Reset bin-dir config

* Added convenient development commands

* Cleaned up .gitignore
These entries should be in the developer's global .gitignore

* cs-fixer: don't check only the lib folder

* Decoupled cs-fixer command from chosen tool

* Standardize CI

* Use phpunit 9 where possible

* Only upload coverage when it has been collected

* Replace assertRegExp with assertMatchesRegularExpression in unit test

* fix an incomplete phpdoc type annotation

* Release 4.3.1

* Adjust boolean vars in .travis.yml to prepare for PHP8.0

* Run unit tests on PHP8

* Fixup calendar parameter to Broker parseEvent

* Release 4.3.2

* Remove Pacific-New obsolete timezone

* Do composer remove --no-update in Travis

* Use min php-cs-fixer 2.16.7

* Release 4.3.3

* Add .gitattributes

* Explicitly select PHP 8.0 in CI

* Use latest php-cs-fixer 2.17.1

* Update windowszones timezone data to 2020-12-13

* Fix typos

* Reassign modified date in yearly rrule

* Add test

* Code style

* Add test for calendar expand

* adjust unit test settings for time limits

Some tests were testing a bug that caused an infinite loop.

Annotate those tests with large, small annotations.

Turn on enforceTimeLimit, failOnWarning and failOnRisky so that the
annotations are enforced when unit tests are run.

Add phpunit/php-invoker to the composer require-dev becaause this is
required to make the enforceTimeLimit setting effective.

* Release 4.3.4

* Make use of until parameter in nextMonthly function

* CS FIX

* CS FIX

* Fix breaking tests

* create testMonthlyByDayUntil

* create testMonthlyByDayUntilWithImpossibleNextOccurrence

* Fix setting properties with group assignment

* Unit test for adding properties with group for a VCard

* Adapt style

* Release 4.3.5

* tests: migrate from Travis to gh-actions

* Removed travis config

* Minor edit to README

* Run phpunit with coverage in CI

* Fix deprecated usages and return types on PHP 8.1

* sync ci.yml to match other repos

* Changes that should have happened for 4.3.6

* changelog and VERSION bump for 4.3.7

* EventIterator returns wrong endTime (sabre-io#534)

* Reordering of the attendees should not be a signitifcant change (sabre-io#540)

* Reordering of vevent should not be a significant change (sabre-io#542)

* Prepare release 4.3.8

* Allow easier extension of the timezone guessing

This will ease customization of timezone-guessing as it is now gets easier
to extend that process with own implementations (as long as they
implement the appropriate interface)

This is espechially necessary when wanting to actually guess a timezone
via the rules defined in the VTIMEZONE-entry (which is currently not
done)

* testEmptyTimeZone

* Changelog for 4.4.0

* Fix Iterator method signatures

This avoids warnings under PHP>=8.1
Real return types should be added before PHP 9

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

* Avoid passing null as separator for implode

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

* Prepare release 4.4.1

* Component/select: Before uppercasing $child->group, make sure it isn't null

Signed-off-by: Gergely Nagy <me@gergo.csillger.hu>

* fix php 8.1 null string deprecation in built-in functions

* drop duplicated workflow config

Co-authored-by: Remi Collet <remi@remirepo.net>
Co-authored-by: Markus Staab <maggus.staab@googlemail.com>
Co-authored-by: Dominik <dominik@tobschall.de>
Co-authored-by: Jeroen van Oort <jvanoort@simplexis.nl>
Co-authored-by: Renaud BOYER <rboyer@linagora.com>
Co-authored-by: Christian Kraus <github@hanzi.cc>
Co-authored-by: Thomas Müller <thomas.mueller@tmit.eu>
Co-authored-by: Phil Davis <phil@jankaritech.com>
Co-authored-by: Michael Stilkerich <ms@mike2k.de>
Co-authored-by: Stéphane <demonchaux.stephane@gmail.com>
Co-authored-by: Allon Moritz <allon.moritz@digital-peak.com>
Co-authored-by: Jair Cueva Junior <junior@dinhost.com.br>
Co-authored-by: Parajuli Kiran <kiranparajuli589@gmail.com>
Co-authored-by: Cédric Anne <cedric.anne@gmail.com>
Co-authored-by: Holger Floerke <floerke@doctronic.de>
Co-authored-by: Andreas Heigl <andreas@heigl.org>
Co-authored-by: Côme Chilliet <come.chilliet@nextcloud.com>
Co-authored-by: Gergely Nagy <me@gergo.csillger.hu>
Co-authored-by: Thomas Müller <1005065+DeepDiver1975@users.noreply.github.com>
Co-authored-by: Christopher Szu <christopher.szu@proton.ch>
  • Loading branch information
@chris-szu @remicollet
@staabm @DominikTo @JeroenVanOort @renaudboyer @hanzi @DeepDiver1975 @phil-davis @mstilkerich @fezfez @laoneo @jaircuevajunior @kiranparajuli589 @cedric-anne @floerke @heiglandreas @come-nc @algernon
21 people committed May 26, 2022
1 parent 623bd9a commit a165030
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions lib/Component.php
View file
Expand Up @@ -212,14 +212,14 @@ public function getComponents()
* string ("HOME.EMAIL"). If you want to search on a specific property that
* has not been assigned a group, specify ".EMAIL".
*
* @param string $name
* @param string|null $name
*
* @return array
*/
public function select($name)
{
$group = null;
$name = strtoupper($name);
$name = is_null($name) ? '' : strtoupper($name);
if (false !== strpos($name, '.')) {
list($group, $name) = explode('.', $name, 2);
}
Expand All @@ -238,7 +238,7 @@ public function select($name)
return array_filter(
$result,
function ($child) use ($group) {
return $child instanceof Property && strtoupper($child->group) === $group;
return $child instanceof Property && strtoupper($child->group ?? '') === $group;
}
);
}
Expand All @@ -249,7 +249,7 @@ function ($child) use ($group) {
$result = [];
foreach ($this->children as $childGroup) {
foreach ($childGroup as $child) {
if ($child instanceof Property && strtoupper($child->group) === $group) {
if ($child instanceof Property && $child->group && strtoupper($child->group) === $group) {
$result[] = $child;
}
}
Expand Down
4 changes: 2 additions & 2 deletions lib/Parameter.php
View file
Expand Up @@ -47,12 +47,12 @@ class Parameter extends Node
*
* It's recommended to use the create:: factory method instead.
*
* @param string $name
* @param string|null $name
* @param string $value
*/
public function __construct(Document $root, $name, $value = null)
{
$this->name = strtoupper($name);
$this->name = is_null($name) ? '' : strtoupper($name);
$this->root = $root;
if (is_null($name)) {
$this->noName = true;
Expand Down
2 changes: 1 addition & 1 deletion lib/Property.php
View file
Expand Up @@ -30,7 +30,7 @@ abstract class Property extends Node
*
* This is only used in vcards
*
* @var string
* @var string|null
*/
public $group;

Expand Down

0 comments on commit a165030

Please sign in to comment.