Use null coalescing operator

joomla · Jul 17, 2020 · 8bebbf5 · 8bebbf5
1 parent 1c63746
commit 8bebbf5
Show file tree

Hide file tree

Showing 17 changed files with 28 additions and 28 deletions.
diff --git a/components/com_content/src/Helper/QueryHelper.php b/components/com_content/src/Helper/QueryHelper.php
@@ -69,7 +69,7 @@ public static function orderbyPrimary($orderby)
 	 */
 	public static function orderbySecondary($orderby, $orderDate = 'created', DatabaseInterface $db = null)
 	{
-		$db = $db ?: Factory::getDbo();
+		$db = $db ?? Factory::getDbo();
 
 		$queryDate = self::getQueryDate($orderDate, $db);
 
@@ -179,7 +179,7 @@ public static function orderbySecondary($orderby, $orderDate = 'created', Databa
 	 */
 	public static function getQueryDate($orderDate, DatabaseInterface $db = null)
 	{
-		$db = $db ?: Factory::getDbo();
+		$db = $db ?? Factory::getDbo();
 
 		switch ($orderDate)
 		{

diff --git a/libraries/src/Application/CLI/CliOutput.php b/libraries/src/Application/CLI/CliOutput.php
@@ -37,7 +37,7 @@ abstract class CliOutput
 	 */
 	public function __construct(ProcessorInterface $processor = null)
 	{
-		$this->setProcessor($processor ?: new Output\Processor\ColorProcessor);
+		$this->setProcessor($processor ?? new Output\Processor\ColorProcessor);
 	}
 
 	/**

diff --git a/libraries/src/Application/CMSApplication.php b/libraries/src/Application/CMSApplication.php
@@ -144,7 +144,7 @@ abstract class CMSApplication extends WebApplication implements ContainerAwareIn
 	 */
 	public function __construct(Input $input = null, Registry $config = null, WebClient $client = null, Container $container = null)
 	{
-		$container = $container ?: new Container;
+		$container = $container ?? new Container;
 		$this->setContainer($container);
 
 		parent::__construct($input, $config, $client);

diff --git a/libraries/src/Application/CliApplication.php b/libraries/src/Application/CliApplication.php
@@ -114,13 +114,13 @@ public function __construct(Input $input = null, Registry $config = null, CliOut
 			$this->close();
 		}
 
-		$container = $container ?: Factory::getContainer();
+		$container = $container ?? Factory::getContainer();
 		$this->setContainer($container);
 
 		$this->input    = new \Joomla\CMS\Input\Cli;
 		$this->language = Factory::getLanguage();
-		$this->output   = $output ?: new Stdout;
-		$this->cliInput = $cliInput ?: new CliInput;
+		$this->output   = $output ?? new Stdout;
+		$this->cliInput = $cliInput ?? new CliInput;
 
 		if ($dispatcher)
 		{

diff --git a/libraries/src/Application/IdentityAware.php b/libraries/src/Application/IdentityAware.php
@@ -59,7 +59,7 @@ public function getIdentity()
 	 */
 	public function loadIdentity(User $identity = null)
 	{
-		$this->identity = $identity ?: $this->userFactory->loadUserById(0);
+		$this->identity = $identity ?? $this->userFactory->loadUserById(0);
 
 		return $this;
 	}

diff --git a/libraries/src/Application/WebApplication.php b/libraries/src/Application/WebApplication.php
@@ -79,7 +79,7 @@ abstract class WebApplication extends AbstractWebApplication
 	public function __construct(Input $input = null, Registry $config = null, WebClient $client = null, ResponseInterface $response = null)
 	{
 		// Ensure we have a CMS Input object otherwise the DI for \Joomla\CMS\Session\Storage\JoomlaStorage fails
-		$input = $input ?: new Input;
+		$input = $input ?? new Input;
 
 		parent::__construct($input, $config, $client, $response);
 

diff --git a/libraries/src/Dispatcher/ComponentDispatcherFactory.php b/libraries/src/Dispatcher/ComponentDispatcherFactory.php
@@ -81,6 +81,6 @@ public function createDispatcher(CMSApplicationInterface $application, Input $in
 			}
 		}
 
-		return new $className($application, $input ?: $application->input, $this->mvcFactory);
+		return new $className($application, $input ?? $application->input, $this->mvcFactory);
 	}
 }
diff --git a/libraries/src/Dispatcher/ModuleDispatcherFactory.php b/libraries/src/Dispatcher/ModuleDispatcherFactory.php
@@ -68,6 +68,6 @@ public function createDispatcher(\stdClass $module, CMSApplicationInterface $app
 			$className = ModuleDispatcher::class;
 		}
 
-		return new $className($module, $application, $input ?: $application->input);
+		return new $className($module, $application, $input ?? $application->input);
 	}
 }
diff --git a/libraries/src/Document/PreloadManager.php b/libraries/src/Document/PreloadManager.php
@@ -38,7 +38,7 @@ class PreloadManager implements PreloadManagerInterface
 	 */
 	public function __construct(EvolvableLinkProviderInterface $linkProvider = null)
 	{
-		$this->linkProvider = $linkProvider ?: new GenericLinkProvider;
+		$this->linkProvider = $linkProvider ?? new GenericLinkProvider;
 	}
 
 	/**

diff --git a/libraries/src/Language/Multilanguage.php b/libraries/src/Language/Multilanguage.php
@@ -52,7 +52,7 @@ public static function isEnabled(CMSApplication $app = null, DatabaseInterface $
 		}
 
 		// Get application object.
-		$app = $app ?: Factory::getApplication();
+		$app = $app ?? Factory::getApplication();
 
 		// If being called from the frontend, we can avoid the database query.
 		if ($app->isClient('site'))
@@ -66,7 +66,7 @@ public static function isEnabled(CMSApplication $app = null, DatabaseInterface $
 		if (!$tested)
 		{
 			// Determine status of language filter plugin.
-			$db    = $db ?: Factory::getDbo();
+			$db    = $db ?? Factory::getDbo();
 			$query = $db->getQuery(true)
 				->select($db->quoteName('enabled'))
 				->from($db->quoteName('#__extensions'))
@@ -103,7 +103,7 @@ public static function getSiteHomePages(DatabaseInterface $db = null)
 		if (!isset($multilangSiteHomePages))
 		{
 			// Check for Home pages languages.
-			$db    = $db ?: Factory::getDbo();
+			$db    = $db ?? Factory::getDbo();
 			$query = $db->getQuery(true)
 				->select(
 					[

diff --git a/libraries/src/Pagination/Pagination.php b/libraries/src/Pagination/Pagination.php
@@ -126,7 +126,7 @@ public function __construct($total, $limitstart, $limit, $prefix = '', CMSApplic
 		$this->limitstart = (int) max($limitstart, 0);
 		$this->limit = (int) max($limit, 0);
 		$this->prefix = $prefix;
-		$this->app = $app ?: Factory::getApplication();
+		$this->app = $app ?? Factory::getApplication();
 
 		if ($this->limit > $this->total)
 		{

diff --git a/libraries/src/Pathway/SitePathway.php b/libraries/src/Pathway/SitePathway.php
@@ -32,7 +32,7 @@ public function __construct(SiteApplication $app = null)
 	{
 		$this->pathway = array();
 
-		$app  = $app ?: Factory::getContainer()->get(SiteApplication::class);
+		$app  = $app ?? Factory::getContainer()->get(SiteApplication::class);
 		$menu = $app->getMenu();
 		$lang = Factory::getLanguage();
 

diff --git a/libraries/src/Plugin/PluginHelper.php b/libraries/src/Plugin/PluginHelper.php
@@ -162,7 +162,7 @@ public static function importPlugin($type, $plugin = null, $autocreate = true, D
 		}
 
 		// Ensure we have a dispatcher now so we can correctly track the loaded plugins
-		$dispatcher = $dispatcher ?: Factory::getApplication()->getDispatcher();
+		$dispatcher = $dispatcher ?? Factory::getApplication()->getDispatcher();
 
 		// Get the dispatcher's hash to allow plugins to be registered to unique dispatchers
 		$dispatcherHash = spl_object_hash($dispatcher);

diff --git a/libraries/src/Router/SiteRouter.php b/libraries/src/Router/SiteRouter.php
@@ -60,8 +60,8 @@ class SiteRouter extends Router
 	 */
 	public function __construct(CMSApplication $app = null, AbstractMenu $menu = null)
 	{
-		$this->app  = $app ?: Factory::getContainer()->get(SiteApplication::class);
-		$this->menu = $menu ?: $this->app->getMenu();
+		$this->app  = $app ?? Factory::getContainer()->get(SiteApplication::class);
+		$this->menu = $menu ?? $this->app->getMenu();
 
 		// Add core rules
 		if ($this->app->get('force_ssl') === 2)

diff --git a/libraries/src/UCM/UCMBase.php b/libraries/src/UCM/UCMBase.php
@@ -52,7 +52,7 @@ public function __construct($alias = null, UCMType $type = null)
 		$input = Factory::getApplication()->input;
 		$this->alias = $alias ?: $input->get('option') . '.' . $input->get('view');
 
-		$this->type = $type ?: $this->getType();
+		$this->type = $type ?? $this->getType();
 	}
 
 	/**
@@ -132,7 +132,7 @@ public function getType()
 	 */
 	public function mapBase($original, UCMType $type = null)
 	{
-		$type = $type ?: $this->type;
+		$type = $type ?? $this->type;
 
 		$data = array(
 			'ucm_type_id' => $type->id,

diff --git a/libraries/src/UCM/UCMContent.php b/libraries/src/UCM/UCMContent.php
@@ -75,7 +75,7 @@ public function __construct(TableInterface $table = null, $alias = null, UCMType
 	 */
 	public function save($original = null, UCMType $type = null)
 	{
-		$type    = $type ?: $this->type;
+		$type    = $type ?? $this->type;
 		$ucmData = $original ? $this->mapData($original, $type) : $this->ucmData;
 
 		// Store the Common fields
@@ -104,7 +104,7 @@ public function save($original = null, UCMType $type = null)
 	public function delete($pk, UCMType $type = null)
 	{
 		$db   = Factory::getDbo();
-		$type = $type ?: $this->type;
+		$type = $type ?? $this->type;
 
 		if (!\is_array($pk))
 		{
@@ -135,7 +135,7 @@ public function delete($pk, UCMType $type = null)
 	 */
 	public function mapData($original, UCMType $type = null)
 	{
-		$contentType = $type ?: $this->type;
+		$contentType = $type ?? $this->type;
 
 		$fields = json_decode($contentType->type->field_mappings);
 
@@ -190,7 +190,7 @@ public function mapData($original, UCMType $type = null)
 	 */
 	protected function store($data, TableInterface $table = null, $primaryKey = null)
 	{
-		$table = $table ?: Table::getInstance('Corecontent');
+		$table = $table ?? Table::getInstance('Corecontent');
 
 		$typeId     = $this->getType()->type->type_id;
 		$primaryKey = $primaryKey ?: $this->getPrimaryKey($typeId, $data['core_content_item_id']);

diff --git a/libraries/src/UCM/UCMType.php b/libraries/src/UCM/UCMType.php
@@ -90,8 +90,8 @@ class UCMType implements UCM
 	 */
 	public function __construct($alias = null, DatabaseDriver $database = null, AbstractApplication $application = null)
 	{
-		$this->db = $database ?: Factory::getDbo();
-		$app      = $application ?: Factory::getApplication();
+		$this->db = $database ?? Factory::getDbo();
+		$app      = $application ?? Factory::getApplication();
 
 		// Make the best guess we can in the absence of information.
 		$this->alias = $alias ?: $app->input->get('option') . '.' . $app->input->get('view');