From e550b006ee5dbe69a4265a77d2375c8b0f1434d2 Mon Sep 17 00:00:00 2001 From: Christopher Timm Date: Tue, 6 Sep 2022 09:37:29 +0200 Subject: [PATCH] Fix styling with rector and php-cs-fixer --- Classes/Ajax/Autocomplete.php | 36 +++++++++---------- Classes/Ajax/GetEntity.php | 21 +++++------ Classes/Controller/SearchController.php | 14 ++++---- Classes/Service/SolrServiceProvider.php | 4 +-- .../ViewHelpers/Data/NewArrayViewHelper.php | 2 +- .../ViewHelpers/Data/TransposeViewHelper.php | 2 +- .../LinkedData/Renderer/RDFRenderer.php | 2 +- .../LinkedData/Renderer/TurtleRenderer.php | 2 +- 8 files changed, 40 insertions(+), 43 deletions(-) diff --git a/Classes/Ajax/Autocomplete.php b/Classes/Ajax/Autocomplete.php index 80502c50..0e0db2db 100644 --- a/Classes/Ajax/Autocomplete.php +++ b/Classes/Ajax/Autocomplete.php @@ -6,12 +6,11 @@ use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Server\MiddlewareInterface; use Psr\Http\Server\RequestHandlerInterface; -use TYPO3\CMS\Core\Http\Response; use TYPO3\CMS\Core\Http\JsonResponse; +use TYPO3\CMS\Core\Http\Response; class Autocomplete implements MiddlewareInterface { - public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface { $response = $handler->handle($request); @@ -21,10 +20,10 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface return $response; } - include_once 'EidSettings.php'; + include_once __DIR__.'/EidSettings.php'; // Configuration options - $solrSuggestUrl = $HOST . $CORE . '/suggest'; + $solrSuggestUrl = $HOST.$CORE.'/suggest'; // Autocomplete dictionary $solrAutocompleteDictionary = 'autocompleteSuggester'; @@ -51,43 +50,43 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface $dictionaryUrlParams = ''; if ($entity) { - $dictionaryUrlParams .= '&suggest.dictionary=' . $solrEntityDictionary; + $dictionaryUrlParams .= '&suggest.dictionary='.$solrEntityDictionary; } + if ($autocomplete) { - $dictionaryUrlParams .= '&suggest.dictionary=' . $solrAutocompleteDictionary; + $dictionaryUrlParams .= '&suggest.dictionary='.$solrAutocompleteDictionary; } if (!$entity && !$autocomplete) { return $response; } - // Get Solr suggestions $response = file_get_contents( - $solrSuggestUrl . '?suggest=true' . $dictionaryUrlParams . '&suggest.q=' . urlencode($query), - FALSE, + $solrSuggestUrl.'?suggest=true'.$dictionaryUrlParams.'&suggest.q='.urlencode($query), + false, stream_context_create([ 'http' => [ 'method' => 'GET', 'follow_location' => 0, - 'timeout' => 1.0 - ] + 'timeout' => 1.0, + ], ]) ); // Parse JSON response - if ($response !== FALSE) { - $json = json_decode($response, TRUE); + if (false !== $response) { + $json = json_decode($response, true); if ($autocomplete) { // get autocomplete foreach ($json['suggest'][$solrAutocompleteDictionary][$query]['suggestions'] as $suggestion) { - list ($id, $normalized) = explode('␝', $suggestion['payload']); + list($id, $normalized) = explode('␝', $suggestion['payload']); $suggests[] = [ 'id' => htmlspecialchars($suggestion['term']), 'term' => htmlspecialchars($suggestion['term']), 'normalized' => htmlspecialchars($suggestion['term']), - 'autocomplete' => '1' + 'autocomplete' => '1', ]; } } @@ -95,7 +94,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface if ($entity && $autocomplete) { // Add break between autocomplete and entity list $suggests[] = [ - 'id' => 'br' + 'id' => 'br', ]; } @@ -104,16 +103,17 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface // get entities foreach ($json['suggest'][$solrEntityDictionary][$query]['suggestions'] as $suggestion) { - list ($id, $normalized) = explode('␝', $suggestion['payload']); + list($id, $normalized) = explode('␝', $suggestion['payload']); if (!in_array($id, $idDeduping)) { if (empty($normalized)) { $normalized = $suggestion['term']; } + $suggests[] = [ 'id' => str_replace('%s', $id, $entityReplacement), 'term' => htmlspecialchars($suggestion['term']), 'normalized' => htmlspecialchars($normalized), - 'autocomplete' => '0' + 'autocomplete' => '0', ]; $idDeduping[] = $id; } diff --git a/Classes/Ajax/GetEntity.php b/Classes/Ajax/GetEntity.php index f93144fe..bc6775bb 100644 --- a/Classes/Ajax/GetEntity.php +++ b/Classes/Ajax/GetEntity.php @@ -2,17 +2,15 @@ namespace Subugoe\Find\Ajax; - use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Server\MiddlewareInterface; use Psr\Http\Server\RequestHandlerInterface; -use TYPO3\CMS\Core\Http\Response; use TYPO3\CMS\Core\Http\JsonResponse; +use TYPO3\CMS\Core\Http\Response; class GetEntity implements MiddlewareInterface { - public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface { $response = $handler->handle($request); @@ -20,10 +18,10 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface return $response; } - include_once 'EidSettings.php'; + include_once __DIR__.'/EidSettings.php'; // Configuration options - $solr_select_url = $HOST . $CORE . '/select'; + $solr_select_url = $HOST.$CORE.'/select'; // Array of entity facts $entity = []; @@ -33,25 +31,24 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface // Get Solr record $response = file_get_contents( - $solr_select_url . '?q=' . urlencode('id:(' . $query . ')') . '&rows=1', - FALSE, + $solr_select_url.'?q='.urlencode('id:('.$query.')').'&rows=1', + false, stream_context_create([ 'http' => [ 'method' => 'GET', 'follow_location' => 0, - 'timeout' => 1.0 - ] + 'timeout' => 1.0, + ], ]) ); // Parse JSON response - if ($response !== FALSE) { - $json = json_decode($response, TRUE); + if (false !== $response) { + $json = json_decode($response, true); $entity = $json['response']['docs'][0]; } // Return result return new JsonResponse($entity); } - } diff --git a/Classes/Controller/SearchController.php b/Classes/Controller/SearchController.php index 234d8c66..4b40d920 100644 --- a/Classes/Controller/SearchController.php +++ b/Classes/Controller/SearchController.php @@ -62,13 +62,13 @@ public function detailAction(string $id) if ($this->request->hasArgument('underlyingQuery')) { $underlyingQueryInfo = $this->request->getArgument('underlyingQuery'); $this->response->addAdditionalHeaderData( - FrontendUtility::addQueryInformationAsJavaScript( - $underlyingQueryInfo['q'], - $this->settings, - (int) $underlyingQueryInfo['position'], - $arguments - ) - ); + FrontendUtility::addQueryInformationAsJavaScript( + $underlyingQueryInfo['q'], + $this->settings, + (int) $underlyingQueryInfo['position'], + $arguments + ) + ); } $this->addStandardAssignments(); diff --git a/Classes/Service/SolrServiceProvider.php b/Classes/Service/SolrServiceProvider.php index b78df68b..61e108de 100644 --- a/Classes/Service/SolrServiceProvider.php +++ b/Classes/Service/SolrServiceProvider.php @@ -404,7 +404,7 @@ protected function addHighlighting(array $arguments): void $queryArguments = $queryParameters[$fieldID]; $queryTerms = null; if (is_array($queryArguments) && array_key_exists('alternate', - $queryArguments) && array_key_exists('queryAlternate', $fieldInfo) + $queryArguments) && array_key_exists('queryAlternate', $fieldInfo) ) { if (array_key_exists('term', $queryArguments)) { $queryTerms = $queryArguments['term']; @@ -738,7 +738,7 @@ protected function getCount(?array $arguments = null): int $arguments = $this->getRequestArguments(); } - $count = (int) ($this->settings['paging']['perPage']); + $count = (int) $this->settings['paging']['perPage']; if (array_key_exists('count', $arguments)) { $count = (int) $this->requestArguments['count']; diff --git a/Classes/ViewHelpers/Data/NewArrayViewHelper.php b/Classes/ViewHelpers/Data/NewArrayViewHelper.php index 94f5ed68..986cae5e 100644 --- a/Classes/ViewHelpers/Data/NewArrayViewHelper.php +++ b/Classes/ViewHelpers/Data/NewArrayViewHelper.php @@ -73,7 +73,7 @@ public static function renderStatic(array $arguments, \Closure $renderChildrenCl } } else { $result = 'newArray View Helper: Number of keys and values must be the same.'.PHP_EOL.print_r($arguments, - true); + true); } } else { foreach ($arguments['values'] as $value) { diff --git a/Classes/ViewHelpers/Data/TransposeViewHelper.php b/Classes/ViewHelpers/Data/TransposeViewHelper.php index f48ca253..f485de46 100644 --- a/Classes/ViewHelpers/Data/TransposeViewHelper.php +++ b/Classes/ViewHelpers/Data/TransposeViewHelper.php @@ -85,7 +85,7 @@ public static function renderStatic( } $output = 'The arrays passed in the »arrays« argument do not have identical numbers of values: ('.implode(', ', - $info).')'; + $info).')'; } return $output; diff --git a/Classes/ViewHelpers/LinkedData/Renderer/RDFRenderer.php b/Classes/ViewHelpers/LinkedData/Renderer/RDFRenderer.php index 63851b59..bfcd51a2 100644 --- a/Classes/ViewHelpers/LinkedData/Renderer/RDFRenderer.php +++ b/Classes/ViewHelpers/LinkedData/Renderer/RDFRenderer.php @@ -40,7 +40,7 @@ class RDFRenderer extends AbstractRenderer implements RendererInterface */ public function renderItems($items) { - $doc = new \DomDocument(); + $doc = new \DOMDocument(); $this->prefixes['rdf'] = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'; $rdf = $doc->createElement($this->prefixedName('rdf:RDF')); $doc->appendChild($rdf); diff --git a/Classes/ViewHelpers/LinkedData/Renderer/TurtleRenderer.php b/Classes/ViewHelpers/LinkedData/Renderer/TurtleRenderer.php index ce606fdf..32e04793 100644 --- a/Classes/ViewHelpers/LinkedData/Renderer/TurtleRenderer.php +++ b/Classes/ViewHelpers/LinkedData/Renderer/TurtleRenderer.php @@ -59,7 +59,7 @@ public function renderItems($items) $objectString = $this->turtleString($object); } else { if (false === strpos($object, '"') && false === strpos($object, "\r") && false === strpos($object, - "\n")) { + "\n")) { $objectString = '"'.$object.'"'; } elseif (false === strpos($object, '"""')) { $objectString = '"""'.$object.'"""';