Version 5.0.0 beta 4

applications/convert/sources/Software/Cms/Joomla.php

@@ -33,9 +33,9 @@ class Joomla extends Software
 	/**
 	 * Software Name
 	 *
-	 * @return	string
+	 * @return    string
 	 */
-	public static function softwareName()
+	public static function softwareName(): string
 	{
 		/* Child classes must override this method */
 		return "Joomla";
@@ -44,9 +44,9 @@ class Joomla extends Software
 	/**
 	 * Software Key
 	 *
-	 * @return	string
+	 * @return    string
 	 */
-	public static function softwareKey()
+	public static function softwareKey(): string
 	{
 		/* Child classes must override this method */
 		return "joomla";
@@ -55,9 +55,9 @@ class Joomla extends Software
 	/**
 	 * Content we can convert from this software. 
 	 *
-	 * @return	array
+	 * @return    array|null
 	 */
-	public static function canConvert()
+	public static function canConvert(): ?array
 	{
 		return array(
 			'convertCmsDatabases'			=> array(
@@ -78,32 +78,30 @@ class Joomla extends Software
 	/**
 	 * Count Source Rows for a specific step
 	 *
-	 * @param	string		$table		The table containing the rows to count.
-	 * @param	array|NULL	$where		WHERE clause to only count specific rows, or NULL to count all.
-	 * @param	bool		$recache	Skip cache and pull directly (updating cache)
-	 * @return	integer
+	 * @param string $table		The table containing the rows to count.
+	 * @param string|array|NULL $where		WHERE clause to only count specific rows, or NULL to count all.
+	 * @param bool $recache	Skip cache and pull directly (updating cache)
+	 * @return    integer
 	 * @throws	\IPS\convert\Exception
 	 */
-	public function countRows( $table, $where=NULL, $recache=FALSE )
+	public function countRows( string $table, string|array|null $where=NULL, bool $recache=FALSE ): int
 	{
 		switch( $table )
 		{
 			case 'cms_database':
 				return 1;
-				break;
 			
 			default:
 				return parent::countRows( $table, $where, $recache );
-				break;
 		}
 	}
 
 	/**
 	 * Can we convert passwords from this software.
 	 *
-	 * @return 	boolean
+	 * @return    boolean
 	 */
-	public static function loginEnabled()
+	public static function loginEnabled(): bool
 	{
 		return TRUE;
 	}
@@ -111,9 +109,9 @@ class Joomla extends Software
 	/**
 	 * Requires Parent?
 	 *
-	 * @return	bool
+	 * @return    bool
 	 */
-	public static function requiresParent()
+	public static function requiresParent(): bool
 	{
 		return TRUE;
 	}
@@ -121,9 +119,9 @@ class Joomla extends Software
 	/**
 	 * Available Parents
 	 *
-	 * @return	array
+	 * @return    array|null
 	 */
-	public static function parents()
+	public static function parents(): ?array
 	{
 		return array( 'core' => array( 'joomla' ) );
 	}
@@ -131,9 +129,9 @@ class Joomla extends Software
 	/**
 	 * Finish - Adds everything it needs to the queues and clears data store
 	 *
-	 * @return	array		Messages to display
+	 * @return    array        Messages to display
 	 */
-	public function finish()
+	public function finish(): array
 	{
 		try
 		{
@@ -154,7 +152,7 @@ class Joomla extends Software
 	 *
 	 * @return 	void
 	 */
-	public function convertCmsDatabases()
+	public function convertCmsDatabases() : void
 	{
 		$libraryClass = $this->getLibrary();
 		
@@ -198,13 +196,13 @@ class Joomla extends Software
 	 *
 	 * @return 	void
 	 */
-	public function convertCmsDatabaseCategories()
+	public function convertCmsDatabaseCategories() : void
 	{
 		$libraryClass = $this->getLibrary();
 		
 		$libraryClass::setKey( 'id' );
 		
-		foreach( $this->fetch( 'categories', 'id' ) as $row )
+		foreach( $this->fetch( 'categories' ) as $row )
 		{
 			$info = array(
 				'category_id'			=> $row['id'],
@@ -225,13 +223,13 @@ class Joomla extends Software
 	 *
 	 * @return 	void
 	 */
-	public function convertCmsDatabaseRecords()
+	public function convertCmsDatabaseRecords() : void
 	{
 		$libraryClass = $this->getLibrary();
 		
 		$libraryClass::setKey( 'id' );
 		
-		foreach( $this->fetch( 'content', 'id' ) as $row )
+		foreach( $this->fetch( 'content' ) as $row )
 		{
 			/* Set the basic details */
 			$info = array(