Fixing scrutinizer issues
This commit is contained in:
parent
d5a9b7b235
commit
84e5831a81
|
@ -502,7 +502,7 @@ class FOSElasticaExtension extends Extension
|
|||
break;
|
||||
}
|
||||
|
||||
if ($tagName) {
|
||||
if (null !== $tagName) {
|
||||
foreach ($this->getDoctrineEvents($typeConfig) as $event) {
|
||||
$listenerDef->addTag($tagName, array('event' => $event));
|
||||
}
|
||||
|
@ -527,7 +527,6 @@ class FOSElasticaExtension extends Extension
|
|||
break;
|
||||
default:
|
||||
throw new InvalidArgumentException(sprintf('Cannot determine events for driver "%s"', $typeConfig['driver']));
|
||||
break;
|
||||
}
|
||||
|
||||
$events = array();
|
||||
|
|
|
@ -2,10 +2,10 @@
|
|||
|
||||
namespace FOS\ElasticaBundle\Doctrine;
|
||||
|
||||
use Doctrine\Common\Persistence\ManagerRegistry;
|
||||
use FOS\ElasticaBundle\HybridResult;
|
||||
use FOS\ElasticaBundle\Transformer\AbstractElasticaToModelTransformer as BaseTransformer;
|
||||
use FOS\ElasticaBundle\Transformer\HighlightableModelInterface;
|
||||
use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
|
||||
|
||||
/**
|
||||
* Maps Elastica documents with Doctrine objects
|
||||
|
@ -16,6 +16,8 @@ abstract class AbstractElasticaToModelTransformer extends BaseTransformer
|
|||
{
|
||||
/**
|
||||
* Manager registry.
|
||||
*
|
||||
* @var ManagerRegistry
|
||||
*/
|
||||
protected $registry = null;
|
||||
|
||||
|
@ -41,11 +43,11 @@ abstract class AbstractElasticaToModelTransformer extends BaseTransformer
|
|||
/**
|
||||
* Instantiates a new Mapper.
|
||||
*
|
||||
* @param object $registry
|
||||
* @param ManagerRegistry $registry
|
||||
* @param string $objectClass
|
||||
* @param array $options
|
||||
*/
|
||||
public function __construct($registry, $objectClass, array $options = array())
|
||||
public function __construct(ManagerRegistry $registry, $objectClass, array $options = array())
|
||||
{
|
||||
$this->registry = $registry;
|
||||
$this->objectClass = $objectClass;
|
||||
|
@ -118,7 +120,7 @@ abstract class AbstractElasticaToModelTransformer extends BaseTransformer
|
|||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
public function getIdentifierField()
|
||||
{
|
||||
|
|
|
@ -71,7 +71,7 @@ abstract class AbstractProvider extends BaseAbstractProvider
|
|||
$objects = $this->getSlice($queryBuilder, $batchSize, $offset, $objects);
|
||||
$objects = array_filter($objects, array($this, 'isObjectIndexable'));
|
||||
|
||||
if ($objects) {
|
||||
if (!empty($objects)) {
|
||||
if (!$ignoreErrors) {
|
||||
$this->objectPersister->insertMany($objects);
|
||||
} else {
|
||||
|
|
|
@ -3,8 +3,8 @@
|
|||
namespace FOS\ElasticaBundle\Doctrine;
|
||||
|
||||
use Doctrine\Common\Persistence\Event\LifecycleEventArgs;
|
||||
use FOS\ElasticaBundle\Persister\ObjectPersisterInterface;
|
||||
use FOS\ElasticaBundle\Persister\ObjectPersister;
|
||||
use FOS\ElasticaBundle\Persister\ObjectPersisterInterface;
|
||||
use FOS\ElasticaBundle\Provider\IndexableInterface;
|
||||
use Psr\Log\LoggerInterface;
|
||||
use Symfony\Component\PropertyAccess\PropertyAccess;
|
||||
|
@ -19,14 +19,14 @@ class Listener
|
|||
/**
|
||||
* Object persister.
|
||||
*
|
||||
* @var ObjectPersister
|
||||
* @var ObjectPersisterInterface
|
||||
*/
|
||||
protected $objectPersister;
|
||||
|
||||
/**
|
||||
* Configuration for the listener.
|
||||
*
|
||||
* @var string
|
||||
* @var array
|
||||
*/
|
||||
private $config;
|
||||
|
||||
|
@ -84,7 +84,7 @@ class Listener
|
|||
$this->objectPersister = $objectPersister;
|
||||
$this->propertyAccessor = PropertyAccess::createPropertyAccessor();
|
||||
|
||||
if ($logger) {
|
||||
if ($logger && $this->objectPersister instanceof ObjectPersister) {
|
||||
$this->objectPersister->setLogger($logger);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -6,6 +6,11 @@ use FOS\ElasticaBundle\Elastica\Index;
|
|||
|
||||
class IndexManager
|
||||
{
|
||||
/**
|
||||
* @var Index
|
||||
*/
|
||||
private $defaultIndex;
|
||||
|
||||
/**
|
||||
* @var array
|
||||
*/
|
||||
|
|
|
@ -38,13 +38,13 @@ class MappingBuilder
|
|||
}
|
||||
|
||||
$mapping = array();
|
||||
if ($typeMappings) {
|
||||
if (!empty($typeMappings)) {
|
||||
$mapping['mappings'] = $typeMappings;
|
||||
}
|
||||
// 'warmers' => $indexConfig->getWarmers(),
|
||||
|
||||
$settings = $indexConfig->getSettings();
|
||||
if ($settings) {
|
||||
if (!empty($settings)) {
|
||||
$mapping['settings'] = $settings;
|
||||
}
|
||||
|
||||
|
@ -95,7 +95,7 @@ class MappingBuilder
|
|||
$mapping['_meta']['model'] = $typeConfig->getModel();
|
||||
}
|
||||
|
||||
if (!$mapping) {
|
||||
if (empty($mapping)) {
|
||||
// Empty mapping, we want it encoded as a {} instead of a []
|
||||
$mapping = new \stdClass();
|
||||
}
|
||||
|
|
|
@ -10,6 +10,15 @@ namespace FOS\ElasticaBundle\Persister;
|
|||
*/
|
||||
interface ObjectPersisterInterface
|
||||
{
|
||||
/**
|
||||
* Checks if this persister can handle the given object or not.
|
||||
*
|
||||
* @param mixed $object
|
||||
*
|
||||
* @return boolean
|
||||
*/
|
||||
public function handlesObject($object);
|
||||
|
||||
/**
|
||||
* Insert one object into the type
|
||||
* The object will be transformed to an elastica document.
|
||||
|
@ -66,13 +75,4 @@ interface ObjectPersisterInterface
|
|||
* @param array $identifiers array of domain model object identifiers
|
||||
*/
|
||||
public function deleteManyByIdentifiers(array $identifiers);
|
||||
|
||||
/**
|
||||
* If the object persister handles the given object.
|
||||
*
|
||||
* @param object $object
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
public function handlesObject($object);
|
||||
}
|
||||
|
|
|
@ -18,12 +18,16 @@ class ObjectSerializerPersister extends ObjectPersister
|
|||
protected $serializer;
|
||||
|
||||
/**
|
||||
* @param Type $type
|
||||
* @param ModelToElasticaTransformerInterface $transformer
|
||||
* @param string $objectClass
|
||||
* @param callable $serializer
|
||||
*/
|
||||
public function __construct(Type $type, ModelToElasticaTransformerInterface $transformer, $objectClass, $serializer)
|
||||
{
|
||||
parent::__construct($type, $transformer, $objectClass, array());
|
||||
$this->serializer = $serializer;
|
||||
|
||||
$this->serializer = $serializer;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -85,7 +85,7 @@ class ElasticaToModelTransformer extends AbstractElasticaToModelTransformer
|
|||
$objects = $this->transform($elasticaObjects);
|
||||
|
||||
$result = array();
|
||||
for ($i = 0; $i < count($elasticaObjects); $i++) {
|
||||
for ($i = 0, $j = count($elasticaObjects); $i < $j; $i++) {
|
||||
$result[] = new HybridResult($elasticaObjects[$i], $objects[$i]);
|
||||
}
|
||||
|
||||
|
|
|
@ -23,10 +23,8 @@ class Callback
|
|||
{
|
||||
$this->groups = $groups;
|
||||
|
||||
if ($this->groups) {
|
||||
if (!$this->serializer instanceof SerializerInterface) {
|
||||
throw new \RuntimeException('Setting serialization groups requires using "JMS\Serializer\Serializer".');
|
||||
}
|
||||
if (!empty($this->groups) && !$this->serializer instanceof SerializerInterface) {
|
||||
throw new \RuntimeException('Setting serialization groups requires using "JMS\Serializer\Serializer".');
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -34,10 +32,8 @@ class Callback
|
|||
{
|
||||
$this->version = $version;
|
||||
|
||||
if ($this->version) {
|
||||
if (!$this->serializer instanceof SerializerInterface) {
|
||||
throw new \RuntimeException('Setting serialization version requires using "JMS\Serializer\Serializer".');
|
||||
}
|
||||
if ($this->version && !$this->serializer instanceof SerializerInterface) {
|
||||
throw new \RuntimeException('Setting serialization version requires using "JMS\Serializer\Serializer".');
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -58,7 +58,6 @@ class AbstractProviderTest extends \PHPUnit_Framework_TestCase
|
|||
->with('index', 'type', $this->anything())
|
||||
->will($this->returnValue(true));
|
||||
|
||||
$providerInvocationOffset = 2;
|
||||
$previousSlice = array();
|
||||
|
||||
foreach ($objectsByIteration as $i => $objects) {
|
||||
|
|
|
@ -13,12 +13,12 @@ namespace FOS\ElasticaBundle\Tests\Functional\app\ORM;
|
|||
|
||||
class IndexableService
|
||||
{
|
||||
public function isIndexable($object)
|
||||
public function isIndexable()
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
public static function isntIndexable($object)
|
||||
public static function isntIndexable()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
|
|
@ -37,7 +37,7 @@ class ElasticaToModelTransformerCollectionTest extends \PHPUnit_Framework_TestCa
|
|||
$this->collection = new ElasticaToModelTransformerCollection($this->transformers = array(
|
||||
'type1' => $transformer1,
|
||||
'type2' => $transformer2,
|
||||
), array());
|
||||
));
|
||||
}
|
||||
|
||||
public function testGetObjectClass()
|
||||
|
|
|
@ -81,7 +81,7 @@ class ElasticaToModelTransformerCollection implements ElasticaToModelTransformer
|
|||
$objects = $this->transform($elasticaObjects);
|
||||
|
||||
$result = array();
|
||||
for ($i = 0; $i < count($elasticaObjects); $i++) {
|
||||
for ($i = 0, $j = count($elasticaObjects); $i < $j; $i++) {
|
||||
$result[] = new HybridResult($elasticaObjects[$i], $objects[$i]);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue