Merge branch 'main' into topic-remove-persistent

MahoCommerce · Oct 14, 2024 · ef28dd2 · ef28dd2
2 parents 4c44348 + 7301407
commit ef28dd2
Show file tree

Hide file tree

Showing 18 changed files with 87 additions and 113 deletions.
diff --git a/.github/workflows/sync-om.yml b/.github/workflows/sync-om.yml
@@ -0,0 +1,79 @@
+name: Sync daily OM commits to Maho
+
+on:
+  schedule:
+    - cron: '0 6 * * *'  # Run at 6 AM UTC every day
+  workflow_dispatch:
+
+jobs:
+  sync-om:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Maho
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Configure Git
+        run: |
+          git config --global user.name 'github-actions[bot]'
+          git config --global user.email 'github-actions[bot]@users.noreply.github.com'
+
+      - name: Fetch OM updates and create PRs
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          # Fetch OpenMage repository
+          git remote add upstream https://github.com/OpenMage/magento-lts.git
+          git fetch upstream
+
+          # Get yesterday's date
+          yesterday=$(date -d "yesterday" +%Y-%m-%d)
+
+          # Get list of commits from yesterday
+          commits=$(git log --since="$yesterday 00:00:00" --until="$yesterday 23:59:59" --format="%H" upstream/main)
+
+          # Function to create a PR for a commit
+          create_pr_for_commit() {
+            commit_hash=$1
+            branch_name="sync-openmage-${commit_hash:0:8}"
+
+            # Create a new branch
+            git checkout -b "$branch_name"
+
+            # Cherry-pick the commit
+            if git cherry-pick "$commit_hash"; then
+              # Push the branch
+              git push -u origin "$branch_name"
+
+              # Get commit message
+              commit_msg=$(git log -1 --pretty=format:"%s" "$commit_hash")
+
+              # Check if the commit is from a PR
+              pr_number=$(git log -1 --pretty=format:"%b" "$commit_hash" | grep -oP "(?<=Pull Request #)\d+")
+
+              if [ -n "$pr_number" ]; then
+                pr_title="OM PR $pr_number"
+              else
+                pr_title="OM commit: $commit_hash"
+              fi
+
+              # Create PR
+              gh pr create --title "$pr_title" --body "This PR syncs the OpenMage commit: $commit_hash
+
+              Original commit message: $commit_msg
+
+              For more details, see: https://github.com/OpenMage/magento-lts/commit/$commit_hash"
+            else
+              echo "Failed to cherry-pick commit $commit_hash. Skipping."
+              git cherry-pick --abort
+            fi
+
+            # Return to main branch
+            git checkout main
+          }
+
+          # Process each commit
+          for commit in $commits; do
+            create_pr_for_commit "$commit"
+          done
diff --git a/app/code/core/Mage/Adminhtml/Helper/Help/Mapping.php b/app/code/core/Mage/Adminhtml/Helper/Help/Mapping.php
@@ -151,7 +151,6 @@ abstract class Mage_Adminhtml_Helper_Help_Mapping extends Mage_Core_Helper_Abstr
             'system_config/edit/section/cataloginventory' => 'configuration/catalog/inventory.html',
             'system_config/edit/section/sitemap' => 'configuration/catalog/google-sitemap.html',
             'system_config/edit/section/rss' => 'configuration/catalog/rss-feeds.html',
-            'system_config/edit/section/sendfriend' => 'configuration/catalog/email-to-a-friend.html',
             'system_config/edit/section/newsletter' => 'configuration/customers/newsletter.html',
             'system_config/edit/section/customer' => 'configuration/customers/customer-configuration.html',
             'system_config/edit/section/wishlist' => 'configuration/customers/wishlist.html',

diff --git a/app/code/core/Mage/Adminhtml/etc/adminhtml.xml b/app/code/core/Mage/Adminhtml/etc/adminhtml.xml
@@ -194,10 +194,6 @@
                                         <title>Currency Setup</title>
                                         <sort_order>120</sort_order>
                                     </currency>
-                                    <sendfriend translate="title">
-                                        <title>Email to a Friend</title>
-                                        <sort_order>140</sort_order>
-                                    </sendfriend>
                                     <admin translate="title">
                                         <title>Admin</title>
                                         <sort_order>100</sort_order>

diff --git a/app/code/core/Mage/Catalog/Block/Product/View.php b/app/code/core/Mage/Catalog/Block/Product/View.php
@@ -91,17 +91,6 @@ public function getProduct()
         return Mage::registry('product');
     }
 
-    /**
-     * Check if product can be emailed to friend
-     *
-     * @return bool
-     */
-    public function canEmailToFriend()
-    {
-        $sendToFriendModel = Mage::registry('send_to_friend_model');
-        return $sendToFriendModel && $sendToFriendModel->canEmailToFriend();
-    }
-
     /**
      * Retrieve url for direct adding product to cart
      *

diff --git a/app/code/core/Mage/Catalog/Helper/Product.php b/app/code/core/Mage/Catalog/Helper/Product.php
@@ -149,22 +149,6 @@ public function getThumbnailUrl($product)
         return $url;
     }
 
-    /**
-     * @param Mage_Catalog_Model_Product $product
-     * @return string
-     */
-    public function getEmailToFriendUrl($product)
-    {
-        $categoryId = null;
-        if ($category = Mage::registry('current_category')) {
-            $categoryId = $category->getId();
-        }
-        return $this->_getUrl('sendfriend/product/send', [
-            'id' => $product->getId(),
-            'cat_id' => $categoryId
-        ]);
-    }
-
     /**
      * @return array
      */

diff --git a/app/code/core/Mage/Catalog/Model/Session.php b/app/code/core/Mage/Catalog/Model/Session.php
@@ -24,8 +24,6 @@
  * @method int getLastVisitedCategoryId()
  * @method string getLimitPage()
  * @method bool getParamsMemorizeDisabled()
- * @method array getSendfriendFormData()
- * @method $this setSendfriendFormData(array $value)
  * @method string getSortDirection()
  * @method string getSortOrder()
  * @method $this unsDisplayMode()

diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.8-0.7.9.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.8-0.7.9.php
@@ -31,7 +31,6 @@
     'sales_email/creditmemo_comment/template'           => 'sales_email_creditmemo_comment_template',
     'sales_email/shipment/template'                     => 'sales_email_shipment_template',
     'sales_email/shipment_comment/template'             => 'sales_email_shipment_comment_template',
-    'sendfriend/email/template'                         => 'sendfriend_email_template',
     'sitemap/generate/error_email_template'             => 'sitemap_generate_error_email_template',
     'wishlist/email/email_template'                     => 'wishlist_email_email_template',
 ];

diff --git a/app/code/core/Mage/Reports/Model/Event/Observer.php b/app/code/core/Mage/Reports/Model/Event/Observer.php
@@ -130,23 +130,6 @@ public function catalogProductView(Varien_Event_Observer $observer)
         return $this->_event(Mage_Reports_Model_Event::EVENT_PRODUCT_VIEW, $productId);
     }
 
-    /**
-     * Send Product link to friends action
-     *
-     * @return $this
-     */
-    public function sendfriendProduct(Varien_Event_Observer $observer)
-    {
-        if (!$this->_enabledReports) {
-            return $this;
-        }
-
-        return $this->_event(
-            Mage_Reports_Model_Event::EVENT_PRODUCT_SEND,
-            $observer->getEvent()->getProduct()->getId()
-        );
-    }
-
     /**
      * Remove Product from Compare Products action
      *

diff --git a/app/code/core/Mage/Reports/data/reports_setup/data-install-1.6.0.0.php b/app/code/core/Mage/Reports/data/reports_setup/data-install-1.6.0.0.php
@@ -21,10 +21,6 @@
         'event_type_id' => Mage_Reports_Model_Event::EVENT_PRODUCT_VIEW,
         'event_name'    => 'catalog_product_view'
     ],
-    [
-        'event_type_id' => Mage_Reports_Model_Event::EVENT_PRODUCT_SEND,
-        'event_name'    => 'sendfriend_product'
-    ],
     [
         'event_type_id' => Mage_Reports_Model_Event::EVENT_PRODUCT_COMPARE,
         'event_name'    => 'catalog_product_compare_add_product'

diff --git a/app/code/core/Mage/Reports/etc/config.xml b/app/code/core/Mage/Reports/etc/config.xml
@@ -128,14 +128,6 @@
                     </reports>
                 </observers>
             </catalog_controller_product_view>
-            <sendfriend_product>
-                <observers>
-                    <reports>
-                        <class>reports/event_observer</class>
-                        <method>sendfriendProduct</method>
-                    </reports>
-                </observers>
-            </sendfriend_product>
             <catalog_product_compare_add_product>
                 <observers>
                     <reports>

diff --git a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-install-0.7.1.php b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-install-0.7.1.php
@@ -25,7 +25,6 @@
 
 INSERT INTO {$this->getTable('report_event_types')} VALUES
 (1, 'catalog_product_view'),
-(2, 'sendfriend_product'),
 (3, 'catalog_product_compare_add_product'),
 (4, 'checkout_cart_add_product'),
 (5, 'wishlist_add_product'),

diff --git a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.0-0.7.1.php
@@ -25,7 +25,6 @@
 
 INSERT INTO {$this->getTable('report_event_types')} VALUES
 (1, 'catalog_product_view'),
-(2, 'sendfriend_product'),
 (3, 'catalog_product_compare_add_product'),
 (4, 'checkout_cart_add_product'),
 (5, 'wishlist_add_product'),

diff --git a/app/design/frontend/base/default/template/catalog/product/view.phtml b/app/design/frontend/base/default/template/catalog/product/view.phtml
@@ -40,10 +40,6 @@
                 <h1><?= $_helper->productAttribute($_product, $_product->getName(), 'name') ?></h1>
             </div>
 
-            <?php if ($this->canEmailToFriend()): ?>
-                <p class="email-friend"><a href="<?= $this->helper('catalog/product')->getEmailToFriendUrl($_product) ?>"><?= $this->__('Email to a Friend') ?></a></p>
-            <?php endif ?>
-
             <?= $this->getReviewsSummaryHtml($_product, false, true) ?>
             <?= $this->getChildHtml('alert_urls') ?>
             <?= $this->getChildHtml('product_type_data') ?>

diff --git a/app/design/frontend/rwd/default/template/catalog/product/view/sharing.phtml b/app/design/frontend/rwd/default/template/catalog/product/view/sharing.phtml
@@ -15,10 +15,6 @@
 <?php $_wishlistSubmitUrl = $this->helper('wishlist')->getAddUrlWithCustomParams($_product, [], false); ?>
 
 <ul class="sharing-links">
-    <?php if ($this->canEmailToFriend()): ?>
-        <li><a href="<?= $this->helper('catalog/product')->getEmailToFriendUrl($_product) ?>" class="link-email-friend" title="<?= Mage::helper('core')->quoteEscape($this->__('Email to a Friend')) ?>"><?= $this->__('Email to a Friend') ?></a></li>
-    <?php endif ?>
-
     <?php $_helper = $this->helper('catalog/output'); ?>
     <?php $_productName = urlencode(trim($_helper->productAttribute($_product, $_product->getName(), 'name')))?>
     <?php $_productImageUrl = urlencode(trim((string)$this->helper('catalog/image')->init($_product, 'image')))?>

diff --git a/app/locale/en_US/template/email/product_share.html b/app/locale/en_US/template/email/product_share.html
diff --git a/composer.json b/composer.json
@@ -69,13 +69,13 @@
     "extra": {
         "patches": {
             "shardj/zf1-future": {
-                "MAG-1.1.1": "https://raw.githubusercontent.com/OpenMage/composer-patches/74862e7a9fa29dd62c5c02d585d931ce9e3c5815/patches/MAG-1.1.1.patch",
-                "MAG-1.9.3.0": "https://raw.githubusercontent.com/OpenMage/composer-patches/74862e7a9fa29dd62c5c02d585d931ce9e3c5815/patches/MAG-1.9.3.0.patch",
-                "MAG-1.9.3.7 - SUPEE-10415": "https://raw.githubusercontent.com/OpenMage/composer-patches/74862e7a9fa29dd62c5c02d585d931ce9e3c5815/patches/MAG-1.9.3.7.patch",
-                "OM-918 - Add runtime cache to Zend_Locale_Data": "https://raw.githubusercontent.com/OpenMage/composer-patches/74862e7a9fa29dd62c5c02d585d931ce9e3c5815/patches/OM-918.patch",
-                "OM-1081 - Not detecting HTTPS behind a proxy": "https://raw.githubusercontent.com/OpenMage/composer-patches/74862e7a9fa29dd62c5c02d585d931ce9e3c5815/patches/OM-1081.patch",
-                "OM-2047 - Pass delimiter char to preg_quote": "https://raw.githubusercontent.com/OpenMage/composer-patches/74862e7a9fa29dd62c5c02d585d931ce9e3c5815/patches/OM-2047.patch",
-                "OM-2050 - Prevent checking known date codes": "https://raw.githubusercontent.com/OpenMage/composer-patches/74862e7a9fa29dd62c5c02d585d931ce9e3c5815/patches/OM-2050.patch"
+                "MAG-1.1.1": "https://raw.githubusercontent.com/MahoCommerce/maho-composer-patches/e75f155864138ef4ee2b18a82797d6f40d71ad51/MAG-1.1.1.patch",
+                "MAG-1.9.3.0": "https://raw.githubusercontent.com/MahoCommerce/maho-composer-patches/e75f155864138ef4ee2b18a82797d6f40d71ad51/MAG-1.9.3.0.patch",
+                "MAG-1.9.3.7 - SUPEE-10415": "https://raw.githubusercontent.com/MahoCommerce/maho-composer-patches/e75f155864138ef4ee2b18a82797d6f40d71ad51/MAG-1.9.3.7.patch",
+                "OM-918 - Add runtime cache to Zend_Locale_Data": "https://raw.githubusercontent.com/MahoCommerce/maho-composer-patches/e75f155864138ef4ee2b18a82797d6f40d71ad51/OM-918.patch",
+                "OM-1081 - Not detecting HTTPS behind a proxy": "https://raw.githubusercontent.com/MahoCommerce/maho-composer-patches/e75f155864138ef4ee2b18a82797d6f40d71ad51/OM-1081.patch",
+                "OM-2047 - Pass delimiter char to preg_quote": "https://raw.githubusercontent.com/MahoCommerce/maho-composer-patches/e75f155864138ef4ee2b18a82797d6f40d71ad51/OM-2047.patch",
+                "OM-2050 - Prevent checking known date codes": "https://raw.githubusercontent.com/MahoCommerce/maho-composer-patches/e75f155864138ef4ee2b18a82797d6f40d71ad51/OM-2050.patch"
             },
             "colinmollenhour/magento-redis-session": {
                 "Cm_RedisSession-Revert-190": "https://raw.githubusercontent.com/MahoCommerce/maho-composer-patches/0424e4b13657d2745931b9063020b005428b9334/Cm_RedisSession-Revert-190.patch"

diff --git a/composer.lock b/composer.lock
diff --git a/lib/MahoCLI/Commands/LegacyRenameMysql4Classes.php b/lib/MahoCLI/Commands/LegacyRenameMysql4Classes.php
@@ -544,7 +544,6 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             '<rule_mysql4>' => '<rule_resource>',
             '<sales_mysql4>' => '<sales_resource>',
             '<salesrule_mysql4>' => '<salesrule_resource>',
-            '<sendfriend_mysql4>' => '<sendfriend_resource>',
             '<shipping_mysql4>' => '<shipping_resource>',
             '<sitemap_mysql4>' => '<sitemap_resource>',
             '<tag_mysql4>' => '<tag_resource>',