From 92b7dd3335a6572debeacfb5faa82c63a5e67888 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Fri, 8 Jun 2018 20:03:25 +0200
Subject: Some minor fixes

---
 .../src/Authorize/AccessConditionExpression.php    | 276 ++++++++++-----------
 1 file changed, 138 insertions(+), 138 deletions(-)

(limited to 'main/app/sprinkles/account/src/Authorize/AccessConditionExpression.php')

diff --git a/main/app/sprinkles/account/src/Authorize/AccessConditionExpression.php b/main/app/sprinkles/account/src/Authorize/AccessConditionExpression.php
index e36f4f4..8a8225e 100644
--- a/main/app/sprinkles/account/src/Authorize/AccessConditionExpression.php
+++ b/main/app/sprinkles/account/src/Authorize/AccessConditionExpression.php
@@ -1,138 +1,138 @@
-<?php
-/**
- * UserFrosting (http://www.userfrosting.com)
- *
- * @link      https://github.com/userfrosting/UserFrosting
- * @license   https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License)
- */
-
-namespace UserFrosting\Sprinkle\Account\Authorize;
-
-use Monolog\Logger;
-use PhpParser\Lexer\Emulative as EmulativeLexer;
-use PhpParser\Node;
-use PhpParser\NodeTraverser;
-use PhpParser\Parser as Parser;
-use PhpParser\PrettyPrinter\Standard as StandardPrettyPrinter;
-use PhpParser\Error as PhpParserException;
-use Psr\Http\Message\ServerRequestInterface as Request;
-use UserFrosting\Sprinkle\Account\Database\Models\User;
-
-/**
- * AccessConditionExpression class
- *
- * This class models the evaluation of an authorization condition expression, as associated with permissions.
- * A condition is built as a boolean expression composed of AccessCondition method calls.
- *
- * @author Alex Weissman (https://alexanderweissman.com)
- */
-class AccessConditionExpression
-{
-    /**
-     * @var User A user object, which for convenience can be referenced as 'self' in access conditions.
-     */
-    protected $user;
-
-    /**
-     * @var ParserNodeFunctionEvaluator The node visitor, which evaluates access condition callbacks used in a permission condition.
-     */
-    protected $nodeVisitor;
-
-    /**
-     * @var \PhpParser\Parser The PhpParser object to use (initialized in the ctor)
-     */
-    protected $parser;
-
-    /**
-     * @var NodeTraverser The NodeTraverser object to use (initialized in the ctor)
-     */
-    protected $traverser;
-
-    /**
-     * @var StandardPrettyPrinter The PrettyPrinter object to use (initialized in the ctor)
-     */
-    protected $prettyPrinter;
-
-    /**
-     * @var Logger
-     */
-    protected $logger;
-
-    /**
-     * @var bool Set to true if you want debugging information printed to the auth log.
-     */
-    protected $debug;
-
-    /**
-     * Create a new AccessConditionExpression object.
-     *
-     * @param User $user A user object, which for convenience can be referenced as 'self' in access conditions.
-     * @param Logger $logger A Monolog logger, used to dump debugging info for authorization evaluations.
-     * @param bool $debug Set to true if you want debugging information printed to the auth log.
-     */
-    public function __construct(ParserNodeFunctionEvaluator $nodeVisitor, User $user, Logger $logger, $debug = FALSE) {
-        $this->nodeVisitor = $nodeVisitor;
-        $this->user = $user;
-        $this->parser = new Parser(new EmulativeLexer);
-        $this->traverser = new NodeTraverser;
-        $this->traverser->addVisitor($nodeVisitor);
-        $this->prettyPrinter = new StandardPrettyPrinter;
-        $this->logger = $logger;
-        $this->debug = $debug;
-    }
-
-    /**
-     * Evaluates a condition expression, based on the given parameters.
-     *
-     * The special parameter `self` is an array of the current user's data.
-     * This get included automatically, and so does not need to be passed in.
-     * @param string $condition a boolean expression composed of calls to AccessCondition functions.
-     * @param array[mixed] $params the parameters to be used when evaluating the expression.
-     * @return bool true if the condition is passed for the given parameters, otherwise returns false.
-     */
-    public function evaluateCondition($condition, $params) {
-        // Set the reserved `self` parameters.
-        // This replaces any values of `self` specified in the arguments, thus preventing them from being overridden in malicious user input.
-        // (For example, from an unfiltered request body).
-        $params['self'] = $this->user->export();
-
-        $this->nodeVisitor->setParams($params);
-
-        $code = "<?php $condition;";
-
-        if ($this->debug) {
-            $this->logger->debug("Evaluating access condition '$condition' with parameters:", $params);
-        }
-
-        // Traverse the parse tree, and execute any callbacks found using the supplied parameters.
-        // Replace the function node with the return value of the callback.
-        try {
-            // parse
-            $stmts = $this->parser->parse($code);
-
-            // traverse
-            $stmts = $this->traverser->traverse($stmts);
-
-            // Evaluate boolean statement.  It is safe to use eval() here, because our expression has been reduced entirely to a boolean expression.
-            $expr = $this->prettyPrinter->prettyPrintExpr($stmts[0]);
-            $expr_eval = "return " . $expr . ";\n";
-            $result = eval($expr_eval);
-
-            if ($this->debug) {
-                $this->logger->debug("Expression '$expr' evaluates to " . ($result == TRUE ? "true" : "false"));
-            }
-
-            return $result;
-        } catch (PhpParserException $e) {
-            if ($this->debug) {
-                $this->logger->debug("Error parsing access condition '$condition':" . $e->getMessage());
-            }
-            return FALSE;   // Access fails if the access condition can't be parsed.
-        } catch (AuthorizationException $e) {
-            if ($this->debug) {
-                $this->logger->debug("Error parsing access condition '$condition':" . $e->getMessage());
-            }
-            return FALSE;
-        }
-    }
-}
+<?php
+/**
+ * UserFrosting (http://www.userfrosting.com)
+ *
+ * @link      https://github.com/userfrosting/UserFrosting
+ * @license   https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License)
+ */
+
+namespace UserFrosting\Sprinkle\Account\Authorize;
+
+use Monolog\Logger;
+use PhpParser\Lexer\Emulative as EmulativeLexer;
+use PhpParser\Node;
+use PhpParser\NodeTraverser;
+use PhpParser\Parser as Parser;
+use PhpParser\PrettyPrinter\Standard as StandardPrettyPrinter;
+use PhpParser\Error as PhpParserException;
+use Psr\Http\Message\ServerRequestInterface as Request;
+use UserFrosting\Sprinkle\Account\Database\Models\User;
+
+/**
+ * AccessConditionExpression class
+ *
+ * This class models the evaluation of an authorization condition expression, as associated with permissions.
+ * A condition is built as a boolean expression composed of AccessCondition method calls.
+ *
+ * @author Alex Weissman (https://alexanderweissman.com)
+ */
+class AccessConditionExpression
+{
+    /**
+     * @var User A user object, which for convenience can be referenced as 'self' in access conditions.
+     */
+    protected $user;
+
+    /**
+     * @var ParserNodeFunctionEvaluator The node visitor, which evaluates access condition callbacks used in a permission condition.
+     */
+    protected $nodeVisitor;
+
+    /**
+     * @var \PhpParser\Parser The PhpParser object to use (initialized in the ctor)
+     */
+    protected $parser;
+
+    /**
+     * @var NodeTraverser The NodeTraverser object to use (initialized in the ctor)
+     */
+    protected $traverser;
+
+    /**
+     * @var StandardPrettyPrinter The PrettyPrinter object to use (initialized in the ctor)
+     */
+    protected $prettyPrinter;
+
+    /**
+     * @var Logger
+     */
+    protected $logger;
+
+    /**
+     * @var bool Set to true if you want debugging information printed to the auth log.
+     */
+    protected $debug;
+
+    /**
+     * Create a new AccessConditionExpression object.
+     *
+     * @param User $user A user object, which for convenience can be referenced as 'self' in access conditions.
+     * @param Logger $logger A Monolog logger, used to dump debugging info for authorization evaluations.
+     * @param bool $debug Set to true if you want debugging information printed to the auth log.
+     */
+    public function __construct(ParserNodeFunctionEvaluator $nodeVisitor, User $user, Logger $logger, $debug = FALSE) {
+        $this->nodeVisitor = $nodeVisitor;
+        $this->user = $user;
+        $this->parser = new Parser(new EmulativeLexer);
+        $this->traverser = new NodeTraverser;
+        $this->traverser->addVisitor($nodeVisitor);
+        $this->prettyPrinter = new StandardPrettyPrinter;
+        $this->logger = $logger;
+        $this->debug = $debug;
+    }
+
+    /**
+     * Evaluates a condition expression, based on the given parameters.
+     *
+     * The special parameter `self` is an array of the current user's data.
+     * This get included automatically, and so does not need to be passed in.
+     * @param string $condition a boolean expression composed of calls to AccessCondition functions.
+     * @param array[mixed] $params the parameters to be used when evaluating the expression.
+     * @return bool true if the condition is passed for the given parameters, otherwise returns false.
+     */
+    public function evaluateCondition($condition, $params) {
+        // Set the reserved `self` parameters.
+        // This replaces any values of `self` specified in the arguments, thus preventing them from being overridden in malicious user input.
+        // (For example, from an unfiltered request body).
+        $params['self'] = $this->user->export();
+
+        $this->nodeVisitor->setParams($params);
+
+        $code = "<?php $condition;";
+
+        if ($this->debug) {
+            $this->logger->debug("Evaluating access condition '$condition' with parameters:", $params);
+        }
+
+        // Traverse the parse tree, and execute any callbacks found using the supplied parameters.
+        // Replace the function node with the return value of the callback.
+        try {
+            // parse
+            $stmts = $this->parser->parse($code);
+
+            // traverse
+            $stmts = $this->traverser->traverse($stmts);
+
+            // Evaluate boolean statement.  It is safe to use eval() here, because our expression has been reduced entirely to a boolean expression.
+            $expr = $this->prettyPrinter->prettyPrintExpr($stmts[0]);
+            $expr_eval = "return " . $expr . ";\n";
+            $result = eval($expr_eval);
+
+            if ($this->debug) {
+                $this->logger->debug("Expression '$expr' evaluates to " . ($result == TRUE ? "true" : "false"));
+            }
+
+            return $result;
+        } catch (PhpParserException $e) {
+            if ($this->debug) {
+                $this->logger->debug("Error parsing access condition '$condition':" . $e->getMessage());
+            }
+            return FALSE;   // Access fails if the access condition can't be parsed.
+        } catch (AuthorizationException $e) {
+            if ($this->debug) {
+                $this->logger->debug("Error parsing access condition '$condition':" . $e->getMessage());
+            }
+            return FALSE;
+        }
+    }
+}
-- 
cgit v1.2.3