[BUGFIX] Avoid yoda-style conditions in PHP

Follow-Up for: * TYPO3/typo3@0fb53e0 * TYPO3/coding-standards#31
TYPO3-Solr · Jul 6, 2022 · 48e52db · 48e52db
1 parent eb87e83
commit 48e52db
Show file tree

Hide file tree

Showing 16 changed files with 24 additions and 27 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,13 +1,14 @@
 .Build
 .buildpath
+*.cache
 .DS_Store
 .idea/
-.php_cs.cache
 .project/
 .settings/
 atlassian-ide-plugin.xml
 composer.lock
 Documentation/_make
+Documentation-GENERATED-temp
 index.php
 typo3
 typo3conf
@@ -16,7 +17,3 @@ typo3_src
 uploads
 var
 vendor
-/composer.lock
-.Build
-Documentation/_make
-/Documentation-GENERATED-temp/
diff --git a/Classes/Controller/Backend/Search/AbstractModuleController.php b/Classes/Controller/Backend/Search/AbstractModuleController.php
@@ -227,7 +227,7 @@ protected function initializeView($view)
             '
                 top.fsMod.recentIds["searchbackend"] = ' . $this->selectedPageUID . ';'
         );
-        if (null === $this->selectedSite) {
+        if ($this->selectedSite === null) {
             return;
         }
 
@@ -236,7 +236,7 @@ protected function initializeView($view)
         $permissionClause = $beUser->getPagePermsClause(1);
         $pageRecord = BackendUtility::readPageAccess($this->selectedSite->getRootPageId(), $permissionClause);
 
-        if (false === $pageRecord) {
+        if ($pageRecord === false) {
             throw new InvalidArgumentException(vsprintf('There is something wrong with permissions for page "%s" for backend user "%s".', [$this->selectedSite->getRootPageId(), $beUser->user['username']]), 1496146317);
         }
         $this->moduleTemplate->getDocHeaderComponent()->setMetaInformation($pageRecord);
@@ -249,7 +249,7 @@ protected function initializeView($view)
      */
     public function generateCoreSelectorMenuUsingPageTree(string $uriToRedirectTo = null)
     {
-        if ($this->selectedPageUID < 1 || null === $this->selectedSite) {
+        if ($this->selectedPageUID < 1 || $this->selectedSite === null) {
             return;
         }
 

diff --git a/Classes/Domain/Index/Queue/RecordMonitor/Helper/RootPageResolver.php b/Classes/Domain/Index/Queue/RecordMonitor/Helper/RootPageResolver.php
@@ -158,7 +158,7 @@ public function getRootPageId(
         bool $forceFallback = false,
         string $mountPointIdentifier = ''
     ): int {
-        if (0 === $pageId) {
+        if ($pageId === 0) {
             return 0;
         }
 

diff --git a/Classes/Domain/Search/ResultSet/Facets/RangeBased/DateRange/DateRange.php b/Classes/Domain/Search/ResultSet/Facets/RangeBased/DateRange/DateRange.php
@@ -90,8 +90,8 @@ public function __construct(
      */
     protected function getRangeString(): string
     {
-        $from = null === $this->startRequested ? '' : $this->startRequested->format('Ymd') . '0000';
-        $till = null === $this->endRequested ? '' : $this->endRequested->format('Ymd') . '0000';
+        $from = $this->startRequested === null ? '' : $this->startRequested->format('Ymd') . '0000';
+        $till = $this->endRequested === null ? '' : $this->endRequested->format('Ymd') . '0000';
         return $from . '-' . $till;
     }
 

diff --git a/.../Domain/Search/ResultSet/Facets/RangeBased/NumericRange/NumericRangeFacetQueryBuilder.php b/.../Domain/Search/ResultSet/Facets/RangeBased/NumericRange/NumericRangeFacetQueryBuilder.php
@@ -33,7 +33,7 @@ public function build(string $facetName, TypoScriptConfiguration $configuration)
         $facetConfiguration = $configuration->getSearchFacetingFacetByName($facetName);
 
         $tag = '';
-        if (true === (bool)($facetConfiguration['keepAllOptionsOnSelection'] ?? null)) {
+        if ((bool)($facetConfiguration['keepAllOptionsOnSelection'] ?? null) === true) {
             $tag = '{!ex=' . $facetConfiguration['field'] . '}';
         }
         $facetParameters['facet.range'][] = $tag . $facetConfiguration['field'];

diff --git a/Classes/Domain/Search/Suggest/SuggestService.php b/Classes/Domain/Search/Suggest/SuggestService.php
@@ -181,7 +181,7 @@ protected function getSolrSuggestions(SuggestQuery $suggestQuery): array
         $response = $search->search($suggestQuery, 0, 0);
 
         $rawResponse = $response->getRawResponse();
-        if (null === $rawResponse) {
+        if ($rawResponse === null) {
             return [];
         }
         $results = json_decode($rawResponse);

diff --git a/Classes/EventListener/PageIndexer/FrontendGroupsModifier.php b/Classes/EventListener/PageIndexer/FrontendGroupsModifier.php
@@ -43,7 +43,7 @@ class FrontendGroupsModifier
      */
     public function __invoke(ModifyResolvedFrontendGroupsEvent $event): void
     {
-        if (null === $event->getRequest() || !$event->getRequest()->hasHeader(PageIndexerRequest::SOLR_INDEX_HEADER)) {
+        if ($event->getRequest() === null || !$event->getRequest()->hasHeader(PageIndexerRequest::SOLR_INDEX_HEADER)) {
             return;
         }
 

diff --git a/Classes/IndexQueue/Indexer.php b/Classes/IndexQueue/Indexer.php
@@ -283,7 +283,7 @@ protected function isAFreeContentModeItemRecord(Item $item): bool
         $itemRecord = $item->getRecord();
 
         $l10nParentField = $GLOBALS['TCA'][$item->getType()]['ctrl']['transOrigPointerField'] ?? null;
-        if (null === $languageField || null === $l10nParentField) {
+        if ($languageField === null || $l10nParentField === null) {
             return true;
         }
         $languageOfRecord = (int)($itemRecord[$languageField] ?? null);

diff --git a/Classes/Middleware/SolrRoutingMiddleware.php b/Classes/Middleware/SolrRoutingMiddleware.php
@@ -381,7 +381,7 @@ protected function retrievePageInformation(UriInterface $uri, Site $site): array
      */
     protected function getRoutingService(): RoutingService
     {
-        if (null === $this->routingService) {
+        if ($this->routingService === null) {
             $this->routingService = GeneralUtility::makeInstance(
                 RoutingService::class,
                 $this->settings,

diff --git a/Classes/Routing/RoutingService.php b/Classes/Routing/RoutingService.php
@@ -452,7 +452,7 @@ public function shouldConcatQueryParameters(): bool
             return true;
         }
 
-        return isset($this->settings['query']['concat']) && true === (bool)$this->settings['query']['concat'];
+        return isset($this->settings['query']['concat']) && (bool)$this->settings['query']['concat'] === true;
     }
 
     /**

diff --git a/Classes/System/Configuration/ExtensionConfiguration.php b/Classes/System/Configuration/ExtensionConfiguration.php
@@ -139,7 +139,7 @@ function ($pluginNamespace) {
 
         $exclusions = array_merge($pluginNamespaces, $enhancersRouteParts);
 
-        if (false === $this->getIncludeGlobalQParameterInCacheHash()) {
+        if ($this->getIncludeGlobalQParameterInCacheHash() === false) {
             $exclusions[] = 'q';
         }
         return array_combine($exclusions, $exclusions);

diff --git a/Classes/System/Mvc/Backend/Service/ModuleDataStorageService.php b/Classes/System/Mvc/Backend/Service/ModuleDataStorageService.php
@@ -71,8 +71,8 @@ private function unsetModuleDataIfCanNotBeSerialized(string &$serializedModuleDa
             $serializedModuleData = '';
             return;
         }
-        if (false !== strpos($serializedModuleData, 'ApacheSolrForTypo3\\Solr\\Domain\\Model\\ModuleData')
-            || false !== strpos($serializedModuleData, 'Tx_Solr_Site')) {
+        if (strpos($serializedModuleData, 'ApacheSolrForTypo3\\Solr\\Domain\\Model\\ModuleData') !== false
+            || strpos($serializedModuleData, 'Tx_Solr_Site') !== false) {
             $serializedModuleData = '';
         }
     }

diff --git a/Classes/System/Solr/ResponseAdapter.php b/Classes/System/Solr/ResponseAdapter.php
@@ -164,7 +164,7 @@ public function getHttpStatusMessage(): string
      */
     public function count(): int
     {
-        if (null !== $this->data) {
+        if ($this->data !== null) {
             return count(get_object_vars($this->data));
         }
         return 0;

diff --git a/Classes/System/UserFunctions/FlexFormUserFunctions.php b/Classes/System/UserFunctions/FlexFormUserFunctions.php
@@ -117,7 +117,7 @@ protected function getParsedSolrFieldsFromSchema(array $configuredFacets, array
      */
     protected function getConfiguredFacetsForPage(?int $pid = null): ?array
     {
-        if (null === $pid) {
+        if ($pid === null) {
             return null;
         }
         $typoScriptConfiguration = $this->getConfigurationFromPageId($pid);
@@ -215,7 +215,7 @@ protected function getTypoScriptTemplateKeyFromFieldName(array $parentInformatio
      */
     protected function getConfigurationFromPageId(?int $pid = null): ?TypoScriptConfiguration
     {
-        if (null === $pid) {
+        if ($pid === null) {
             return null;
         }
         return $this->frontendEnvironment->getSolrConfigurationFromPageId($pid);

diff --git a/Classes/ViewHelpers/Debug/DocumentScoreAnalyzerViewHelper.php b/Classes/ViewHelpers/Debug/DocumentScoreAnalyzerViewHelper.php
@@ -81,7 +81,7 @@ public static function renderStatic(array $arguments, Closure $renderChildrenClo
         $resultSet = self::getUsedSearchResultSetFromRenderingContext($renderingContext);
         $debugData = '';
         if (
-            null !== $resultSet->getUsedSearch()->getDebugResponse()
+            $resultSet->getUsedSearch()->getDebugResponse() !== null
             && !empty($resultSet->getUsedSearch()->getDebugResponse()->explain)
         ) {
             $debugData = $resultSet->getUsedSearch()->getDebugResponse()->explain->{$document->getId()} ?? '';

diff --git a/Classes/ViewHelpers/Debug/QueryViewHelper.php b/Classes/ViewHelpers/Debug/QueryViewHelper.php
@@ -54,10 +54,10 @@ public static function renderStatic(array $arguments, Closure $renderChildrenClo
         $content = '';
         $resultSet = self::getUsedSearchResultSetFromRenderingContext($renderingContext);
         $backendUserIsLoggedIn = GeneralUtility::makeInstance(Context::class)->getPropertyFromAspect('backend.user', 'isLoggedIn');
-        if (true === $backendUserIsLoggedIn && $resultSet && null !== $resultSet->getUsedSearch()) {
+        if ($backendUserIsLoggedIn === true && $resultSet && $resultSet->getUsedSearch() !== null) {
             if (
-                true === $resultSet->getHasSearched()
-                && null !== $resultSet->getUsedSearch()->getDebugResponse()
+                $resultSet->getHasSearched() === true
+                && $resultSet->getUsedSearch()->getDebugResponse() !== null
                 && !empty($resultSet->getUsedSearch()->getDebugResponse()->parsedquery)
             ) {
                 $renderingContext->getVariableProvider()->add('parsedQuery', $resultSet->getUsedSearch()->getDebugResponse()->parsedquery);