Fix tests failing on PHP7

voku · May 10, 2016 · 0185781 · 0185781
1 parent 68f50da
commit 0185781
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -23,6 +23,5 @@ matrix:
         - php: 7.0
         - php: hhvm
     allow_failures:
-        - php: 7.0
         - php: hhvm
     fast_finish: true
diff --git a/lib/classes/Swift/CharacterReader/GenericFixedWidthReader.php b/lib/classes/Swift/CharacterReader/GenericFixedWidthReader.php
@@ -48,7 +48,7 @@ public function getCharPositions($string, $startOffset, &$currentMap, &$ignoredC
         $strlen = strlen($string);
         // % and / are CPU intensive, so, maybe find a better way
         $ignored = $strlen % $this->_width;
-        $ignoredChars = substr($string, -$ignored);
+        $ignoredChars = $ignored ? substr($string, -$ignored) : '';
         $currentMap = $this->_width;
 
         return ($strlen - $ignored) / $this->_width;

diff --git a/lib/classes/Swift/CharacterStream/NgCharacterStream.php b/lib/classes/Swift/CharacterStream/NgCharacterStream.php
@@ -215,7 +215,7 @@ public function read($length)
      *
      * @param int $length
      *
-     * @return integer[]
+     * @return int[]
      */
     public function readBytes($length)
     {

diff --git a/tests/acceptance/Swift/Mime/ContentEncoder/QpContentEncoderAcceptanceTest.php b/tests/acceptance/Swift/Mime/ContentEncoder/QpContentEncoderAcceptanceTest.php
@@ -11,6 +11,11 @@ public function setUp()
         $this->_factory = new Swift_CharacterReaderFactory_SimpleCharacterReaderFactory();
     }
 
+    public function tearDown()
+    {
+        Swift_Preferences::getInstance()->setQPDotEscape(false);
+    }
+
     public function testEncodingAndDecodingSamples()
     {
         $sampleFp = opendir($this->_samplesDir);
@@ -144,8 +149,6 @@ public function testDotStuffingEncodingAndDecodingSamplesFromDiConfiguredInstanc
         // Enable DotEscaping
         Swift_Preferences::getInstance()->setQPDotEscape(true);
         $this->testEncodingAndDecodingSamplesFromDiConfiguredInstance();
-        // Disable DotStuffing to continue
-        Swift_Preferences::getInstance()->setQPDotEscape(false);
     }
 
     private function _createEncoderFromContainer()

diff --git a/tests/unit/Swift/Events/SimpleEventDispatcherTest.php b/tests/unit/Swift/Events/SimpleEventDispatcherTest.php
@@ -87,7 +87,7 @@ public function testListenersAreOnlyCalledIfImplementingCorrectInterface()
         $evt = $this->_dispatcher->createSendEvent($transport, $message);
 
         $targetListener = $this->getMock('Swift_Events_SendListener');
-        $otherListener = $this->getMock('Swift_Events_TransportChangeListener');
+        $otherListener = $this->getMock('DummyListener');
 
         $this->_dispatcher->bindEventListener($targetListener);
         $this->_dispatcher->bindEventListener($otherListener);
@@ -133,3 +133,10 @@ private function _createDispatcher(array $map)
         return new Swift_Events_SimpleEventDispatcher($map);
     }
 }
+
+class DummyListener implements Swift_Events_EventListener
+{
+    public function sendPerformed(Swift_Events_SendEvent $evt)
+    {
+    }
+}