Merge pull request PHPMailer#2583 from jrfnl/feature/composer-update-…

…version-constraints Composer: update version constraints
bpgs · Dec 18, 2021 · ff796f2 · ff796f2
2 parents a127e25 + d5a5ad1
commit ff796f2
Show file tree

Hide file tree

Showing 41 changed files with 2 additions and 42 deletions.
diff --git a/composer.json b/composer.json
@@ -35,10 +35,10 @@
         "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
         "doctrine/annotations": "^1.2",
         "php-parallel-lint/php-console-highlighter": "^0.5.0",
-        "php-parallel-lint/php-parallel-lint": "^1.3",
+        "php-parallel-lint/php-parallel-lint": "^1.3.1",
         "phpcompatibility/php-compatibility": "^9.3.5",
         "roave/security-advisories": "dev-latest",
-        "squizlabs/php_codesniffer": "^3.6.0",
+        "squizlabs/php_codesniffer": "^3.6.2",
         "yoast/phpunit-polyfills": "^1.0.0"
     },
     "suggest": {

diff --git a/test/OAuth/OAuthTest.php b/test/OAuth/OAuthTest.php
@@ -22,7 +22,6 @@
  */
 final class OAuthTest extends TestCase
 {
-
     /**
      * Test OAuth method.
      *

diff --git a/test/PHPMailer/AddEmbeddedImageTest.php b/test/PHPMailer/AddEmbeddedImageTest.php
@@ -27,7 +27,6 @@
  */
 final class AddEmbeddedImageTest extends PreSendTestCase
 {
-
     /**
      * Test successfully adding an embedded image.
      */

diff --git a/test/PHPMailer/AddStringAttachmentTest.php b/test/PHPMailer/AddStringAttachmentTest.php
@@ -27,7 +27,6 @@
  */
 final class AddStringAttachmentTest extends PreSendTestCase
 {
-
     /**
      * Test successfully adding a simple plain string attachment.
      */

diff --git a/test/PHPMailer/AddStringEmbeddedImageTest.php b/test/PHPMailer/AddStringEmbeddedImageTest.php
@@ -26,7 +26,6 @@
  */
 final class AddStringEmbeddedImageTest extends PreSendTestCase
 {
-
     /**
      * Test successfully adding a stingified embedded image without a name.
      */

diff --git a/test/PHPMailer/AuthCRAMMD5Test.php b/test/PHPMailer/AuthCRAMMD5Test.php
@@ -20,7 +20,6 @@
  */
 final class AuthCRAMMD5Test extends SendTestCase
 {
-
     /**
      * Test CRAM-MD5 authentication.
      * Needs a connection to a server that supports this auth mechanism, so commented out by default.

diff --git a/test/PHPMailer/CustomHeaderTest.php b/test/PHPMailer/CustomHeaderTest.php
@@ -22,7 +22,6 @@
  */
 final class CustomHeaderTest extends TestCase
 {
-
     /**
      * Tests setting and getting custom headers.
      *

diff --git a/test/PHPMailer/DKIMTest.php b/test/PHPMailer/DKIMTest.php
@@ -24,7 +24,6 @@
  */
 final class DKIMTest extends SendTestCase
 {
-
     /**
      * Whether or not to initialize the PHPMailer object to throw exceptions.
      *

diff --git a/test/PHPMailer/EncodeQTest.php b/test/PHPMailer/EncodeQTest.php
@@ -23,7 +23,6 @@
  */
 final class EncodeQTest extends TestCase
 {
-
     /**
      * Test encoding a string using Q encoding.
      *

diff --git a/test/PHPMailer/EncodeStringTest.php b/test/PHPMailer/EncodeStringTest.php
@@ -22,7 +22,6 @@
  */
 final class EncodeStringTest extends TestCase
 {
-
     /**
      * Encoding and charset tests.
      *

diff --git a/test/PHPMailer/FileIsAccessibleTest.php b/test/PHPMailer/FileIsAccessibleTest.php
@@ -28,7 +28,6 @@
  */
 final class FileIsAccessibleTest extends TestCase
 {
-
     /**
      * Verify whether the "is a file accessible" check works correctly.
      *

diff --git a/test/PHPMailer/FilenameToTypeTest.php b/test/PHPMailer/FilenameToTypeTest.php
@@ -23,7 +23,6 @@
  */
 final class FilenameToTypeTest extends TestCase
 {
-
     /**
      * Verify mapping a file name to a MIME type.
      *

diff --git a/test/PHPMailer/GenerateIdTest.php b/test/PHPMailer/GenerateIdTest.php
@@ -23,7 +23,6 @@
  */
 final class GenerateIdTest extends PreSendTestCase
 {
-
     /**
      * Test generating a unique ID.
      *

diff --git a/test/PHPMailer/GetLastMessageIDTest.php b/test/PHPMailer/GetLastMessageIDTest.php
@@ -23,7 +23,6 @@
  */
 final class GetLastMessageIDTest extends PreSendTestCase
 {
-
     /**
      * Test setting and retrieving an invalid message ID.
      *

diff --git a/test/PHPMailer/HasLineLongerThanMaxTest.php b/test/PHPMailer/HasLineLongerThanMaxTest.php
@@ -21,7 +21,6 @@
  */
 final class HasLineLongerThanMaxTest extends PreSendTestCase
 {
-
     /**
      * Test constructing a multipart message that contains lines that are too long for RFC compliance.
      *

diff --git a/test/PHPMailer/Html2TextTest.php b/test/PHPMailer/Html2TextTest.php
@@ -23,7 +23,6 @@
  */
 final class Html2TextTest extends TestCase
 {
-
     /**
      * Test converting an arbitrary HTML string into plain text.
      *

diff --git a/test/PHPMailer/ICalTest.php b/test/PHPMailer/ICalTest.php
@@ -20,7 +20,6 @@
  */
 final class ICalTest extends PreSendTestCase
 {
-
     /**
      * Test ICal method.
      *

diff --git a/test/PHPMailer/IsPermittedPathTest.php b/test/PHPMailer/IsPermittedPathTest.php
@@ -24,7 +24,6 @@
  */
 final class IsPermittedPathTest extends TestCase
 {
-
     /**
      * Test whether the validation of whether a path is of a permitted type works correctly.
      *

diff --git a/test/PHPMailer/IsValidHostTest.php b/test/PHPMailer/IsValidHostTest.php
@@ -23,7 +23,6 @@
  */
 final class IsValidHostTest extends TestCase
 {
-
     /**
      * Test host validation when a valid host is passed.
      *

diff --git a/test/PHPMailer/LocalizationTest.php b/test/PHPMailer/LocalizationTest.php
@@ -31,7 +31,6 @@
  */
 final class LocalizationTest extends TestCase
 {
-
     /**
      * Test setting the preferred language for error messages.
      *

diff --git a/test/PHPMailer/MailTransportTest.php b/test/PHPMailer/MailTransportTest.php
@@ -20,7 +20,6 @@
  */
 final class MailTransportTest extends SendTestCase
 {
-
     /**
      * Test sending using SendMail.
      *

diff --git a/test/PHPMailer/MbPathinfoTest.php b/test/PHPMailer/MbPathinfoTest.php
@@ -23,7 +23,6 @@
  */
 final class MbPathinfoTest extends TestCase
 {
-
     /**
      * Verify retrieving information about a file path when the $options parameter has been passed.
      *

diff --git a/test/PHPMailer/MimeTypesTest.php b/test/PHPMailer/MimeTypesTest.php
@@ -23,7 +23,6 @@
  */
 final class MimeTypesTest extends TestCase
 {
-
     /**
      * Test mime type mapping.
      *

diff --git a/test/PHPMailer/NormalizeBreaksTest.php b/test/PHPMailer/NormalizeBreaksTest.php
@@ -24,7 +24,6 @@
  */
 final class NormalizeBreaksTest extends TestCase
 {
-
     /**
      * Test line break normalization.
      *

diff --git a/test/PHPMailer/ParseAddressesTest.php b/test/PHPMailer/ParseAddressesTest.php
@@ -28,7 +28,6 @@
  */
 final class ParseAddressesTest extends TestCase
 {
-
     /**
      * Test RFC822 address splitting using the PHPMailer native implementation
      * with the Mbstring extension available.

diff --git a/test/PHPMailer/PunyencodeAddressTest.php b/test/PHPMailer/PunyencodeAddressTest.php
@@ -23,7 +23,6 @@
  */
 final class PunyencodeAddressTest extends TestCase
 {
-
     /**
      * Test IDN to ASCII form/punycode conversion for an email address.
      *

diff --git a/test/PHPMailer/QuotedStringTest.php b/test/PHPMailer/QuotedStringTest.php
@@ -23,7 +23,6 @@
  */
 final class QuotedStringTest extends TestCase
 {
-
     /**
      * Test quoting of a string depending on the content of the string.
      *

diff --git a/test/PHPMailer/ReplyToGetSetClearTest.php b/test/PHPMailer/ReplyToGetSetClearTest.php
@@ -22,7 +22,6 @@
  */
 final class ReplyToGetSetClearTest extends PreSendTestCase
 {
-
     /**
      * Test adding a non-IDN reply-to address.
      *

diff --git a/test/PHPMailer/SetErrorTest.php b/test/PHPMailer/SetErrorTest.php
@@ -24,7 +24,6 @@
  */
 final class SetErrorTest extends TestCase
 {
-
     /**
      * Test simple, non-STMP, error registration.
      */

diff --git a/test/PHPMailer/SetFromTest.php b/test/PHPMailer/SetFromTest.php
@@ -24,7 +24,6 @@
  */
 final class SetFromTest extends TestCase
 {
-
     /**
      * Test succesfully setting the From, FromName and Sender properties.
      *

diff --git a/test/PHPMailer/SetTest.php b/test/PHPMailer/SetTest.php
@@ -22,7 +22,6 @@
  */
 final class SetTest extends TestCase
 {
-
     /**
      * Test setting the value of a class property.
      *

diff --git a/test/PHPMailer/SetWordWrapTest.php b/test/PHPMailer/SetWordWrapTest.php
@@ -23,7 +23,6 @@
  */
 final class SetWordWrapTest extends PreSendTestCase
 {
-
     /**
      * Test word-wrapping a message.
      *

diff --git a/test/PHPMailer/Utf8CharBoundaryTest.php b/test/PHPMailer/Utf8CharBoundaryTest.php
@@ -24,7 +24,6 @@
  */
 final class Utf8CharBoundaryTest extends TestCase
 {
-
     /**
      * Verify that the utf8CharBoundary() returns the correct last character boundary for encoded text.
      *

diff --git a/test/PHPMailer/ValidateAddressCustomValidatorTest.php b/test/PHPMailer/ValidateAddressCustomValidatorTest.php
@@ -23,7 +23,6 @@
  */
 final class ValidateAddressCustomValidatorTest extends TestCase
 {
-
     /**
      * Test injecting a one-off custom validator.
      */

diff --git a/test/PHPMailer/ValidateAddressTest.php b/test/PHPMailer/ValidateAddressTest.php
@@ -33,7 +33,6 @@
  */
 final class ValidateAddressTest extends TestCase
 {
-
     /**
      * Run before this test class.
      */

diff --git a/test/PHPMailer/WrapTextTest.php b/test/PHPMailer/WrapTextTest.php
@@ -23,7 +23,6 @@
  */
 final class WrapTextTest extends TestCase
 {
-
     /**
      * Test wrapping text.
      *

diff --git a/test/POP3/PopBeforeSmtpTest.php b/test/POP3/PopBeforeSmtpTest.php
@@ -25,7 +25,6 @@
  */
 final class PopBeforeSmtpTest extends TestCase
 {
-
     /**
      * PIDs of any processes we need to kill.
      *

diff --git a/test/PreSendTestCase.php b/test/PreSendTestCase.php
@@ -21,7 +21,6 @@
  */
 abstract class PreSendTestCase extends TestCase
 {
-
     /**
      * Property names and their values for the test instance of the PHPMailer class.
      *

diff --git a/test/Security/DenialOfServiceVectorsTest.php b/test/Security/DenialOfServiceVectorsTest.php
@@ -22,7 +22,6 @@
  */
 final class DenialOfServiceVectorsTest extends SendTestCase
 {
-
     /**
      * Test this denial of service attack.
      *

diff --git a/test/SendTestCase.php b/test/SendTestCase.php
@@ -20,7 +20,6 @@
  */
 abstract class SendTestCase extends PreSendTestCase
 {
-
     /**
      * Translation map for supported $REQUEST keys to the property name in the PHPMailer class.
      *

diff --git a/test/TestCase.php b/test/TestCase.php
@@ -24,7 +24,6 @@
  */
 abstract class TestCase extends PolyfillTestCase
 {
-
     /**
      * Whether or not to initialize the PHPMailer object to throw exceptions.
      *
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,7 +22,6 @@ @@
      */
     final class OAuthTest extends TestCase
     {
         /**
          * Test OAuth method.
          *
@@ Expand Down @@