Completed
Pull Request — 5.x (#23)
by Lars
07:46
created
lib/classes/Swift/Signers/OpenDKIMSigner.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
         $header = new Swift_Mime_Headers_OpenDKIMHeader('DKIM-Signature');
80 80
         $headerVal = $this->_dkimHandler->getSignatureHeader();
81 81
         if (!$headerVal) {
82
-            throw new Swift_SwiftException('OpenDKIM Error: ' . $this->_dkimHandler->getError());
82
+            throw new Swift_SwiftException('OpenDKIM Error: '.$this->_dkimHandler->getError());
83 83
         }
84 84
         $header->setValue($headerVal);
85 85
         $headers->set($header);
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
112 112
             OpenDKIM::setOption(OpenDKIM::OPTS_FIXEDTIME, time());
113 113
         } else {
114 114
             if (!OpenDKIM::setOption(OpenDKIM::OPTS_FIXEDTIME, $this->_signatureTimestamp)) {
115
-                throw new Swift_SwiftException('Unable to force signature timestamp [' . openssl_error_string() . ']');
115
+                throw new Swift_SwiftException('Unable to force signature timestamp ['.openssl_error_string().']');
116 116
             }
117 117
         }
118 118
 
Please login to merge, or discard this patch.
lib/classes/Swift/Plugins/LoggerPlugin.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -134,7 +134,7 @@
 block discarded – undo
134 134
         $code = $e->getCode();
135 135
         $this->_logger->add(sprintf('!! %s (code: %s)', $message, $code));
136 136
         $message .= PHP_EOL;
137
-        $message .= 'Log data:' . PHP_EOL;
137
+        $message .= 'Log data:'.PHP_EOL;
138 138
         $message .= $this->_logger->dump();
139 139
         $evt->cancelBubble();
140 140
         throw new Swift_TransportException($message, $code, $e->getPrevious());
Please login to merge, or discard this patch.
lib/classes/Swift/Plugins/Reporters/HtmlReporter.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -25,14 +25,14 @@
 block discarded – undo
25 25
     public function notify(Swift_Mime_Message $message, $address, $result)
26 26
     {
27 27
         if (self::RESULT_PASS === $result) {
28
-            echo '<div style="color: #fff; background: #006600; padding: 2px; margin: 2px;">' . PHP_EOL;
29
-            echo 'PASS ' . $address . PHP_EOL;
30
-            echo '</div>' . PHP_EOL;
28
+            echo '<div style="color: #fff; background: #006600; padding: 2px; margin: 2px;">'.PHP_EOL;
29
+            echo 'PASS '.$address.PHP_EOL;
30
+            echo '</div>'.PHP_EOL;
31 31
             flush();
32 32
         } else {
33
-            echo '<div style="color: #fff; background: #880000; padding: 2px; margin: 2px;">' . PHP_EOL;
34
-            echo 'FAIL ' . $address . PHP_EOL;
35
-            echo '</div>' . PHP_EOL;
33
+            echo '<div style="color: #fff; background: #880000; padding: 2px; margin: 2px;">'.PHP_EOL;
34
+            echo 'FAIL '.$address.PHP_EOL;
35
+            echo '</div>'.PHP_EOL;
36 36
             flush();
37 37
         }
38 38
     }
Please login to merge, or discard this patch.
lib/classes/Swift/Encoder/Rfc2231Encoder.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -63,7 +63,7 @@
 block discarded – undo
63 63
             if (
64 64
                 $currentLine !== ''
65 65
                 &&
66
-                strlen($currentLine . $encodedChar) > $thisLineLength
66
+                strlen($currentLine.$encodedChar) > $thisLineLength
67 67
             ) {
68 68
                 $lines[] = '';
69 69
                 $currentLine = &$lines[$lineCount++];
Please login to merge, or discard this patch.
lib/classes/Swift/Encoder/Base64Encoder.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -39,11 +39,11 @@
 block discarded – undo
39 39
         $firstLine = '';
40 40
 
41 41
         if (0 != $firstLineOffset) {
42
-            $firstLine = substr($encodedString, 0, $maxLineLength - $firstLineOffset) . "\r\n";
42
+            $firstLine = substr($encodedString, 0, $maxLineLength - $firstLineOffset)."\r\n";
43 43
             $encodedString = substr($encodedString, $maxLineLength - $firstLineOffset);
44 44
         }
45 45
 
46
-        return $firstLine . trim(chunk_split($encodedString, $maxLineLength, "\r\n"));
46
+        return $firstLine.trim(chunk_split($encodedString, $maxLineLength, "\r\n"));
47 47
     }
48 48
 
49 49
     /**
Please login to merge, or discard this patch.
lib/classes/Swift/CharacterStream/NgCharacterStream.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -198,7 +198,7 @@
 block discarded – undo
198 198
                 $to = $start;
199 199
                 for (; $this->_currentPos < $end; ++$this->_currentPos) {
200 200
                     if (isset($this->_map['i'][$this->_currentPos])) {
201
-                        $ret .= substr($this->_datas, $start, $to - $start) . '?';
201
+                        $ret .= substr($this->_datas, $start, $to - $start).'?';
202 202
                         $start = $this->_map['p'][$this->_currentPos];
203 203
                     } else {
204 204
                         $to = $this->_map['p'][$this->_currentPos];
Please login to merge, or discard this patch.
lib/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -51,23 +51,23 @@  discard block
 block discarded – undo
51 51
         $prefix = 'Swift_CharacterReader_';
52 52
 
53 53
         $singleByte = array(
54
-            'class' => $prefix . 'GenericFixedWidthReader',
54
+            'class' => $prefix.'GenericFixedWidthReader',
55 55
             'constructor' => array(1),
56 56
             );
57 57
 
58 58
         $doubleByte = array(
59
-            'class' => $prefix . 'GenericFixedWidthReader',
59
+            'class' => $prefix.'GenericFixedWidthReader',
60 60
             'constructor' => array(2),
61 61
             );
62 62
 
63 63
         $fourBytes = array(
64
-            'class' => $prefix . 'GenericFixedWidthReader',
64
+            'class' => $prefix.'GenericFixedWidthReader',
65 65
             'constructor' => array(4),
66 66
             );
67 67
 
68 68
         // Utf-8
69 69
         self::$_map['utf-?8'] = array(
70
-            'class' => $prefix . 'Utf8Reader',
70
+            'class' => $prefix.'Utf8Reader',
71 71
             'constructor' => array(),
72 72
             );
73 73
 
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
     {
106 106
         $charset = trim(strtolower($charset));
107 107
         foreach (self::$_map as $pattern => $spec) {
108
-            $re = '/^' . $pattern . '$/D';
108
+            $re = '/^'.$pattern.'$/D';
109 109
             if (preg_match($re, $charset)) {
110 110
                 if (!array_key_exists($pattern, self::$_loaded)) {
111 111
                     $reflector = new ReflectionClass($spec['class']);
Please login to merge, or discard this patch.
lib/classes/Swift/KeyCache/ArrayKeyCache.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -67,8 +67,8 @@  discard block
 block discarded – undo
67 67
                 break;
68 68
             default:
69 69
                 throw new Swift_SwiftException(
70
-                    'Invalid mode [' . $mode . '] used to set nsKey=' .
71
-                    $nsKey . ', itemKey=' . $itemKey
70
+                    'Invalid mode ['.$mode.'] used to set nsKey='.
71
+                    $nsKey.', itemKey='.$itemKey
72 72
                 );
73 73
         }
74 74
     }
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
                 break;
102 102
             default:
103 103
                 throw new Swift_SwiftException(
104
-                    'Invalid mode [' . $mode . '] used to set nsKey=' . $nsKey . ', itemKey=' . $itemKey
104
+                    'Invalid mode ['.$mode.'] used to set nsKey='.$nsKey.', itemKey='.$itemKey
105 105
                 );
106 106
         }
107 107
     }
Please login to merge, or discard this patch.
lib/classes/Swift/KeyCache/DiskKeyCache.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -95,8 +95,8 @@  discard block
 block discarded – undo
95 95
                 break;
96 96
             default:
97 97
                 throw new Swift_SwiftException(
98
-                    'Invalid mode [' . $mode . '] used to set nsKey=' .
99
-                    $nsKey . ', itemKey=' . $itemKey
98
+                    'Invalid mode ['.$mode.'] used to set nsKey='.
99
+                    $nsKey.', itemKey='.$itemKey
100 100
                     );
101 101
                 break;
102 102
         }
@@ -129,8 +129,8 @@  discard block
 block discarded – undo
129 129
                 break;
130 130
             default:
131 131
                 throw new Swift_SwiftException(
132
-                    'Invalid mode [' . $mode . '] used to set nsKey=' .
133
-                    $nsKey . ', itemKey=' . $itemKey
132
+                    'Invalid mode ['.$mode.'] used to set nsKey='.
133
+                    $nsKey.', itemKey='.$itemKey
134 134
                     );
135 135
                 break;
136 136
         }
@@ -240,7 +240,7 @@  discard block
 block discarded – undo
240 240
      */
241 241
     public function hasKey($nsKey, $itemKey)
242 242
     {
243
-        return is_file($this->_path . '/' . $nsKey . '/' . $itemKey);
243
+        return is_file($this->_path.'/'.$nsKey.'/'.$itemKey);
244 244
     }
245 245
 
246 246
     /**
@@ -253,7 +253,7 @@  discard block
 block discarded – undo
253 253
     {
254 254
         if ($this->hasKey($nsKey, $itemKey)) {
255 255
             $this->_freeHandle($nsKey, $itemKey);
256
-            unlink($this->_path . '/' . $nsKey . '/' . $itemKey);
256
+            unlink($this->_path.'/'.$nsKey.'/'.$itemKey);
257 257
         }
258 258
     }
259 259
 
@@ -269,8 +269,8 @@  discard block
 block discarded – undo
269 269
                 $this->clearKey($nsKey, $itemKey);
270 270
             }
271 271
 
272
-            if (is_dir($this->_path . '/' . $nsKey)) {
273
-                rmdir($this->_path . '/' . $nsKey);
272
+            if (is_dir($this->_path.'/'.$nsKey)) {
273
+                rmdir($this->_path.'/'.$nsKey);
274 274
             }
275 275
 
276 276
             unset($this->_keys[$nsKey]);
@@ -284,10 +284,10 @@  discard block
 block discarded – undo
284 284
      */
285 285
     private function _prepareCache($nsKey)
286 286
     {
287
-        $cacheDir = $this->_path . '/' . $nsKey;
287
+        $cacheDir = $this->_path.'/'.$nsKey;
288 288
         if (!is_dir($cacheDir)) {
289 289
             if (!mkdir($cacheDir)) {
290
-                throw new Swift_IoException('Failed to create cache directory ' . $cacheDir);
290
+                throw new Swift_IoException('Failed to create cache directory '.$cacheDir);
291 291
             }
292 292
             $this->_keys[$nsKey] = array();
293 293
         }
@@ -304,11 +304,11 @@  discard block
 block discarded – undo
304 304
      */
305 305
     private function _getHandle($nsKey, $itemKey, $position)
306 306
     {
307
-        $position = (int)$position;
307
+        $position = (int) $position;
308 308
 
309 309
         if (!isset($this->_keys[$nsKey][$itemKey])) {
310 310
             $openMode = $this->hasKey($nsKey, $itemKey) ? 'r+b' : 'w+b';
311
-            $fp = fopen($this->_path . '/' . $nsKey . '/' . $itemKey, $openMode);
311
+            $fp = fopen($this->_path.'/'.$nsKey.'/'.$itemKey, $openMode);
312 312
             $this->_keys[$nsKey][$itemKey] = $fp;
313 313
         }
314 314
 
Please login to merge, or discard this patch.