php5.4 compatibility

mdiyakov · Mar 24, 2018 · 6592d15 · 6592d15
1 parent 22eaaa0
commit 6592d15
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 55 deletions.
diff --git a/Manager/FinderManager.php b/Manager/FinderManager.php
@@ -27,14 +27,14 @@ class FinderManager
     public function __construct(Config $config, SelectQueryBuilder $queryBuilder)
     {
         $entityConfigs = $config->getIndexedEntities();
-
+        $defaultFinderClass = 'Mdiyakov\DoctrineSolrBundle\Finder\ClassFinder';
         foreach ($entityConfigs as $entityConfig) {
             $entityClass = $entityConfig['class'];
             if (!array_key_exists($entityClass, $this->classFinders)) {
 
-                $finderClass = (!empty($entityConfig['finder_class'])) ? $entityConfig['finder_class'] : ClassFinder::class;
+                $finderClass = (!empty($entityConfig['finder_class'])) ? $entityConfig['finder_class'] : $defaultFinderClass;
 
-                if ($finderClass != ClassFinder::class && !is_subclass_of($finderClass, ClassFinder::class)) {
+                if ($finderClass != $defaultFinderClass && !is_subclass_of($finderClass, $defaultFinderClass)) {
                     throw new FinderException('Finder class of entity must be extended from ClassFinder');
                 }
 

diff --git a/Schema/Field/Entity/FieldFactory.php b/Schema/Field/Entity/FieldFactory.php
@@ -5,12 +5,12 @@
 class FieldFactory
 {
     private $map = [
-        'string' => StringField::class,
-        'int' => IntField::class,
-        'double' => DoubleField::class,
-        'array' => ArrayField::class,
-        'boolean' => BooleanField::class,
-        'date' => DateField::class,
+        'string' => 'Mdiyakov\DoctrineSolrBundle\Schema\Field\Entity\StringField',
+        'int' => 'Mdiyakov\DoctrineSolrBundle\Schema\Field\Entity\IntField',
+        'double' => 'Mdiyakov\DoctrineSolrBundle\Schema\Field\Entity\DoubleField',
+        'array' => 'Mdiyakov\DoctrineSolrBundle\Schema\Field\Entity\ArrayField',
+        'boolean' => 'Mdiyakov\DoctrineSolrBundle\Schema\Field\Entity\BooleanField',
+        'date' => 'Mdiyakov\DoctrineSolrBundle\Schema\Field\Entity\DateField',
     ];
 
     /**

diff --git a/Tests/Config/ConfigValidatorTest.php b/Tests/Config/ConfigValidatorTest.php
@@ -4,8 +4,6 @@
 
 use Mdiyakov\DoctrineSolrBundle\Config\ConfigValidator;
 use Mdiyakov\DoctrineSolrBundle\Finder\ClassFinder;
-use Mdiyakov\DoctrineSolrBundle\Tests\Config\Entity\MyEntity;
-use Mdiyakov\DoctrineSolrBundle\Tests\Config\Entity\MyEntity2;
 use Symfony\Component\Yaml\Yaml;
 
 class MyEntityFinder extends ClassFinder {}
@@ -96,8 +94,8 @@ public function testDiscriminatorConfigNotUnique()
     {
         $config = $this->configFixtures['discriminator_config_not_unique'];
 
-        $config['indexed_entities']['my_entity_1']['class']  = MyEntity::class;
-        $config['indexed_entities']['my_entity_2']['class']  = MyEntity2::class;
+        $config['indexed_entities']['my_entity_1']['class']  = 'Mdiyakov\DoctrineSolrBundle\Tests\Config\Entity\MyEntity';
+        $config['indexed_entities']['my_entity_2']['class']  = 'Mdiyakov\DoctrineSolrBundle\Tests\Config\Entity\MyEntity2';
 
         foreach ($config['indexed_entities'] as $entityConfig) {
             $this->validator->validate($entityConfig, $config['schemes'], $config['filters'], $config['solarium_clients']);
@@ -112,8 +110,8 @@ private function getConfig($configName)
     {
         $config = $this->configFixtures[$configName];
 
-        $config['indexed_entities']['my_entity']['class']  = MyEntity::class;
-        $config['indexed_entities']['my_entity']['finder_class']  = MyEntityFinder::class;
+        $config['indexed_entities']['my_entity']['class']  = 'Mdiyakov\DoctrineSolrBundle\Tests\Config\Entity\MyEntity';
+        $config['indexed_entities']['my_entity']['finder_class']  = 'Mdiyakov\DoctrineSolrBundle\Tests\Config\MyEntityFinder';
 
         return $config;
     }

diff --git a/Tests/Query/Select/AbstractSelectQueryTest.php b/Tests/Query/Select/AbstractSelectQueryTest.php
@@ -3,10 +3,6 @@
 namespace Mdiyakov\DoctrineSolrBundle\Tests\Query\Select;
 
 use Mdiyakov\DoctrineSolrBundle\Query\Select\AbstractSelectQuery;
-use Mdiyakov\DoctrineSolrBundle\Schema\Field\ConfigEntityField;
-use Mdiyakov\DoctrineSolrBundle\Schema\Field\Entity\Field;
-use Mdiyakov\DoctrineSolrBundle\Schema\Field\Entity\StringField;
-use Mdiyakov\DoctrineSolrBundle\Schema\Schema;
 
 class AbstractSelectQueryTest extends \PHPUnit_Framework_TestCase
 {
@@ -19,7 +15,7 @@ public function testAddConfigFieldOrWhere()
 
         $fieldName = 'type';
         $documentFieldName = 'discriminator';
-        $field = $this->getFieldMock($documentFieldName, ConfigEntityField::class);
+        $field = $this->getFieldMock($documentFieldName, 'Mdiyakov\DoctrineSolrBundle\Schema\Field\ConfigEntityField');
         $searchTerm = 'search';
 
         $schema->expects($this->any())
@@ -51,7 +47,7 @@ public function testAddAndWhere()
 
         $entityFieldName = 'title';
         $documentFieldName = 'd_title';
-        $field = $this->getFieldMock($documentFieldName, StringField::class);
+        $field = $this->getFieldMock($documentFieldName, 'Mdiyakov\DoctrineSolrBundle\Schema\Field\Entity\StringField');
         $searchTerm = 'search+-?*';
         $searchTermFiltered = 'search\+\-\?\*';
         $searchTermWildcardFiltered = 'search\+\-?*';
@@ -85,7 +81,7 @@ public function testReset()
 
         $entityFieldName = 'title';
         $documentFieldName = 'd_title';
-        $field = $this->getFieldMock($documentFieldName, StringField::class);
+        $field = $this->getFieldMock($documentFieldName, 'Mdiyakov\DoctrineSolrBundle\Schema\Field\Entity\StringField');
         $searchTerm = 'search';
 
         $schema->expects($this->any())
@@ -118,7 +114,7 @@ public function testAddOrWhere()
         $entityFieldName = 'title';
         $documentFieldName = 'd_title';
         $searchTerm = 'search';
-        $field = $this->getFieldMock($documentFieldName, StringField::class);
+        $field = $this->getFieldMock($documentFieldName, 'Mdiyakov\DoctrineSolrBundle\Schema\Field\Entity\StringField');
 
         $schema->expects($this->any())
             ->method('getFieldByEntityFieldName')
@@ -149,7 +145,7 @@ public function testAddOrWhereWithPriority()
         $entityFieldName = 'title';
         $documentFieldName = 'd_title';
         $searchTerm = 'search';
-        $field = $this->getFieldMock($documentFieldName, StringField::class, 10);
+        $field = $this->getFieldMock($documentFieldName, 'Mdiyakov\DoctrineSolrBundle\Schema\Field\Entity\StringField', 10);
 
         $schema->expects($this->any())
             ->method('getFieldByEntityFieldName')
@@ -184,7 +180,7 @@ public function testAddRangeOrWhere()
         $from = 3;
         $to = 89;
 
-        $field = $this->getFieldMock($documentFieldName, StringField::class);
+        $field = $this->getFieldMock($documentFieldName, 'Mdiyakov\DoctrineSolrBundle\Schema\Field\Entity\StringField');
 
         $schema->expects($this->any())
             ->method('getFieldByEntityFieldName')
@@ -219,7 +215,7 @@ public function testAddRangeAndWhere()
         $from = 3;
         $to = 89;
 
-        $field = $this->getFieldMock($documentFieldName, StringField::class);
+        $field = $this->getFieldMock($documentFieldName, 'Mdiyakov\DoctrineSolrBundle\Schema\Field\Entity\StringField');
         $schema->expects($this->any())
             ->method('getFieldByEntityFieldName')
             ->with($entityFieldName)
@@ -254,7 +250,7 @@ public function testAddFuzzyAndWhere()
         $searchTerm = 'search';
         $distance = 19;
 
-        $field = $this->getFieldMock($documentFieldName, StringField::class);
+        $field = $this->getFieldMock($documentFieldName, 'Mdiyakov\DoctrineSolrBundle\Schema\Field\Entity\StringField');
         $schema->expects($this->any())
             ->method('getFieldByEntityFieldName')
             ->with($entityFieldName)
@@ -287,7 +283,7 @@ public function testAddFuzzyOrWhere()
         $searchTerm = 'search';
         $distance = 19;
 
-        $field = $this->getFieldMock($documentFieldName, StringField::class);
+        $field = $this->getFieldMock($documentFieldName, 'Mdiyakov\DoctrineSolrBundle\Schema\Field\Entity\StringField');
         $schema->expects($this->any())
             ->method('getFieldByEntityFieldName')
             ->with($entityFieldName)
@@ -318,7 +314,7 @@ public function testGroupConditionsAsOr()
         $documentFieldName = 'd_category';
         $searchTerm = 'search';
 
-        $field = $this->getFieldMock($documentFieldName, StringField::class);
+        $field = $this->getFieldMock($documentFieldName, 'Mdiyakov\DoctrineSolrBundle\Schema\Field\Entity\StringField');
         $schema->expects($this->any())
             ->method('getFieldByEntityFieldName')
             ->with($entityFieldName)
@@ -350,7 +346,7 @@ public function testGroupConditionsAsAnd()
         $documentFieldName = 'd_category';
         $searchTerm = 'search';
 
-        $field = $this->getFieldMock($documentFieldName, StringField::class);
+        $field = $this->getFieldMock($documentFieldName, 'Mdiyakov\DoctrineSolrBundle\Schema\Field\Entity\StringField');
         $schema->expects($this->any())
             ->method('getFieldByEntityFieldName')
             ->with($entityFieldName)
@@ -374,9 +370,9 @@ public function testGroupConditionsAsAnd()
 
     private function getSchemaMock()
     {
-        $schema = $this->getMockBuilder(Schema::class)->disableOriginalConstructor()->getMock();
-        $discriminatorField = $this->getMockBuilder(ConfigEntityField::class)->disableOriginalConstructor()->getMock();
-        $primaryKeyField = $this->getMockBuilder(Field::class)->disableOriginalConstructor()->getMock();
+        $schema = $this->getMockBuilder('Mdiyakov\DoctrineSolrBundle\Schema\Schema')->disableOriginalConstructor()->getMock();
+        $discriminatorField = $this->getMockBuilder('Mdiyakov\DoctrineSolrBundle\Schema\Field\ConfigEntityField')->disableOriginalConstructor()->getMock();
+        $primaryKeyField = $this->getMockBuilder('Mdiyakov\DoctrineSolrBundle\Schema\Field\Entity\Field')->disableOriginalConstructor()->getMock();
 
         $schema->expects($this->at(0))->method('getDiscriminatorConfigField')
             ->will($this->returnValue($discriminatorField));
@@ -395,12 +391,12 @@ private function getSchemaMock()
     private function getQueryMock($client, $schema)
     {
         /** @var AbstractSelectQuery|\PHPUnit_Framework_MockObject_MockObject $query */
-        return $this->getMockForAbstractClass(AbstractSelectQuery::class, [$client, $schema]);
+        return $this->getMockForAbstractClass('Mdiyakov\DoctrineSolrBundle\Query\Select\AbstractSelectQuery', [$client, $schema]);
     }
 
     private function getClientMock()
     {
-        $client = $this->getMockBuilder(\Solarium\Client::class)->disableOriginalConstructor()->getMock();
+        $client = $this->getMockBuilder('Solarium\Client')->disableOriginalConstructor()->getMock();
 
         $client->expects($this->at(0))->method('createSelect')
             ->will($this->returnValue(

diff --git a/Tests/Query/Select/ClassSelectQueryTest.php b/Tests/Query/Select/ClassSelectQueryTest.php
@@ -5,7 +5,6 @@
 use Mdiyakov\DoctrineSolrBundle\Query\Hydrator\SelectQueryHydrator;
 use Mdiyakov\DoctrineSolrBundle\Query\Select\ClassSelectQuery;
 use Mdiyakov\DoctrineSolrBundle\Schema\Field\ConfigEntityField;
-use Mdiyakov\DoctrineSolrBundle\Schema\Field\Entity\Field;
 use Mdiyakov\DoctrineSolrBundle\Schema\Schema;
 
 class ClassSelectQueryTest extends \PHPUnit_Framework_TestCase
@@ -23,17 +22,17 @@ public function testInitDiscriminatorConditionsSuccess()
         ];
 
         /** @var \Solarium\Client|\PHPUnit_Framework_MockObject_MockObject $client */
-        $client = $this->getMockBuilder(\Solarium\Client::class)->disableOriginalConstructor()->getMock();
+        $client = $this->getMockBuilder('Solarium\Client')->disableOriginalConstructor()->getMock();
         $client->expects($this->at(0))->method('createSelect')
             ->will($this->returnValue(
                 $this->createMock('Solarium\QueryType\Select\Query\Query')
             ));
 
 
         /** @var Schema|\PHPUnit_Framework_MockObject_MockObject $schema */
-        $schema = $this->getMockBuilder(Schema::class)->disableOriginalConstructor()->getMock();
+        $schema = $this->getMockBuilder('Mdiyakov\DoctrineSolrBundle\Schema\Schema')->disableOriginalConstructor()->getMock();
         $discriminatorField = new ConfigEntityField($configFieldName, $documentFieldName, true, 10);
-        $primaryKeyField = $this->getMockBuilder(Field::class)->disableOriginalConstructor()->getMock();
+        $primaryKeyField = $this->getMockBuilder('Mdiyakov\DoctrineSolrBundle\Schema\Field\Entity\Field')->disableOriginalConstructor()->getMock();
 
         $schema->expects($this->any())->method('getDiscriminatorConfigField')
             ->will($this->returnValue($discriminatorField));
@@ -42,7 +41,7 @@ public function testInitDiscriminatorConditionsSuccess()
             ->will($this->returnValue($primaryKeyField));
 
         /** @var SelectQueryHydrator|\PHPUnit_Framework_MockObject_MockObject $hydrator */
-        $hydrator = $this->getMockBuilder(SelectQueryHydrator::class)->disableOriginalConstructor()->getMock();
+        $hydrator = $this->getMockBuilder('Mdiyakov\DoctrineSolrBundle\Query\Hydrator\SelectQueryHydrator')->disableOriginalConstructor()->getMock();
         $query = new ClassSelectQuery(
             $client,
             $schema,

diff --git a/Tests/Query/Select/MultiClassSelectQueryTest.php b/Tests/Query/Select/MultiClassSelectQueryTest.php
@@ -1,13 +1,10 @@
 <?php
 
-
 namespace Mdiyakov\DoctrineSolrBundle\Tests\Query\Select;
 
-
 use Mdiyakov\DoctrineSolrBundle\Query\Hydrator\SelectQueryHydrator;
 use Mdiyakov\DoctrineSolrBundle\Query\Select\MultiClassSelectQuery;
 use Mdiyakov\DoctrineSolrBundle\Schema\Field\ConfigEntityField;
-use Mdiyakov\DoctrineSolrBundle\Schema\Field\Entity\Field;
 use Mdiyakov\DoctrineSolrBundle\Schema\Schema;
 
 class MultiClassSelectQueryTest extends \PHPUnit_Framework_TestCase
@@ -32,17 +29,17 @@ public function testInitDiscriminatorConditionsSuccess()
         ];
 
         /** @var \Solarium\Client|\PHPUnit_Framework_MockObject_MockObject $client */
-        $client = $this->getMockBuilder(\Solarium\Client::class)->disableOriginalConstructor()->getMock();
+        $client = $this->getMockBuilder('Solarium\Client')->disableOriginalConstructor()->getMock();
         $client->expects($this->at(0))->method('createSelect')
             ->will($this->returnValue(
                 $this->createMock('Solarium\QueryType\Select\Query\Query')
             ));
 
 
         /** @var Schema|\PHPUnit_Framework_MockObject_MockObject $schema */
-        $schema = $this->getMockBuilder(Schema::class)->disableOriginalConstructor()->getMock();
+        $schema = $this->getMockBuilder('Mdiyakov\DoctrineSolrBundle\Schema\Schema')->disableOriginalConstructor()->getMock();
         $discriminatorField = new ConfigEntityField($configFieldName, $documentFieldName, true, 10);
-        $primaryKeyField = $this->getMockBuilder(Field::class)->disableOriginalConstructor()->getMock();
+        $primaryKeyField = $this->getMockBuilder('Mdiyakov\DoctrineSolrBundle\Schema\Field\Entity\Field')->disableOriginalConstructor()->getMock();
 
         $schema->expects($this->any())->method('getDiscriminatorConfigField')
             ->will($this->returnValue($discriminatorField));
@@ -51,7 +48,7 @@ public function testInitDiscriminatorConditionsSuccess()
             ->will($this->returnValue($primaryKeyField));
 
         /** @var SelectQueryHydrator|\PHPUnit_Framework_MockObject_MockObject $hydrator */
-        $hydrator = $this->getMockBuilder(SelectQueryHydrator::class)->disableOriginalConstructor()->getMock();
+        $hydrator = $this->getMockBuilder('Mdiyakov\DoctrineSolrBundle\Query\Hydrator\SelectQueryHydrator')->disableOriginalConstructor()->getMock();
         $query = new MultiClassSelectQuery(
             $schema,
             $client,

diff --git a/Tests/Schema/SchemaTest.php b/Tests/Schema/SchemaTest.php
@@ -2,9 +2,6 @@
 
 namespace Mdiyakov\DoctrineSolrBundle\Tests\Schema;
 
-use Mdiyakov\DoctrineSolrBundle\Schema\Field\ConfigEntityField;
-use Mdiyakov\DoctrineSolrBundle\Schema\Field\DocumentUniqueField;
-use Mdiyakov\DoctrineSolrBundle\Schema\Field\Entity\Field;
 use Mdiyakov\DoctrineSolrBundle\Schema\Schema;
 use Symfony\Component\Yaml\Yaml;
 
@@ -65,7 +62,7 @@ function($configFieldConfig) { return $configFieldConfig['document_field_name'];
 
         $discriminator = false;
         foreach($configFields as $configField) {
-            $this->assertInstanceOf(ConfigEntityField::class, $configField);
+            $this->assertInstanceOf('Mdiyakov\DoctrineSolrBundle\Schema\Field\ConfigEntityField', $configField);
             $discriminator = $discriminator ? $discriminator : $configField->isDiscriminator();
             $this->assertArrayHasKey($configField->getConfigFieldName(), $configFieldNames);
             $this->assertArrayHasKey($configField->getDocumentFieldName(), $documentConfigFieldNames);
@@ -74,23 +71,23 @@ function($configFieldConfig) { return $configFieldConfig['document_field_name'];
         $this->assertEquals(true, $discriminator);
 
         $uniqueDocumentField = $schema->getDocumentUniqueField();
-        $this->assertInstanceOf(DocumentUniqueField::class, $uniqueDocumentField);
+        $this->assertInstanceOf('Mdiyakov\DoctrineSolrBundle\Schema\Field\DocumentUniqueField', $uniqueDocumentField);
         $this->assertEquals($schemaConfig['document_unique_field']['name'], $uniqueDocumentField->getName());
 
         $primaryKeyField = $schema->getEntityPrimaryKeyField();
-        $this->assertInstanceOf(Field::class, $primaryKeyField);
+        $this->assertInstanceOf('Mdiyakov\DoctrineSolrBundle\Schema\Field\Entity\Field', $primaryKeyField);
         $this->assertEquals('id', $primaryKeyField->getEntityFieldName());
         $this->assertEquals('d_id', $primaryKeyField->getDocumentFieldName());
 
         $fields = $schema->getFields();
         foreach($fields as $field) {
-            $this->assertInstanceOf(Field::class, $field);
+            $this->assertInstanceOf('Mdiyakov\DoctrineSolrBundle\Schema\Field\Entity\Field', $field);
             $this->assertArrayHasKey($field->getEntityFieldName(), $fieldNames);
             $this->assertArrayHasKey($field->getDocumentFieldName(), $documentFieldNames);
         }
 
         $titleField = $schema->getFieldByEntityFieldName('title');
-        $this->assertInstanceOf(Field::class, $titleField);
+        $this->assertInstanceOf('Mdiyakov\DoctrineSolrBundle\Schema\Field\Entity\Field', $titleField);
         $this->assertEquals('title', $titleField->getEntityFieldName());
         $this->assertEquals('d_title', $titleField->getDocumentFieldName());
     }