Refs #4202 Cleaning up the good old bridge classes

core/DataTable.php

@@ -1097,6 +1097,8 @@ class DataTable
      */
     public function addRowsFromSerializedArray($stringSerialized)
     {
+        require_once PIWIK_INCLUDE_PATH . "/core/DataTable/Bridges.php";
+        
         $serialized = unserialize($stringSerialized);
         if ($serialized === false) {
             throw new Exception("The unserialization has failed!");
@@ -1508,14 +1510,4 @@ class DataTable
         $result->addRowsFromSerializedArray($data);
         return $result;
     }
-}
-
-
-// Bridge for when serialized classes were not using namespaces yet (pre Piwik 2.0)
-class Piwik_DataTable_Row_DataTableSummary extends DataTableSummaryRow
-{
-}
-
-class Piwik_DataTable_Row extends Row
-{
-}
+}
\ No newline at end of file

core/DataTable/Bridges.php

+<?php
+/**
+ * Piwik - Open source web analytics
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ * @category Piwik
+ * @package Piwik
+ */
+
+/**
+ * This contains the bridge classes which were used prior to Piwik 2.0
+ * The serialized reports contains these classes below, which were not using namespaces yet
+ */
+namespace {
+
+    use Piwik\DataTable\Row\DataTableSummaryRow;
+    use Piwik\DataTable\Row;
+
+    class Piwik_DataTable_Row_DataTableSummary extends DataTableSummaryRow
+    {
+    }
+
+    class Piwik_DataTable_Row extends Row
+    {
+    }
+
+}
+

tests/PHPUnit/Core/DataTableTest.php

@@ -307,6 +307,7 @@ class DataTableTest extends PHPUnit_Framework_TestCase
         $serializedDatatable = '';
         // Prior Piwik 2.0, we didn't use namespaces. Some
         require PIWIK_INCLUDE_PATH . "/tests/resources/pre-Piwik2-DataTable-archived.php";
+        require_once PIWIK_INCLUDE_PATH . "/core/DataTable/Bridges.php";
 
         $this->assertTrue(strlen($serializedDatatable) > 1000);