Update and apply php-cs-fixer (#4)

Author: connorhu

.php-cs-fixer.dist.php

@@ -6,19 +6,14 @@
 return (new PhpCsFixer\Config())
     ->setRules([
         '@Symfony' => true,
-        '@Symfony:risky' => true,
-        '@PHPUnit75Migration:risky' => true,
-        'php_unit_dedicate_assert' => ['target' => '5.6'],
         'array_syntax' => ['syntax' => 'short'],
         'php_unit_fqcn_annotation' => true,
         'no_unreachable_default_argument_value' => false,
         'braces' => ['allow_single_line_closure' => true],
         'heredoc_to_nowdoc' => false,
         'ordered_imports' => true,
         'phpdoc_types_order' => ['null_adjustment' => 'always_last', 'sort_algorithm' => 'none'],
-        'native_function_invocation' => ['include' => ['@compiler_optimized'], 'scope' => 'all'],
         'fopen_flags' => false,
     ])
-    ->setRiskyAllowed(true)
     ->setFinder($finder)
 ;

lib/classes/Swift.php

@@ -15,7 +15,7 @@
  */
 abstract class Swift
 {
-    const VERSION = '6.3.0';
+    public const VERSION = '6.3.0';
 
     public static $initialized = false;
     public static $inits = [];

lib/classes/Swift/Attachment.php

@@ -30,7 +30,7 @@ public function __construct($data = null, $filename = null, $contentType = null)
             'Swift_Mime_Attachment::__construct',
             Swift_DependencyContainer::getInstance()
                 ->createDependenciesFor('mime.attachment')
-            );
+        );
 
         $this->setBody($data, $contentType);
         $this->setFilename($filename);

lib/classes/Swift/ByteStream/AbstractFilterableInputStream.php

@@ -76,9 +76,9 @@ public function removeFilter($key)
      *
      * @param string $bytes
      *
-     * @throws Swift_IoException
-     *
      * @return int
+     *
+     * @throws Swift_IoException
      */
     public function write($bytes)
     {

lib/classes/Swift/ByteStream/FileByteStream.php

@@ -31,7 +31,7 @@ class Swift_ByteStream_FileByteStream extends Swift_ByteStream_AbstractFilterabl
     private $writer;
 
     /** If stream is seekable true/false, or null if not known */
-    private $seekable = null;
+    private $seekable;
 
     /**
      * Create a new FileByteStream for $path.

lib/classes/Swift/ByteStream/TemporaryFileByteStream.php

@@ -42,11 +42,11 @@ public function __destruct()
 
     public function __sleep()
     {
-        throw new \BadMethodCallException('Cannot serialize '.__CLASS__);
+        throw new BadMethodCallException('Cannot serialize '.__CLASS__);
     }
 
     public function __wakeup()
     {
-        throw new \BadMethodCallException('Cannot unserialize '.__CLASS__);
+        throw new BadMethodCallException('Cannot unserialize '.__CLASS__);
     }
 }

lib/classes/Swift/CharacterReader.php

@@ -16,17 +16,16 @@
  */
 interface Swift_CharacterReader
 {
-    const MAP_TYPE_INVALID = 0x01;
-    const MAP_TYPE_FIXED_LEN = 0x02;
-    const MAP_TYPE_POSITIONS = 0x03;
+    public const MAP_TYPE_INVALID = 0x01;
+    public const MAP_TYPE_FIXED_LEN = 0x02;
+    public const MAP_TYPE_POSITIONS = 0x03;
 
     /**
      * Returns the complete character map.
      *
      * @param string $string
      * @param int    $startOffset
      * @param array  $currentMap
-     * @param mixed  $ignoredChars
      *
      * @return int
      */

lib/classes/Swift/CharacterReader/GenericFixedWidthReader.php

@@ -39,7 +39,6 @@ public function __construct($width)
      * @param string $string
      * @param int    $startOffset
      * @param array  $currentMap
-     * @param mixed  $ignoredChars
      *
      * @return int
      */

lib/classes/Swift/CharacterReader/Utf8Reader.php

@@ -78,7 +78,6 @@ class Swift_CharacterReader_Utf8Reader implements Swift_CharacterReader
      * @param string $string
      * @param int    $startOffset
      * @param array  $currentMap
-     * @param mixed  $ignoredChars
      *
      * @return int
      */

lib/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php

@@ -71,7 +71,7 @@ public function init()
             'constructor' => [],
             ];
 
-        //7-8 bit charsets
+        // 7-8 bit charsets
         self::$map['(us-)?ascii'] = $singleByte;
         self::$map['(iso|iec)-?8859-?[0-9]+'] = $singleByte;
         self::$map['windows-?125[0-9]'] = $singleByte;
@@ -84,10 +84,10 @@ public function init()
         self::$map['(cork|t1)'] = $singleByte;
         self::$map['v?iscii'] = $singleByte;
 
-        //16 bits
+        // 16 bits
         self::$map['(ucs-?2|utf-?16)'] = $doubleByte;
 
-        //32 bits
+        // 32 bits
         self::$map['(ucs-?4|utf-?32)'] = $fourBytes;
 
         // Fallback