Revert "Update 4.1 from 4.0 (#36690)"

This reverts commit 989c719.

.drone.yml

@@ -182,41 +182,39 @@ steps:
     commands:
       - bash tests/Codeception/drone-api-run.sh "$(pwd)" mysql
 
-#  - name: phpnext-api-mysql
-#    depends_on:
-#      - phpmin-api-mysql
-#    image: joomlaprojects/docker-images:systemtests8.2
-#    failure: ignore
-#    environment:
-#      JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
-#    commands:
-#      - bash tests/Codeception/drone-api-run.sh "$(pwd)" mysqlphpnext
+  - name: phpnext-api-mysql
+    depends_on:
+      - phpmin-api-mysql
+    image: joomlaprojects/docker-images:systemtests8.2
+    failure: ignore
+    environment:
+      JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
+    commands:
+      - bash tests/Codeception/drone-api-run.sh "$(pwd)" mysqlphpnext
 
   - name: phpmin-api-postgres
     depends_on:
- #     - phpnext-api-mysql
-      - phpmin-api-mysql
+      - phpnext-api-mysql
     image: joomlaprojects/docker-images:systemtests
     failure: ignore
     environment:
       JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
     commands:
       - bash tests/Codeception/drone-api-run.sh "$(pwd)" postgres
 
-#  - name: phpnext-api-postgres
-#    depends_on:
-#      - phpmin-api-postgres
-#    image: joomlaprojects/docker-images:systemtests8.2
-#    failure: ignore
-#    environment:
-#      JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
-#    commands:
-#      - bash tests/Codeception/drone-api-run.sh "$(pwd)" postgresphpnext
+  - name: phpnext-api-postgres
+    depends_on:
+      - phpmin-api-postgres
+    image: joomlaprojects/docker-images:systemtests8.2
+    failure: ignore
+    environment:
+      JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
+    commands:
+      - bash tests/Codeception/drone-api-run.sh "$(pwd)" postgresphpnext
 
   - name: phpmax-api-postgres
     depends_on:
-#      - phpnext-api-postgres
-      - phpmin-api-postgres
+      - phpnext-api-postgres
     image: joomlaprojects/docker-images:systemtests8.1
     failure: ignore
     environment:
@@ -235,62 +233,53 @@ steps:
     commands:
       - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysql
 
-#  - name: phpnext-system-mysql
-#    depends_on:
-#      - phpmin-system-mysql
-#    image: joomlaprojects/docker-images:systemtests8.2
-#    failure: ignore
-#    environment:
-#      JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
-#    commands:
-#      - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysqlphpnext
+  - name: phpnext-system-mysql
+    depends_on: [ phpmin-system-mysql ]
+    image: joomlaprojects/docker-images:systemtests8.2
+    failure: ignore
+    environment:
+      JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
+    commands:
+      - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysqlphpnext
 
   - name: phpmax-system-mysql
-    depends_on:
-#      - phpnext-system-mysql
-      - phpmin-system-mysql
+    depends_on: [ phpnext-system-mysql ]
     image: joomlaprojects/docker-images:systemtests8.1
     failure: ignore
     environment:
       JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
     commands:
       - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysqlphpmax
 
-#  - name: phpnext-system-mysql8
-#    depends_on:
-#      - phpmax-system-mysql
-#    image: joomlaprojects/docker-images:systemtests8.2
-#    failure: ignore
-#    environment:
-#      JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
-#    commands:
-#      - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysql8phpnext
+  - name: phpnext-system-mysql8
+    depends_on: [ phpmax-system-mysql ]
+    image: joomlaprojects/docker-images:systemtests8.2
+    failure: ignore
+    environment:
+      JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
+    commands:
+      - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysql8phpnext
 
   - name: phpmax-system-mysql8
-    depends_on:
-#      - phpnext-system-mysql
-      - phpmax-system-mysql
+    depends_on: [ phpnext-system-mysql ]
     image: joomlaprojects/docker-images:systemtests8.1
     failure: ignore
     environment:
       JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
     commands:
       - bash tests/Codeception/drone-system-run.sh "$(pwd)" mysql8phpmax
 
-#  - name: phpnext-system-postgres
-#    depends_on:
-#      - phpmax-system-mysql8
-#    image: joomlaprojects/docker-images:systemtests8.2
-#    failure: ignore
-#    environment:
-#      JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
-#    commands:
-#      - bash tests/Codeception/drone-system-run.sh "$(pwd)" postgresphpnext
+  - name: phpnext-system-postgres
+    depends_on: [ phpmax-system-mysql8 ]
+    image: joomlaprojects/docker-images:systemtests8.2
+    failure: ignore
+    environment:
+      JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
+    commands:
+      - bash tests/Codeception/drone-system-run.sh "$(pwd)" postgresphpnext
 
   - name: phpmax-system-postgres
-    depends_on:
-#      - phpnext-system-mysql8
-      - phpmax-system-mysql8
+    depends_on: [ phpnext-system-mysql8 ]
     image: joomlaprojects/docker-images:systemtests8.1
     failure: ignore
     environment:
@@ -317,17 +306,17 @@ steps:
   - name: artifacts-system-tests
     image: cschlosser/drone-ftps
     depends_on:
-#      - phpnext-system-mysql
-#      - phpnext-system-mysql8
-#      - phpnext-system-postgres
+      - phpnext-system-mysql
+      - phpnext-system-mysql8
+      - phpnext-system-postgres
       - phpmax-system-mysql
       - phpmax-system-mysql8
       - phpmax-system-postgres
       - phpmin-system-mysql
       - phpmin-system-mysql8
       - phpmin-system-postgres
-#      - phpnext-api-mysql
-#      - phpnext-api-postgres
+      - phpnext-api-mysql
+      - phpnext-api-postgres
       - phpmax-api-mysql
       - phpmax-api-postgres
       - phpmin-api-mysql
@@ -420,6 +409,6 @@ steps:
 
 ---
 kind: signature
-hmac: daa8e5588cc88058bc57aadf35e3d9dd55eefaa9419c457ce374a0dd19eb7cda
+hmac: e93522732dd8607448fa7705982c42c06f9ebf9762023ed1bb2207ee975fee42
 
 ...

administrator/components/com_content/src/Model/ArticleModel.php

@@ -416,7 +416,7 @@ public function getItem($pk = null)
 			$registry = new Registry($item->urls);
 			$item->urls = $registry->toArray();
 
-			$item->articletext = ($item->fulltext !== null && trim($item->fulltext) != '') ? $item->introtext . "<hr id=\"system-readmore\">" . $item->fulltext : $item->introtext;
+			$item->articletext = trim($item->fulltext) != '' ? $item->introtext . "<hr id=\"system-readmore\">" . $item->fulltext : $item->introtext;
 
 			if (!empty($item->id))
 			{

administrator/components/com_cpanel/src/View/Cpanel/HtmlView.php

@@ -56,7 +56,7 @@ class HtmlView extends BaseHtmlView
 	public function display($tpl = null)
 	{
 		$app = Factory::getApplication();
-		$dashboard = $app->input->getCmd('dashboard', '');
+		$dashboard = $app->input->getCmd('dashboard');
 
 		$position = ApplicationHelper::stringURLSafe($dashboard);
 

administrator/components/com_joomlaupdate/extract.php

@@ -525,7 +525,7 @@ public function enforceMinimumExecutionTime()
 			return;
 		}
 
-		$sleepMillisec = intval($minExecTime - $elapsed);
+		$sleepMillisec = $minExecTime - $elapsed;
 
 		/**
 		 * If we need to sleep for more than 1 second we should be using sleep() or time_sleep_until() to prevent high

administrator/components/com_joomlaupdate/src/View/Joomlaupdate/HtmlView.php

@@ -296,12 +296,6 @@ protected function addToolbar()
 	 */
 	public function shouldDisplayPreUpdateCheck()
 	{
-		// When the download URL is not found there is no core upgrade path
-		if (!isset($this->updateInfo['object']->downloadurl->_data))
-		{
-			return false;
-		}
-
 		$nextMinor = Version::MAJOR_VERSION . '.' . (Version::MINOR_VERSION + 1);
 
 		// Show only when we found a download URL, we have an update and when we update to the next minor or greater.

administrator/components/com_media/src/Provider/ProviderManager.php

@@ -55,32 +55,6 @@ public function registerProvider(ProviderInterface $provider)
 		$this->providers[$provider->getID()] = $provider;
 	}
 
-	/**
-	 * Unregister a provider from the ProviderManager.
-	 * When no provider, or null is passed in, then all providers are cleared.
-	 *
-	 * @param   ProviderInterface|null  $provider  The provider to be unregistered
-	 *
-	 * @return  void
-	 *
-	 * @since   4.0.6
-	 */
-	public function unregisterProvider(ProviderInterface $provider = null): void
-	{
-		if ($provider === null)
-		{
-			$this->providers = [];
-			return;
-		}
-
-		if (!array_key_exists($provider->getID(), $this->providers))
-		{
-			return;
-		}
-
-		unset($this->providers[$provider->getID()]);
-	}
-
 	/**
 	 * Returns the provider for a particular ID
 	 *

administrator/language/en-GB/com_joomlaupdate.ini

@@ -121,7 +121,7 @@ COM_JOOMLAUPDATE_VIEW_DEFAULT_INSTALLAGAIN="Reinstall Joomla core files"
 COM_JOOMLAUPDATE_VIEW_DEFAULT_INSTALLED="Installed Joomla version"
 COM_JOOMLAUPDATE_VIEW_DEFAULT_INSTALLUPDATE="Update"
 COM_JOOMLAUPDATE_VIEW_DEFAULT_LATEST="Latest Joomla version"
-COM_JOOMLAUPDATE_VIEW_DEFAULT_NO_DOWNLOAD_URL="Update unavailable"
+COM_JOOMLAUPDATE_VIEW_DEFAULT_NO_DOWNLOAD_URL="We can't find a download URL"
 COM_JOOMLAUPDATE_VIEW_DEFAULT_NO_DOWNLOAD_URL_DESC="An update to Joomla %1$s was found, but it wasn't possible to fetch the download URL for that update. Either the update to Joomla %1$s is not available for your stability level or there is a problem with the Joomla Update Server.<br>Please try to download the update package from <a href=\"https://downloads.joomla.org/latest\">the official Joomla download page</a> and use the Upload and Update tab."
 COM_JOOMLAUPDATE_VIEW_DEFAULT_NO_LIVE_UPDATE="A new version of the Joomla Update Component is available."
 COM_JOOMLAUPDATE_VIEW_DEFAULT_NO_LIVE_UPDATE_DESC="You must update this component first before you can update Joomla! <a class=\"alert-link\" href=\"index.php?option=com_installer&view=update\">Click here to update the component</a>."

administrator/language/en-GB/lib_joomla.ini

@@ -649,10 +649,6 @@ JLIB_INSTALLER_NOT_ERROR="If the error is related to the installation of TinyMCE
 JLIB_INSTALLER_NOTICE_LANG_RESET_USERS="Language set to Default for %d users."
 JLIB_INSTALLER_NOTICE_LANG_RESET_USERS_1="Language set to Default for the user."
 JLIB_INSTALLER_PURGED_UPDATES="Cleared updates."
-JLIB_INSTALLER_SQL_BEGIN="Start of SQL updates."
-JLIB_INSTALLER_SQL_BEGIN_SCHEMA="The current database version (schema) is %s."
-JLIB_INSTALLER_SQL_END="End of SQL updates."
-JLIB_INSTALLER_SQL_END_NOT_COMPLETE="End of SQL updates - INCOMPLETE."
 JLIB_INSTALLER_UNINSTALL="Uninstall"
 JLIB_INSTALLER_UPDATE="Update"
 JLIB_INSTALLER_UPDATE_LOG_QUERY="Ran query from file %1$s. Query text: %2$s."

administrator/modules/mod_latest/src/Helper/LatestHelper.php

@@ -96,8 +96,7 @@ public static function getList(Registry &$params, ArticlesModel $model)
 		{
 			$item->link = '';
 
-			if ($user->authorise('core.edit', 'com_content.article.' . $item->id)
-				|| ($user->authorise('core.edit.own', 'com_content.article.' . $item->id) && ($userId === $item->created_by)))
+			if ($user->authorise('core.edit', 'com_content.article.' . $item->id))
 			{
 				$item->link = Route::_('index.php?option=com_content&task=article.edit&id=' . $item->id);
 			}

administrator/modules/mod_popular/src/Helper/PopularHelper.php

@@ -87,8 +87,7 @@ public static function getList(Registry &$params, ArticlesModel $model)
 		{
 			$item->link = '';
 
-			if ($user->authorise('core.edit', 'com_content.article.' . $item->id)
-				|| ($user->authorise('core.edit.own', 'com_content.article.' . $item->id) && ($userId === $item->created_by)))
+			if ($user->authorise('core.edit', 'com_content.article.' . $item->id))
 			{
 				$item->link = Route::_('index.php?option=com_content&task=article.edit&id=' . $item->id);
 			}

api/components/com_categories/src/Controller/CategoriesController.php

@@ -51,7 +51,7 @@ protected function preprocessSaveData(array $data): array
 		$extension = $this->getExtensionFromInput();
 		$data['extension'] = $extension;
 
-		// TODO: This is a hack to drop the extension into the global input object - to satisfy how state is built
+		// @todo: This is a hack to drop the extension into the global input object - to satisfy how state is built
 		//       we should be able to improve this in the future
 		$this->input->set('extension', $extension);
 
@@ -65,7 +65,7 @@ protected function preprocessSaveData(array $data): array
 	 *
 	 * @return  integer  The record ID on success, false on failure
 	 *
-	 * @since   4.0.6
+	 * @since   4.1.0
 	 */
 	protected function save($recordKey = null)
 	{

build/stubGenerator.php

@@ -61,7 +61,6 @@ class StubGenerator extends CliApplication
 	public function doExecute()
 	{
 		$this->createExtensionNamespaceMap();
-		$contentsByNamespace = [];
 
 		$file = "<?php\n";
 
@@ -78,36 +77,18 @@ public function doExecute()
 			$modifier   = (!$reflection->isInterface() && $reflection->isFinal()) ? 'final ' : '';
 			$modifier   = ($reflection->isAbstract() && !$reflection->isInterface()) ? $modifier . 'abstract ' : $modifier;
 
-			$namespaceSegments = explode('\\', $oldName);
-			$className         = array_pop($namespaceSegments);
-			$targetNamespace   = ltrim(implode('\\', $namespaceSegments), '\\');
-
 			// If a deprecated version is available, write a stub class doc block with a deprecated tag
 			if ($deprecatedVersion !== false)
 			{
-				$fileContents = <<<PHP
-	/**
-	 * @deprecated $deprecatedVersion Use $newName instead.
-	 */
+				$file .= <<<PHP
+/**
+ * @deprecated $deprecatedVersion Use $newName instead.
+ */
 
 PHP;
 			}
 
-			$fileContents .= "\t$modifier$type $className extends \\$newName {}\n\n";
-
-			if (!array_key_exists($targetNamespace, $contentsByNamespace))
-			{
-				$contentsByNamespace[$targetNamespace] = '';
-			}
-
-			$contentsByNamespace[$targetNamespace] .= $fileContents;
-		}
-
-		foreach ($contentsByNamespace as $namespace => $contents)
-		{
-			$file .= "namespace $namespace {\n";
-			$file .= $contents;
-			$file .= "}\n\n";
+			$file .= "$modifier$type $oldName extends $newName {}\n\n";
 		}
 
 		// And save the file locally

components/com_contact/tmpl/category/default_items.php

@@ -12,7 +12,6 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\Layout\LayoutHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Uri\Uri;
 use Joomla\Component\Contact\Administrator\Helper\ContactHelper;
@@ -100,14 +99,7 @@ class="inputbox" onchange="document.adminForm.submit();"
 							<a href="<?php echo Route::_(RouteHelper::getContactRoute($item->slug, $item->catid, $item->language)); ?>">
 								<?php if ($this->params->get('show_image_heading')) : ?>
 									<?php if ($item->image) : ?>
-										<?php echo LayoutHelper::render(
-											'joomla.html.image',
-											[
-												'src'   => $item->image,
-												'alt'   => '',
-												'class' => 'contact-thumbnail img-thumbnail',
-											]
-										); ?>
+										<?php echo HTMLHelper::_('image', $item->image, '', array('class' => 'contact-thumbnail img-thumbnail')); ?>
 									<?php endif; ?>
 								<?php endif; ?>
 								<?php echo $this->escape($item->name); ?>