Skip to content

Commit 37d1c60

Browse files
remorhazremorhaz
committed
Data accessors package version updated.
1 parent 55286c9 commit 37d1c60

File tree

12 files changed

+152
-155
lines changed

12 files changed

+152
-155
lines changed

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
],
1414
"require": {
1515
"php": ">=7.0",
16-
"remorhaz/php-json-data" : "0.1.*"
16+
"remorhaz/php-json-data" : "0.2.1"
1717
},
1818
"require-dev": {
1919
"phpunit/phpunit": "@stable",

‎src/Evaluator/OperationAdd.php‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
namespace Remorhaz\JSON\Pointer\Evaluator;
44

55
use Remorhaz\JSON\Data\ReaderInterface;
6-
use Remorhaz\JSON\Data\SelectableWriterInterface;
6+
use Remorhaz\JSON\Data\WriterInterface;
77
use Remorhaz\JSON\Pointer\Locator\Locator;
88
use Remorhaz\JSON\Pointer\Locator\Reference;
99

@@ -18,7 +18,7 @@ class OperationAdd extends Operation
1818
protected $valueReader;
1919

2020

21-
public function __construct(Locator $locator, SelectableWriterInterface $writer, ReaderInterface $valueReader)
21+
public function __construct(Locator $locator, WriterInterface $writer, ReaderInterface $valueReader)
2222
{
2323
parent::__construct($locator);
2424
$this->writer = $writer;
@@ -30,15 +30,15 @@ public function perform()
3030
{
3131
parent::perform();
3232
if ($this->writer->hasData()) {
33-
if ($this->writer->isIndexSelected()) {
33+
if ($this->writer->isElement()) {
3434
$this->writer->insertElement($this->valueReader);
3535
} else {
3636
$this->writer->replaceData($this->valueReader);
3737
}
3838
} else {
39-
if ($this->writer->isNewIndexSelected()) {
39+
if ($this->writer->isNewElement()) {
4040
$this->writer->appendElement($this->valueReader);
41-
} elseif ($this->writer->isPropertySelected()) {
41+
} elseif ($this->writer->isProperty()) {
4242
$this->writer->insertProperty($this->valueReader);
4343
} else {
4444
throw new EvaluatorException("No data at {$this->locator->getText()}");
@@ -53,23 +53,23 @@ protected function applyReference(Reference $reference)
5353
if (!$this->writer->hasData()) {
5454
throw new EvaluatorException("No data at '{$reference->getPath()}'");
5555
}
56-
if ($this->writer->isArraySelected()) {
56+
if ($this->writer->isArray()) {
5757
if ($reference->getType() == $reference::TYPE_NEXT_INDEX) {
58-
$this->writer->selectNewIndex();
58+
$this->writer->selectNewElement();
5959
} elseif ($reference->getType() == $reference::TYPE_INDEX) {
6060
$index = (int) $reference->getKey();
6161
$elementCount = $this->writer->getElementCount();
6262
if ($index == $elementCount) {
63-
$this->writer->selectNewIndex();
63+
$this->writer->selectNewElement();
6464
} elseif ($index < $elementCount && $index >= 0) {
65-
$this->writer->selectIndex($index);
65+
$this->writer->selectElement($index);
6666
} else {
6767
throw new EvaluatorException("Invalid index #{$index} at '{$reference->getPath()}'");
6868
}
6969
} else {
7070
throw new EvaluatorException("Invalid index '{$reference->getKey()}' at '{$reference->getPath()}'");
7171
}
72-
} elseif ($this->writer->isObjectSelected()) {
72+
} elseif ($this->writer->isObject()) {
7373
$property = (string) $reference->getKey();
7474
$this->writer->selectProperty($property);
7575
} else {

‎src/Evaluator/OperationRead.php‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,50 +2,47 @@
22

33
namespace Remorhaz\JSON\Pointer\Evaluator;
44

5-
use Remorhaz\JSON\Data\RawSelectableReader;
6-
use Remorhaz\JSON\Data\SelectableReaderInterface;
5+
use Remorhaz\JSON\Data\SelectorInterface;
76
use Remorhaz\JSON\Pointer\Locator\Locator;
87
use Remorhaz\JSON\Pointer\Locator\Reference;
98

109
class OperationRead extends Operation
1110
{
1211

13-
protected $reader;
12+
protected $selector;
1413

1514

16-
public function __construct(Locator $locator, SelectableReaderInterface $reader)
15+
public function __construct(Locator $locator, SelectorInterface $selector)
1716
{
1817
parent::__construct($locator);
19-
$this->reader = $reader;
18+
$this->selector = $selector;
2019
}
2120

2221

2322
public function perform()
2423
{
2524
parent::perform();
26-
$resultData = $this->reader->getData();
27-
$result = new RawSelectableReader($resultData);
28-
return $this->setResult($result);
25+
return $this->setResult($this->selector->getAsReader());
2926
}
3027

3128

3229
protected function applyReference(Reference $reference)
3330
{
34-
if ($this->reader->isArraySelected()) {
31+
if ($this->selector->isArray()) {
3532
if ($reference->getType() != $reference::TYPE_INDEX) {
3633
throw new EvaluatorException(
3734
"Invalid index '{$reference->getKey()}' at {$reference->getPath()}"
3835
);
3936
}
4037
$index = (int) $reference->getKey();
41-
$this->reader->selectIndex($index);
42-
if (!$this->reader->hasData()) {
38+
$this->selector->selectElement($index);
39+
if (!$this->selector->hasData()) {
4340
throw new EvaluatorException("No index #{$index} at {$reference->getPath()}");
4441
}
45-
} elseif ($this->reader->isObjectSelected()) {
42+
} elseif ($this->selector->isObject()) {
4643
$property = (string) $reference->getKey();
47-
$this->reader->selectProperty($property);
48-
if (!$this->reader->hasData()) {
44+
$this->selector->selectProperty($property);
45+
if (!$this->selector->hasData()) {
4946
throw new EvaluatorException("No property '{$property}' at {$reference->getPath()}");
5047
}
5148
} else {

‎src/Evaluator/OperationRemove.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace Remorhaz\JSON\Pointer\Evaluator;
44

5-
use Remorhaz\JSON\Data\SelectableWriterInterface;
5+
use Remorhaz\JSON\Data\WriterInterface;
66
use Remorhaz\JSON\Pointer\Locator\Locator;
77
use Remorhaz\JSON\Pointer\Locator\Reference;
88

@@ -15,7 +15,7 @@ class OperationRemove extends Operation
1515
protected $writer;
1616

1717

18-
public function __construct(Locator $locator, SelectableWriterInterface $writer)
18+
public function __construct(Locator $locator, WriterInterface $writer)
1919
{
2020
parent::__construct($locator);
2121
$this->writer = $writer;
@@ -28,9 +28,9 @@ public function perform()
2828
throw new EvaluatorException("Data root can't be removed");
2929
}
3030
parent::perform();
31-
if ($this->writer->isIndexSelected()) {
31+
if ($this->writer->isElement()) {
3232
$this->writer->removeElement();
33-
} elseif ($this->writer->isPropertySelected()) {
33+
} elseif ($this->writer->isProperty()) {
3434
$this->writer->removeProperty();
3535
} else {
3636
throw new LogicException("Failed to remove data at '{$this->locator->getText()}'");
@@ -41,18 +41,18 @@ public function perform()
4141

4242
protected function applyReference(Reference $reference)
4343
{
44-
if ($this->writer->isArraySelected()) {
44+
if ($this->writer->isArray()) {
4545
if ($reference->getType() != $reference::TYPE_INDEX) {
4646
throw new EvaluatorException(
4747
"Invalid index '{$reference->getKey()}' at '{$reference->getPath()}''"
4848
);
4949
}
5050
$index = (int) $reference->getKey();
51-
$this->writer->selectIndex($index);
51+
$this->writer->selectElement($index);
5252
if (!$this->writer->hasData()) {
5353
throw new EvaluatorException("No element #{$index} at '{$reference->getPath()}'");
5454
}
55-
} elseif ($this->writer->isObjectSelected()) {
55+
} elseif ($this->writer->isObject()) {
5656
$property = (string) $reference->getKey();
5757
$this->writer->selectProperty($property);
5858
if (!$this->writer->hasData()) {

‎src/Evaluator/OperationReplace.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
namespace Remorhaz\JSON\Pointer\Evaluator;
44

55
use Remorhaz\JSON\Data\ReaderInterface;
6-
use Remorhaz\JSON\Data\SelectableWriterInterface;
6+
use Remorhaz\JSON\Data\WriterInterface;
77
use Remorhaz\JSON\Pointer\Locator\Locator;
88
use Remorhaz\JSON\Pointer\Locator\Reference;
99

@@ -18,7 +18,7 @@ class OperationReplace extends Operation
1818
protected $valueReader;
1919

2020

21-
public function __construct(Locator $locator, SelectableWriterInterface $writer, ReaderInterface $valueReader)
21+
public function __construct(Locator $locator, WriterInterface $writer, ReaderInterface $valueReader)
2222
{
2323
parent::__construct($locator);
2424
$this->writer = $writer;
@@ -36,16 +36,16 @@ public function perform()
3636

3737
protected function applyReference(Reference $reference)
3838
{
39-
if ($this->writer->isArraySelected()) {
39+
if ($this->writer->isArray()) {
4040
if ($reference->getType() != $reference::TYPE_INDEX) {
4141
throw new EvaluatorException("Invalid index '{$reference->getKey()}' at '{$reference->getPath()}'");
4242
}
4343
$index = (int) $reference->getKey();
44-
$this->writer->selectIndex($index);
44+
$this->writer->selectElement($index);
4545
if (!$this->writer->hasData()) {
4646
throw new EvaluatorException("No element #{$index} at '{$reference->getPath()}'");
4747
}
48-
} elseif ($this->writer->isObjectSelected()) {
48+
} elseif ($this->writer->isObject()) {
4949
$property = (string) $reference->getKey();
5050
$this->writer->selectProperty($property);
5151
if (!$this->writer->hasData()) {

‎src/Evaluator/OperationTest.php‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@
22

33
namespace Remorhaz\JSON\Pointer\Evaluator;
44

5-
use Remorhaz\JSON\Data\RawSelectableReader;
6-
use Remorhaz\JSON\Data\SelectableReaderInterface;
5+
use Remorhaz\JSON\Data\Reference\Reader;
6+
use Remorhaz\JSON\Data\SelectorInterface;
77
use Remorhaz\JSON\Pointer\Locator\Locator;
88
use Remorhaz\JSON\Pointer\Locator\Reference;
99

1010
class OperationTest extends Operation
1111
{
1212

13-
protected $reader;
13+
protected $selector;
1414

1515

16-
public function __construct(Locator $locator, SelectableReaderInterface $reader)
16+
public function __construct(Locator $locator, SelectorInterface $selector)
1717
{
1818
parent::__construct($locator);
19-
$this->reader = $reader;
19+
$this->selector = $selector;
2020
}
2121

2222

@@ -32,22 +32,22 @@ public function perform()
3232

3333
protected function applyReference(Reference $reference)
3434
{
35-
if ($this->reader->isArraySelected()) {
35+
if ($this->selector->isArray()) {
3636
if ($reference->getType() != $reference::TYPE_INDEX) {
3737
return $this->setResultFromBool(false);
3838
}
3939
$index = (int) $reference->getKey();
4040
$hasData = $this
41-
->reader
42-
->selectIndex($index)
41+
->selector
42+
->selectElement($index)
4343
->hasData();
4444
if (!$hasData) {
4545
return $this->setResultFromBool(false);
4646
}
47-
} elseif ($this->reader->isObjectSelected()) {
47+
} elseif ($this->selector->isObject()) {
4848
$property = (string) $reference->getKey();
4949
$hasData = $this
50-
->reader
50+
->selector
5151
->selectProperty($property)
5252
->hasData();
5353
if (!$hasData) {
@@ -58,11 +58,11 @@ protected function applyReference(Reference $reference)
5858
}
5959
return $this;
6060
}
61-
62-
61+
62+
6363
private function setResultFromBool($resultData)
6464
{
65-
$result = new RawSelectableReader($resultData);
65+
$result = new Reader($resultData);
6666
return $this->setResult($result);
6767
}
6868
}

0 commit comments

Comments
 (0)