Fixing build + update readme

b2e72140 · mattab · 96df9d57 · b2e72140 · b2e72140 · b2e72140
--- a/core/Singleton.php
+++ b/core/Singleton.php
@@ -11,15 +11,22 @@
 namespace Piwik;
+/**
+ * The singleton class restricts the Instantiation of a class to one object only.
+ *
+ * @package Piwik
+ */
 class Singleton
 {
    protected static $instances;
    protected function __construct() { }
    final private function __clone() { }
+    /**
+     * @return self
+     */
    public static function getInstance() {
        $class = get_called_class();
@@ -29,6 +36,10 @@ class Singleton
        return self::$instances[$class];
    }
+    /**
+     * Used in tests only
+     * @ignore
+     */
    public static function unsetInstance()
    {
        $class = get_called_class();
@@ -37,6 +48,7 @@ class Singleton
    /**
     * Sets the singleton instance. For testing purposes.
+     * @ignore
     */
    public static function setSingletonInstance($instance)
    {

--- a/plugins/CoreConsole/GitCommit.php
+++ b/plugins/CoreConsole/GitCommit.php
@@ -93,7 +93,7 @@ class GitCommit extends Command
        }
        if ($this->hasChangesToBeCommitted()) {
-            $cmd = sprintf('cd %s && git commit -m "Converged submodules"', PIWIK_DOCUMENT_ROOT);
+            $cmd = sprintf('cd %s && git commit -m "Updating submodules"', PIWIK_DOCUMENT_ROOT);
            $this->passthru($cmd, $output);
        }
    }

--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html
@@ -5658,7 +5658,7 @@
 </h2>
            <img alt=""
-                                    src="data:image/png;base64,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"
+                                    src="data:image/png;base64,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"
                                height="200"
                width="700"/>
@@ -5688,7 +5688,7 @@
                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
                                                                                                                                                                        Returning Visits                                                                                                                        </td>
                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1
+                                                                                                4
                                                                                    </td>
                                    </tr>
@@ -5696,7 +5696,7 @@
                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
                                                                                                                                                                        Actions by Returning Visits                                                                                                                        </td>
                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                6
+                                                                                                12
                                                                                    </td>
                                    </tr>
@@ -5704,7 +5704,7 @@
                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
                                                                                                                                                                        Bounce Rate for Returning Visits                                                                                                                        </td>
                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
+                                                                                                25%
                                                                                    </td>
                                    </tr>
@@ -5712,7 +5712,7 @@
                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
                                                                                                                                                                        Avg. Actions per Returning Visit                                                                                                                        </td>
                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                6
+                                                                                                3
                                                                                    </td>
                                    </tr>
@@ -5720,7 +5720,7 @@
                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
                                                                                                                                                                        Avg. Duration of a Returning Visit (in sec)                                                                                                                        </td>
                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                01:06:01
+                                                                                                00:25:32
                                                                                    </td>
                                    </tr>
                        </tbody>

--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
@@ -5460,7 +5460,7 @@
                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
                                                                                                                                                                        Returning Visits                                                                                                                        </td>
                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1
+                                                                                                4
                                                                                    </td>
                                    </tr>
@@ -5468,7 +5468,7 @@
                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
                                                                                                                                                                        Actions by Returning Visits                                                                                                                        </td>
                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                6
+                                                                                                12
                                                                                    </td>
                                    </tr>
@@ -5476,7 +5476,7 @@
                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
                                                                                                                                                                        Bounce Rate for Returning Visits                                                                                                                        </td>
                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                0%
+                                                                                                25%
                                                                                    </td>
                                    </tr>
@@ -5484,7 +5484,7 @@
                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
                                                                                                                                                                        Avg. Actions per Returning Visit                                                                                                                        </td>
                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                6
+                                                                                                3
                                                                                    </td>
                                    </tr>
@@ -5492,7 +5492,7 @@
                                                                <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
                                                                                                                                                                        Avg. Duration of a Returning Visit (in sec)                                                                                                                        </td>
                                            <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                01:06:01
+                                                                                                00:25:32
                                                                                    </td>
                                    </tr>
                        </tbody>

--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf
--- a/tests/PHPUnit/IntegrationTestCase.php
+++ b/tests/PHPUnit/IntegrationTestCase.php
@@ -312,12 +312,10 @@ abstract class IntegrationTestCase extends PHPUnit_Framework_TestCase
    {
        if (!Test_Piwik_BaseFixture::canImagesBeIncludedInScheduledReports()) {
            $this->markTestSkipped(
-                'Do take note that scheduled reports are not being tested with images. ' .
+                'Scheduled reports generated during integration tests will not contain the image graphs. ' .
-                    'If images contained in scheduled reports have been altered, tests will fail on the Piwik QA Server. ' .
+                    'For tests to generate images, use a machine with the following specifications : ' .
-                    'To include images in the test suite, please use a machine with the following specifications : ' .
+                    'OS = '.Test_Piwik_BaseFixture::IMAGES_GENERATED_ONLY_FOR_OS.', PHP = '.Test_Piwik_BaseFixture::IMAGES_GENERATED_FOR_PHP .
-                    'OS = '.Test_Piwik_BaseFixture::IMAGES_GENERATED_ONLY_FOR_OS.', Minimum PHP Version = '.Test_Piwik_BaseFixture::IMAGES_GENERATED_FOR_PHP.' and GD Version = ' . Test_Piwik_BaseFixture::IMAGES_GENERATED_FOR_GD
+                    ' and GD = ' . Test_Piwik_BaseFixture::IMAGES_GENERATED_FOR_GD
-                    . "\n Ignore this message if you're running on your dev machine, but pay attention when it comes from the CI server."
            );
        }
    }

--- a/tests/README.md
+++ b/tests/README.md
@@ -23,6 +23,12 @@ You can get the latest Git revision at: http://github.com/piwik/piwik
 $ git clone https://github.com/piwik/piwik.git
 ```
+Next install Composer which will lets you download the libraries used in Piwik:
+```
+$ curl -sS https://getcomposer.org/installer | php
+$php composer.phar install
+```
 To execute the tests:
 * In your php.ini make sure you have the setting to show all errors:
@@ -101,7 +107,15 @@ Change from:
 to this:
    `UUID=83237e54-445f-8b83-180f06459d46       /       ext4    errors=remount-ro,nobarrier     0       1`
-Then
+### Using latest GIT version
+On ubuntu to use the latest GIT:
+```
+sudo add-apt-repository ppa:git-core/ppa
+sudo apt-get update
+sudo apt-get upgrade
+```
 ## Integration Tests
 Integration tests files are in `tests/PHPUnit/Integration/*Test.php`