From 0cd6f2ead0163b52e72dbaca4acd51c7ec47fd3d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 23 Sep 2024 22:53:08 +0000
Subject: [PATCH] chore(deps): bump nextcloud/coding-standard from 1.2.3 to
^1.3.1
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
composer.json | 2 +-
composer.lock | 107 ++++++++++++------
lib/Dav/PatchPlugin.php | 2 +-
lib/Service/Social/FacebookProvider.php | 2 +-
tests/bootstrap.php | 4 +-
.../Service/Social/DiasporaProviderTest.php | 10 +-
.../Service/Social/TumblrProviderTest.php | 2 +-
.../unit/Service/Social/XingProviderTest.php | 4 +-
tests/unit/Service/SocialApiServiceTest.php | 2 +-
9 files changed, 88 insertions(+), 47 deletions(-)
diff --git a/composer.json b/composer.json
index ca5a6c0bb..d2175bebe 100644
--- a/composer.json
+++ b/composer.json
@@ -25,6 +25,6 @@
"require-dev": {
"christophwurst/nextcloud_testing": "^1.0.0",
"phpunit/phpunit": "^9",
- "nextcloud/coding-standard": "^1.2.3"
+ "nextcloud/coding-standard": "^1.3.1"
}
}
diff --git a/composer.lock b/composer.lock
index c7330e1ac..9d230875d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "834254960f4fa0c807a3bf8eed630c0b",
+ "content-hash": "9f450312626b7fab26ce209b806d7530",
"packages": [],
"packages-dev": [
{
@@ -119,6 +119,52 @@
],
"time": "2022-12-30T00:15:36+00:00"
},
+ {
+ "name": "kubawerlos/php-cs-fixer-custom-fixers",
+ "version": "v3.22.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/kubawerlos/php-cs-fixer-custom-fixers.git",
+ "reference": "8701394f0c7cd450ac4fa577d24589122c1d5d5e"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/kubawerlos/php-cs-fixer-custom-fixers/zipball/8701394f0c7cd450ac4fa577d24589122c1d5d5e",
+ "reference": "8701394f0c7cd450ac4fa577d24589122c1d5d5e",
+ "shasum": ""
+ },
+ "require": {
+ "ext-filter": "*",
+ "ext-tokenizer": "*",
+ "friendsofphp/php-cs-fixer": "^3.61.1",
+ "php": "^7.4 || ^8.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^9.6.4 || ^10.5.29"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "PhpCsFixerCustomFixers\\": "src"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Kuba Werłos",
+ "email": "werlos@gmail.com"
+ }
+ ],
+ "description": "A set of custom fixers for PHP CS Fixer",
+ "support": {
+ "issues": "https://github.com/kubawerlos/php-cs-fixer-custom-fixers/issues",
+ "source": "https://github.com/kubawerlos/php-cs-fixer-custom-fixers/tree/v3.22.0"
+ },
+ "time": "2024-08-16T20:44:35+00:00"
+ },
{
"name": "myclabs/deep-copy",
"version": "1.11.1",
@@ -180,19 +226,20 @@
},
{
"name": "nextcloud/coding-standard",
- "version": "v1.2.3",
+ "version": "v1.3.1",
"source": {
"type": "git",
"url": "https://github.com/nextcloud/coding-standard.git",
- "reference": "bc9c53a5306114b60c4363057aff9c2ed10a54da"
+ "reference": "e88acb0df6217b808d1632286ddfec9267a102e4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nextcloud/coding-standard/zipball/bc9c53a5306114b60c4363057aff9c2ed10a54da",
- "reference": "bc9c53a5306114b60c4363057aff9c2ed10a54da",
+ "url": "https://api.github.com/repos/nextcloud/coding-standard/zipball/e88acb0df6217b808d1632286ddfec9267a102e4",
+ "reference": "e88acb0df6217b808d1632286ddfec9267a102e4",
"shasum": ""
},
"require": {
+ "kubawerlos/php-cs-fixer-custom-fixers": "^3.22",
"php": "^7.3|^8.0",
"php-cs-fixer/shim": "^3.17"
},
@@ -215,9 +262,9 @@
"description": "Nextcloud coding standards for the php cs fixer",
"support": {
"issues": "https://github.com/nextcloud/coding-standard/issues",
- "source": "https://github.com/nextcloud/coding-standard/tree/v1.2.3"
+ "source": "https://github.com/nextcloud/coding-standard/tree/v1.3.1"
},
- "time": "2024-08-23T14:32:32+00:00"
+ "time": "2024-09-19T09:07:10+00:00"
},
{
"name": "nikic/php-parser",
@@ -1900,20 +1947,20 @@
},
{
"name": "symfony/polyfill-mbstring",
- "version": "v1.28.0",
+ "version": "v1.31.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
- "reference": "42292d99c55abe617799667f454222c54c60e229"
+ "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/42292d99c55abe617799667f454222c54c60e229",
- "reference": "42292d99c55abe617799667f454222c54c60e229",
+ "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/85181ba99b2345b0ef10ce42ecac37612d9fd341",
+ "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341",
"shasum": ""
},
"require": {
- "php": ">=7.1"
+ "php": ">=7.2"
},
"provide": {
"ext-mbstring": "*"
@@ -1923,9 +1970,6 @@
},
"type": "library",
"extra": {
- "branch-alias": {
- "dev-main": "1.28-dev"
- },
"thanks": {
"name": "symfony/polyfill",
"url": "https://github.com/symfony/polyfill"
@@ -1963,7 +2007,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.28.0"
+ "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.31.0"
},
"funding": [
{
@@ -1979,30 +2023,27 @@
"type": "tidelift"
}
],
- "time": "2023-07-28T09:04:16+00:00"
+ "time": "2024-09-09T11:45:10+00:00"
},
{
"name": "symfony/polyfill-php80",
- "version": "v1.28.0",
+ "version": "v1.31.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php80.git",
- "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5"
+ "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/6caa57379c4aec19c0a12a38b59b26487dcfe4b5",
- "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5",
+ "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/60328e362d4c2c802a54fcbf04f9d3fb892b4cf8",
+ "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8",
"shasum": ""
},
"require": {
- "php": ">=7.1"
+ "php": ">=7.2"
},
"type": "library",
"extra": {
- "branch-alias": {
- "dev-main": "1.28-dev"
- },
"thanks": {
"name": "symfony/polyfill",
"url": "https://github.com/symfony/polyfill"
@@ -2046,7 +2087,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-php80/tree/v1.28.0"
+ "source": "https://github.com/symfony/polyfill-php80/tree/v1.31.0"
},
"funding": [
{
@@ -2062,20 +2103,20 @@
"type": "tidelift"
}
],
- "time": "2023-01-26T09:26:14+00:00"
+ "time": "2024-09-09T11:45:10+00:00"
},
{
"name": "symfony/process",
- "version": "v5.4.28",
+ "version": "v5.4.44",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
- "reference": "45261e1fccad1b5447a8d7a8e67aa7b4a9798b7b"
+ "reference": "1b9fa82b5c62cd49da8c9e3952dd8531ada65096"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/process/zipball/45261e1fccad1b5447a8d7a8e67aa7b4a9798b7b",
- "reference": "45261e1fccad1b5447a8d7a8e67aa7b4a9798b7b",
+ "url": "https://api.github.com/repos/symfony/process/zipball/1b9fa82b5c62cd49da8c9e3952dd8531ada65096",
+ "reference": "1b9fa82b5c62cd49da8c9e3952dd8531ada65096",
"shasum": ""
},
"require": {
@@ -2108,7 +2149,7 @@
"description": "Executes commands in sub-processes",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/process/tree/v5.4.28"
+ "source": "https://github.com/symfony/process/tree/v5.4.44"
},
"funding": [
{
@@ -2124,7 +2165,7 @@
"type": "tidelift"
}
],
- "time": "2023-08-07T10:36:04+00:00"
+ "time": "2024-09-17T12:46:43+00:00"
},
{
"name": "theseer/tokenizer",
diff --git a/lib/Dav/PatchPlugin.php b/lib/Dav/PatchPlugin.php
index f4dd8a8d8..9b488ec78 100644
--- a/lib/Dav/PatchPlugin.php
+++ b/lib/Dav/PatchPlugin.php
@@ -129,7 +129,7 @@ public function httpPatch(RequestInterface $request, ResponseInterface $response
// Append to existing value
if ($method === self::METHOD_APPEND) {
$oldData = $properties[0]->getValue();
- $properties[0]->setRawMimeDirValue($oldData.$propertyData);
+ $properties[0]->setRawMimeDirValue($oldData . $propertyData);
}
// Validate & write
diff --git a/lib/Service/Social/FacebookProvider.php b/lib/Service/Social/FacebookProvider.php
index a862e8208..7353d8d85 100644
--- a/lib/Service/Social/FacebookProvider.php
+++ b/lib/Service/Social/FacebookProvider.php
@@ -116,7 +116,7 @@ protected function getProfileIds(array $contact):array {
*/
protected function findFacebookId(string $profileName):string {
try {
- $result = $this->httpClient->get('https://facebook.com/'.$profileName);
+ $result = $this->httpClient->get('https://facebook.com/' . $profileName);
if ($result->getStatusCode() !== 200) {
return $profileName;
}
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 1f39cfb8d..519cadd02 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -4,8 +4,8 @@
* SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
-require_once __DIR__.'/../../../lib/base.php';
-require_once __DIR__.'/../vendor/autoload.php';
+require_once __DIR__ . '/../../../lib/base.php';
+require_once __DIR__ . '/../vendor/autoload.php';
\OC::$loader->addValidRoot(OC::$SERVERROOT . '/tests');
\OC_App::loadApp('contacts');
diff --git a/tests/unit/Service/Social/DiasporaProviderTest.php b/tests/unit/Service/Social/DiasporaProviderTest.php
index 3b3ef68f3..e499dfdbd 100644
--- a/tests/unit/Service/Social/DiasporaProviderTest.php
+++ b/tests/unit/Service/Social/DiasporaProviderTest.php
@@ -81,10 +81,10 @@ public function dataProviderGetImageUrls() {
'https://three/public/two.atom'
];
$contactWithSocialHtml = array_map(function ($url) {
- return ''.$url.'-small-avatar.jpg';
+ return '' . $url . '-small-avatar.jpg';
}, $contactWithSocialUrls);
$contactWithSocialImg = array_map(function ($url) {
- return $url.'-large-avatar.jpg';
+ return $url . '-large-avatar.jpg';
}, $contactWithSocialUrls);
$contactWithoutSocial = [
@@ -145,9 +145,9 @@ public function testGetImageUrlLoop() {
];
$url1 = 'https://two/public/one.atom';
$url2 = 'https://four/public/three.atom';
- $html1 = '';
- $html2 = ''.$url2.'-small-avatar.jpg';
- $img = $url2.'-large-avatar.jpg';
+ $html1 = '';
+ $html2 = '' . $url2 . '-small-avatar.jpg';
+ $img = $url2 . '-large-avatar.jpg';
$this->response
->method('getBody')
diff --git a/tests/unit/Service/Social/TumblrProviderTest.php b/tests/unit/Service/Social/TumblrProviderTest.php
index 5387ebe9d..f9ee14697 100644
--- a/tests/unit/Service/Social/TumblrProviderTest.php
+++ b/tests/unit/Service/Social/TumblrProviderTest.php
@@ -64,7 +64,7 @@ public function dataProviderGetImageUrls() {
];
foreach ($contactWithSocial['X-SOCIALPROFILE'] as $profile) {
- $urls[] = 'https://api.tumblr.com/v2/blog/'.$profile['value'].'/avatar/512';
+ $urls[] = 'https://api.tumblr.com/v2/blog/' . $profile['value'] . '/avatar/512';
}
return [
diff --git a/tests/unit/Service/Social/XingProviderTest.php b/tests/unit/Service/Social/XingProviderTest.php
index 807e0f14f..9cb99783b 100644
--- a/tests/unit/Service/Social/XingProviderTest.php
+++ b/tests/unit/Service/Social/XingProviderTest.php
@@ -73,7 +73,7 @@ public function dataProviderGetImageUrls() {
$contactImages = [
'username1' => 'https://profile-images-abcusername1.jpg',
'username2' => 'https://profile-images-abcusername2.jpg',
- 'username3' => 'https://'.urlencode('profile-images-abc.ÄÖÜ/äöü_ß.jpg')
+ 'username3' => 'https://' . urlencode('profile-images-abc.ÄÖÜ/äöü_ß.jpg')
];
$contactWithSocial = [
'X-SOCIALPROFILE' => [
@@ -88,7 +88,7 @@ public function dataProviderGetImageUrls() {
'https://www.xing.com/profile/username3'
];
$contactWithSocialHtml = array_map(function ($profile) use ($contactImages) {
- return '
';
+ return '
';
}, $contactWithSocial['X-SOCIALPROFILE']);
$contactWithSocialImg = array_map(function ($profile) use ($contactImages) {
return $contactImages[$profile['value']];
diff --git a/tests/unit/Service/SocialApiServiceTest.php b/tests/unit/Service/SocialApiServiceTest.php
index f6f70e194..824fa4acf 100644
--- a/tests/unit/Service/SocialApiServiceTest.php
+++ b/tests/unit/Service/SocialApiServiceTest.php
@@ -303,7 +303,7 @@ public function testUpdateContactWithNetworkVersion4() {
$changes = [
'URI' => $contact['URI'],
'VERSION' => $contact['VERSION'],
- 'PHOTO' => 'data:'.$imageType.';base64,' . base64_encode($body)
+ 'PHOTO' => 'data:' . $imageType . ';base64,' . base64_encode($body)
];
$this->socialProvider