Even more QA

Author: merk

Event/IndexEvent.php

@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * This file is part of the FOSElasticaBundle project.
+ *
+ * (c) Tim Nagel <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace FOS\ElasticaBundle\Event;
+
+use Symfony\Component\EventDispatcher\Event;
+
+class IndexEvent extends Event
+{
+    /**
+     * @var string
+     */
+    private $index;
+
+    /**
+     * @param string $index
+     */
+    public function __construct($index)
+    {
+        $this->index = $index;
+    }
+
+    /**
+     * @return string
+     */
+    public function getIndex()
+    {
+        return $this->index;
+    }
+}

Event/IndexPopulateEvent.php

@@ -11,23 +11,16 @@
 
 namespace FOS\ElasticaBundle\Event;
 
-use Symfony\Component\EventDispatcher\Event;
-
 /**
  * Index Populate Event.
  *
  * @author Oleg Andreyev <[email protected]>
  */
-class IndexPopulateEvent extends Event
+class IndexPopulateEvent extends IndexEvent
 {
     const PRE_INDEX_POPULATE = 'elastica.index.index_pre_populate';
     const POST_INDEX_POPULATE = 'elastica.index.index_post_populate';
 
-    /**
-     * @var string
-     */
-    private $index;
-
     /**
      * @var bool
      */
@@ -45,19 +38,12 @@ class IndexPopulateEvent extends Event
      */
     public function __construct($index, $reset, $options)
     {
-        $this->index   = $index;
+        parent::__construct($index);
+
         $this->reset   = $reset;
         $this->options = $options;
     }
 
-    /**
-     * @return string
-     */
-    public function getIndex()
-    {
-        return $this->index;
-    }
-
     /**
      * @return boolean
      */

Event/IndexResetEvent.php

@@ -11,14 +11,12 @@
 
 namespace FOS\ElasticaBundle\Event;
 
-use Symfony\Component\EventDispatcher\Event;
-
 /**
  * Index ResetEvent.
  *
  * @author Oleg Andreyev <[email protected]>
  */
-class IndexResetEvent extends Event
+class IndexResetEvent extends IndexEvent
 {
     const PRE_INDEX_RESET = 'elastica.index.pre_reset';
     const POST_INDEX_RESET = 'elastica.index.post_reset';
@@ -28,11 +26,6 @@ class IndexResetEvent extends Event
      */
     private $force;
 
-    /**
-     * @var string
-     */
-    private $index;
-
     /**
      * @var bool
      */
@@ -45,19 +38,12 @@ class IndexResetEvent extends Event
      */
     public function __construct($index, $populating, $force)
     {
+        parent::__construct($index);
+
         $this->force = $force;
-        $this->index = $index;
         $this->populating = $populating;
     }
 
-    /**
-     * @return string
-     */
-    public function getIndex()
-    {
-        return $this->index;
-    }
-
     /**
      * @return boolean
      */

Event/TypeResetEvent.php

@@ -18,16 +18,11 @@
  *
  * @author Oleg Andreyev <[email protected]>
  */
-class TypeResetEvent extends Event
+class TypeResetEvent extends IndexEvent
 {
     const PRE_TYPE_RESET = 'elastica.index.type_pre_reset';
     const POST_TYPE_RESET = 'elastica.index.type_post_reset';
 
-    /**
-     * @var string
-     */
-    private $index;
-
     /**
      * @var string
      */
@@ -39,16 +34,9 @@ class TypeResetEvent extends Event
      */
     public function __construct($index, $type)
     {
-        $this->type = $type;
-        $this->index = $index;
-    }
+        parent::__construct($index);
 
-    /**
-     * @return string
-     */
-    public function getIndex()
-    {
-        return $this->index;
+        $this->type = $type;
     }
 
     /**

Propel/Provider.php

@@ -30,7 +30,7 @@ public function populate(\Closure $loggerClosure = null, array $options = array(
                 ->getArrayCopy();
 
             $objects = array_filter($objects, array($this, 'isObjectIndexable'));
-            if ($objects) {
+            if (!empty($objects)) {
                 $this->objectPersister->insertMany($objects);
             }
 

Provider/AbstractProvider.php

@@ -25,7 +25,7 @@ abstract class AbstractProvider implements ProviderInterface
     protected $options;
 
     /**
-     * @var Indexable
+     * @var IndexableInterface
      */
     private $indexable;
 

Serializer/Callback.php

@@ -8,7 +8,7 @@
 class Callback
 {
     protected $serializer;
-    protected $groups;
+    protected $groups = array();
     protected $version;
 
     public function setSerializer($serializer)
@@ -41,7 +41,7 @@ public function serialize($object)
     {
         $context = $this->serializer instanceof SerializerInterface ? SerializationContext::create()->enableMaxDepthChecks() : array();
 
-        if ($this->groups) {
+        if (!empty($this->groups)) {
             $context->setGroups($this->groups);
         }
 

Tests/Persister/ObjectPersisterTest.php

@@ -203,7 +203,7 @@ public function testThatErrorIsHandledWhenCannotInsertManyObject()
     private function getTransformer()
     {
         $transformer = new ModelToElasticaAutoTransformer();
-        $transformer->setPropertyAccessor(PropertyAccess::getPropertyAccessor());
+        $transformer->setPropertyAccessor(PropertyAccess::createPropertyAccessor());
 
         return $transformer;
     }

Tests/Persister/ObjectSerializerPersisterTest.php

@@ -112,7 +112,7 @@ public function testThatCanInsertManyObjects()
     private function getTransformer()
     {
         $transformer = new ModelToElasticaIdentifierTransformer();
-        $transformer->setPropertyAccessor(PropertyAccess::getPropertyAccessor());
+        $transformer->setPropertyAccessor(PropertyAccess::createPropertyAccessor());
 
         return $transformer;
     }

Tests/RepositoryTest.php

@@ -57,10 +57,10 @@ public function testThatFindHybridCallsFindHybridOnFinder()
 
     /**
      * @param string $testQuery
-     * @param int    $testLimit
+     * @param mixed $testLimit
      * @param string $method
      *
-     * @return \FOS\ElasticaBundle\Finder\TransformedFinder|\PHPUnit_Framework_MockObject_MockObject
+     * @return \FOS\ElasticaBundle\Finder\TransformedFinder
      */
     private function getFinderMock($testQuery, $testLimit = null, $method = 'find')
     {