Use Json::json_encode instead of \GuzzleHttp\json_encode

This commit is contained in:
Bob den Otter
2019-08-16 15:55:52 +02:00
parent 7069581e00
commit 1403750785
4 changed files with 8 additions and 4 deletions
+2 -1
View File
@@ -4,6 +4,7 @@ declare(strict_types=1);
namespace Bolt\Repository;
use Bolt\Common\Json;
use Bolt\Configuration\Content\ContentType;
use Bolt\Entity\Content;
use Bolt\Enum\Statuses;
@@ -157,7 +158,7 @@ class ContentRepository extends ServiceEntityRepository
'field.id = slug.id'
)
->andWhere('slug.value = :slug')
->setParameter('slug', \GuzzleHttp\json_encode([$slug]))
->setParameter('slug', Json::json_encode([$slug]))
->getQuery()
->getOneOrNullResult();
}
+2 -1
View File
@@ -4,6 +4,7 @@ declare(strict_types=1);
namespace Bolt\Repository;
use Bolt\Common\Json;
use Bolt\Entity\Field;
use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
use Doctrine\ORM\QueryBuilder;
@@ -31,7 +32,7 @@ class FieldRepository extends ServiceEntityRepository
{
return $this->getQueryBuilder()
->andWhere('field.value = :slug')
->setParameter('slug', \GuzzleHttp\json_encode([$slug]))
->setParameter('slug', Json::json_encode([$slug]))
->getQuery()
->getOneOrNullResult();
}
+2 -1
View File
@@ -4,6 +4,7 @@ declare(strict_types=1);
namespace Bolt\Storage\Query;
use Bolt\Common\Json;
use Doctrine\ORM\Query\Expr\Base;
use Doctrine\ORM\Query\ParameterTypeInferer;
use Doctrine\ORM\QueryBuilder;
@@ -325,7 +326,7 @@ class SelectQuery implements ContentQueryInterface
)
->setParameter($keyParam, $key);
foreach ($filter->getParameters() as $key => $value) {
$this->qb->setParameter($key, \GuzzleHttp\json_encode([$value]));
$this->qb->setParameter($key, Json::json_encode([$value]));
}
}
}
+2 -1
View File
@@ -4,6 +4,7 @@ declare(strict_types=1);
namespace Bolt\Twig;
use Bolt\Common\Json;
use Bolt\Entity\Content;
use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
use Twig\Extension\AbstractExtension;
@@ -34,7 +35,7 @@ class JsonExtension extends AbstractExtension
public function jsonRecords($records): string
{
return \GuzzleHttp\json_encode($this->normalizeRecords($records));
return Json::json_encode($this->normalizeRecords($records));
}
public function normalizeRecords($records): array