Erikmitk / kitodo-presentation

Classes/Eid/PageViewProxy.php

Braces +3 added lines, -6 removed lines

@@ -34,8 +34,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class PageViewProxy
-{
+class PageViewProxy {
     /**
      * @var RequestFactory
      */
@@ -46,8 +45,7 @@ 
      */
     protected $extConf;
 
-    public function __construct()
-    {
+    public function __construct() {
         $this->requestFactory = GeneralUtility::makeInstance(RequestFactory::class);
         $this->extConf = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get('dlf');
     }
@@ -173,8 +171,7 @@ 
      * @param ServerRequestInterface $request
      * @return ResponseInterface
      */
-    public function main(ServerRequestInterface $request)
-    {
+    public function main(ServerRequestInterface $request) {
         switch ($request->getMethod()) {
             case 'OPTIONS':
                 return $this->handleOptions($request);

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -140,11 +140,11 @@
                 // For performance, don't download content up-front. Rather, we'll
                 // download and upload simultaneously.
                 // https://docs.guzzlephp.org/en/6.5/request-options.html#stream
-                'stream' => true,
+                'stream' => TRUE,
 
                 // Don't throw exceptions when a non-success status code is
                 // received. We handle these manually.
-                'http_errors' => false,
+                'http_errors' => FALSE,
             ]);
         } catch (\Exception $e) {
             return new JsonResponse(['message' => 'Could not fetch resource of given URL.'], 500);

Classes/Eid/SearchSuggest.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
         $parameters = $request->getParsedBody();
         $solrCore = (string) $parameters['solrcore'];
         $uHash = (string) $parameters['uHash'];
-        if (hash_equals(GeneralUtility::hmac((string) (new Typo3Version()) . Environment::getExtensionsPath(), 'SearchSuggest'), $uHash) === false) {
+        if (hash_equals(GeneralUtility::hmac((string) (new Typo3Version()).Environment::getExtensionsPath(), 'SearchSuggest'), $uHash) === false) {
             throw new \InvalidArgumentException('No valid parameter passed!', 1580585079);
         }
         // Perform Solr query.

Braces +2 added lines, -4 removed lines

@@ -30,16 +30,14 @@
  * @subpackage dlf
  * @access public
  */
-class SearchSuggest
-{
+class SearchSuggest {
     /**
      * The main method of the eID script
      *
      * @param ServerRequestInterface $request
      * @return ResponseInterface XML response of search suggestions
      */
-    public function main(ServerRequestInterface $request)
-    {
+    public function main(ServerRequestInterface $request) {
         $output = [];
         // Get input parameters and decrypt core name.
         $parameters = $request->getParsedBody();

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
         $parameters = $request->getParsedBody();
         $solrCore = (string) $parameters['solrcore'];
         $uHash = (string) $parameters['uHash'];
-        if (hash_equals(GeneralUtility::hmac((string) (new Typo3Version()) . Environment::getExtensionsPath(), 'SearchSuggest'), $uHash) === false) {
+        if (hash_equals(GeneralUtility::hmac((string) (new Typo3Version()) . Environment::getExtensionsPath(), 'SearchSuggest'), $uHash) === FALSE) {
             throw new \InvalidArgumentException('No valid parameter passed!', 1580585079);
         }
         // Perform Solr query.

ext_localconf.php

Spacing +10 added lines, -10 removed lines

@@ -65,22 +65,22 @@
 $_EXTKEY = 'dlf';
 // Register tools for toolbox plugin.
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'] = [];
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY) . '_fulltexttool'] = 'LLL:EXT:dlf/Resources/Private/Language/Labels.xml:tx_dlf_toolbox.fulltexttool';
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY) . '_annotationtool'] = 'LLL:EXT:dlf/Resources/Private/Language/Labels.xml:tx_dlf_toolbox.annotationtool';
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY) . '_fulltextdownloadtool'] = 'LLL:EXT:dlf/Resources/Private/Language/Labels.xml:tx_dlf_toolbox.fulltextdownloadtool';
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY) . '_imagedownloadtool'] = 'LLL:EXT:dlf/Resources/Private/Language/Labels.xml:tx_dlf_toolbox.imagedownloadtool';
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY) . '_imagemanipulationtool'] = 'LLL:EXT:dlf/Resources/Private/Language/Labels.xml:tx_dlf_toolbox.imagemanipulationtool';
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY) . '_pdfdownloadtool'] = 'LLL:EXT:dlf/Resources/Private/Language/Labels.xml:tx_dlf_toolbox.pdfdownloadtool';
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY) . '_searchindocumenttool'] = 'LLL:EXT:dlf/Resources/Private/Language/Labels.xml:tx_dlf_toolbox.searchindocumenttool';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY).'_fulltexttool'] = 'LLL:EXT:dlf/Resources/Private/Language/Labels.xml:tx_dlf_toolbox.fulltexttool';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY).'_annotationtool'] = 'LLL:EXT:dlf/Resources/Private/Language/Labels.xml:tx_dlf_toolbox.annotationtool';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY).'_fulltextdownloadtool'] = 'LLL:EXT:dlf/Resources/Private/Language/Labels.xml:tx_dlf_toolbox.fulltextdownloadtool';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY).'_imagedownloadtool'] = 'LLL:EXT:dlf/Resources/Private/Language/Labels.xml:tx_dlf_toolbox.imagedownloadtool';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY).'_imagemanipulationtool'] = 'LLL:EXT:dlf/Resources/Private/Language/Labels.xml:tx_dlf_toolbox.imagemanipulationtool';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY).'_pdfdownloadtool'] = 'LLL:EXT:dlf/Resources/Private/Language/Labels.xml:tx_dlf_toolbox.pdfdownloadtool';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Plugin/Toolbox.php']['tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY).'_searchindocumenttool'] = 'LLL:EXT:dlf/Resources/Private/Language/Labels.xml:tx_dlf_toolbox.searchindocumenttool';
 // Register hooks.
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processDatamapClass'][] = \Kitodo\Dlf\Hooks\DataHandler::class;
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processCmdmapClass'][] = \Kitodo\Dlf\Hooks\DataHandler::class;
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/Classes/Common/MetsDocument.php']['hookClass'][] = \Kitodo\Dlf\Hooks\KitodoProductionHacks::class;
 // Register AJAX eID handlers.
-$GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['tx_dlf_search_suggest'] = \Kitodo\Dlf\Eid\SearchSuggest::class . '::main';
-$GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['tx_dlf_search_in_document'] = \Kitodo\Dlf\Eid\SearchInDocument::class . '::main';
+$GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['tx_dlf_search_suggest'] = \Kitodo\Dlf\Eid\SearchSuggest::class.'::main';
+$GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['tx_dlf_search_in_document'] = \Kitodo\Dlf\Eid\SearchInDocument::class.'::main';
 if ($GLOBALS['TYPO3_CONF_VARS']['EXTENSIONS']['dlf']['enableInternalProxy'] ?? false) {
-    $GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['tx_dlf_pageview_proxy'] = \Kitodo\Dlf\Eid\PageViewProxy::class . '::main';
+    $GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['tx_dlf_pageview_proxy'] = \Kitodo\Dlf\Eid\PageViewProxy::class.'::main';
 }
 // Use Caching Framework for Solr queries
 if (!is_array($GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['tx_dlf_solr'])) {

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -79,7 +79,7 @@
 // Register AJAX eID handlers.
 $GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['tx_dlf_search_suggest'] = \Kitodo\Dlf\Eid\SearchSuggest::class . '::main';
 $GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['tx_dlf_search_in_document'] = \Kitodo\Dlf\Eid\SearchInDocument::class . '::main';
-if ($GLOBALS['TYPO3_CONF_VARS']['EXTENSIONS']['dlf']['enableInternalProxy'] ?? false) {
+if ($GLOBALS['TYPO3_CONF_VARS']['EXTENSIONS']['dlf']['enableInternalProxy'] ?? FALSE) {
     $GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['tx_dlf_pageview_proxy'] = \Kitodo\Dlf\Eid\PageViewProxy::class . '::main';
 }
 // Use Caching Framework for Solr queries

Classes/Controller/StatisticsController.php

Spacing +2 added lines, -2 removed lines

@@ -33,13 +33,13 @@
         $foundNumbers = $this->documentRepository->getStatisticsForSelectedCollection($this->settings);
 
         // Set replacements.
-        $args['###TITLES###'] = $foundNumbers['titles'] . ' ' . htmlspecialchars(
+        $args['###TITLES###'] = $foundNumbers['titles'].' '.htmlspecialchars(
             LocalizationUtility::translate(
                 ($foundNumbers['titles'] > 1 ? 'titles' : 'title'), 'dlf'
             )
         );
 
-        $args['###VOLUMES###'] = $foundNumbers['volumes'] . ' ' . htmlspecialchars(
+        $args['###VOLUMES###'] = $foundNumbers['volumes'].' '.htmlspecialchars(
             LocalizationUtility::translate(
                 ($foundNumbers['volumes'] > 1 ? 'volumes' : 'volume'), 'dlf'
             )

Braces +2 added lines, -4 removed lines

@@ -21,15 +21,13 @@
  * @subpackage dlf
  * @access public
  */
-class StatisticsController extends AbstractController
-{
+class StatisticsController extends AbstractController {
     /**
      * The main method of the plugin
      *
      * @return void
      */
-    public function mainAction()
-    {
+    public function mainAction() {
         $foundNumbers = $this->documentRepository->getStatisticsForSelectedCollection($this->settings);
 
         // Set replacements.

Classes/Domain/Repository/DocumentRepository.php

Indentation -1 removed lines

@@ -210,7 +210,6 @@
      * Volumes are documents that are both
      *  a) "leaf" elements i.e. partof != 0
      *  b) "root" elements that are not referenced by other documents ("root" elements that have no descendants)
-
      * @param array $settings
      *
      * @return array

Spacing +14 added lines, -14 removed lines

@@ -356,7 +356,7 @@ 
 
         $excludeOtherWhere = '';
         if ($settings['excludeOther']) {
-            $excludeOtherWhere = 'tx_dlf_documents.pid=' . intval($settings['storagePid']);
+            $excludeOtherWhere = 'tx_dlf_documents.pid='.intval($settings['storagePid']);
         }
         // Check if there are any metadata to suggest.
         $result = $queryBuilder
@@ -408,12 +408,12 @@ 
         $connection = GeneralUtility::makeInstance(ConnectionPool::class)
             ->getConnectionForTable('tx_dlf_documents');
 
-        $sql = 'SELECT `tx_dlf_documents`.*, GROUP_CONCAT(DISTINCT `tx_dlf_collections`.`oai_name` ORDER BY `tx_dlf_collections`.`oai_name` SEPARATOR " ") AS `collections` ' .
-            'FROM `tx_dlf_documents` ' .
-            'INNER JOIN `tx_dlf_relations` ON `tx_dlf_relations`.`uid_local` = `tx_dlf_documents`.`uid` ' .
-            'INNER JOIN `tx_dlf_collections` ON `tx_dlf_collections`.`uid` = `tx_dlf_relations`.`uid_foreign` ' .
-            'WHERE `tx_dlf_documents`.`record_id` = ? ' .
-            'AND `tx_dlf_relations`.`ident`="docs_colls" ' .
+        $sql = 'SELECT `tx_dlf_documents`.*, GROUP_CONCAT(DISTINCT `tx_dlf_collections`.`oai_name` ORDER BY `tx_dlf_collections`.`oai_name` SEPARATOR " ") AS `collections` '.
+            'FROM `tx_dlf_documents` '.
+            'INNER JOIN `tx_dlf_relations` ON `tx_dlf_relations`.`uid_local` = `tx_dlf_documents`.`uid` '.
+            'INNER JOIN `tx_dlf_collections` ON `tx_dlf_collections`.`uid` = `tx_dlf_relations`.`uid_foreign` '.
+            'WHERE `tx_dlf_documents`.`record_id` = ? '.
+            'AND `tx_dlf_relations`.`ident`="docs_colls" '.
             $where;
 
         $values = [
@@ -443,13 +443,13 @@ 
         $connection = GeneralUtility::makeInstance(ConnectionPool::class)
             ->getConnectionForTable('tx_dlf_documents');
 
-        $sql = 'SELECT `tx_dlf_documents`.*, GROUP_CONCAT(DISTINCT `tx_dlf_collections`.`oai_name` ORDER BY `tx_dlf_collections`.`oai_name` SEPARATOR " ") AS `collections` ' .
-            'FROM `tx_dlf_documents` ' .
-            'INNER JOIN `tx_dlf_relations` ON `tx_dlf_relations`.`uid_local` = `tx_dlf_documents`.`uid` ' .
-            'INNER JOIN `tx_dlf_collections` ON `tx_dlf_collections`.`uid` = `tx_dlf_relations`.`uid_foreign` ' .
-            'WHERE `tx_dlf_documents`.`uid` IN ( ? ) ' .
-            'AND `tx_dlf_relations`.`ident`="docs_colls" ' .
-            'AND ' . Helper::whereExpression('tx_dlf_collections') . ' ' .
+        $sql = 'SELECT `tx_dlf_documents`.*, GROUP_CONCAT(DISTINCT `tx_dlf_collections`.`oai_name` ORDER BY `tx_dlf_collections`.`oai_name` SEPARATOR " ") AS `collections` '.
+            'FROM `tx_dlf_documents` '.
+            'INNER JOIN `tx_dlf_relations` ON `tx_dlf_relations`.`uid_local` = `tx_dlf_documents`.`uid` '.
+            'INNER JOIN `tx_dlf_collections` ON `tx_dlf_collections`.`uid` = `tx_dlf_relations`.`uid_foreign` '.
+            'WHERE `tx_dlf_documents`.`uid` IN ( ? ) '.
+            'AND `tx_dlf_relations`.`ident`="docs_colls" '.
+            'AND '.Helper::whereExpression('tx_dlf_collections').' '.
             'GROUP BY `tx_dlf_documents`.`uid` ';
 
         $values = [

Braces +13 added lines, -26 removed lines

@@ -48,8 +48,7 @@ 
      *
      * @return \Kitodo\Dlf\Domain\Model\Document|null
      */
-    public function findOneByParameters($parameters)
-    {
+    public function findOneByParameters($parameters) {
         $doc = null;
         $document = null;
 
@@ -93,8 +92,7 @@ 
      *
      * @return \Kitodo\Dlf\Domain\Model\Document|null
      */
-    public function findOldestDocument()
-    {
+    public function findOldestDocument() {
         $query = $this->createQuery();
 
         $query->setOrderings(['tstamp' => QueryInterface::ORDER_ASCENDING]);
@@ -108,8 +106,7 @@ 
      * @param  \Kitodo\Dlf\Domain\Model\Structure $structure
      * @return array|\TYPO3\CMS\Extbase\Persistence\QueryResultInterface
      */
-    public function getChildrenOfYearAnchor($partOf, $structure)
-    {
+    public function getChildrenOfYearAnchor($partOf, $structure) {
         $query = $this->createQuery();
 
         $query->matching($query->equals('structure', $structure));
@@ -130,8 +127,7 @@ 
      *
      * @return \Kitodo\Dlf\Domain\Model\Document|null
      */
-    public function findOneByIdAndSettings($uid, $settings = [])
-    {
+    public function findOneByIdAndSettings($uid, $settings = []) {
         $settings = ['documentSets' => $uid];
 
         return $this->findDocumentsBySettings($settings)->getFirst();
@@ -144,8 +140,7 @@ 
      *
      * @return array|\TYPO3\CMS\Extbase\Persistence\QueryResultInterface
      */
-    public function findDocumentsBySettings($settings = [])
-    {
+    public function findDocumentsBySettings($settings = []) {
         $query = $this->createQuery();
 
         $constraints = [];
@@ -175,8 +170,7 @@ 
      *
      * @return array|\TYPO3\CMS\Extbase\Persistence\QueryResultInterface
      */
-    public function findAllByCollectionsLimited($collections, $limit = 50)
-    {
+    public function findAllByCollectionsLimited($collections, $limit = 50) {
         $query = $this->createQuery();
 
         // order by start_date -> start_time...
@@ -213,8 +207,7 @@ 
      *
      * @return array
      */
-    public function getStatisticsForSelectedCollection($settings)
-    {
+    public function getStatisticsForSelectedCollection($settings) {
         if ($settings['collections']) {
             // Include only selected collections.
             $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
@@ -348,8 +341,7 @@ 
      *
      * @return \TYPO3\CMS\Extbase\Persistence\QueryResultInterface
      */
-    public function getTableOfContentsFromDb($uid, $pid, $settings)
-    {
+    public function getTableOfContentsFromDb($uid, $pid, $settings) {
         // Build table of contents from database.
         $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
             ->getQueryBuilderForTable('tx_dlf_documents');
@@ -397,8 +389,7 @@ 
      *
      * @return array The found document object
      */
-    public function getOaiRecord($settings, $parameters)
-    {
+    public function getOaiRecord($settings, $parameters) {
         $where = '';
 
         if (!$settings['show_userdefined']) {
@@ -438,8 +429,7 @@ 
      *
      * @return array The found document objects
      */
-    public function getOaiDocumentList($settings, $documentsToProcess)
-    {
+    public function getOaiDocumentList($settings, $documentsToProcess) {
         $connection = GeneralUtility::makeInstance(ConnectionPool::class)
             ->getConnectionForTable('tx_dlf_documents');
 
@@ -474,8 +464,7 @@ 
      *
      * @return array
      */
-    public function findAllByUids($uids, $checkPartof = false)
-    {
+    public function findAllByUids($uids, $checkPartof = false) {
         // get all documents from db we are talking about
         $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
         $queryBuilder = $connectionPool->getQueryBuilderForTable('tx_dlf_documents');
@@ -524,8 +513,7 @@ 
      *
      * @return array
      */
-    public function findChildrenOfEach(array $uids)
-    {
+    public function findChildrenOfEach(array $uids) {
         $allDocuments = $this->findAllByUids($uids, true);
 
         $result = [];
@@ -546,8 +534,7 @@ 
      * @param \TYPO3\CMS\Extbase\Persistence\Generic\QueryResult $listedMetadata
      * @return array
      */
-    public function findSolrByCollection($collection, $settings, $searchParams, $listedMetadata = null)
-    {
+    public function findSolrByCollection($collection, $settings, $searchParams, $listedMetadata = null) {
         // set settings global inside this repository
         // (may be necessary when SolrSearch calls back)
         $this->settings = $settings;

Upper-Lower-Casing +11 added lines, -11 removed lines

@@ -50,8 +50,8 @@ 
      */
     public function findOneByParameters($parameters)
     {
-        $doc = null;
-        $document = null;
+        $doc = NULL;
+        $document = NULL;
 
         if (isset($parameters['id']) && MathUtility::canBeInterpretedAsInteger($parameters['id'])) {
 
@@ -63,13 +63,13 @@ 
 
         } else if (isset($parameters['location']) && GeneralUtility::isValidUrl($parameters['location'])) {
 
-            $doc = Doc::getInstance($parameters['location'], [], true);
+            $doc = Doc::getInstance($parameters['location'], [], TRUE);
 
             if ($doc->recordId) {
                 $document = $this->findOneByRecordId($doc->recordId);
             }
 
-            if ($document === null) {
+            if ($document === NULL) {
                 // create new (dummy) Document object
                 $document = GeneralUtility::makeInstance(Document::class);
                 $document->setLocation($parameters['location']);
@@ -77,11 +77,11 @@ 
 
         }
 
-        if ($document !== null && $doc === null) {
-            $doc = Doc::getInstance($document->getLocation(), [], true);
+        if ($document !== NULL && $doc === NULL) {
+            $doc = Doc::getInstance($document->getLocation(), [], TRUE);
         }
 
-        if ($doc !== null) {
+        if ($doc !== NULL) {
             $document->setDoc($doc);
         }
 
@@ -155,7 +155,7 @@ 
         }
 
         if (isset($settings['excludeOther']) && (int) $settings['excludeOther'] === 0) {
-            $query->getQuerySettings()->setRespectStoragePage(false);
+            $query->getQuerySettings()->setRespectStoragePage(FALSE);
         }
 
         if (count($constraints)) {
@@ -474,7 +474,7 @@ 
      *
      * @return array
      */
-    public function findAllByUids($uids, $checkPartof = false)
+    public function findAllByUids($uids, $checkPartof = FALSE)
     {
         // get all documents from db we are talking about
         $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
@@ -526,7 +526,7 @@ 
      */
     public function findChildrenOfEach(array $uids)
     {
-        $allDocuments = $this->findAllByUids($uids, true);
+        $allDocuments = $this->findAllByUids($uids, TRUE);
 
         $result = [];
         foreach ($allDocuments as $doc) {
@@ -546,7 +546,7 @@ 
      * @param \TYPO3\CMS\Extbase\Persistence\Generic\QueryResult $listedMetadata
      * @return array
      */
-    public function findSolrByCollection($collection, $settings, $searchParams, $listedMetadata = null)
+    public function findSolrByCollection($collection, $settings, $searchParams, $listedMetadata = NULL)
     {
         // set settings global inside this repository
         // (may be necessary when SolrSearch calls back)

Classes/ViewHelpers/StdWrapViewHelper.php

Braces +3 added lines, -6 removed lines

@@ -15,12 +15,10 @@ 
 use TYPO3\CMS\Extbase\Configuration\ConfigurationManager;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 
-class StdWrapViewHelper extends AbstractViewHelper
-{
+class StdWrapViewHelper extends AbstractViewHelper {
     protected $escapeOutput = false;
 
-    public function initializeArguments()
-    {
+    public function initializeArguments() {
         parent::initializeArguments();
         $this->registerArgument('wrap', 'string', 'The wrap information', true);
         $this->registerArgument('data', 'array', 'Data for the content object', false);
@@ -31,8 +29,7 @@ 
      *
      * @return string
      */
-    public function render()
-    {
+    public function render() {
         $wrap = $this->arguments['wrap'];
         $data = $this->arguments['data'] ?? [];
 

Upper-Lower-Casing +3 added lines, -3 removed lines

@@ -17,13 +17,13 @@
 
 class StdWrapViewHelper extends AbstractViewHelper
 {
-    protected $escapeOutput = false;
+    protected $escapeOutput = FALSE;
 
     public function initializeArguments()
     {
         parent::initializeArguments();
-        $this->registerArgument('wrap', 'string', 'The wrap information', true);
-        $this->registerArgument('data', 'array', 'Data for the content object', false);
+        $this->registerArgument('wrap', 'string', 'The wrap information', TRUE);
+        $this->registerArgument('data', 'array', 'Data for the content object', FALSE);
     }
 
     /**

Tests/Functional/FunctionalTestCase.php

Spacing +6 added lines, -6 removed lines

@@ -71,7 +71,7 @@ 
         $this->configurationToUseInTestInstance['EXTENSIONS']['dlf'] = $this->getDlfConfiguration();
 
         if ($this->disableJsonWrappedResponse) {
-            $this->frameworkExtensionsToLoad = array_filter($this->frameworkExtensionsToLoad, function ($ext) {
+            $this->frameworkExtensionsToLoad = array_filter($this->frameworkExtensionsToLoad, function($ext) {
                 return $ext !== 'Resources/Core/Functional/Extensions/json_response';
             });
         }
@@ -83,7 +83,7 @@ 
 
         $this->objectManager = GeneralUtility::makeInstance(ObjectManager::class);
 
-        $this->baseUrl = 'http://web:8000/public/typo3temp/var/tests/functional-' . $this->identifier . '/';
+        $this->baseUrl = 'http://web:8000/public/typo3temp/var/tests/functional-'.$this->identifier.'/';
         $this->httpClient = new HttpClient([
             'base_uri' => $this->baseUrl,
             'http_errors' => false,
@@ -127,13 +127,13 @@ 
 
     protected function addSiteConfig($identifier, $baseUrl)
     {
-        $siteConfig = Yaml::parseFile(__DIR__ . '/../Fixtures/siteconfig.yaml');
+        $siteConfig = Yaml::parseFile(__DIR__.'/../Fixtures/siteconfig.yaml');
         $siteConfig['base'] = $baseUrl;
         $siteConfig['languages'][0]['base'] = $baseUrl;
 
-        $siteConfigPath = $this->instancePath . '/typo3conf/sites/' . $identifier;
+        $siteConfigPath = $this->instancePath.'/typo3conf/sites/'.$identifier;
         @mkdir($siteConfigPath, 0775, true);
-        file_put_contents($siteConfigPath . '/config.yaml', Yaml::dump($siteConfig));
+        file_put_contents($siteConfigPath.'/config.yaml', Yaml::dump($siteConfig));
     }
 
     protected function initializeRepository(string $className, int $storagePid)
@@ -152,7 +152,7 @@ 
         $jsonDocuments = json_decode(file_get_contents($path), true);
 
         $updateQuery = $solr->service->createUpdate();
-        $documents = array_map(function ($jsonDoc) use ($updateQuery) {
+        $documents = array_map(function($jsonDoc) use ($updateQuery) {
             $document = $updateQuery->createDocument();
             foreach ($jsonDoc as $key => $value) {
                 $document->setField($key, $value);

Upper-Lower-Casing +4 added lines, -4 removed lines

@@ -49,7 +49,7 @@ 
      *
      * @var bool
      */
-    protected $disableJsonWrappedResponse = false;
+    protected $disableJsonWrappedResponse = FALSE;
 
     /** @var ObjectManager */
     protected $objectManager;
@@ -86,7 +86,7 @@ 
         $this->baseUrl = 'http://web:8000/public/typo3temp/var/tests/functional-' . $this->identifier . '/';
         $this->httpClient = new HttpClient([
             'base_uri' => $this->baseUrl,
-            'http_errors' => false,
+            'http_errors' => FALSE,
         ]);
 
         $this->addSiteConfig('dlf-testing', $this->baseUrl);
@@ -132,7 +132,7 @@ 
         $siteConfig['languages'][0]['base'] = $baseUrl;
 
         $siteConfigPath = $this->instancePath . '/typo3conf/sites/' . $identifier;
-        @mkdir($siteConfigPath, 0775, true);
+        @mkdir($siteConfigPath, 0775, TRUE);
         file_put_contents($siteConfigPath . '/config.yaml', Yaml::dump($siteConfig));
     }
 
@@ -149,7 +149,7 @@ 
 
     protected function importSolrDocuments(Solr $solr, string $path)
     {
-        $jsonDocuments = json_decode(file_get_contents($path), true);
+        $jsonDocuments = json_decode(file_get_contents($path), TRUE);
 
         $updateQuery = $solr->service->createUpdate();
         $documents = array_map(function ($jsonDoc) use ($updateQuery) {

Braces +7 added lines, -14 removed lines

@@ -67,8 +67,7 @@ 
      */
     protected $httpClient;
 
-    public function __construct()
-    {
+    public function __construct() {
         parent::__construct();
 
         $this->configurationToUseInTestInstance['EXTENSIONS']['dlf'] = $this->getDlfConfiguration();
@@ -95,8 +94,7 @@ 
         $this->addSiteConfig('dlf-testing', $this->baseUrl);
     }
 
-    protected function getDlfConfiguration()
-    {
+    protected function getDlfConfiguration() {
         return [
             'fileGrpImages' => 'DEFAULT,MAX',
             'fileGrpThumbs' => 'THUMBS',
@@ -134,8 +132,7 @@ 
         ];
     }
 
-    protected function addSiteConfig($identifier, $baseUrl)
-    {
+    protected function addSiteConfig($identifier, $baseUrl) {
         $siteConfig = Yaml::parseFile(__DIR__ . '/../Fixtures/siteconfig.yaml');
         $siteConfig['base'] = $baseUrl;
         $siteConfig['languages'][0]['base'] = $baseUrl;
@@ -145,8 +142,7 @@ 
         file_put_contents($siteConfigPath . '/config.yaml', Yaml::dump($siteConfig));
     }
 
-    protected function initializeRepository(string $className, int $storagePid)
-    {
+    protected function initializeRepository(string $className, int $storagePid) {
         $repository = $this->objectManager->get($className);
 
         $querySettings = $this->objectManager->get(Typo3QuerySettings::class);
@@ -156,8 +152,7 @@ 
         return $repository;
     }
 
-    protected function importSolrDocuments(Solr $solr, string $path)
-    {
+    protected function importSolrDocuments(Solr $solr, string $path) {
         $jsonDocuments = json_decode(file_get_contents($path), true);
 
         $updateQuery = $solr->service->createUpdate();
@@ -176,8 +171,7 @@ 
         $solr->service->update($updateQuery);
     }
 
-    protected function initLanguageService(string $locale)
-    {
+    protected function initLanguageService(string $locale) {
         if (class_exists(\TYPO3\CMS\Core\Localization\LanguageServiceFactory::class)) {
             $GLOBALS['LANG'] = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Localization\LanguageServiceFactory::class)->create($locale);
         } else {
@@ -193,8 +187,7 @@ 
     /**
      * Assert that $sub is recursively contained within $super.
      */
-    protected function assertArrayMatches(array $sub, array $super, string $message = '')
-    {
+    protected function assertArrayMatches(array $sub, array $super, string $message = '') {
         $this->assertEquals($sub, ArrayUtility::intersectRecursive($super, $sub), $message);
     }
 }

Tests/Functional/Api/OaiPmhTest.php

Spacing +9 added lines, -9 removed lines

@@ -37,15 +37,15 @@ 
     {
         parent::setUp();
 
-        $this->oaiUrl = $this->baseUrl . '/index.php?id=' . $this->oaiPage;
-        $this->oaiUrlNoStoragePid = $this->baseUrl . '/index.php?id=' . $this->oaiPageNoStoragePid;
+        $this->oaiUrl = $this->baseUrl.'/index.php?id='.$this->oaiPage;
+        $this->oaiUrlNoStoragePid = $this->baseUrl.'/index.php?id='.$this->oaiPageNoStoragePid;
 
-        $this->importDataSet(__DIR__ . '/../../Fixtures/Common/documents_1.xml');
-        $this->importDataSet(__DIR__ . '/../../Fixtures/Common/metadata.xml');
-        $this->importDataSet(__DIR__ . '/../../Fixtures/Common/libraries.xml');
-        $this->importDataSet(__DIR__ . '/../../Fixtures/Common/pages.xml');
-        $this->importDataSet(__DIR__ . '/../../Fixtures/OaiPmh/pages.xml');
-        $this->importDataSet(__DIR__ . '/../../Fixtures/OaiPmh/solrcores.xml');
+        $this->importDataSet(__DIR__.'/../../Fixtures/Common/documents_1.xml');
+        $this->importDataSet(__DIR__.'/../../Fixtures/Common/metadata.xml');
+        $this->importDataSet(__DIR__.'/../../Fixtures/Common/libraries.xml');
+        $this->importDataSet(__DIR__.'/../../Fixtures/Common/pages.xml');
+        $this->importDataSet(__DIR__.'/../../Fixtures/OaiPmh/pages.xml');
+        $this->importDataSet(__DIR__.'/../../Fixtures/OaiPmh/solrcores.xml');
 
         $this->persistenceManager = $this->objectManager->get(PersistenceManager::class);
         $this->solrCoreRepository = $this->initializeRepository(SolrCoreRepository::class, 20000);
@@ -62,7 +62,7 @@ 
             $coreName = Solr::createCore();
             $solr = Solr::getInstance($coreName);
 
-            $this->importSolrDocuments($solr, __DIR__ . '/../../Fixtures/Common/documents_1.solr.json');
+            $this->importSolrDocuments($solr, __DIR__.'/../../Fixtures/Common/documents_1.solr.json');
         }
 
         $oaiCoreModel = $this->solrCoreRepository->findByUid(11001);

Braces +14 added lines, -28 removed lines

@@ -12,8 +12,7 @@ 
 use SimpleXMLElement;
 use TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager;
 
-class OaiPmhTest extends FunctionalTestCase
-{
+class OaiPmhTest extends FunctionalTestCase {
     protected $disableJsonWrappedResponse = true;
 
     protected $coreExtensionsToLoad = [
@@ -53,8 +52,7 @@ 
         $this->setUpOaiSolr();
     }
 
-    protected function setUpOaiSolr()
-    {
+    protected function setUpOaiSolr() {
         // Setup Solr only once for all tests in this suite
         static $solr = null;
 
@@ -74,8 +72,7 @@ 
     /**
      * @test
      */
-    public function correctlyRespondsOnBadVerb()
-    {
+    public function correctlyRespondsOnBadVerb() {
         $client = new HttpClient();
         $response = $client->get($this->baseUrl, [
             'query' => [
@@ -100,8 +97,7 @@ 
     /**
      * @test
      */
-    public function canIdentify()
-    {
+    public function canIdentify() {
         $oai = Endpoint::build($this->oaiUrl);
         $identity = $oai->identify();
 
@@ -114,8 +110,7 @@ 
     /**
      * @test
      */
-    public function identifyGivesFallbackDatestampWhenNoDocuments()
-    {
+    public function identifyGivesFallbackDatestampWhenNoDocuments() {
         $oai = Endpoint::build($this->oaiUrlNoStoragePid);
         $identity = $oai->identify();
 
@@ -125,8 +120,7 @@ 
     /**
      * @test
      */
-    public function canListMetadataFormats()
-    {
+    public function canListMetadataFormats() {
         $oai = Endpoint::build($this->oaiUrl);
         $formats = $oai->listMetadataFormats();
 
@@ -141,8 +135,7 @@ 
     /**
      * @test
      */
-    public function canListRecords()
-    {
+    public function canListRecords() {
         $oai = Endpoint::build($this->oaiUrl);
         $result = $oai->listRecords('mets');
 
@@ -155,8 +148,7 @@ 
     /**
      * @test
      */
-    public function noRecordsUntil1900()
-    {
+    public function noRecordsUntil1900() {
         $this->expectException(OaipmhException::class);
         $this->expectExceptionMessage('empty list');
 
@@ -169,8 +161,7 @@ 
     /**
      * @test
      */
-    public function canUseResumptionToken()
-    {
+    public function canUseResumptionToken() {
         // NOTE: cursor and expirationDate are optional by the specification,
         //       but we include them in our implementation
 
@@ -228,8 +219,7 @@ 
     /**
      * @test
      */
-    public function noResumptionTokenForCompleteList()
-    {
+    public function noResumptionTokenForCompleteList() {
         $client = new HttpClient();
 
         foreach (['ListIdentifiers', 'ListRecords'] as $verb) {
@@ -251,8 +241,7 @@ 
     /**
      * @test
      */
-    public function canListAndResumeIdentifiers()
-    {
+    public function canListAndResumeIdentifiers() {
         $oai = Endpoint::build($this->oaiUrl);
         $result = $oai->listIdentifiers('mets');
 
@@ -265,18 +254,15 @@ 
         $this->assertEquals('oai:de:slub-dresden:db:id-476248086', $record->identifier);
     }
 
-    protected function parseUtc(string $dateTime)
-    {
+    protected function parseUtc(string $dateTime) {
         return DateTime::createFromFormat('Y-m-d\TH:i:s\Z', $dateTime);
     }
 
-    protected function assertUtcDateString(string $dateTime)
-    {
+    protected function assertUtcDateString(string $dateTime) {
         $this->assertInstanceOf(DateTime::class, $this->parseUtc($dateTime));
     }
 
-    protected function assertInFuture(string $dateTime)
-    {
+    protected function assertInFuture(string $dateTime) {
         $this->assertGreaterThan(new DateTime(), $this->parseUtc($dateTime));
     }
 }

Upper-Lower-Casing +4 added lines, -4 removed lines

@@ -14,7 +14,7 @@ 
 
 class OaiPmhTest extends FunctionalTestCase
 {
-    protected $disableJsonWrappedResponse = true;
+    protected $disableJsonWrappedResponse = TRUE;
 
     protected $coreExtensionsToLoad = [
         'fluid',
@@ -56,9 +56,9 @@ 
     protected function setUpOaiSolr()
     {
         // Setup Solr only once for all tests in this suite
-        static $solr = null;
+        static $solr = NULL;
 
-        if ($solr === null) {
+        if ($solr === NULL) {
             $coreName = Solr::createCore();
             $solr = Solr::getInstance($coreName);
 
@@ -161,7 +161,7 @@ 
         $this->expectExceptionMessage('empty list');
 
         $oai = Endpoint::build($this->oaiUrl);
-        $result = $oai->listRecords('mets', null, (new DateTime())->setDate(1900, 1, 1));
+        $result = $oai->listRecords('mets', NULL, (new DateTime())->setDate(1900, 1, 1));
 
         $result->current();
     }

Tests/Functional/Common/SolrIndexingTest.php

Spacing +6 added lines, -6 removed lines

@@ -43,9 +43,9 @@ 
         $this->documentRepository = $this->initializeRepository(DocumentRepository::class, 20000);
         $this->solrCoreRepository = $this->initializeRepository(SolrCoreRepository::class, 20000);
 
-        $this->importDataSet(__DIR__ . '/../../Fixtures/Common/documents_1.xml');
-        $this->importDataSet(__DIR__ . '/../../Fixtures/Common/libraries.xml');
-        $this->importDataSet(__DIR__ . '/../../Fixtures/Common/metadata.xml');
+        $this->importDataSet(__DIR__.'/../../Fixtures/Common/documents_1.xml');
+        $this->importDataSet(__DIR__.'/../../Fixtures/Common/libraries.xml');
+        $this->importDataSet(__DIR__.'/../../Fixtures/Common/metadata.xml');
     }
 
     /**
@@ -112,9 +112,9 @@ 
     {
         $core = $this->createSolrCore();
 
-        $this->importDataSet(__DIR__ . '/../../Fixtures/Common/documents_fulltext.xml');
-        $this->importSolrDocuments($core->solr, __DIR__ . '/../../Fixtures/Common/documents_1.solr.json');
-        $this->importSolrDocuments($core->solr, __DIR__ . '/../../Fixtures/Common/documents_fulltext.solr.json');
+        $this->importDataSet(__DIR__.'/../../Fixtures/Common/documents_fulltext.xml');
+        $this->importSolrDocuments($core->solr, __DIR__.'/../../Fixtures/Common/documents_1.solr.json');
+        $this->importSolrDocuments($core->solr, __DIR__.'/../../Fixtures/Common/documents_fulltext.solr.json');
 
         $collections = $this->collectionRepository->findCollectionsBySettings([
             'index_name' => ['Musik', 'Projekt: Dresdner Hefte'],

Braces +4 added lines, -8 removed lines

@@ -16,8 +16,7 @@ 
 use TYPO3\CMS\Extbase\Object\ObjectManager;
 use TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager;
 
-class SolrIndexingTest extends FunctionalTestCase
-{
+class SolrIndexingTest extends FunctionalTestCase {
     /** @var PersistenceManager */
     protected $persistenceManager;
 
@@ -51,8 +50,7 @@ 
     /**
      * @test
      */
-    public function canCreateCore()
-    {
+    public function canCreateCore() {
         $coreName = uniqid('testCore');
         $solr = Solr::getInstance($coreName);
         $this->assertNull($solr->core);
@@ -67,8 +65,7 @@ 
     /**
      * @test
      */
-    public function canIndexAndSearchDocument()
-    {
+    public function canIndexAndSearchDocument() {
         $core = $this->createSolrCore();
 
         $document = $this->documentRepository->findByUid(1001);
@@ -108,8 +105,7 @@ 
     /**
      * @test
      */
-    public function canSearchInCollections()
-    {
+    public function canSearchInCollections() {
         $core = $this->createSolrCore();
 
         $this->importDataSet(__DIR__ . '/../../Fixtures/Common/documents_fulltext.xml');

Upper-Lower-Casing +3 added lines, -3 removed lines

@@ -86,17 +86,17 @@
             'storagePid' => $document->getPid(),
         ];
 
-        $solrSearch = $this->documentRepository->findSolrByCollection(null, $solrSettings, ['query' => '*']);
+        $solrSearch = $this->documentRepository->findSolrByCollection(NULL, $solrSettings, ['query' => '*']);
         $solrSearch->getQuery()->execute();
         $this->assertEquals(1, count($solrSearch));
         $this->assertEquals(15, $solrSearch->getNumFound());
 
         // Check that the title stored in Solr matches the title of database entry
-        $docTitleInSolr = false;
+        $docTitleInSolr = FALSE;
         foreach ($solrSearch->getSolrResults()['documents'] as $solrDoc) {
             if ($solrDoc['toplevel'] && $solrDoc['uid'] === $document->getUid()) {
                 $this->assertEquals($document->getTitle(), $solrDoc['title']);
-                $docTitleInSolr = true;
+                $docTitleInSolr = TRUE;
                 break;
             }
         }