Merge remote-tracking branch 'origin/j4/services/templates' into j4/s…

…ervices/templates
joomla · May 31, 2018 · 82151d1 · 82151d1
2 parents c37e26a + 8410c48
commit 82151d1
Show file tree

Hide file tree

Showing 38 changed files with 528 additions and 602 deletions.
diff --git a/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-03-05.sql b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-03-05.sql
@@ -0,0 +1 @@
+ALTER TABLE `#__modules` CHANGE `content` `content` TEXT NULL;
diff --git a/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-03-05.sql b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-03-05.sql
@@ -0,0 +1 @@
+ALTER TABLE "#__modules" ALTER COLUMN "content" DROP NOT NULL;
diff --git a/administrator/components/com_cache/dispatcher.php b/administrator/components/com_cache/dispatcher.php
diff --git a/administrator/components/com_cache/services/provider.php b/administrator/components/com_cache/services/provider.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_cache
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Dispatcher\DispatcherFactoryInterface;
+use Joomla\CMS\Extension\ComponentInterface;
+use Joomla\CMS\Extension\MVCComponent;
+use Joomla\CMS\Extension\Service\Provider\DispatcherFactory;
+use Joomla\CMS\Extension\Service\Provider\MVCFactoryFactory;
+use Joomla\CMS\MVC\Factory\MVCFactoryFactoryInterface;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+
+/**
+ * The cache service provider.
+ *
+ * @since  4.0.0
+ */
+return new class implements ServiceProviderInterface
+{
+	/**
+	 * Registers the service provider with a DI container.
+	 *
+	 * @param   Container  $container  The DI container.
+	 *
+	 * @return  void
+	 *
+	 * @since   4.0.0
+	 */
+	public function register(Container $container)
+	{
+		$container->registerServiceProvider(new MVCFactoryFactory('\\Joomla\\Component\\Cache'));
+		$container->registerServiceProvider(new DispatcherFactory('\\Joomla\\Component\\Cache<'));
+
+		$container->set(
+			ComponentInterface::class,
+			function (Container $container)
+			{
+				$component = new MVCComponent($container->get(DispatcherFactoryInterface::class));
+
+				$component->setMvcFactoryFactory($container->get(MVCFactoryFactoryInterface::class));
+
+				return $component;
+			}
+		);
+	}
+};
diff --git a/administrator/components/com_checkin/dispatcher.php b/administrator/components/com_checkin/dispatcher.php
diff --git a/administrator/components/com_checkin/services/provider.php b/administrator/components/com_checkin/services/provider.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_checkin
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Dispatcher\DispatcherFactoryInterface;
+use Joomla\CMS\Extension\ComponentInterface;
+use Joomla\CMS\Extension\MVCComponent;
+use Joomla\CMS\Extension\Service\Provider\DispatcherFactory;
+use Joomla\CMS\Extension\Service\Provider\MVCFactoryFactory;
+use Joomla\CMS\MVC\Factory\MVCFactoryFactoryInterface;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+
+/**
+ * The checkin service provider.
+ *
+ * @since  4.0.0
+ */
+return new class implements ServiceProviderInterface
+{
+	/**
+	 * Registers the service provider with a DI container.
+	 *
+	 * @param   Container  $container  The DI container.
+	 *
+	 * @return  void
+	 *
+	 * @since   4.0.0
+	 */
+	public function register(Container $container)
+	{
+		$container->registerServiceProvider(new MVCFactoryFactory('\\Joomla\\Component\\Checkin'));
+		$container->registerServiceProvider(new DispatcherFactory('\\Joomla\\Component\\Checkin'));
+
+		$container->set(
+			ComponentInterface::class,
+			function (Container $container)
+			{
+				$component = new MVCComponent($container->get(DispatcherFactoryInterface::class));
+
+				$component->setMvcFactoryFactory($container->get(MVCFactoryFactoryInterface::class));
+
+				return $component;
+			}
+		);
+	}
+};
diff --git a/administrator/components/com_joomlaupdate/Model/UpdateModel.php b/administrator/components/com_joomlaupdate/Model/UpdateModel.php
@@ -1056,24 +1056,6 @@ public function getPhpOptions()
 		$option->notice = null;
 		$options[]      = $option;
 
-		// Only check if required PHP version is less than 7.
-		if (version_compare($this->getTargetMinimumPHPVersion(), '7', '<'))
-		{
-			// Check for magic quotes gpc.
-			$option         = new \stdClass;
-			$option->label  = \JText::_('INSTL_MAGIC_QUOTES_GPC');
-			$option->state  = (ini_get('magic_quotes_gpc') == false);
-			$option->notice = null;
-			$options[]      = $option;
-
-			// Check for register globals.
-			$option         = new \stdClass;
-			$option->label  = \JText::_('INSTL_REGISTER_GLOBALS');
-			$option->state  = (ini_get('register_globals') == false);
-			$option->notice = null;
-			$options[]      = $option;
-		}
-
 		// Check for zlib support.
 		$option         = new \stdClass;
 		$option->label  = \JText::_('INSTL_ZLIB_COMPRESSION_SUPPORT');
@@ -1159,24 +1141,6 @@ public function getPhpSettings()
 		$setting->recommended = true;
 		$settings[] = $setting;
 
-		// Only check if required PHP version is less than 7.
-		if (version_compare($this->getTargetMinimumPHPVersion(), '7', '<'))
-		{
-			// Check for magic quotes runtimes.
-			$setting = new \stdClass;
-			$setting->label = \JText::_('INSTL_MAGIC_QUOTES_RUNTIME');
-			$setting->state = (bool) ini_get('magic_quotes_runtime');
-			$setting->recommended = false;
-			$settings[] = $setting;
-
-			// Check for safe mode.
-			$setting = new \stdClass;
-			$setting->label = \JText::_('INSTL_SAFE_MODE');
-			$setting->state = (bool) ini_get('safe_mode');
-			$setting->recommended = false;
-			$settings[] = $setting;
-		}
-
 		// Check for output buffering.
 		$setting = new \stdClass;
 		$setting->label = \JText::_('INSTL_OUTPUT_BUFFERING');

diff --git a/administrator/components/com_joomlaupdate/dispatcher.php b/administrator/components/com_joomlaupdate/dispatcher.php
diff --git a/administrator/components/com_joomlaupdate/services/provider.php b/administrator/components/com_joomlaupdate/services/provider.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_joomlaupdate
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Dispatcher\DispatcherFactoryInterface;
+use Joomla\CMS\Extension\ComponentInterface;
+use Joomla\CMS\Extension\MVCComponent;
+use Joomla\CMS\Extension\Service\Provider\DispatcherFactory;
+use Joomla\CMS\Extension\Service\Provider\MVCFactoryFactory;
+use Joomla\CMS\MVC\Factory\MVCFactoryFactoryInterface;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+
+/**
+ * The content service provider.
+ *
+ * @since  4.0.0
+ */
+return new class implements ServiceProviderInterface
+{
+	/**
+	 * Registers the service provider with a DI container.
+	 *
+	 * @param   Container  $container  The DI container.
+	 *
+	 * @return  void
+	 *
+	 * @since   4.0.0
+	 */
+	public function register(Container $container)
+	{
+		$container->registerServiceProvider(new MVCFactoryFactory('\\Joomla\\Component\\Joomlaupdate'));
+		$container->registerServiceProvider(new DispatcherFactory('\\Joomla\\Component\\Joomlaupdate'));
+
+		$container->set(
+			ComponentInterface::class,
+			function (Container $container)
+			{
+				$component = new MVCComponent($container->get(DispatcherFactoryInterface::class));
+
+				$component->setMvcFactoryFactory($container->get(MVCFactoryFactoryInterface::class));
+
+				return $component;
+			}
+		);
+	}
+};
diff --git a/administrator/language/en-GB/en-GB.com_admin.ini b/administrator/language/en-GB/en-GB.com_admin.ini
@@ -125,7 +125,6 @@ COM_ADMIN_PHP_SETTINGS="PHP Settings"
 COM_ADMIN_PHP_VERSION="PHP Version"
 COM_ADMIN_PHPINFO_DISABLED="The built in phpinfo() function has been disabled by your host."
 COM_ADMIN_PLATFORM_VERSION="Joomla! Platform Version"
-COM_ADMIN_REGISTER_GLOBALS="Register Globals"
 COM_ADMIN_RELEVANT_PHP_SETTINGS="Relevant PHP Settings"
 COM_ADMIN_SAFE_MODE="Safe Mode"
 COM_ADMIN_SEARCH="Search"

diff --git a/administrator/language/en-GB/en-GB.com_joomlaupdate.ini b/administrator/language/en-GB/en-GB.com_joomlaupdate.ini
@@ -101,17 +101,13 @@ INSTL_DATABASE_SUPPORTED="Database Supported (%s)"
 INSTL_DISPLAY_ERRORS="Display Errors"
 INSTL_FILE_UPLOADS="File Uploads"
 INSTL_JSON_SUPPORT_AVAILABLE="JSON Support"
-INSTL_MAGIC_QUOTES_GPC="Magic Quotes GPC Off"
-INSTL_MAGIC_QUOTES_RUNTIME="Magic Quotes Runtime"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB Language is Default"
 INSTL_MB_STRING_OVERLOAD_OFF="MB String Overload Off"
 INSTL_NOTICEMBLANGNOTDEFAULT="PHP mbstring language is not set to neutral. This can be set locally by entering <strong>php_value mbstring.language neutral</strong> in your <code>.htaccess</code> file."
 INSTL_NOTICEMBSTRINGOVERLOAD="PHP mbstring function overload is set. This can be turned off locally by entering <strong>php_value mbstring.func_overload 0</strong> in your <code>.htaccess</code> file."
 INSTL_OUTPUT_BUFFERING="Output Buffering"
 INSTL_PARSE_INI_FILE_AVAILABLE="INI Parser Support"
 INSTL_PHP_VERSION_NEWER="PHP Version >= %s"
-INSTL_REGISTER_GLOBALS="Register Globals Off"
-INSTL_SAFE_MODE="Safe Mode"
 INSTL_SESSION_AUTO_START="Session Auto Start"
 INSTL_XML_SUPPORT="XML Support"
 INSTL_ZIP_SUPPORT_AVAILABLE="Native ZIP support"

diff --git a/administrator/templates/atum/component.php b/administrator/templates/atum/component.php
@@ -21,7 +21,7 @@
 
 // Add JavaScript Frameworks
 HTMLHelper::_('bootstrap.framework');
-HTMLHelper::_('script', 'media/vendor/flying-focus-a11y/js/flying-focus.min.js', ['version' => 'auto']);
+HTMLHelper::_('script', 'vendor/focus-visible/focus-visible.min.js', ['version' => 'auto', 'relative' => true]);
 
 // Load template CSS file
 HTMLHelper::_('stylesheet', 'bootstrap.min.css', ['version' => 'auto', 'relative' => true]);

diff --git a/administrator/templates/atum/css/bootstrap.css b/administrator/templates/atum/css/bootstrap.css
@@ -109,7 +109,7 @@ html {
   -webkit-text-size-adjust: 100%;
   -ms-text-size-adjust: 100%;
   -ms-overflow-style: scrollbar;
-  -webkit-tap-highlight-color: transparent; }
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0); }
 
 @-ms-viewport {
   width: device-width; }

diff --git a/administrator/templates/atum/index.php b/administrator/templates/atum/index.php
@@ -34,7 +34,7 @@
 
 // Add JavaScript
 HTMLHelper::_('bootstrap.framework');
-HTMLHelper::_('script', 'media/vendor/flying-focus-a11y/js/flying-focus.min.js', ['version' => 'auto']);
+HTMLHelper::_('script', 'vendor/focus-visible/focus-visible.min.js', ['version' => 'auto', 'relative' => true]);
 
 // Load template CSS file
 HTMLHelper::_('stylesheet', 'bootstrap.min.css', ['version' => 'auto', 'relative' => true]);

diff --git a/administrator/templates/atum/login.php b/administrator/templates/atum/login.php
@@ -20,7 +20,7 @@
 $lang = Factory::getLanguage();
 
 // Add JavaScript Frameworks
-HTMLHelper::_('script', 'media/vendor/flying-focus-a11y/js/flying-focus.min.js', ['version' => 'auto']);
+HTMLHelper::_('script', 'vendor/focus-visible/focus-visible.min.js', ['version' => 'auto', 'relative' => true]);
 
 // Load template CSS file
 HTMLHelper::_('stylesheet', 'bootstrap.min.css', ['version' => 'auto', 'relative' => true]);

diff --git a/components/com_content/Dispatcher/Dispatcher.php b/components/com_content/Dispatcher/Dispatcher.php
@@ -50,7 +50,6 @@ public function dispatch()
 		}
 
 		\JLoader::register('ContentHelperRoute', JPATH_SITE . '/components/com_content/helpers/route.php');
-		\JLoader::register('ContentHelperAssociation', JPATH_SITE . '/components/com_content/helpers/association.php');
 
 		parent::dispatch();
 	}