Merge pull request #51 from akunzai/update-dependencies

Update dependencies
akunzai · Jan 15, 2024 · 3549e0f · 3549e0f
2 parents f3bc140 + 261a98f
commit 3549e0f
Show file tree

Hide file tree

Showing 41 changed files with 78 additions and 77 deletions.
diff --git a/.devcontainer/joomla/Dockerfile b/.devcontainer/joomla/Dockerfile
@@ -1,7 +1,7 @@
 # https://mcr.microsoft.com/v2/vscode/devcontainers/php/tags/list
 ARG PHP_VERSION=8.2
 # https://hub.docker.com/_/joomla
-ARG JOOMLA_VERSION=5.0.1
+ARG JOOMLA_VERSION=5.0.2
 
 FROM joomla:${JOOMLA_VERSION}-apache AS joomla
 

diff --git a/.devcontainer/openmage/install.sh b/.devcontainer/openmage/install.sh
@@ -28,10 +28,10 @@ if [ "${INSTALL_SAMPLE_DATA}" = "true" ]; then
     echo "Uncompressing Sample Data ..."
     docker compose exec --user www-data openmage tar zxf /tmp/sample_data.tgz -C /tmp/
 
-    echo "Copying Sample Data into the OpenMage directory..."
+    echo "Copying Sample Data into the OpenMage directory ..."
     docker compose exec --user www-data openmage sh -c "cp -r /tmp/${SAMPLE_DATA_DIR}/* /var/www/html/"
 
-    echo "Importing Sample Data into the database..."
+    echo "Importing Sample Data into the database ..."
     docker compose exec --user www-data openmage sh -c "mysql -h ${OPENMAGE_DB_HOST:-mysql} -u${OPENMAGE_DB_USER:-root} -p${OPENMAGE_DB_PASSWORD:-${MYSQL_ROOT_PASSWORD:-secret}} ${OPENMAGE_DB_NAME:-openmage} < /tmp/${SAMPLE_DATA_DIR}/${SAMPLE_DATA_SQL}"
 
     echo "Cleaning up ..."

diff --git a/bundle.php b/bundle.php
@@ -113,7 +113,7 @@ private function addFile($file, $folder = null)
 	{
 		$path = (str_starts_with($file, $this->prefix)) ? $file : $this->joinPaths($this->prefix, $folder, $file);
 		$entry = str_replace($this->prefix, "", $path);
-		echo "adding: $path\t$entry\n";
+		echo "Adding: $path\t$entry\n";
 		$this->zip->addFile($path, $entry);
 	}
 
@@ -129,7 +129,7 @@ private function addDirectory($path)
 			}
 			if ($file->isFile()) {
 				$entry = str_replace($this->prefix, "", $file);
-				echo "adding: $path\t$entry\n";
+				echo "Adding: $path\t$entry\n";
 				$this->zip->addFile($file, $entry);
 				continue;
 			}

diff --git a/composer.json b/composer.json
@@ -26,28 +26,28 @@
             "type": "package",
             "package": {
                 "name": "joomla/joomla-cms",
-                "version": "5.0.1",
+                "version": "5.0.2",
                 "dist": {
-                    "url": "https://github.com/joomla/joomla-cms/releases/download/5.0.1/Joomla_5.0.1-Stable-Full_Package.zip",
+                    "url": "https://github.com/joomla/joomla-cms/releases/download/5.0.2/Joomla_5.0.2-Stable-Full_Package.zip",
                     "type": "zip"
                 },
                 "source": {
                     "url": "https://github.com/joomla/joomla-cms.git",
                     "type": "git",
-                    "reference": "tags/5.0.1"
+                    "reference": "tags/5.0.2"
                 }
             }
         },
         {
             "type": "package",
             "package": {
                 "name": "akunzai/joomla-stubs",
-				"version": "master",
-				"source": {
-					"url": "https://github.com/akunzai/joomla-stubs.git",
-					"type": "git",
-					"reference": "master"
-				}
+                "version": "master",
+                "source": {
+                    "url": "https://github.com/akunzai/joomla-stubs.git",
+                    "type": "git",
+                    "reference": "master"
+                }
             }
         }
     ],
@@ -57,10 +57,10 @@
     },
     "require-dev": {
         "akunzai/joomla-stubs": "dev-master",
-        "friendsofphp/php-cs-fixer": "v3.45.0",
-        "joomla/joomla-cms": "5.0.1",
+        "friendsofphp/php-cs-fixer": "v3.47.0",
+        "joomla/joomla-cms": "5.0.2",
         "openmage/magento-lts": "v20.3.0",
-        "phpstan/phpstan": "^1.10.50"
+        "phpstan/phpstan": "^1.10.56"
     },
     "extra": {
         "magento-root-dir": "vendor/openmage/magento-lts"
@@ -83,4 +83,4 @@
             "./build.sh"
         ]
     }
-}
+}
diff --git a/composer.lock b/composer.lock
diff --git a/joomla/com_magebridge.xml b/joomla/com_magebridge.xml
@@ -7,7 +7,7 @@
     <creationDate>August 2017</creationDate>
     <copyright>Copyright (C) 2017 Yireo.com. All rights reserved.</copyright>
     <license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
-    <version>2.0.0-rc2</version>
+    <version>2.0.0</version>
     <description>COM_MAGEBRIDGE_DESC</description>
 
     <!-- installation part -->

diff --git a/joomla/libraries/yireo/yireo.xml b/joomla/libraries/yireo/yireo.xml
@@ -8,7 +8,7 @@
     <creationDate>September 2017</creationDate>
     <copyright>Copyright 2016 Yireo.com. All rights reserved.</copyright>
     <license>http://www.gnu.org/licenses/gpl-3.0.html GNU/GPL</license>
-    <version>2.0.0-rc2</version>
+    <version>2.0.0</version>
 
 	<languages folder="language/en-GB">
 		<language tag="en-GB">lib_yireo.ini</language>

diff --git a/joomla/modules/mod_magebridge_block/mod_magebridge_block.xml b/joomla/modules/mod_magebridge_block/mod_magebridge_block.xml
@@ -7,7 +7,7 @@
 	<license>GNU/GPL</license>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>https://www.yireo.com/</authorUrl>
-	<version>2.0.0-rc2</version>
+	<version>2.0.0</version>
 	<description>MOD_MAGEBRIDGE_BLOCK_DESC</description>
 
 	<files>

diff --git a/joomla/modules/mod_magebridge_cart/mod_magebridge_cart.xml b/joomla/modules/mod_magebridge_cart/mod_magebridge_cart.xml
@@ -7,7 +7,7 @@
 	<license>GNU/GPL</license>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>www.yireo.com</authorUrl>
-	<version>2.0.0-rc2</version>
+	<version>2.0.0</version>
 	<description>MOD_MAGEBRIDGE_CART_DESC</description>
 
 	<files>

diff --git a/joomla/modules/mod_magebridge_cms/mod_magebridge_cms.xml b/joomla/modules/mod_magebridge_cms/mod_magebridge_cms.xml
@@ -7,7 +7,7 @@
 	<license>GNU/GPL</license>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>https://www.yireo.com/</authorUrl>
-	<version>2.0.0-rc2</version>
+	<version>2.0.0</version>
 	<description>MOD_MAGEBRIDGE_CMS_DESC</description>
 
 	<files>

diff --git a/joomla/modules/mod_magebridge_login/mod_magebridge_login.xml b/joomla/modules/mod_magebridge_login/mod_magebridge_login.xml
@@ -7,7 +7,7 @@
 	<license>GNU/GPL</license>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>www.yireo.com</authorUrl>
-    <version>2.0.0-rc2</version>
+    <version>2.0.0</version>
     <description>MOD_MAGEBRIDGE_LOGIN</description>
 
     <files>

diff --git a/joomla/modules/mod_magebridge_menu/mod_magebridge_menu.xml b/joomla/modules/mod_magebridge_menu/mod_magebridge_menu.xml
@@ -7,7 +7,7 @@
 	<license>GNU/GPL</license>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>www.yireo.com</authorUrl>
-	<version>2.0.0-rc2</version>
+	<version>2.0.0</version>
 	<description>MOD_MAGEBRIDGE_MENU_DESC</description>
 
 	<files>

diff --git a/joomla/modules/mod_magebridge_newsletter/mod_magebridge_newsletter.xml b/joomla/modules/mod_magebridge_newsletter/mod_magebridge_newsletter.xml
@@ -7,7 +7,7 @@
 	<license>GNU/GPL</license>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>www.yireo.com</authorUrl>
-	<version>2.0.0-rc2</version>
+	<version>2.0.0</version>
 	<description>MOD_MAGEBRIDGE_NEWSLETTER_DESC</description>
 
 	<files>

diff --git a/joomla/modules/mod_magebridge_progress/mod_magebridge_progress.xml b/joomla/modules/mod_magebridge_progress/mod_magebridge_progress.xml
@@ -7,7 +7,7 @@
 	<license>GNU/GPL</license>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>www.yireo.com</authorUrl>
-	<version>2.0.0-rc2</version>
+	<version>2.0.0</version>
 	<description>MOD_MAGEBRIDGE_PROGRESS_DESC</description>
 
 	<files>

diff --git a/joomla/modules/mod_magebridge_switcher/mod_magebridge_switcher.xml b/joomla/modules/mod_magebridge_switcher/mod_magebridge_switcher.xml
@@ -7,7 +7,7 @@
 	<license>GNU/GPL</license>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>www.yireo.com</authorUrl>
-	<version>2.0.0-rc2</version>
+	<version>2.0.0</version>
 	<description>MOD_MAGEBRIDGE_SWITCHER_DESC</description>
 
 	<files>

diff --git a/joomla/modules/mod_magebridge_widget/mod_magebridge_widget.xml b/joomla/modules/mod_magebridge_widget/mod_magebridge_widget.xml
@@ -7,7 +7,7 @@
 	<license>GNU/GPL</license>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>https://www.yireo.com/</authorUrl>
-	<version>2.0.0-rc2</version>
+	<version>2.0.0</version>
 	<description>MOD_MAGEBRIDGE_WIDGET_DESC</description>
 
 	<files>

diff --git a/joomla/pkg_magebridge.xml b/joomla/pkg_magebridge.xml
@@ -4,7 +4,7 @@
     <name>MageBridge</name>
     <author>Charley Wu</author>
     <creationDate>October 2022</creationDate>
-    <version>2.0.0-rc2</version>
+    <version>2.0.0</version>
     <packagename>magebridge</packagename>
 
     <files folder="packages">

diff --git a/joomla/plugins/authentication/magebridge/magebridge.xml b/joomla/plugins/authentication/magebridge/magebridge.xml
@@ -7,7 +7,7 @@
     <license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
     <authorEmail>[email protected]</authorEmail>
     <authorUrl>www.yireo.com</authorUrl>
-    <version>2.0.0-rc2</version>
+    <version>2.0.0</version>
     <description>PLG_AUTHENTICATION_MAGEBRIDGE_DESC</description>
 
     <files>

diff --git a/joomla/plugins/community/magebridge/magebridge.xml b/joomla/plugins/community/magebridge/magebridge.xml
@@ -7,7 +7,7 @@
     <creationDate>August 2017</creationDate>
     <license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
     <copyright>Copyright (C) 2017 Yireo.com. All rights reserved.</copyright>
-    <version>2.0.0-rc2</version>
+    <version>2.0.0</version>
     <description>PLG_COMMUNITY_MAGEBRIDGE_DESC</description>
     <isapplication>false</isapplication>
 

diff --git a/joomla/plugins/content/magebridge/magebridge.xml b/joomla/plugins/content/magebridge/magebridge.xml
@@ -7,7 +7,7 @@
     <license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
     <authorEmail>[email protected]</authorEmail>
     <authorUrl>www.yireo.com</authorUrl>
-    <version>2.0.0-rc2</version>
+    <version>2.0.0</version>
     <description>PLG_CONTENT_MAGEBRIDGE_DESC</description>
 
     <files>

diff --git a/joomla/plugins/finder/magebridge/magebridge.xml b/joomla/plugins/finder/magebridge/magebridge.xml
@@ -7,7 +7,7 @@
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>www.yireo.com</authorUrl>
-	<version>2.0.0-rc2</version>
+	<version>2.0.0</version>
 	<description>PLG_FINDER_MAGEBRIDGE_DESC</description>
 
 	<files>

diff --git a/joomla/plugins/magebridge/magebridge/magebridge.xml b/joomla/plugins/magebridge/magebridge/magebridge.xml
@@ -7,7 +7,7 @@
     <license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
     <authorEmail>[email protected]</authorEmail>
     <authorUrl>www.yireo.com</authorUrl>
-    <version>2.0.0-rc2</version>
+    <version>2.0.0</version>
     <description>PLG_MAGEBRIDGE_MAGEBRIDGE_DESC</description>
 
     <files>

diff --git a/joomla/plugins/magebridgestore/falang/falang.xml b/joomla/plugins/magebridgestore/falang/falang.xml
@@ -7,7 +7,7 @@
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>www.yireo.com</authorUrl>
-	<version>2.0.0-rc2</version>
+	<version>2.0.0</version>
 	<description>PLG_MAGEBRIDGESTORE_FALANG_DESC</description>
 
 	<files>