bug #664 Fixed properties not declared explicitly (deguif)

This PR was merged into the 5.x branch. Discussion ---------- Fixed properties not declared explicitly There were also some wrong property names used (eg `showLen` vs `_showLen`) that could be causing some bugs. Commits ------- e433854 Fixed properties not declared explicitly
swiftmailer · Apr 30, 2016 · 9417399 · 9417399
2 parents 0c1487b + e433854
commit 9417399
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 3 deletions.
diff --git a/lib/classes/Swift/Signers/DKIMSigner.php b/lib/classes/Swift/Signers/DKIMSigner.php
@@ -373,7 +373,7 @@ public function setBodySignedLen($len)
             $this->_showLen = true;
             $this->_maxLen = PHP_INT_MAX;
         } elseif ($len === false) {
-            $this->showLen = false;
+            $this->_showLen = false;
             $this->_maxLen = PHP_INT_MAX;
         } else {
             $this->_showLen = true;

diff --git a/lib/classes/Swift/Signers/DomainKeySigner.php b/lib/classes/Swift/Signers/DomainKeySigner.php
@@ -502,7 +502,7 @@ private function _startHash()
                 $this->_hashHandler = hash_init('sha1');
                 break;
         }
-        $this->_canonLine = '';
+        $this->_bodyCanonLine = '';
     }
 
     /**

diff --git a/tests/acceptance/Swift/Mime/ContentEncoder/NativeQpContentEncoderAcceptanceTest.php b/tests/acceptance/Swift/Mime/ContentEncoder/NativeQpContentEncoderAcceptanceTest.php
@@ -2,6 +2,8 @@
 
 class Swift_Mime_ContentEncoder_NativeQpContentEncoderAcceptanceTest extends \PHPUnit_Framework_TestCase
 {
+    protected $_samplesDir;
+
     /**
      * @var Swift_Mime_ContentEncoder_NativeQpContentEncoder
      */

diff --git a/tests/acceptance/Swift/Transport/StreamBuffer/SocketTimeoutTest.php b/tests/acceptance/Swift/Transport/StreamBuffer/SocketTimeoutTest.php
@@ -4,6 +4,8 @@ class Swift_Transport_StreamBuffer_SocketTimeoutTest extends \PHPUnit_Framework_
 {
     protected $_buffer;
 
+    protected $_randomHighPort;
+
     protected $_server;
 
     public function setUp()

diff --git a/tests/smoke/Swift/Smoke/AttachmentSmokeTest.php b/tests/smoke/Swift/Smoke/AttachmentSmokeTest.php
@@ -5,6 +5,8 @@
  */
 class Swift_Smoke_AttachmentSmokeTest extends SwiftMailerSmokeTestCase
 {
+    private $_attFile;
+
     public function setUp()
     {
         $this->_attFile = __DIR__.'/../../../_samples/files/textfile.zip';

diff --git a/tests/smoke/Swift/Smoke/HtmlWithAttachmentSmokeTest.php b/tests/smoke/Swift/Smoke/HtmlWithAttachmentSmokeTest.php
@@ -5,6 +5,8 @@
  */
 class Swift_Smoke_HtmlWithAttachmentSmokeTest extends SwiftMailerSmokeTestCase
 {
+    private $_attFile;
+
     public function setUp()
     {
         $this->_attFile = __DIR__.'/../../../_samples/files/textfile.zip';

diff --git a/tests/smoke/Swift/Smoke/InternationalSmokeTest.php b/tests/smoke/Swift/Smoke/InternationalSmokeTest.php
@@ -5,6 +5,8 @@
  */
 class Swift_Smoke_InternationalSmokeTest extends SwiftMailerSmokeTestCase
 {
+    private $_attFile;
+
     public function setUp()
     {
         $this->_attFile = __DIR__.'/../../../_samples/files/textfile.zip';

diff --git a/tests/unit/Swift/Plugins/BandwidthMonitorPluginTest.php b/tests/unit/Swift/Plugins/BandwidthMonitorPluginTest.php
@@ -2,6 +2,10 @@
 
 class Swift_Plugins_BandwidthMonitorPluginTest extends \PHPUnit_Framework_TestCase
 {
+    private $_monitor;
+
+    private $_bytes = 0;
+
     public function setUp()
     {
         $this->_monitor = new Swift_Plugins_BandwidthMonitorPlugin();
@@ -117,7 +121,6 @@ private function _createMessageWithByteCount($bytes)
         return $msg;
     }
 
-    private $_bytes = 0;
     public function _write($is)
     {
         for ($i = 0; $i < $this->_bytes; ++$i) {