[5.3] Use str_contains function for components (#44875)

joomdonation · web-flow · commit b69c4c576f31 · 2025-02-16T01:11:24.000+01:00
diff --git a/administrator/components/com_associations/src/Helper/AssociationsHelper.php b/administrator/components/com_associations/src/Helper/AssociationsHelper.php
@@ -193,7 +193,7 @@ private static function getExtensionHelperClassName($extensionName)
      */
     private static function getExtensionRealName($extensionName)
     {
-        return strpos($extensionName, 'com_') === false ? $extensionName : substr($extensionName, 4);
+        return !str_contains($extensionName, 'com_') ? $extensionName : substr($extensionName, 4);
     }
 
     /**
diff --git a/administrator/components/com_categories/src/Field/CategoryeditField.php b/administrator/components/com_categories/src/Field/CategoryeditField.php
@@ -196,7 +196,7 @@ protected function getOptions()
 
         // Filter language
         if (!empty($this->element['language'])) {
-            if (strpos($this->element['language'], ',') !== false) {
+            if (str_contains($this->element['language'], ',')) {
                 $language = explode(',', $this->element['language']);
             } else {
                 $language = $this->element['language'];
diff --git a/administrator/components/com_config/src/Model/ApplicationModel.php b/administrator/components/com_config/src/Model/ApplicationModel.php
@@ -959,7 +959,7 @@ public function storePermissions($permission = null)
                 /** @var Asset $parentAsset */
                 $parentAsset = Table::getInstance('Asset');
 
-                if (strpos($asset->name, '.') !== false) {
+                if (str_contains($asset->name, '.')) {
                     $assetParts = explode('.', $asset->name);
                     $parentAsset->loadByName($assetParts[0]);
                     $parentAssetId = $parentAsset->id;
diff --git a/administrator/components/com_content/src/Event/Model/FeatureEvent.php b/administrator/components/com_content/src/Event/Model/FeatureEvent.php
@@ -42,7 +42,7 @@ public function __construct($name, array $arguments = [])
             throw new \BadMethodCallException("Argument 'extension' of event $this->name is not of type 'string'");
         }
 
-        if (strpos($arguments['extension'], '.') === false) {
+        if (!str_contains($arguments['extension'], '.')) {
             throw new \BadMethodCallException("Argument 'extension' of event $this->name has wrong format. Valid format: 'component.section'");
         }
 
diff --git a/administrator/components/com_cpanel/src/View/Cpanel/HtmlView.php b/administrator/components/com_cpanel/src/View/Cpanel/HtmlView.php
@@ -69,7 +69,7 @@ public function display($tpl = null)
             $parts     = explode('.', $dashboard);
             $component = $parts[0];
 
-            if (strpos($component, 'com_') === false) {
+            if (!str_contains($component, 'com_')) {
                 $component = 'com_' . $component;
             }
 
diff --git a/administrator/components/com_guidedtours/src/Model/StepModel.php b/administrator/components/com_guidedtours/src/Model/StepModel.php
@@ -81,7 +81,7 @@ public function save($data)
         $tour->load($data['tour_id']);
 
         // Language keys must include GUIDEDTOUR to prevent save issues
-        if (strpos($data['description'], 'GUIDEDTOUR') !== false) {
+        if (str_contains($data['description'], 'GUIDEDTOUR')) {
             $data['description'] = strip_tags($data['description']);
         }
 
diff --git a/administrator/components/com_guidedtours/src/Model/TourModel.php b/administrator/components/com_guidedtours/src/Model/TourModel.php
@@ -63,7 +63,7 @@ public function save($data)
         $input = Factory::getApplication()->getInput();
 
         // Language keys must include GUIDEDTOUR to prevent save issues
-        if (strpos($data['description'], 'GUIDEDTOUR') !== false) {
+        if (str_contains($data['description'], 'GUIDEDTOUR')) {
             $data['description'] = strip_tags($data['description']);
         }
 
diff --git a/administrator/components/com_installer/src/Model/LanguagesModel.php b/administrator/components/com_installer/src/Model/LanguagesModel.php
@@ -166,8 +166,8 @@ protected function getLanguages()
 
             if ($search) {
                 if (
-                    strpos(strtolower($language->name), $search) === false
-                    && strpos(strtolower($language->element), $search) === false
+                    !str_contains(strtolower($language->name), $search)
+                    && !str_contains(strtolower($language->element), $search)
                 ) {
                     continue;
                 }
diff --git a/administrator/components/com_installer/src/Model/ManageModel.php b/administrator/components/com_installer/src/Model/ManageModel.php
@@ -253,7 +253,7 @@ public function remove($eid = [])
             $langstring = 'COM_INSTALLER_TYPE_TYPE_' . strtoupper($row->type);
             $rowtype    = Text::_($langstring);
 
-            if (strpos($rowtype, $langstring) !== false) {
+            if (str_contains($rowtype, $langstring)) {
                 $rowtype = $row->type;
             }
 
diff --git a/administrator/components/com_installer/src/Model/UpdateModel.php b/administrator/components/com_installer/src/Model/UpdateModel.php
@@ -421,7 +421,7 @@ private function install($update)
         $sources = $update->get('downloadSources', []);
 
         if ($extra_query = $update->get('extra_query')) {
-            $url .= (strpos($url, '?') === false) ? '?' : '&amp;';
+            $url .= (!str_contains($url, '?')) ? '?' : '&amp;';
             $url .= $extra_query;
         }
 
@@ -432,7 +432,7 @@ private function install($update)
             $url  = trim($name->url);
 
             if ($extra_query) {
-                $url .= (strpos($url, '?') === false) ? '?' : '&amp;';
+                $url .= (!str_contains($url, '?')) ? '?' : '&amp;';
                 $url .= $extra_query;
             }
 
diff --git a/administrator/components/com_joomlaupdate/extract.php b/administrator/components/com_joomlaupdate/extract.php
@@ -567,7 +567,7 @@ public function enforceMinimumExecutionTime()
     public function setFilename(string $value)
     {
         // Security check: disallow remote filenames
-        if (!empty($value) && strpos($value, '://') !== false) {
+        if (!empty($value) && str_contains($value, '://')) {
             $this->setError('Invalid archive location');
 
             return;
diff --git a/administrator/components/com_joomlaupdate/src/Model/UpdateModel.php b/administrator/components/com_joomlaupdate/src/Model/UpdateModel.php
@@ -404,7 +404,7 @@ public function download()
         // Remove protocol, path and query string from URL
         $basename = basename($packageURL);
 
-        if (strpos($basename, '?') !== false) {
+        if (str_contains($basename, '?')) {
             $basename = substr($basename, 0, strpos($basename, '?'));
         }
 
diff --git a/administrator/components/com_languages/src/Model/StringsModel.php b/administrator/components/com_languages/src/Model/StringsModel.php
@@ -90,7 +90,7 @@ public function refresh()
         // Parse all found ini files and add the strings to the database cache.
         foreach ($files as $file) {
             // Only process if language file is for selected language
-            if (strpos($file, $language, \strlen($base)) === false) {
+            if (!str_contains(substr($file, \strlen($base)), $language)) {
                 continue;
             }
 
diff --git a/administrator/components/com_login/src/Controller/DisplayController.php b/administrator/components/com_login/src/Controller/DisplayController.php
@@ -82,7 +82,7 @@ public function login()
 
         $app->login($credentials, ['action' => 'core.login.admin']);
 
-        if (Uri::isInternal($return) && strpos($return, 'tmpl=component') === false) {
+        if (Uri::isInternal($return) && !str_contains($return, 'tmpl=component')) {
             $app->redirect($return);
         } else {
             $app->redirect('index.php');
diff --git a/administrator/components/com_menus/src/Model/ItemsModel.php b/administrator/components/com_menus/src/Model/ItemsModel.php
@@ -497,7 +497,7 @@ protected function preprocessForm(Form $form, $data, $group = 'content')
         if ($name == 'com_menus.items.filter') {
             $clientId = $this->getState('filter.client_id');
             $form->setFieldAttribute('menutype', 'clientid', $clientId);
-        } elseif (false !== strpos($name, 'com_menus.items.modal.')) {
+        } elseif (str_contains($name, 'com_menus.items.modal.')) {
             $form->removeField('client_id');
 
             $clientId = $this->getState('filter.client_id');
diff --git a/administrator/components/com_menus/src/Model/MenutypesModel.php b/administrator/components/com_menus/src/Model/MenutypesModel.php
@@ -470,7 +470,7 @@ protected function getTypeOptionsFromLayouts($component, $view)
         // Build list of standard layout names
         foreach ($layouts as $layout) {
             // Ignore private layouts.
-            if (strpos(basename($layout), '_') === false) {
+            if (!str_contains(basename($layout), '_')) {
                 // Get the layout name.
                 $layoutNames[] = basename($layout, '.xml');
             }
@@ -509,7 +509,7 @@ protected function getTypeOptionsFromLayouts($component, $view)
         // Process the found layouts.
         foreach ($layouts as $layout) {
             // Ignore private layouts.
-            if (strpos(basename($layout), '_') === false) {
+            if (!str_contains(basename($layout), '_')) {
                 $file = $layout;
 
                 // Get the layout name.
diff --git a/administrator/components/com_postinstall/src/Helper/PostinstallHelper.php b/administrator/components/com_postinstall/src/Helper/PostinstallHelper.php
@@ -32,9 +32,9 @@ class PostinstallHelper
      */
     public function parsePath($path)
     {
-        if (strpos($path, 'site://') !== false) {
+        if (str_contains($path, 'site://')) {
             $path = JPATH_ROOT . str_replace('site://', '/', $path);
-        } elseif (strpos($path, 'admin://') !== false) {
+        } elseif (str_contains($path, 'admin://')) {
             $path = JPATH_ADMINISTRATOR . str_replace('admin://', '/', $path);
         }
 
diff --git a/administrator/components/com_templates/src/Model/TemplateModel.php b/administrator/components/com_templates/src/Model/TemplateModel.php
@@ -574,7 +574,7 @@ public function getCoreFile($file, $client_id)
      */
     private function getSafeName($name)
     {
-        if (strpos($name, '-') !== false && preg_match('/[0-9]/', $name)) {
+        if (str_contains($name, '-') && preg_match('/[0-9]/', $name)) {
             // Get the extension
             $extension = File::getExt($name);
 

Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ private static function getExtensionHelperClassName($extensionName)`
`193`	`193`	`*/`
`194`	`194`	`private static function getExtensionRealName($extensionName)`
`195`	`195`	`{`
`196`		`- return strpos($extensionName, 'com_') === false ? $extensionName : substr($extensionName, 4);`
	`196`	`+ return !str_contains($extensionName, 'com_') ? $extensionName : substr($extensionName, 4);`
`197`	`197`	`}`
`198`	`198`
`199`	`199`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public function __construct($name, array $arguments = [])`
`42`	`42`	`throw new \BadMethodCallException("Argument 'extension' of event $this->name is not of type 'string'");`
`43`	`43`	`}`
`44`	`44`
`45`		`- if (strpos($arguments['extension'], '.') === false) {`
	`45`	`+ if (!str_contains($arguments['extension'], '.')) {`
`46`	`46`	`throw new \BadMethodCallException("Argument 'extension' of event $this->name has wrong format. Valid format: 'component.section'");`
`47`	`47`	`}`
`48`	`48`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public function display($tpl = null)`
`69`	`69`	`$parts = explode('.', $dashboard);`
`70`	`70`	`$component = $parts[0];`
`71`	`71`
`72`		`- if (strpos($component, 'com_') === false) {`
	`72`	`+ if (!str_contains($component, 'com_')) {`
`73`	`73`	`$component = 'com_' . $component;`
`74`	`74`	`}`
`75`	`75`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public function save($data)`
`81`	`81`	`$tour->load($data['tour_id']);`
`82`	`82`
`83`	`83`	`// Language keys must include GUIDEDTOUR to prevent save issues`
`84`		`- if (strpos($data['description'], 'GUIDEDTOUR') !== false) {`
	`84`	`+ if (str_contains($data['description'], 'GUIDEDTOUR')) {`
`85`	`85`	`$data['description'] = strip_tags($data['description']);`
`86`	`86`	`}`
`87`	`87`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public function save($data)`
`63`	`63`	`$input = Factory::getApplication()->getInput();`
`64`	`64`
`65`	`65`	`// Language keys must include GUIDEDTOUR to prevent save issues`
`66`		`- if (strpos($data['description'], 'GUIDEDTOUR') !== false) {`
	`66`	`+ if (str_contains($data['description'], 'GUIDEDTOUR')) {`
`67`	`67`	`$data['description'] = strip_tags($data['description']);`
`68`	`68`	`}`
`69`	`69`
Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,7 @@ public function remove($eid = [])`
`253`	`253`	`$langstring = 'COM_INSTALLER_TYPE_TYPE_' . strtoupper($row->type);`
`254`	`254`	`$rowtype = Text::_($langstring);`
`255`	`255`
`256`		`- if (strpos($rowtype, $langstring) !== false) {`
	`256`	`+ if (str_contains($rowtype, $langstring)) {`
`257`	`257`	`$rowtype = $row->type;`
`258`	`258`	`}`
`259`	`259`
Original file line number	Diff line number	Diff line change
`@@ -421,7 +421,7 @@ private function install($update)`
`421`	`421`	`$sources = $update->get('downloadSources', []);`
`422`	`422`
`423`	`423`	`if ($extra_query = $update->get('extra_query')) {`
`424`		`- $url .= (strpos($url, '?') === false) ? '?' : '&';`
	`424`	`+ $url .= (!str_contains($url, '?')) ? '?' : '&';`
`425`	`425`	`$url .= $extra_query;`
`426`	`426`	`}`
`427`	`427`
`@@ -432,7 +432,7 @@ private function install($update)`
`432`	`432`	`$url = trim($name->url);`
`433`	`433`
`434`	`434`	`if ($extra_query) {`
`435`		`- $url .= (strpos($url, '?') === false) ? '?' : '&';`
	`435`	`+ $url .= (!str_contains($url, '?')) ? '?' : '&';`
`436`	`436`	`$url .= $extra_query;`
`437`	`437`	`}`
`438`	`438`