aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel <mail@danielkesselberg.de>2024-08-25 21:09:41 +0200
committerGitHub <noreply@github.com>2024-08-25 21:09:41 +0200
commitcead56ac6a46ccd6567345772462c19ded7f4570 (patch)
tree47e8b5c0125978a0b2ef0aba8d4e3f5319faa2c7
parent5d632154c234cd55f9663da6a2e09a1a833c1b6e (diff)
parent47168ad5bdf167f5f25c545fdb671c2d2515d87c (diff)
downloadnextcloud-server-cead56ac6a46ccd6567345772462c19ded7f4570.tar.gz
nextcloud-server-cead56ac6a46ccd6567345772462c19ded7f4570.zip
Merge pull request #47464 from nextcloud/dependabot/composer/vendor-bin/cs-fixer/nextcloud/coding-standard-1.2.3
bump nextcloud/coding-standard from 1.2.1 to 1.2.3 in /vendor-bin/cs-fixer
-rw-r--r--.git-blame-ignore-revs1
-rw-r--r--lib/public/Mail/Provider/IMessage.php18
-rw-r--r--lib/public/Mail/Provider/Message.php18
-rw-r--r--vendor-bin/cs-fixer/composer.lock24
4 files changed, 31 insertions, 30 deletions
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index e804aa9f969..143ae3f7632 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -5,3 +5,4 @@
# Update to coding-standard 1.2.3
af6de04e9e141466dc229e444ff3f146f4a34765
+0bd284cb81b6866338aaaa67aa1d81ef9bfbb2ab
diff --git a/lib/public/Mail/Provider/IMessage.php b/lib/public/Mail/Provider/IMessage.php
index d4f03b24d0d..2ad3b422b9d 100644
--- a/lib/public/Mail/Provider/IMessage.php
+++ b/lib/public/Mail/Provider/IMessage.php
@@ -43,7 +43,7 @@ interface IMessage {
*
* @since 30.0.0
*
- * @return IAddress|null sender's mail address object
+ * @return IAddress|null sender's mail address object
*/
public function getFrom(): IAddress|null;
@@ -63,7 +63,7 @@ interface IMessage {
*
* @since 30.0.0
*
- * @return IAddress|null sender's reply to mail address object
+ * @return IAddress|null sender's reply to mail address object
*/
public function getReplyTo(): IAddress|null;
@@ -83,7 +83,7 @@ interface IMessage {
*
* @since 30.0.0
*
- * @return array<int,IAddress> collection of all recipient mail address objects
+ * @return array<int,IAddress> collection of all recipient mail address objects
*/
public function getTo(): array;
@@ -103,7 +103,7 @@ interface IMessage {
*
* @since 30.0.0
*
- * @return array<int,IAddress> collection of all copied recipient mail address objects
+ * @return array<int,IAddress> collection of all copied recipient mail address objects
*/
public function getCc(): array;
@@ -123,7 +123,7 @@ interface IMessage {
*
* @since 30.0.0
*
- * @return array<int,IAddress> collection of all blind copied recipient mail address objects
+ * @return array<int,IAddress> collection of all blind copied recipient mail address objects
*/
public function getBcc(): array;
@@ -143,7 +143,7 @@ interface IMessage {
*
* @since 30.0.0
*
- * @return string|null subject of message or null if one is not set
+ * @return string|null subject of message or null if one is not set
*/
public function getSubject(): string|null;
@@ -166,7 +166,7 @@ interface IMessage {
*
* @since 30.0.0
*
- * @return string|null html/plain body of this message or null if one is not set
+ * @return string|null html/plain body of this message or null if one is not set
*/
public function getBody(): string|null;
@@ -186,7 +186,7 @@ interface IMessage {
*
* @since 30.0.0
*
- * @return string|null html body of this message or null if one is not set
+ * @return string|null html body of this message or null if one is not set
*/
public function getBodyHtml(): string|null;
@@ -206,7 +206,7 @@ interface IMessage {
*
* @since 30.0.0
*
- * @return string|null plain text body of this message or null if one is not set
+ * @return string|null plain text body of this message or null if one is not set
*/
public function getBodyPlain(): string|null;
diff --git a/lib/public/Mail/Provider/Message.php b/lib/public/Mail/Provider/Message.php
index bfa5153f4ef..7814fb849d5 100644
--- a/lib/public/Mail/Provider/Message.php
+++ b/lib/public/Mail/Provider/Message.php
@@ -63,7 +63,7 @@ class Message implements \OCP\Mail\Provider\IMessage {
*
* @since 30.0.0
*
- * @return IAddress|null sender's mail address object
+ * @return IAddress|null sender's mail address object
*/
public function getFrom(): IAddress|null {
// evaluate if data store field exists and return value(s) or null otherwise
@@ -91,7 +91,7 @@ class Message implements \OCP\Mail\Provider\IMessage {
*
* @since 30.0.0
*
- * @return IAddress|null sender's reply to mail address object
+ * @return IAddress|null sender's reply to mail address object
*/
public function getReplyTo(): IAddress|null {
// evaluate if data store field exists and return value(s) or null otherwise
@@ -119,7 +119,7 @@ class Message implements \OCP\Mail\Provider\IMessage {
*
* @since 30.0.0
*
- * @return array<int,IAddress> collection of all recipient mail address objects
+ * @return array<int,IAddress> collection of all recipient mail address objects
*/
public function getTo(): array {
// evaluate if data store field exists and return value(s) or empty collection
@@ -147,7 +147,7 @@ class Message implements \OCP\Mail\Provider\IMessage {
*
* @since 30.0.0
*
- * @return array<int,IAddress> collection of all copied recipient mail address objects
+ * @return array<int,IAddress> collection of all copied recipient mail address objects
*/
public function getCc(): array {
// evaluate if data store field exists and return value(s) or empty collection
@@ -175,7 +175,7 @@ class Message implements \OCP\Mail\Provider\IMessage {
*
* @since 30.0.0
*
- * @return array<int,IAddress> collection of all blind copied recipient mail address objects
+ * @return array<int,IAddress> collection of all blind copied recipient mail address objects
*/
public function getBcc(): array {
// evaluate if data store field exists and return value(s) or empty collection
@@ -203,7 +203,7 @@ class Message implements \OCP\Mail\Provider\IMessage {
*
* @since 30.0.0
*
- * @return string|null subject of message or null if one is not set
+ * @return string|null subject of message or null if one is not set
*/
public function getSubject(): string|null {
// evaluate if data store field exists and return value(s) or null otherwise
@@ -238,7 +238,7 @@ class Message implements \OCP\Mail\Provider\IMessage {
*
* @since 30.0.0
*
- * @return string|null html/plain body of this message or null if one is not set
+ * @return string|null html/plain body of this message or null if one is not set
*/
public function getBody(): string|null {
// evaluate if data store field(s) exists and return value
@@ -272,7 +272,7 @@ class Message implements \OCP\Mail\Provider\IMessage {
*
* @since 30.0.0
*
- * @return string|null html body of this message or null if one is not set
+ * @return string|null html body of this message or null if one is not set
*/
public function getBodyHtml(): string|null {
// evaluate if data store field exists and return value(s) or null otherwise
@@ -300,7 +300,7 @@ class Message implements \OCP\Mail\Provider\IMessage {
*
* @since 30.0.0
*
- * @return string|null plain text body of this message or null if one is not set
+ * @return string|null plain text body of this message or null if one is not set
*/
public function getBodyPlain(): string|null {
// evaluate if data store field exists and return value(s) or null otherwise
diff --git a/vendor-bin/cs-fixer/composer.lock b/vendor-bin/cs-fixer/composer.lock
index 489451c00e5..e905331a93a 100644
--- a/vendor-bin/cs-fixer/composer.lock
+++ b/vendor-bin/cs-fixer/composer.lock
@@ -8,16 +8,16 @@
"packages": [
{
"name": "nextcloud/coding-standard",
- "version": "v1.2.1",
+ "version": "v1.2.3",
"source": {
"type": "git",
"url": "https://github.com/nextcloud/coding-standard.git",
- "reference": "cf5f18d989ec62fb4cdc7fc92a36baf34b3d829e"
+ "reference": "bc9c53a5306114b60c4363057aff9c2ed10a54da"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nextcloud/coding-standard/zipball/cf5f18d989ec62fb4cdc7fc92a36baf34b3d829e",
- "reference": "cf5f18d989ec62fb4cdc7fc92a36baf34b3d829e",
+ "url": "https://api.github.com/repos/nextcloud/coding-standard/zipball/bc9c53a5306114b60c4363057aff9c2ed10a54da",
+ "reference": "bc9c53a5306114b60c4363057aff9c2ed10a54da",
"shasum": ""
},
"require": {
@@ -43,22 +43,22 @@
"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.1"
+ "source": "https://github.com/nextcloud/coding-standard/tree/v1.2.3"
},
- "time": "2024-02-01T14:54:37+00:00"
+ "time": "2024-08-23T14:32:32+00:00"
},
{
"name": "php-cs-fixer/shim",
- "version": "v3.58.1",
+ "version": "v3.62.0",
"source": {
"type": "git",
"url": "https://github.com/PHP-CS-Fixer/shim.git",
- "reference": "a6af3df8516033b450a220003c673b9393d68f55"
+ "reference": "7a91d5ce45c486f5b445d95901228507a02f60ae"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PHP-CS-Fixer/shim/zipball/a6af3df8516033b450a220003c673b9393d68f55",
- "reference": "a6af3df8516033b450a220003c673b9393d68f55",
+ "url": "https://api.github.com/repos/PHP-CS-Fixer/shim/zipball/7a91d5ce45c486f5b445d95901228507a02f60ae",
+ "reference": "7a91d5ce45c486f5b445d95901228507a02f60ae",
"shasum": ""
},
"require": {
@@ -95,9 +95,9 @@
"description": "A tool to automatically fix PHP code style",
"support": {
"issues": "https://github.com/PHP-CS-Fixer/shim/issues",
- "source": "https://github.com/PHP-CS-Fixer/shim/tree/v3.58.1"
+ "source": "https://github.com/PHP-CS-Fixer/shim/tree/v3.62.0"
},
- "time": "2024-05-29T16:39:49+00:00"
+ "time": "2024-08-07T17:03:46+00:00"
}
],
"packages-dev": [],