From 37fd79e816c1a22cf37595b4338d051d065db8a6 Mon Sep 17 00:00:00 2001
From: Awilum <sergey.romanenko@flextype.org>
Date: Thu, 26 May 2022 23:19:14 +0300
Subject: [PATCH] feat(core): add expression language service

---
 composer.json                     |  4 ++--
 src/flextype/flextype.php         |  4 ++++
 src/flextype/helpers/services.php | 10 ++++++++++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index d0e76575..ef0cb6a6 100755
--- a/composer.json
+++ b/composer.json
@@ -60,10 +60,10 @@
         "filp/whoops": "^2.14.5",
         "symfony/console": "^5.4.8",
         "symfony/var-exporter": "^5.4.8",
+        "symfony/expression-language": "^5.4.8",
         "thermage/thermage": "^0.19.0",
         "colinodell/json5": "^2.2.2",
-        "netcarver/textile": "^3.7",
-        "chriskonnertz/string-calc": "^1.0"
+        "netcarver/textile": "^3.7"
     },
     "suggest": {
         "ext-zend-opcache": "Recommended for better performance",
diff --git a/src/flextype/flextype.php b/src/flextype/flextype.php
index 306533ba..920d3a66 100644
--- a/src/flextype/flextype.php
+++ b/src/flextype/flextype.php
@@ -47,6 +47,7 @@ use Slim\Psr7\Factory\StreamFactory;
 use Slim\Psr7\Response;
 use Slim\Psr7\Stream;
 use Symfony\Component\Yaml\Yaml as SymfonyYaml;
+use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
 use Flextype\Middlewares\WhoopsMiddleware;
 use Flextype\Console\FlextypeConsole;
 
@@ -203,6 +204,9 @@ if (registry()->get('flextype.settings.router.cache')) {
     app()->getRouteCollector()->setCacheFile(PATH['tmp'] . '/routes/routes.php');
 }
 
+// Add Expression Service
+container()->set('expression', new ExpressionLanguage());
+
 // Add Session Service
 container()->set('session', new Session());
 
diff --git a/src/flextype/helpers/services.php b/src/flextype/helpers/services.php
index f31c8a17..f23a50be 100644
--- a/src/flextype/helpers/services.php
+++ b/src/flextype/helpers/services.php
@@ -34,6 +34,16 @@ if (! function_exists('container')) {
     }
 }
 
+if (! function_exists('expression')) {
+    /**
+     * Get Flextype Expression Service.
+     */
+    function expression()
+    {
+        return flextype()->container()->get('expression');
+    }
+}
+
 if (! function_exists('console')) {
     /**
      * Get Flextype Console Service.