@@ -26,13 +26,10 @@ |
||
| 26 | 26 | ***************************************************************/ |
| 27 | 27 | |
| 28 | 28 | use ApacheSolrForTypo3\Solr\Domain\Index\IndexService; |
| 29 | -use ApacheSolrForTypo3\Solr\IndexQueue\Indexer; |
|
| 30 | 29 | use ApacheSolrForTypo3\Solr\IndexQueue\Queue; |
| 31 | 30 | use ApacheSolrForTypo3\Solr\Site; |
| 32 | 31 | use ApacheSolrForTypo3\Solr\System\Environment\CliEnvironment; |
| 33 | 32 | use ApacheSolrForTypo3\Solr\Tests\Integration\IntegrationTest; |
| 34 | -use ApacheSolrForTypo3\Solr\IndexQueue\RecordMonitor; |
|
| 35 | -use TYPO3\CMS\Backend\Utility\BackendUtility; |
|
| 36 | 33 | use TYPO3\CMS\Core\Utility\GeneralUtility; |
| 37 | 34 | |
| 38 | 35 | /** |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | $GLOBALS['TCA']['tx_fakeextension_domain_model_bar'] = include($this->getFixturePath('fake_extension2_bar_tca.php')); |
| 118 | 118 | $GLOBALS['TCA']['tx_fakeextension_domain_model_directrelated'] = include($this->getFixturePath('fake_extension2_directrelated_tca.php')); |
| 119 | 119 | |
| 120 | - $this->importDataSetFromFixture('can_index_custom_record_absRefPrefix_'.$absRefPrefix.'.xml'); |
|
| 120 | + $this->importDataSetFromFixture('can_index_custom_record_absRefPrefix_' . $absRefPrefix . '.xml'); |
|
| 121 | 121 | |
| 122 | 122 | $this->addToIndexQueue('tx_fakeextension_domain_model_bar', 111); |
| 123 | 123 | |
@@ -139,7 +139,7 @@ discard block |
||
| 139 | 139 | sleep(2); |
| 140 | 140 | $solrContent = file_get_contents('http://localhost:8080/solr/core_en/select?q=*:*'); |
| 141 | 141 | $this->assertContains('"numFound":1', $solrContent, 'Could not index document into solr'); |
| 142 | - $this->assertContains('"url":"'.$expectedUrl.'"', $solrContent, 'Generated unexpected url with absRefPrefix = auto'); |
|
| 142 | + $this->assertContains('"url":"' . $expectedUrl . '"', $solrContent, 'Generated unexpected url with absRefPrefix = auto'); |
|
| 143 | 143 | $this->assertNotContains('auto', $solrContent, 'absRefPrefix=auto was not resolved'); |
| 144 | 144 | $this->cleanUpSolrServerAndAssertEmpty(); |
| 145 | 145 | } |
@@ -24,7 +24,6 @@ |
||
| 24 | 24 | * This copyright notice MUST APPEAR in all copies of the script! |
| 25 | 25 | ***************************************************************/ |
| 26 | 26 | |
| 27 | -use ApacheSolrForTypo3\Solr\Site; |
|
| 28 | 27 | use TYPO3\CMS\Core\TimeTracker\TimeTracker; |
| 29 | 28 | use TYPO3\CMS\Core\Utility\GeneralUtility; |
| 30 | 29 | use ApacheSolrForTypo3\Solr\Tests\Integration\IntegrationTest; |
@@ -219,7 +219,7 @@ |
||
| 219 | 219 | /** |
| 220 | 220 | * @param string $table |
| 221 | 221 | * @param integer $uid |
| 222 | - * @return \Apache_Solr_Response |
|
| 222 | + * @return boolean |
|
| 223 | 223 | */ |
| 224 | 224 | protected function addToQueueAndIndexRecord($table, $uid) |
| 225 | 225 | { |
@@ -27,10 +27,7 @@ |
||
| 27 | 27 | use ApacheSolrForTypo3\Solr\IndexQueue\Indexer; |
| 28 | 28 | use ApacheSolrForTypo3\Solr\IndexQueue\Queue; |
| 29 | 29 | use ApacheSolrForTypo3\Solr\Tests\Integration\IntegrationTest; |
| 30 | -use ApacheSolrForTypo3\Solr\IndexQueue\RecordMonitor; |
|
| 31 | -use TYPO3\CMS\Backend\Utility\BackendUtility; |
|
| 32 | 30 | use TYPO3\CMS\Core\Charset\CharsetConverter; |
| 33 | -use TYPO3\CMS\Core\DataHandling\DataHandler; |
|
| 34 | 31 | use TYPO3\CMS\Core\Utility\GeneralUtility; |
| 35 | 32 | |
| 36 | 33 | /** |
@@ -24,14 +24,9 @@ |
||
| 24 | 24 | * This copyright notice MUST APPEAR in all copies of the script! |
| 25 | 25 | ***************************************************************/ |
| 26 | 26 | |
| 27 | -use ApacheSolrForTypo3\Solr\IndexQueue\Indexer; |
|
| 28 | 27 | use ApacheSolrForTypo3\Solr\IndexQueue\Queue; |
| 29 | 28 | use ApacheSolrForTypo3\Solr\Site; |
| 30 | 29 | use ApacheSolrForTypo3\Solr\Tests\Integration\IntegrationTest; |
| 31 | -use ApacheSolrForTypo3\Solr\IndexQueue\RecordMonitor; |
|
| 32 | -use TYPO3\CMS\Backend\Utility\BackendUtility; |
|
| 33 | -use TYPO3\CMS\Core\Charset\CharsetConverter; |
|
| 34 | -use TYPO3\CMS\Core\DataHandling\DataHandler; |
|
| 35 | 30 | use TYPO3\CMS\Core\Utility\GeneralUtility; |
| 36 | 31 | |
| 37 | 32 | /** |
@@ -73,7 +73,7 @@ |
||
| 73 | 73 | protected function assertItemsInQueue($expectedAmount) |
| 74 | 74 | { |
| 75 | 75 | $itemCount = $this->indexQueue->getAllItemsCount(); |
| 76 | - $this->assertSame($itemCount, $expectedAmount, 'Indexqueue contains unexpected amount of items. Expected amount: '.$expectedAmount); |
|
| 76 | + $this->assertSame($itemCount, $expectedAmount, 'Indexqueue contains unexpected amount of items. Expected amount: ' . $expectedAmount); |
|
| 77 | 77 | } |
| 78 | 78 | |
| 79 | 79 | /** |
@@ -27,7 +27,6 @@ |
||
| 27 | 27 | use ApacheSolrForTypo3\Solr\IndexQueue\Queue; |
| 28 | 28 | use ApacheSolrForTypo3\Solr\Tests\Integration\IntegrationTest; |
| 29 | 29 | use ApacheSolrForTypo3\Solr\IndexQueue\RecordMonitor; |
| 30 | -use TYPO3\CMS\Backend\Utility\BackendUtility; |
|
| 31 | 30 | use TYPO3\CMS\Core\DataHandling\DataHandler; |
| 32 | 31 | use TYPO3\CMS\Core\Utility\GeneralUtility; |
| 33 | 32 | |
@@ -87,7 +87,7 @@ |
||
| 87 | 87 | protected function assertIndexQueueContainsItemAmount($amount) |
| 88 | 88 | { |
| 89 | 89 | $this->assertEquals($amount, $this->indexQueue->getAllItemsCount(), |
| 90 | - 'Index queue is empty and was expected to contain '.(int) $amount.' items.'); |
|
| 90 | + 'Index queue is empty and was expected to contain ' . (int)$amount . ' items.'); |
|
| 91 | 91 | } |
| 92 | 92 | |
| 93 | 93 | /** |
@@ -87,7 +87,7 @@ |
||
| 87 | 87 | } |
| 88 | 88 | |
| 89 | 89 | /** |
| 90 | - * @param $amount |
|
| 90 | + * @param integer $amount |
|
| 91 | 91 | */ |
| 92 | 92 | protected function assertIndexQueryContainsItemAmount($amount) |
| 93 | 93 | { |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | /** |
| 66 | 66 | * Loads a Fixture from the Fixtures folder beside the current test case. |
| 67 | 67 | * |
| 68 | - * @param $fixtureName |
|
| 68 | + * @param string $fixtureName |
|
| 69 | 69 | * @throws \TYPO3\CMS\Core\Tests\Exception |
| 70 | 70 | */ |
| 71 | 71 | protected function importDataSetFromFixture($fixtureName) |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | /** |
| 87 | 87 | * Returns the absolute path to a fixture file. |
| 88 | 88 | * |
| 89 | - * @param $fixtureName |
|
| 89 | + * @param string $fixtureName |
|
| 90 | 90 | * @return string |
| 91 | 91 | */ |
| 92 | 92 | protected function getFixturePath($fixtureName) |
@@ -25,13 +25,9 @@ |
||
| 25 | 25 | ***************************************************************/ |
| 26 | 26 | |
| 27 | 27 | use ApacheSolrForTypo3\Solr\Domain\Search\SearchRequest; |
| 28 | -use ApacheSolrForTypo3\Solr\Site; |
|
| 29 | 28 | use ApacheSolrForTypo3\Solr\System\Configuration\TypoScriptConfiguration; |
| 30 | -use ApacheSolrForTypo3\Solr\Tests\Integration\IntegrationTest; |
|
| 31 | 29 | use ApacheSolrForTypo3\Solr\Tests\Integration\Plugin\AbstractPluginTest; |
| 32 | 30 | use TYPO3\CMS\Core\Utility\GeneralUtility; |
| 33 | -use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer; |
|
| 34 | -use TYPO3\CMS\Frontend\Page\PageGenerator; |
|
| 35 | 31 | |
| 36 | 32 | /** |
| 37 | 33 | * Integration testcase to test the results plugin. |
@@ -56,8 +56,6 @@ |
||
| 56 | 56 | use ApacheSolrForTypo3\Solr\IndexQueue\Queue; |
| 57 | 57 | use ApacheSolrForTypo3\Solr\Site; |
| 58 | 58 | use ApacheSolrForTypo3\Solr\Tests\Integration\IntegrationTest; |
| 59 | -use ApacheSolrForTypo3\Solr\IndexQueue\RecordMonitor; |
|
| 60 | -use TYPO3\CMS\Core\DataHandling\DataHandler; |
|
| 61 | 59 | use TYPO3\CMS\Core\Utility\GeneralUtility; |
| 62 | 60 | |
| 63 | 61 | /** |
@@ -87,7 +87,7 @@ |
||
| 87 | 87 | } |
| 88 | 88 | |
| 89 | 89 | /** |
| 90 | - * @param $amount |
|
| 90 | + * @param integer $amount |
|
| 91 | 91 | */ |
| 92 | 92 | protected function assertIndexQueryContainsItemAmount($amount) |
| 93 | 93 | { |
@@ -87,7 +87,7 @@ |
||
| 87 | 87 | protected function assertIndexQueueContainsItemAmount($amount) |
| 88 | 88 | { |
| 89 | 89 | $this->assertEquals($amount, $this->indexQueue->getAllItemsCount(), |
| 90 | - 'Index queue is empty and was expected to contain '.(int) $amount.' items.'); |
|
| 90 | + 'Index queue is empty and was expected to contain ' . (int)$amount . ' items.'); |
|
| 91 | 91 | } |
| 92 | 92 | |
| 93 | 93 | /** |