From 9a7f3cbf8a179924a1a321a93a76fb7ee38760b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Thu, 9 Jul 2020 10:44:12 +0200 Subject: [PATCH] Make php-cs-fixer happy --- Core/Frameworks/Baikal/Core/Tools.php | 1 + Core/Frameworks/Flake/Controller/Cli.php | 2 -- Core/Frameworks/Flake/Core/Collection.php | 2 ++ Core/Frameworks/Flake/Util/Router.php | 1 + Core/Frameworks/Flake/Util/Router/QuestionMarkRewrite.php | 1 + 5 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Core/Frameworks/Baikal/Core/Tools.php b/Core/Frameworks/Baikal/Core/Tools.php index 334d587..6879258 100644 --- a/Core/Frameworks/Baikal/Core/Tools.php +++ b/Core/Frameworks/Baikal/Core/Tools.php @@ -121,6 +121,7 @@ class Tools { echo $prompt; @flush(); @ob_flush(); + return @trim(fgets(STDIN)); } diff --git a/Core/Frameworks/Flake/Controller/Cli.php b/Core/Frameworks/Flake/Controller/Cli.php index e77ef67..9fd8032 100644 --- a/Core/Frameworks/Flake/Controller/Cli.php +++ b/Core/Frameworks/Flake/Controller/Cli.php @@ -48,8 +48,6 @@ class Cli extends \Flake\Core\Render\Container { } } - /**************************************************************************/ - public $sLog = ""; function sys_init() { diff --git a/Core/Frameworks/Flake/Core/Collection.php b/Core/Frameworks/Flake/Core/Collection.php index f9e548c..d662264 100644 --- a/Core/Frameworks/Flake/Core/Collection.php +++ b/Core/Frameworks/Flake/Core/Collection.php @@ -115,6 +115,7 @@ class Collection extends \Flake\Core\FLObject implements \Iterator { } $var = null; # two lines instead of one + return $var; # as PHP needs a variable to return by ref } @@ -148,6 +149,7 @@ class Collection extends \Flake\Core\FLObject implements \Iterator { # This abstraction is useful because of CollectionTyped protected function newCollectionLikeThisOne() { $oCollection = new \Flake\Core\Collection(); # two lines instead of one + return $oCollection; # as PHP needs a variable to return by ref } diff --git a/Core/Frameworks/Flake/Util/Router.php b/Core/Frameworks/Flake/Util/Router.php index 5607994..74b405f 100644 --- a/Core/Frameworks/Flake/Util/Router.php +++ b/Core/Frameworks/Flake/Util/Router.php @@ -112,6 +112,7 @@ abstract class Router extends \Flake\Core\FLObject { $sCurrentRoute = $GLOBALS["ROUTER"]::getCurrentRoute(); array_unshift($aParams, $sCurrentRoute); # Injecting route as first param + return call_user_func_array($GLOBALS["ROUTER"] . "::buildRoute", $aParams); } diff --git a/Core/Frameworks/Flake/Util/Router/QuestionMarkRewrite.php b/Core/Frameworks/Flake/Util/Router/QuestionMarkRewrite.php index 9f51c95..f8b673b 100644 --- a/Core/Frameworks/Flake/Util/Router/QuestionMarkRewrite.php +++ b/Core/Frameworks/Flake/Util/Router/QuestionMarkRewrite.php @@ -51,6 +51,7 @@ class QuestionMarkRewrite extends \Flake\Util\Router { } $aBestMatches = array_pop($aMatches); // obtains the deepest matching route (higher number of slashes) + return array_shift($aBestMatches); // first route amongst best matches }