Merge branch '2015.11-develop' into 2016.03
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 6 Apr 2016 09:28:20 +0000 (11:28 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 6 Apr 2016 09:28:20 +0000 (11:28 +0200)
Conflicts:
tine20/library/Zend/Locale/Format.php

Change-Id: Ieaa0b5363a5d48e521ea79b7c16b5cb5d47bacfe

tests/tine20/Addressbook/Export/DocTest.php
tests/tine20/Addressbook/JsonTest.php
tests/tine20/Calendar/Export/DocTest.php

index ae50260..fca918c 100644 (file)
@@ -29,7 +29,7 @@ class Addressbook_Export_DocTest extends TestCase
         //  class name in /usr/local/share/tine20.git/tine20/vendor/phpoffice/phpword/src/PhpWord/TemplateProcessor.php
         //  on line 23
         if (PHP_VERSION_ID >= 70000) {
-            $this->markTestSkipped('FIXME in php7');
+            $this->markTestSkipped('FIXME 0011730: fix doc export for php7');
         }
 
         // make sure definition is imported
index a78a475..8f90169 100644 (file)
@@ -1860,7 +1860,7 @@ Steuernummer 33/111/32212";
             'operator' => 'equals',
             'value'    => 'somename'
         ));
-        $result = $this->_instance->searchContacts($filter, '');
+        $result = $this->_uit->searchContacts($filter, '');
         $this->assertEquals(0, $result['totalcount']);
     }
 }
index 15759d1..33633cf 100644 (file)
@@ -24,6 +24,14 @@ class Calendar_Export_DocTest extends Calendar_TestCase
 {
     public function testExportSimpleDocSheet()
     {
+        // skip tests for php7
+        // ERROR: PHP Fatal error:  Cannot use PhpOffice\PhpWord\Shared\String as String because 'String' is a special
+        //  class name in /usr/local/share/tine20.git/tine20/vendor/phpoffice/phpword/src/PhpWord/TemplateProcessor.php
+        //  on line 23
+        if (PHP_VERSION_ID >= 70000) {
+            $this->markTestSkipped('FIXME 0011730: fix doc export for php7');
+        }
+
         // make sure definition is imported
         $definitionFile = __DIR__ . '/../../../../tine20/Calendar/Export/definitions/cal_default_doc_sheet.xml';
         $calendarApp = Tinebase_Application::getInstance()->getApplicationByName('Calendar');