Minor code refactoring and configuration.

Author: remorhaz

.codeclimate.yml

@@ -13,4 +13,5 @@ ratings:
   paths:
   - "**.php"
 exclude_paths:
+- build/
 - tests/

README.md

@@ -1,8 +1,8 @@
 # PHP JSON Pointer
 
-[![Build Status](https://travis-ci.org/remorhaz/php-json-pointer.svg?branch=master)](https://travis-ci.org/remorhaz/php-json-pointer)
 [![Latest Stable Version](https://poser.pugx.org/remorhaz/php-json-pointer/v/stable)](https://packagist.org/packages/remorhaz/php-json-pointer)
 [![License](https://poser.pugx.org/remorhaz/php-json-pointer/license)](https://packagist.org/packages/remorhaz/php-json-pointer)
+[![Build Status](https://travis-ci.org/remorhaz/php-json-pointer.svg?branch=master)](https://travis-ci.org/remorhaz/php-json-pointer)
 [![Code Climate](https://codeclimate.com/github/remorhaz/php-json-pointer/badges/gpa.svg)](https://codeclimate.com/github/remorhaz/php-json-pointer)
 [![Test Coverage](https://codeclimate.com/github/remorhaz/php-json-pointer/badges/coverage.svg)](https://codeclimate.com/github/remorhaz/php-json-pointer/coverage)
 

phpunit.xml

@@ -3,12 +3,14 @@
     bootstrap="vendor/autoload.php"
     colors="true">
     <testsuites>
-        <testsuite name="Library Test Suite">
+        <testsuite name="Full Test Suite">
             <directory>tests/</directory>
         </testsuite>
     </testsuites>
     <filter>
-        <whitelist>
+        <whitelist
+            getUncoveredFilesFromWhitelist="true"
+            processUncoveredFilesFromWhitelist="true">
             <directory suffix=".php">src/</directory>
         </whitelist>
     </filter>

src/Locator.php

@@ -57,17 +57,15 @@ public function getReferenceList()
     public function addReference(Locator\Reference $reference)
     {
         $this->referenceList[] = $reference;
-        if (null === $this->lastReference) {
-            $pathPrefix = '';
-        } else {
-            $pathPrefix = $this
+        $pathPrefix = null === $this->lastReference
+            ? ''
+            : $this
                 ->lastReference
-                ->setLast(false)
+                ->setIsLast(false)
                 ->getPath();
-        }
 
         $this->lastReference = $reference
-            ->setLast()
+            ->setIsLast()
             ->setPath("{$pathPrefix}/{$reference->getText()}");
         return $this;
     }

src/Locator/Reference.php

@@ -173,12 +173,12 @@ public function isLast()
     }
 
 
-    public function setLast($on = true)
+    public function setIsLast($isLast = true)
     {
-        if (!is_bool($on)) {
+        if (!is_bool($isLast)) {
             throw new Reference\InvalidArgumentException("Reference value must be boolean");
         }
-        $this->isLast = $on;
+        $this->isLast = $isLast;
         return $this;
     }
 

src/Pointer.php

@@ -134,7 +134,7 @@ public function unsetData()
     public function test()
     {
         return Pointer\Evaluate\Test::factory()
-            ->setAllowedNonNumericArrayIndices($this->hasOption(self::OPTION_NON_NUMERIC_ARRAY_INDICES))
+            ->setNonNumericArrayIndices($this->hasOption(self::OPTION_NON_NUMERIC_ARRAY_INDICES))
             ->setLocator($this->getLocator())
             ->setData($this->getData())
             ->perform()
@@ -144,7 +144,7 @@ public function test()
     public function &read()
     {
         return Pointer\Evaluate\Read::factory()
-            ->setAllowedNonNumericArrayIndices($this->hasOption(self::OPTION_NON_NUMERIC_ARRAY_INDICES))
+            ->setNonNumericArrayIndices($this->hasOption(self::OPTION_NON_NUMERIC_ARRAY_INDICES))
             ->setLocator($this->getLocator())
             ->setData($this->getData())
             ->perform()
@@ -155,7 +155,7 @@ public function &read()
     public function write($value)
     {
         Pointer\Evaluate\Write::factory()
-            ->setAllowedNonNumericArrayIndices($this->hasOption(self::OPTION_NON_NUMERIC_ARRAY_INDICES))
+            ->setNonNumericArrayIndices($this->hasOption(self::OPTION_NON_NUMERIC_ARRAY_INDICES))
             ->setLocator($this->getLocator())
             ->setData($this->getData())
             ->setValue($value)

src/Pointer/Evaluate.php

@@ -55,7 +55,7 @@ abstract class Evaluate
      */
     protected $result;
 
-    protected $areAllowedNonNumericArrayIndices = false;
+    protected $nonNumericArrayIndices = false;
 
 
     /**
@@ -176,12 +176,12 @@ public function &getResult()
     }
 
 
-    public function setAllowedNonNumericArrayIndices($on = true)
+    public function setNonNumericArrayIndices($allow = true)
     {
-        if (!is_bool($on)) {
+        if (!is_bool($allow)) {
             throw new Evaluate\InvalidArgumentException("Non-numeric array indices allowance flag must be boolean");
         }
-        $this->areAllowedNonNumericArrayIndices = $on;
+        $this->nonNumericArrayIndices = $allow;
         return $this;
     }
 
@@ -267,7 +267,7 @@ protected function processArrayIndex(Reference $reference)
                 return $this->processNumericArrayIndex($reference);
 
             default:
-                return $this->areAllowedNonNumericArrayIndices
+                return $this->nonNumericArrayIndices
                     ? $this->processAllowedNonNumericArrayIndex($reference)
                     : $this->processNotAllowedNonNumericArrayIndex($reference);
         }

tests/Locator/Reference/IsLastTest.php

@@ -32,7 +32,7 @@ public function testAccessingUninitializedIsLastThrowsSplException()
      */
     public function testGotIsLastSameAsSet($on)
     {
-        $reference = Reference::factory()->setLast($on);
+        $reference = Reference::factory()->setIsLast($on);
         $this->assertSame($on, $reference->isLast(), "Got last reference flag differs from the one that was set");
     }
 
@@ -51,7 +51,7 @@ public function providerGotIsLastSameAsSet()
      */
     public function testSetNotBooleanLastThrowsException()
     {
-        Reference::factory()->setLast(0);
+        Reference::factory()->setIsLast(0);
     }
 
 
@@ -60,6 +60,6 @@ public function testSetNotBooleanLastThrowsException()
      */
     public function testSetNotBooleanLastThrowsSplException()
     {
-        Reference::factory()->setLast(0);
+        Reference::factory()->setIsLast(0);
     }
 }