Skip to content

Commit

Permalink
Merge pull request #4160 from nextcloud/renovate/nextcloud-coding-sta…
Browse files Browse the repository at this point in the history
…ndard-1.x

chore(deps): bump nextcloud/coding-standard from 1.2.3 to ^1.3.1
  • Loading branch information
renovate[bot] authored Sep 30, 2024
2 parents e3354a3 + 0cd6f2e commit 53051cd
Show file tree
Hide file tree
Showing 9 changed files with 88 additions and 47 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
107 changes: 74 additions & 33 deletions composer.lock

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

2 changes: 1 addition & 1 deletion lib/Dav/PatchPlugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/Service/Social/FacebookProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions tests/bootstrap.php
Original file line number Diff line number Diff line change
Expand Up @@ -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');
10 changes: 5 additions & 5 deletions tests/unit/Service/Social/DiasporaProviderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,10 @@ public function dataProviderGetImageUrls() {
'https://three/public/two.atom'
];
$contactWithSocialHtml = array_map(function ($url) {
return '<logo>'.$url.'-small-avatar.jpg</logo>';
return '<logo>' . $url . '-small-avatar.jpg</logo>';
}, $contactWithSocialUrls);
$contactWithSocialImg = array_map(function ($url) {
return $url.'-large-avatar.jpg';
return $url . '-large-avatar.jpg';
}, $contactWithSocialUrls);

$contactWithoutSocial = [
Expand Down Expand Up @@ -145,9 +145,9 @@ public function testGetImageUrlLoop() {
];
$url1 = 'https://two/public/one.atom';
$url2 = 'https://four/public/three.atom';
$html1 = '<link rel="alternate" href="'.$url2.'" />';
$html2 = '<logo>'.$url2.'-small-avatar.jpg</logo>';
$img = $url2.'-large-avatar.jpg';
$html1 = '<link rel="alternate" href="' . $url2 . '" />';
$html2 = '<logo>' . $url2 . '-small-avatar.jpg</logo>';
$img = $url2 . '-large-avatar.jpg';

$this->response
->method('getBody')
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/Service/Social/TumblrProviderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 [
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/Service/Social/XingProviderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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' => [
Expand All @@ -88,7 +88,7 @@ public function dataProviderGetImageUrls() {
'https://www.xing.com/profile/username3'
];
$contactWithSocialHtml = array_map(function ($profile) use ($contactImages) {
return '<img src="'.$contactImages[$profile['value']].'" />';
return '<img src="' . $contactImages[$profile['value']] . '" />';
}, $contactWithSocial['X-SOCIALPROFILE']);
$contactWithSocialImg = array_map(function ($profile) use ($contactImages) {
return $contactImages[$profile['value']];
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/Service/SocialApiServiceTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 53051cd

Please sign in to comment.