Merge pull request #396 from helloextend/master

08.07.23 Master to Develop

.github/branch_changelog.md

@@ -1,33 +0,0 @@
-SEINT-1701 Updated highest PHP version to 8.2
-
-Merge pull request #391 from helloextend/EX-484
-
-[EX-484] [M2] Pass 'price' and 'category' parameters & values to the …
-
-Merge pull request #389 from helloextend/EX-484
-
-Ex 484
-
-Merge pull request #388 from helloextend/EX-466
-
-Ex 466
-
-Merge pull request #385 from helloextend/EX-477
-
-Ex 477
-
-Merge pull request #383 from helloextend/EX-466
-
-Ex 466
-
-Update composer.json
-
-Update composer.json version to v2.2.1
-
-Merge pull request #379 from helloextend/EX-486
-
-[EX-486] [M2] Missing logging for add to cart failures, and overall n…
-
-Merge pull request #380 from helloextend/EX-487
-
-[EX-487] [M2] cart and minicart normalization not running after remov…

.github/version.txt

@@ -1 +1 @@
-2.2.1
+2.2.3

.github/version_update.py

@@ -1,4 +1,4 @@
-import re, sys
+import re, sys, json
 import xml.etree.ElementTree as ET
 
 # fetch type of upgrade code from bash arguments
@@ -27,6 +27,9 @@
 # xml_file_name dictates where XML file is located
 xml_file_name = './etc/config.xml'
 
+# json_file_name dictates where XML file is located
+json_file_name = 'composer.json'
+
 # updateMajorVersion(Lines) updates the Major version x.0.0
 def updateMajorVersion(Lines) :
 
@@ -158,6 +161,20 @@ def processXML(version):
     # write data back to file
     tree.write(xml_file_name)
 
+# processJSON(versiion) takes version input and writes to the config.xml
+def processJSON(version):
+    # read JSON file
+    j_file = open('composer.json')
+
+    j_obj = json.load(j_file)
+
+    j_obj['version'] = version
+
+    j_obj = json.dumps(j_obj, indent=4)
+
+    with open(json_file_name, 'w') as outfile:
+        outfile.write(j_obj)
+
 # writeToFile(version) takes in version from update functions and writes it to the version file
 def writeToFile(contents, filename) :
     file1 = open(filename, 'w')
@@ -214,6 +231,7 @@ def readFile(filename) :
     # 4. Write the update to the changelog file
     # 5. Clear the branch changelog file
     # 6. Update the XML version
+    # 7. Update the composer.json version
 
     changelog_file_lines = readFile(changelog_file_name)
 
@@ -225,4 +243,7 @@ def readFile(filename) :
 
     writeToFile([], branch_changelog_file_name)
 
-    processXML(version_to_write)
+    processXML(version_to_write)
+
+    processJSON(version_to_write)
+

.github/workflows/master-changelog_manager.yml

@@ -34,7 +34,7 @@ jobs:
        run: |
           git config --global user.name 'martin-liriano'
           git config --global user.email "[email protected]"
-          git add ./.github/version.txt ./etc/config.xml changelog.md ./.github/branch_changelog.md
+          git add ./.github/version.txt ./etc/config.xml changelog.md composer.json ./.github/branch_changelog.md  
           git commit -m "version update deployment ${{ steps.set-tag.outputs.tag_name }}"
           git push
           git fetch

changelog.md

@@ -1,12 +1,65 @@
 # Extend Magento2 Changelog
 
-## version: 2.2.1
+## version: 2.2.3
 
 ### Changelog:
 
 ---
 
 
+**2.2.3**
+
+Patch Release - Merge pull request #395 from helloextend/martin-bugfix07/24
+
+Bug Fix for 
+
+
+
+
+
+**2.2.2**
+
+Patch Release - Merge pull request #394 from helloextend/martin-update07/24]
+
+Patch Release - updated version_update.py to update composer.json version
+
+SEINT-1701 Updated highest PHP version to 8.2
+
+Merge pull request #391 from helloextend/EX-484
+
+[EX-484] [M2] Pass 'price' and 'category' parameters & values to the …
+
+Merge pull request #389 from helloextend/EX-484
+
+Ex 484
+
+Merge pull request #388 from helloextend/EX-466
+
+Ex 466
+
+Merge pull request #385 from helloextend/EX-477
+
+Ex 477
+
+Merge pull request #383 from helloextend/EX-466
+
+Ex 466
+
+Update composer.json
+
+Update composer.json version to v2.2.1
+
+Merge pull request #379 from helloextend/EX-486
+
+[EX-486] [M2] Missing logging for add to cart failures, and overall n…
+
+Merge pull request #380 from helloextend/EX-487
+
+[EX-487] [M2] cart and minicart normalization not running after remov…
+
+
+
+
 **2.2.1**
 
 Patch Release Merge pull request #382 from helloextend/develop

composer.json

@@ -1,30 +1,30 @@
 {
-  "name": "extend/module-warranty",
-  "description": "Extend Module for Magento 2",
-  "version": "2.2.1",
-  "require": {
-    "php": "^7.3 || ^8.0",
-    "magento/magento2-base": "2.3.* || 2.4.*"
-  },
-  "type": "magento2-module",
-  "license": [
-    "OSL-3.0",
-    "AFL-3.0"
-  ],
-  "authors": [
-    {
-      "name": "Extend, Inc.",
-      "email": "[email protected]",
-      "homepage": "https://www.extend.com",
-      "role": "Support"
-    }
-  ],
-  "autoload": {
-    "files": [
-      "registration.php"
+    "name": "extend/module-warranty",
+    "description": "Extend Module for Magento 2",
+    "version": "2.2.3",
+    "require": {
+        "php": "^7.3 || ^8.0",
+        "magento/magento2-base": "2.3.* || 2.4.*"
+    },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "authors": [
+        {
+            "name": "Extend, Inc.",
+            "email": "[email protected]",
+            "homepage": "https://www.extend.com",
+            "role": "Support"
+        }
     ],
-    "psr-4": {
-      "Extend\\Warranty\\": ""
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Extend\\Warranty\\": ""
+        }
     }
-  }
-}
+}

etc/config.xml

@@ -2,7 +2,7 @@
     <default>
         <warranty>
             <version>
-               <tag>2.2.1</tag>
+               <tag>2.2.3</tag>
             </version>
             <enableExtend>
                 <enable>0</enable>