Merge branch 'master' into bugfix/6156

.travis.yml

@@ -9,12 +9,9 @@
 
 language: php
 
-# We want to test against PHP 5.3.3/5.4/5.5
 php:
-  - 5.4
-  - 5.3.3
   - 5.6
-  - 5.5
+  - 5.3.3
 #  - hhvm
 
 # Separate different test suites
@@ -40,15 +37,15 @@ matrix:
   fast_finish: true
   allow_failures:
     - php: hhvm
-    - php: 5.4
+    - php: 5.6
       env: MYSQL_ADAPTER=PDO_MYSQL COVERAGE=Integration
-    - php: 5.4
+    - php: 5.6
       env: MYSQL_ADAPTER=PDO_MYSQL COVERAGE=Unit
   include:
     # Code Coverage
-    - php: 5.4
+    - php: 5.6
       env: MYSQL_ADAPTER=PDO_MYSQL COVERAGE=Integration
-    - php: 5.4
+    - php: 5.6
       env: MYSQL_ADAPTER=PDO_MYSQL COVERAGE=Unit
   exclude:
     # Run test suites separately only on PHP 5.4 with PDO
@@ -58,49 +55,25 @@ matrix:
       env: TEST_SUITE=IntegrationTests MYSQL_ADAPTER=PDO_MYSQL
     - php: 5.3.3
       env: TEST_SUITE=UnitTests MYSQL_ADAPTER=PDO_MYSQL
-    - php: 5.5
-      env: TEST_SUITE=SystemTests MYSQL_ADAPTER=PDO_MYSQL
-    - php: 5.5
-      env: TEST_SUITE=IntegrationTests MYSQL_ADAPTER=PDO_MYSQL
-    - php: 5.5
-      env: TEST_SUITE=UnitTests MYSQL_ADAPTER=PDO_MYSQL
-    - php: 5.6
-      env: TEST_SUITE=SystemTests MYSQL_ADAPTER=PDO_MYSQL
-    - php: 5.6
-      env: TEST_SUITE=IntegrationTests MYSQL_ADAPTER=PDO_MYSQL
-    - php: 5.6
-      env: TEST_SUITE=UnitTests MYSQL_ADAPTER=PDO_MYSQL
     - php: hhvm
       env: TEST_SUITE=SystemTests MYSQL_ADAPTER=PDO_MYSQL
     - php: hhvm
       env: TEST_SUITE=IntegrationTests MYSQL_ADAPTER=PDO_MYSQL
     - php: hhvm
       env: TEST_SUITE=UnitTests MYSQL_ADAPTER=PDO_MYSQL
-    # run all tests not on PHP 5.3.3 and run MySQLI tests only on 5.4
-    - php: 5.4
+    # run all tests not on PHP 5.6 and run MySQLI tests only on 5.6
+    - php: 5.6
       env: TEST_SUITE=AllTests MYSQL_ADAPTER=PDO_MYSQL
     - php: 5.3.3
       env: TEST_SUITE=AllTests MYSQL_ADAPTER=MYSQLI
-    - php: 5.5
-      env: TEST_SUITE=AllTests MYSQL_ADAPTER=MYSQLI
-    - php: 5.6
-      env: TEST_SUITE=AllTests MYSQL_ADAPTER=MYSQLI
     - php: hhvm
       env: TEST_SUITE=AllTests MYSQL_ADAPTER=MYSQLI
     # Javascript tests need to run only on one PHP version
-    - php: 5.4
-      env: TEST_SUITE=JavascriptTests MYSQL_ADAPTER=PDO_MYSQL
-    - php: 5.5
-      env: TEST_SUITE=JavascriptTests MYSQL_ADAPTER=PDO_MYSQL
     - php: 5.6
       env: TEST_SUITE=JavascriptTests MYSQL_ADAPTER=PDO_MYSQL
     - php: hhvm
       env: TEST_SUITE=JavascriptTests MYSQL_ADAPTER=PDO_MYSQL
     # AngularJS tests need to run only on one PHP version
-    - php: 5.4
-      env: TEST_SUITE=AngularJSTests MYSQL_ADAPTER=PDO_MYSQL
-    - php: 5.5
-      env: TEST_SUITE=AngularJSTests MYSQL_ADAPTER=PDO_MYSQL
     - php: 5.6
       env: TEST_SUITE=AngularJSTests MYSQL_ADAPTER=PDO_MYSQL
     - php: hhvm

core/ReportRenderer.php

@@ -157,15 +157,11 @@ abstract class ReportRenderer extends BaseFactory
         $filename = self::appendExtension($filename, $extension);
         $outputFilename = self::getOutputPath($filename);
 
-        $emailReport = @fopen($outputFilename, "w");
-
-        if (!$emailReport) {
-            throw new Exception ("The file : " . $outputFilename . " can not be opened in write mode.");
+        $bytesWritten = file_put_contents($outputFilename, $content);
+        if ($bytesWritten === false) {
+            throw new Exception ("ReportRenderer: Could not write to file '" . $outputFilename . "'.");
         }
 
-        fwrite($emailReport, $content);
-        fclose($emailReport);
-
         return $outputFilename;
     }
 

plugins/CoreAdminHome/stylesheets/pluginSettings.less

 #pluginSettings {
-  width: 820px;
+  width: 975px;
   border-spacing: 0px 15px;
 
   .columnTitle {

plugins/CoreAdminHome/templates/pluginSettings.twig

@@ -81,7 +81,7 @@
 
                                 </select>
                             {% elseif setting.uiControlType == 'textarea' %}
-                                <textarea style="width: 376px;"
+                                <textarea style="width: 376px; height: 250px;"
                                     {% for attr, val in setting.uiControlAttributes %}
                                         {{ attr|e('html_attr') }}="{{ val|e('html_attr') }}"
                                     {% endfor %}

plugins/CoreConsole/templates/travis.yml.twig

@@ -12,12 +12,9 @@
 language: php
 
 {% if phpVersions|default is empty %}
-# We want to test against PHP 5.3.3/5.4/5.5
 php:
-  - 5.4
-  - 5.3.3
   - 5.6
-  - 5.5
+  - 5.3.3
 #  - hhvm
 {% else %}
 php:

plugins/ScheduledReports/API.php

@@ -12,6 +12,7 @@ use Exception;
 use Piwik\Common;
 use Piwik\Date;
 use Piwik\Db;
+use Piwik\Log;
 use Piwik\NoAccessException;
 use Piwik\Piwik;
 use Piwik\Plugins\LanguagesManager\LanguagesManager;
@@ -501,10 +502,11 @@ class API extends \Piwik\Plugin\API
             throw new Exception("The report file wasn't found in $outputFilename");
         }
 
-        $filename = basename($outputFilename);
-        $handle = fopen($outputFilename, "r");
-        $contents = fread($handle, filesize($outputFilename));
-        fclose($handle);
+        $contents = file_get_contents($outputFilename);
+
+        if (empty($contents)) {
+            Log::warning("Scheduled report file '%s' exists but is empty!", $outputFilename);
+        }
 
         /**
          * Triggered when sending scheduled reports.
@@ -537,7 +539,7 @@ class API extends \Piwik\Plugin\API
                 $report['type'],
                 $report,
                 $contents,
-                $filename,
+                $filename = basename($outputFilename),
                 $prettyDate,
                 $reportSubject,
                 $reportTitle,

tests/travis/initiate_ui_tests.sh

 #!/bin/bash
 
 # initiate UI tests before starting system tests for php 5.5
-if [ "$TEST_SUITE" != "SystemTests" ] || [[ "$TRAVIS_PHP_VERSION" != 5\.4* ]]; then
+if [ "$TEST_SUITE" != "SystemTests" ] || [[ "$TRAVIS_PHP_VERSION" != 5\.6* ]]; then
     echo "Not initiating UI tests (\$TEST_SUITE = $TEST_SUITE, \$TRAVIS_PHP_VERSION = $TRAVIS_PHP_VERSION)."
     exit
 fi