Skip to content

Commit

Permalink
Merge pull request #563 from nextcloud/fix/require-php73-php8
Browse files Browse the repository at this point in the history 
Require php7.3 or php8
  • Loading branch information
@ChristophWurst
ChristophWurst authored Dec 29, 2020
2 parents 4ff56cd + 9dacfb0 commit 1c93416
Show file tree
Hide file tree
Showing 7 changed files with 85 additions and 71 deletions.
2 changes: 1 addition & 1 deletion composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
}
},
"require": {
"php": ">=7.2",
"php": "^7.3|^8.0",
"aws/aws-sdk-php": "^3.35",
"bantu/ini-get-wrapper": "v1.0.1",
"christophwurst/id3parser": "^0.1.1",
Expand Down
50 changes: 30 additions & 20 deletions composer.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 12 additions & 12 deletions composer/InstalledVersions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ class InstalledVersions
private static $installed = array (
'root' =>
array (
'pretty_version' => '1.0.0+no-version-set',
'version' => '1.0.0.0',
'pretty_version' => 'dev-master',
'version' => 'dev-master',
'aliases' =>
array (
),
'reference' => NULL,
'reference' => '4ff56cd34055c01ef9671481a82492a0d4fd7b99',
'name' => 'nextcloud/3rdparty',
),
'versions' =>
Expand Down Expand Up @@ -198,12 +198,12 @@ class InstalledVersions
),
'icewind/streams' =>
array (
'pretty_version' => 'v0.7.1',
'version' => '0.7.1.0',
'pretty_version' => 'v0.7.2',
'version' => '0.7.2.0',
'aliases' =>
array (
),
'reference' => '4db3ed6c366e90b958d00e1d4c6360a9b39b2121',
'reference' => '77d750ccc654c0eda4a41fedb2dbd71053755790',
),
'justinrainbow/json-schema' =>
array (
Expand Down Expand Up @@ -279,12 +279,12 @@ class InstalledVersions
),
'nextcloud/3rdparty' =>
array (
'pretty_version' => '1.0.0+no-version-set',
'version' => '1.0.0.0',
'pretty_version' => 'dev-master',
'version' => 'dev-master',
'aliases' =>
array (
),
'reference' => NULL,
'reference' => '4ff56cd34055c01ef9671481a82492a0d4fd7b99',
),
'nextcloud/lognormalizer' =>
array (
Expand Down Expand Up @@ -583,12 +583,12 @@ class InstalledVersions
),
'sabre/dav' =>
array (
'pretty_version' => '4.0.3',
'version' => '4.0.3.0',
'pretty_version' => '4.1.3',
'version' => '4.1.3.0',
'aliases' =>
array (
),
'reference' => 'b793fb4ce27cf0f981b540ad771281c430ffe818',
'reference' => 'b903eeedfbdcd6cab7935661ec6dc2d90cdf8a1e',
),
'sabre/event' =>
array (
Expand Down
1 change: 0 additions & 1 deletion composer/autoload_psr4.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@
'League\\Flysystem\\' => array($vendorDir . '/league/flysystem/src'),
'JsonSchema\\' => array($vendorDir . '/justinrainbow/json-schema/src/JsonSchema'),
'JmesPath\\' => array($vendorDir . '/mtdowling/jmespath.php/src'),
'Icewind\\Streams\\Tests\\' => array($vendorDir . '/icewind/streams/tests'),
'Icewind\\Streams\\' => array($vendorDir . '/icewind/streams/src'),
'ID3Parser\\' => array($vendorDir . '/christophwurst/id3parser/src'),
'Http\\Promise\\' => array($vendorDir . '/php-http/promise/src'),
Expand Down
5 changes: 0 additions & 5 deletions composer/autoload_static.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,6 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
),
'I' =>
array (
'Icewind\\Streams\\Tests\\' => 22,
'Icewind\\Streams\\' => 16,
'ID3Parser\\' => 10,
),
Expand Down Expand Up @@ -388,10 +387,6 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
array (
0 => __DIR__ . '/..' . '/mtdowling/jmespath.php/src',
),
'Icewind\\Streams\\Tests\\' =>
array (
0 => __DIR__ . '/..' . '/icewind/streams/tests',
),
'Icewind\\Streams\\' =>
array (
0 => __DIR__ . '/..' . '/icewind/streams/src',
Expand Down
50 changes: 30 additions & 20 deletions composer/installed.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1193,32 +1193,31 @@
},
{
"name": "icewind/streams",
"version": "v0.7.1",
"version_normalized": "0.7.1.0",
"version": "v0.7.2",
"version_normalized": "0.7.2.0",
"source": {
"type": "git",
"url": "https://github.com/icewind1991/Streams.git",
"reference": "4db3ed6c366e90b958d00e1d4c6360a9b39b2121"
"reference": "77d750ccc654c0eda4a41fedb2dbd71053755790"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/icewind1991/Streams/zipball/4db3ed6c366e90b958d00e1d4c6360a9b39b2121",
"reference": "4db3ed6c366e90b958d00e1d4c6360a9b39b2121",
"url": "https://api.github.com/repos/icewind1991/Streams/zipball/77d750ccc654c0eda4a41fedb2dbd71053755790",
"reference": "77d750ccc654c0eda4a41fedb2dbd71053755790",
"shasum": ""
},
"require": {
"php": ">=5.3"
"php": ">=5.6"
},
"require-dev": {
"phpunit/phpunit": "^4.8",
"satooshi/php-coveralls": "v1.0.0"
"php-coveralls/php-coveralls": "v2.1.0",
"phpunit/phpunit": "^5.7"
},
"time": "2019-02-15T12:57:29+00:00",
"time": "2020-04-08T14:59:33+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
"psr-4": {
"Icewind\\Streams\\Tests\\": "tests/",
"Icewind\\Streams\\": "src/"
}
},
Expand All @@ -1233,6 +1232,10 @@
}
],
"description": "A set of generic stream wrappers",
"support": {
"issues": "https://github.com/icewind1991/Streams/issues",
"source": "https://github.com/icewind1991/Streams/tree/master"
},
"install-path": "../icewind/streams"
},
{
Expand Down Expand Up @@ -3247,17 +3250,17 @@
},
{
"name": "sabre/dav",
"version": "4.0.3",
"version_normalized": "4.0.3.0",
"version": "4.1.3",
"version_normalized": "4.1.3.0",
"source": {
"type": "git",
"url": "https://github.com/sabre-io/dav.git",
"reference": "b793fb4ce27cf0f981b540ad771281c430ffe818"
"reference": "b903eeedfbdcd6cab7935661ec6dc2d90cdf8a1e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sabre-io/dav/zipball/b793fb4ce27cf0f981b540ad771281c430ffe818",
"reference": "b793fb4ce27cf0f981b540ad771281c430ffe818",
"url": "https://api.github.com/repos/sabre-io/dav/zipball/b903eeedfbdcd6cab7935661ec6dc2d90cdf8a1e",
"reference": "b903eeedfbdcd6cab7935661ec6dc2d90cdf8a1e",
"shasum": ""
},
"require": {
Expand All @@ -3271,25 +3274,27 @@
"ext-simplexml": "*",
"ext-spl": "*",
"lib-libxml": ">=2.7.0",
"php": ">=7.0.0",
"php": "^7.1.0 || ^8.0",
"psr/log": "^1.0",
"sabre/event": "^5.0",
"sabre/http": "^5.0",
"sabre/http": "^5.0.5",
"sabre/uri": "^2.0",
"sabre/vobject": "^4.2.0-alpha1",
"sabre/vobject": "^4.2.1",
"sabre/xml": "^2.0.1"
},
"require-dev": {
"evert/phpdoc-md": "~0.1.0",
"friendsofphp/php-cs-fixer": "^2.16.7",
"monolog/monolog": "^1.18",
"phpunit/phpunit": "^6"
"phpstan/phpstan": "^0.12",
"phpunit/phpunit": "^7.5 || ^8.5 || ^9.0"
},
"suggest": {
"ext-curl": "*",
"ext-imap": "*",
"ext-pdo": "*"
},
"time": "2020-01-10T07:52:45+00:00",
"time": "2020-11-09T07:48:35+00:00",
"bin": [
"bin/sabredav",
"bin/naturalselection"
Expand Down Expand Up @@ -3325,6 +3330,11 @@
"framework",
"iCalendar"
],
"support": {
"forum": "https://groups.google.com/group/sabredav-discuss",
"issues": "https://github.com/sabre-io/dav/issues",
"source": "https://github.com/fruux/sabre-dav"
},
"install-path": "../sabre/dav"
},
{
Expand Down
Loading

0 comments on commit 1c93416

Please sign in to comment.