Merge branch 'sw-26098/5.7/correct-date-columns' into '5.7'

SW-26098 - Correct some date fields back to datetime

See merge request shopware/5/product/shopware!568

Author: mitelg

UPGRADE-5.7.md

@@ -2,6 +2,25 @@
 
 This changelog references changes done in Shopware 5.7 patch versions.
 
+## 5.7.1
+
+[View all changes from v5.7.0...v5.7.1](https://github.com/shopware/shopware/compare/v5.7.0...v5.7.1)
+
+### Additions
+
+* Added service alias from `Template` to `template`
+* Added service alias from `Loader` to `loader`
+
+### Changes
+
+* Changed the visibility of services from tags `shopware_emotion.component_handler`, `criteria_request_handler` and `sitemap_url_provider` to public
+* Changed following columns type from `date` to `datetime`
+  * `s_order_basket.datum`
+  * `s_order_comparisons.datum`
+  * `s_order_notes.datum`
+
+## 5.7.0
+
 [View all changes from v5.6.1...v5.7.0](https://github.com/shopware/shopware/compare/v5.6.1...v5.7.0)
 
 ### Breaks

_sql/migrations/1702-no-more-invalid-dates.php

@@ -33,9 +33,9 @@ public function up($modus)
         $sql[] = 'ALTER TABLE `s_emarketing_banners` CHANGE `valid_to` `valid_to` DATETIME  NULL  DEFAULT NULL;';
         $sql[] = 'ALTER TABLE `s_emarketing_lastarticles` CHANGE `time` `time` DATETIME  NULL  DEFAULT NULL;';
         $sql[] = 'ALTER TABLE `s_emarketing_tellafriend` CHANGE `datum` `datum` DATE  NULL  DEFAULT NULL;';
-        $sql[] = 'ALTER TABLE `s_order_basket` CHANGE `datum` `datum` DATE  NULL  DEFAULT NULL;';
-        $sql[] = 'ALTER TABLE `s_order_comparisons` CHANGE `datum` `datum` DATE  NULL  DEFAULT NULL;';
-        $sql[] = 'ALTER TABLE `s_order_notes` CHANGE `datum` `datum` DATE  NULL  DEFAULT NULL;';
+        $sql[] = 'ALTER TABLE `s_order_basket` CHANGE `datum` `datum` DATETIME  NULL  DEFAULT NULL;';
+        $sql[] = 'ALTER TABLE `s_order_comparisons` CHANGE `datum` `datum` DATETIME  NULL  DEFAULT NULL;';
+        $sql[] = 'ALTER TABLE `s_order_notes` CHANGE `datum` `datum` DATETIME  NULL  DEFAULT NULL;';
         $sql[] = 'ALTER TABLE `s_statistics_pool` CHANGE `datum` `datum` DATE  NULL  DEFAULT NULL;';
         $sql[] = 'ALTER TABLE `s_statistics_referer` CHANGE `datum` `datum` DATE  NULL  DEFAULT NULL;';
         $sql[] = 'ALTER TABLE `s_statistics_visitors` CHANGE `datum` `datum` DATE  NULL  DEFAULT NULL;';

_sql/migrations/1710-correct-date-columns.php

@@ -0,0 +1,32 @@
+<?php
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our dual licensing model, this program can be used either
+ * under the terms of the GNU Affero General Public License, version 3,
+ * or under a proprietary license.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission and of our proprietary license can be found at and
+ * in the LICENSE file you have received along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore any rights, title and interest in
+ * our trademarks remain entirely with us.
+ */
+class Migrations_Migration1710 extends Shopware\Components\Migrations\AbstractMigration
+{
+    public function up($modus)
+    {
+        $this->addSql('ALTER TABLE `s_order_basket` CHANGE `datum` `datum` DATETIME  NULL  DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_order_comparisons` CHANGE `datum` `datum` DATETIME  NULL  DEFAULT NULL;');
+        $this->addSql('ALTER TABLE `s_order_notes` CHANGE `datum` `datum` DATETIME  NULL  DEFAULT NULL;');
+    }
+}

engine/Shopware/Models/Order/Basket.php

@@ -132,7 +132,7 @@ class Basket extends ModelEntity
     /**
      * @var \DateTimeInterface|null
      *
-     * @ORM\Column(name="datum", type="date", nullable=true)
+     * @ORM\Column(name="datum", type="datetime", nullable=true)
      */
     private $date;