Merge branch '4.0' into 4.x

Author: aryaantony92

doc/02_Installation/README.md

@@ -23,7 +23,7 @@ composer require pimcore/customer-management-framework-bundle
 ```
 2. Make sure the bundle is enabled in the `config/bundles.php` file. The following lines should be added:
 ```php
-use Pimcore\Bundle\CustomerManagementFrameworkBundle\PimcoreCustomerManagementFrameworkBundle;
+use \CustomerManagementFrameworkBundle\PimcoreCustomerManagementFrameworkBundle;
 use Pimcore\Bundle\ObjectMergerBundle\ObjectMergerBundle;
 // ...
 return [

src/ActivityStore/MariaDb.php

@@ -284,7 +284,8 @@ public function getActivitiesDataForWebservice($pageSize, $page, ExportActivitie
             ->addOrderBy('activityDate', 'asc');
 
         if ($ts = $params->getModifiedSinceTimestamp()) {
-            $select->where('modificationDate >= ?', $ts);
+            $select->where('modificationDate >= ?');
+            $select->setParameters([$ts]);
         }
 
         $paginator = $this->paginator->paginate($select, $page, $pageSize);

src/ActivityStore/MySQL.php

@@ -151,7 +151,8 @@ public function getActivitiesDataForWebservice($pageSize, $page, ExportActivitie
             ->addOrderBy('activityDate', 'asc');
 
         if ($ts = $params->getModifiedSinceTimestamp()) {
-            $select->where('modificationDate >= ?', $ts);
+            $select->where('modificationDate >= ?');
+            $select->setParameters([$ts]);
         }
 
         $paginator = $this->paginator->paginate($select, $page, $pageSize);