aboutsummaryrefslogtreecommitdiffstats
path: root/vendor/sabre/vobject
diff options
context:
space:
mode:
Diffstat (limited to 'vendor/sabre/vobject')
-rw-r--r--vendor/sabre/vobject/.gitignore15
-rw-r--r--vendor/sabre/vobject/.travis.yml29
-rw-r--r--vendor/sabre/vobject/CHANGELOG.md8
-rw-r--r--vendor/sabre/vobject/composer.json20
-rw-r--r--vendor/sabre/vobject/lib/Component.php2
-rw-r--r--vendor/sabre/vobject/lib/Version.php2
-rw-r--r--vendor/sabre/vobject/tests/phpunit.xml5
7 files changed, 48 insertions, 33 deletions
diff --git a/vendor/sabre/vobject/.gitignore b/vendor/sabre/vobject/.gitignore
index e9b0ed32f..82b7dad3f 100644
--- a/vendor/sabre/vobject/.gitignore
+++ b/vendor/sabre/vobject/.gitignore
@@ -5,20 +5,5 @@ tests/cov/
tests/temp
tests/.phpunit.result.cache
-#vim
-.*.swp
-
-#binaries
-bin/phpunit
-bin/php-cs-fixer
-bin/phpstan
-bin/phpstan.phar
-bin/hoa
-
# Development stuff
-testdata/
.php_cs.cache
-.idea
-
-# OS X
-.DS_Store
diff --git a/vendor/sabre/vobject/.travis.yml b/vendor/sabre/vobject/.travis.yml
index 511119bbb..d1feb60de 100644
--- a/vendor/sabre/vobject/.travis.yml
+++ b/vendor/sabre/vobject/.travis.yml
@@ -5,22 +5,33 @@ php:
- 7.3
- 7.4
+env:
+ global:
+ - MEMCACHED_SERVER=127.0.0.1
+ - RUN_PHPSTAN="FALSE"
+ matrix:
+ - PREFER_LOWEST="" REPORT_COVERAGE="TRUE" WITH_COVERAGE="--coverage-clover=coverage.xml"
+ - PREFER_LOWEST="--prefer-lowest" REPORT_COVERAGE="FALSE" WITH_COVERAGE=""
+
matrix:
+ include:
+ - name: 'PHPStan'
+ php: 7.4
+ env:
+ - RUN_PHPSTAN="TRUE"
+ - REPORT_COVERAGE="FALSE"
fast_finish: true
-install:
- - composer require --dev phpstan/phpstan:^0.12
-
before_script:
- - composer install
+ - composer update $PREFER_LOWEST
script:
- - ./bin/php-cs-fixer fix lib/ --dry-run --diff
- - php ./bin/phpstan.phar analyse -c phpstan.neon lib tests
- - ./bin/phpunit --configuration tests/phpunit.xml --coverage-clover=coverage.xml
-
+ - if [ $RUN_PHPSTAN == "FALSE" ]; then php vendor/bin/php-cs-fixer fix --dry-run --diff; fi
+ - if [ $RUN_PHPSTAN == "FALSE" ]; then php vendor/bin/phpunit --configuration tests/phpunit.xml $WITH_COVERAGE; fi
+ - if [ $RUN_PHPSTAN == "TRUE" ]; then composer phpstan; fi
+
after_success:
- - bash <(curl -s https://codecov.io/bash)
+ - if [ $REPORT_COVERAGE == "TRUE" ]; then bash <(curl -s https://codecov.io/bash); fi
cache:
directories:
diff --git a/vendor/sabre/vobject/CHANGELOG.md b/vendor/sabre/vobject/CHANGELOG.md
index 5126e04f9..69e14154b 100644
--- a/vendor/sabre/vobject/CHANGELOG.md
+++ b/vendor/sabre/vobject/CHANGELOG.md
@@ -1,6 +1,14 @@
ChangeLog
=========
+4.3.1 (2020-07-13)
+------------------
+
+* #510: Fix an incomplete phpdoc type annotation (@mstilkerich)
+* #505: Refactor unit test code for phpunit9 (@phil-davis)
+* #500: Standardize CI (@phil-davis)
+* #496: CI tooling changes (@JeroenVanOort)
+
4.3.0 (2020-01-31)
------------------
diff --git a/vendor/sabre/vobject/composer.json b/vendor/sabre/vobject/composer.json
index 9e522f8a4..d4fa56a31 100644
--- a/vendor/sabre/vobject/composer.json
+++ b/vendor/sabre/vobject/composer.json
@@ -38,7 +38,8 @@
},
"require-dev" : {
"friendsofphp/php-cs-fixer": "~2.16.1",
- "phpunit/phpunit" : "^7 || ^8"
+ "phpunit/phpunit" : "^7.5 || ^8.5 || ^9.0",
+ "phpstan/phpstan": "^0.12"
},
"suggest" : {
"hoa/bench" : "If you would like to run the benchmark scripts"
@@ -86,7 +87,20 @@
"dev-master" : "4.0.x-dev"
}
},
- "config" : {
- "bin-dir" : "bin"
+ "scripts": {
+ "phpstan": [
+ "phpstan analyse lib tests"
+ ],
+ "cs-fixer": [
+ "php-cs-fixer fix"
+ ],
+ "phpunit": [
+ "phpunit --configuration tests/phpunit.xml"
+ ],
+ "test": [
+ "composer phpstan",
+ "composer cs-fixer",
+ "composer phpunit"
+ ]
}
}
diff --git a/vendor/sabre/vobject/lib/Component.php b/vendor/sabre/vobject/lib/Component.php
index 58594aec1..da45eb29f 100644
--- a/vendor/sabre/vobject/lib/Component.php
+++ b/vendor/sabre/vobject/lib/Component.php
@@ -431,7 +431,7 @@ class Component extends Node
*
* @param string $name
*
- * @return Property
+ * @return Property|null
*/
public function __get($name)
{
diff --git a/vendor/sabre/vobject/lib/Version.php b/vendor/sabre/vobject/lib/Version.php
index 883d20289..e5ab9af38 100644
--- a/vendor/sabre/vobject/lib/Version.php
+++ b/vendor/sabre/vobject/lib/Version.php
@@ -14,5 +14,5 @@ class Version
/**
* Full version number.
*/
- const VERSION = '4.3.0';
+ const VERSION = '4.3.1';
}
diff --git a/vendor/sabre/vobject/tests/phpunit.xml b/vendor/sabre/vobject/tests/phpunit.xml
index c9abae412..c0588d460 100644
--- a/vendor/sabre/vobject/tests/phpunit.xml
+++ b/vendor/sabre/vobject/tests/phpunit.xml
@@ -9,16 +9,13 @@
>
<testsuites>
<testsuite name="Sabre\VObject">
- <directory>VObject/</directory>
+ <directory>.</directory>
</testsuite>
</testsuites>
<filter>
<whitelist addUncoveredFilesFromWhitelist="true">
<directory suffix=".php">../lib/</directory>
- <exclude>
- <file>../lib/Sabre/VObject/includes.php</file>
- </exclude>
</whitelist>
</filter>
</phpunit>