Merge pull request #163 from joomlatools/feature/162-joomla5

amazeika · web-flow · commit 699fd6d2da32 · 2023-11-16T13:41:25.000+01:00
Support for Joomla 5
diff --git a/src/Joomlatools/Console/Joomla/Util.php b/src/Joomlatools/Console/Joomla/Util.php
@@ -68,7 +68,7 @@ public static function getJoomlaVersion($base)
                 }
 
                 //start to provide support for Joomla 4 onwards
-                if (defined( "$className::MAJOR_VERSION") && $version::MAJOR_VERSION == '4'){
+                if (defined( "$className::MAJOR_VERSION") && in_array($version::MAJOR_VERSION, ['4', '5'])){
                     return  $version::MAJOR_VERSION . "." . $version::MINOR_VERSION . "." . $version::PATCH_VERSION . ($version::EXTRA_VERSION ? "." . $version::EXTRA_VERSION : '');
                 }
 

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public static function getJoomlaVersion($base)`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`//start to provide support for Joomla 4 onwards`
`71`		`- if (defined( "$className::MAJOR_VERSION") && $version::MAJOR_VERSION == '4'){`
	`71`	`+ if (defined( "$className::MAJOR_VERSION") && in_array($version::MAJOR_VERSION, ['4', '5'])){`
`72`	`72`	`return $version::MAJOR_VERSION . "." . $version::MINOR_VERSION . "." . $version::PATCH_VERSION . ($version::EXTRA_VERSION ? "." . $version::EXTRA_VERSION : '');`
`73`	`73`	`}`
`74`	`74`