diff --git a/src/Solr/SolrIndex.php b/src/Solr/SolrIndex.php index ef3a82b..fcf3f51 100644 --- a/src/Solr/SolrIndex.php +++ b/src/Solr/SolrIndex.php @@ -124,29 +124,6 @@ abstract class SolrIndex extends SearchIndex return implode($indexParts); } - /** - * Helper for returning the indexer class name from an index name, encoded via {@link getIndexName()} - * - * @param string $indexName - * @return string - */ - public static function getClassNameFromIndex($indexName) - { - if (($indexPrefix = Environment::getEnv('SS_SOLR_INDEX_PREFIX')) - && (substr($indexName, 0, strlen($indexPrefix)) === $indexPrefix) - ) { - $indexName = substr($indexName, strlen($indexPrefix)); - } - - if (($indexSuffix = Environment::getEnv('SS_SOLR_INDEX_SUFFIX')) - && (substr($indexName, -strlen($indexSuffix)) === $indexSuffix) - ) { - $indexName = substr($indexName, 0, -strlen($indexSuffix)); - } - - return str_replace('-', '\\', $indexName); - } - public function getTypes() { return $this->renderWith($this->getTemplatesPath() . '/types.ss'); diff --git a/tests/SolrIndexTest.php b/tests/SolrIndexTest.php index 6d5925e..9ca5697 100644 --- a/tests/SolrIndexTest.php +++ b/tests/SolrIndexTest.php @@ -386,7 +386,7 @@ class SolrIndexTest extends SapphireTest Environment::putEnv('SS_SOLR_INDEX_PREFIX="foo_"'); Environment::putEnv('SS_SOLR_INDEX_SUFFIX="_bar"'); - $this->assertSame($expected, SolrIndex::getClassNameFromIndex($indexName)); + $this->assertSame($expected, $indexName); } /**