Skip to content

Commit c77cf21

Browse files
committed
Version 1.13.3
1 parent 58b58d1 commit c77cf21

4 files changed

Lines changed: 24 additions & 23 deletions

File tree

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "processmaker/pmql",
3-
"version": "1.13.2",
3+
"version": "1.13.3",
44
"description": "An Eloquent trait that provides the pmql scope to allow converting simple sql criteria clauses to Eloquent",
55
"type": "project",
66
"authors": [

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@processmaker/pmql",
3-
"version": "1.13.2",
3+
"version": "1.13.3",
44
"description": "",
55
"main": "tools/build.js",
66
"dependencies": {

src/Parser.php

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/*
34
* Generated by PEG.js 0.10.x with phpegjs plugin
45
*
@@ -245,10 +246,10 @@ private function peg_buildException($message, $expected, $pos)
245246
}
246247

247248
$expectedDesc = count($expected) > 1
248-
? implode(', ', array_slice($expectedDescs, 0, -1))
249-
. ' or '
250-
. $expectedDescs[count($expected) - 1]
251-
: $expectedDescs[0];
249+
? implode(', ', array_slice($expectedDescs, 0, -1))
250+
. ' or '
251+
. $expectedDescs[count($expected) - 1]
252+
: $expectedDescs[0];
252253

253254
$foundDesc = $found ? json_encode($found) : 'end of input';
254255

@@ -479,7 +480,7 @@ private function peg_buildException($message, $expected, $pos)
479480

480481
private function peg_f0($le, $ler)
481482
{
482-
$collection = new \ProcessMaker\Query\ExpressionCollection();
483+
$collection = new ExpressionCollection();
483484
// Add to our collection
484485
if ($le) {
485486
$collection[] = $le;
@@ -500,7 +501,7 @@ private function peg_f1($fe)
500501
private function peg_f2($field, $comparison)
501502
{
502503
// Return a new expression instance
503-
return new \ProcessMaker\Query\Expression($field, $comparison[0]['value'], $comparison[2]);
504+
return new Expression($field, $comparison[0]['value'], $comparison[2]);
504505
}
505506

506507
private function peg_f3($go, $le)
@@ -512,12 +513,12 @@ private function peg_f3($go, $le)
512513

513514
private function peg_f4($field, $type)
514515
{
515-
return new \ProcessMaker\Query\Cast($field, $type);
516+
return new Cast($field, $type);
516517
}
517518

518519
private function peg_f5($name, $param)
519520
{
520-
return new \ProcessMaker\Query\FunctionCall($name, $param);
521+
return new FunctionCall($name, $param);
521522
}
522523

523524
private function peg_f6($v)
@@ -552,12 +553,12 @@ private function peg_f10($x)
552553
{
553554
$value = floatval($x[2] . $x[3]);
554555

555-
return new \ProcessMaker\Query\IntervalExpression($value, $x[5]);
556+
return new IntervalExpression($value, $x[5]);
556557
}
557558

558559
private function peg_f11()
559560
{
560-
return new \ProcessMaker\Query\IntervalExpression();
561+
return new IntervalExpression();
561562
}
562563

563564
private function peg_f12($x)
@@ -567,33 +568,33 @@ private function peg_f12($x)
567568

568569
private function peg_f13($x)
569570
{
570-
return new \ProcessMaker\Query\LiteralValue($x);
571+
return new LiteralValue($x);
571572
}
572573

573574
private function peg_f14($x)
574575
{
575-
return new \ProcessMaker\Query\ArrayValue($x);
576+
return new ArrayValue($x);
576577
}
577578

578579
private function peg_f15($dn)
579580
{
580-
return new \ProcessMaker\Query\JsonField(\ProcessMaker\Query\Processor::flatstr($dn, true));
581+
return new JsonField(Processor::flatstr($dn, true));
581582
}
582583

583584
private function peg_f16($el)
584585
{
585-
return \ProcessMaker\Query\Processor::flatstr($el, true);
586+
return Processor::flatstr($el, true);
586587
}
587588

588589
private function peg_f17($ae)
589590
{
590-
return \ProcessMaker\Query\Processor::flatstr($ae);
591+
return Processor::flatstr($ae);
591592
}
592593

593594
private function peg_f18($str)
594595
{
595-
$flatted = \ProcessMaker\Query\Processor::flatstr(
596-
\ProcessMaker\Query\Processor::flatten($str, true), true
596+
$flatted = Processor::flatstr(
597+
Processor::flatten($str, true), true
597598
);
598599
if (strpos($flatted, '.')) {
599600
return floatval($flatted);
@@ -604,7 +605,7 @@ private function peg_f18($str)
604605

605606
private function peg_f19($str)
606607
{
607-
return \ProcessMaker\Query\Processor::flatstr($str[1]);
608+
return Processor::flatstr($str[1]);
608609
}
609610

610611
private function peg_f20($x)
@@ -629,7 +630,7 @@ private function peg_f23($str)
629630

630631
private function peg_f24($cn)
631632
{
632-
return new \ProcessMaker\Query\ColumnField($cn);
633+
return new ColumnField($cn);
633634
}
634635

635636
private function peg_parsestart()

0 commit comments

Comments
 (0)