From ee4220e1ce501f9d6c02da8d11ffb0df8fd4ce5b Mon Sep 17 00:00:00 2001
From: Yuri Kuznetsov <yurikuzn@users.noreply.github.com>
Date: Sun, 7 Feb 2021 18:46:19 +0200
Subject: [PATCH] cs fixes

---
 application/Espo/Core/Application.php               | 12 ++++++------
 application/Espo/Core/ApplicationRunners/Api.php    |  2 +-
 .../Core/ApplicationRunners/ApplicationRunner.php   |  2 +-
 .../Espo/Core/ApplicationRunners/ClearCache.php     |  2 +-
 application/Espo/Core/ApplicationRunners/Client.php |  2 +-
 .../Espo/Core/ApplicationRunners/Command.php        |  2 +-
 application/Espo/Core/ApplicationRunners/Cron.php   |  3 ++-
 application/Espo/Core/ApplicationRunners/Daemon.php | 12 +++++++++++-
 .../Espo/Core/ApplicationRunners/EntryPoint.php     |  2 +-
 application/Espo/Core/ApplicationRunners/Job.php    |  2 +-
 .../Espo/Core/ApplicationRunners/PortalClient.php   |  2 +-
 .../Espo/Core/ApplicationRunners/Preload.php        |  2 +-
 .../Espo/Core/ApplicationRunners/Rebuild.php        |  2 +-
 .../Espo/Core/ApplicationRunners/WebSocket.php      |  2 +-
 application/Espo/Core/Container.php                 |  4 ++--
 application/Espo/Core/InjectableFactory.php         | 13 ++++++++-----
 application/Espo/Core/Portal/Application.php        | 11 +++--------
 .../Espo/Core/Portal/ApplicationRunners/Client.php  |  2 +-
 18 files changed, 44 insertions(+), 35 deletions(-)

diff --git a/application/Espo/Core/Application.php b/application/Espo/Core/Application.php
index 8c1d9d42f3..211dccb56e 100644
--- a/application/Espo/Core/Application.php
+++ b/application/Espo/Core/Application.php
@@ -60,7 +60,7 @@ class Application
         $this->initPreloads();
     }
 
-    protected function initContainer()
+    protected function initContainer() : void
     {
         $this->container = (new ContainerBuilder())->build();
     }
@@ -68,7 +68,7 @@ class Application
     /**
      * Run a specific application runner.
      */
-    public function run(string $className, ?StdClass $params = null)
+    public function run(string $className, ?StdClass $params = null) : void
     {
         if (!$className || !class_exists($className)) {
             $this->getLog()->error("Application runner '{$className}' does not exist.");
@@ -147,7 +147,7 @@ class Application
         return $this->container->get('config');
     }
 
-    protected function initAutoloads()
+    protected function initAutoloads() : void
     {
         $autoload = $this->getInjectableFactory()->create(Autoload::class);
 
@@ -157,7 +157,7 @@ class Application
     /**
      * Initialize services that has the 'preload' parameter.
      */
-    protected function initPreloads()
+    protected function initPreloads() : void
     {
         foreach ($this->getMetadata()->get(['app', 'containerServices']) ?? [] as $name => $defs) {
             if ($defs['preload'] ?? false) {
@@ -169,7 +169,7 @@ class Application
     /**
      * Set a base path of an index file related to the application directory. Used for a portal.
      */
-    public function setClientBasePath(string $basePath)
+    public function setClientBasePath(string $basePath) : void
     {
         $this->getClientManager()->setBasePath($basePath);
     }
@@ -177,7 +177,7 @@ class Application
     /**
      * Setup the system user. The system user is used when no user is logged in.
      */
-    public function setupSystemUser()
+    public function setupSystemUser() : void
     {
         $this->getApplicationUser()->setupSystemUser();
     }
diff --git a/application/Espo/Core/ApplicationRunners/Api.php b/application/Espo/Core/ApplicationRunners/Api.php
index e8a058193a..c96c49eac7 100644
--- a/application/Espo/Core/ApplicationRunners/Api.php
+++ b/application/Espo/Core/ApplicationRunners/Api.php
@@ -80,7 +80,7 @@ class Api implements ApplicationRunner
         $this->log = $log;
     }
 
-    public function run()
+    public function run() : void
     {
         $slim = SlimAppFactory::create();
 
diff --git a/application/Espo/Core/ApplicationRunners/ApplicationRunner.php b/application/Espo/Core/ApplicationRunners/ApplicationRunner.php
index e8671b7dae..d8442054e1 100644
--- a/application/Espo/Core/ApplicationRunners/ApplicationRunner.php
+++ b/application/Espo/Core/ApplicationRunners/ApplicationRunner.php
@@ -34,5 +34,5 @@ namespace Espo\Core\ApplicationRunners;
  */
 interface ApplicationRunner
 {
-    public function run();
+    public function run() : void;
 }
diff --git a/application/Espo/Core/ApplicationRunners/ClearCache.php b/application/Espo/Core/ApplicationRunners/ClearCache.php
index 1a3a951969..eeb4c36e9b 100644
--- a/application/Espo/Core/ApplicationRunners/ClearCache.php
+++ b/application/Espo/Core/ApplicationRunners/ClearCache.php
@@ -47,7 +47,7 @@ class ClearCache implements ApplicationRunner
         $this->dataManager = $dataManager;
     }
 
-    public function run()
+    public function run() : void
     {
         $this->dataManager->clearCache();
     }
diff --git a/application/Espo/Core/ApplicationRunners/Client.php b/application/Espo/Core/ApplicationRunners/Client.php
index 9c61bfdfb4..8511b5f468 100644
--- a/application/Espo/Core/ApplicationRunners/Client.php
+++ b/application/Espo/Core/ApplicationRunners/Client.php
@@ -45,7 +45,7 @@ class Client implements ApplicationRunner
         $this->clientManager = $clientManager;
     }
 
-    public function run()
+    public function run() : void
     {
         $this->clientManager->display();
     }
diff --git a/application/Espo/Core/ApplicationRunners/Command.php b/application/Espo/Core/ApplicationRunners/Command.php
index 662073f692..943184c646 100644
--- a/application/Espo/Core/ApplicationRunners/Command.php
+++ b/application/Espo/Core/ApplicationRunners/Command.php
@@ -49,7 +49,7 @@ class Command implements ApplicationRunner
         $this->commandManager = $commandManager;
     }
 
-    public function run()
+    public function run() : void
     {
         ob_start();
 
diff --git a/application/Espo/Core/ApplicationRunners/Cron.php b/application/Espo/Core/ApplicationRunners/Cron.php
index 608d8999e7..e9c025307c 100644
--- a/application/Espo/Core/ApplicationRunners/Cron.php
+++ b/application/Espo/Core/ApplicationRunners/Cron.php
@@ -51,10 +51,11 @@ class Cron implements ApplicationRunner
         $this->config = $config;
     }
 
-    public function run()
+    public function run() : void
     {
         if ($this->config->get('cronDisabled')) {
             $GLOBALS['log']->warning("Cron is not run because it's disabled with 'cronDisabled' param.");
+
             return;
         }
 
diff --git a/application/Espo/Core/ApplicationRunners/Daemon.php b/application/Espo/Core/ApplicationRunners/Daemon.php
index f97d42a3ed..8d2b1e9f9c 100644
--- a/application/Espo/Core/ApplicationRunners/Daemon.php
+++ b/application/Espo/Core/ApplicationRunners/Daemon.php
@@ -47,7 +47,7 @@ class Daemon implements ApplicationRunner
 
     protected $config;
 
-    public function __construct(Config $config)
+    public function __construct(Config $config) : void
     {
         $this->config = $config;
     }
@@ -59,12 +59,14 @@ class Daemon implements ApplicationRunner
         $timeout = $this->config->get('daemonProcessTimeout');
 
         $phpExecutablePath = $this->config->get('phpExecutablePath');
+
         if (!$phpExecutablePath) {
             $phpExecutablePath = (new PhpExecutableFinder)->find();
         }
 
         if (!$maxProcessNumber || !$interval) {
             $GLOBALS['log']->error("Daemon config params are not set.");
+
             return;
         }
 
@@ -73,6 +75,7 @@ class Daemon implements ApplicationRunner
         while (true) {
             $toSkip = false;
             $runningCount = 0;
+
             foreach ($processList as $i => $process) {
                 if ($process->isRunning()) {
                     $runningCount++;
@@ -80,16 +83,23 @@ class Daemon implements ApplicationRunner
                     unset($processList[$i]);
                 }
             }
+
             $processList = array_values($processList);
+
             if ($runningCount >= $maxProcessNumber) {
                 $toSkip = true;
             }
+
             if (!$toSkip) {
                 $process = new Process([$phpExecutablePath, 'cron.php']);
+
                 $process->setTimeout($timeout);
+
                 $process->run();
+
                 $processList[] = $process;
             }
+
             sleep($interval);
         }
     }
diff --git a/application/Espo/Core/ApplicationRunners/EntryPoint.php b/application/Espo/Core/ApplicationRunners/EntryPoint.php
index 3a8d21c8a5..4d0b74a2b5 100644
--- a/application/Espo/Core/ApplicationRunners/EntryPoint.php
+++ b/application/Espo/Core/ApplicationRunners/EntryPoint.php
@@ -91,7 +91,7 @@ class EntryPoint implements ApplicationRunner
         $this->params = $params ?? (object) [];
     }
 
-    public function run()
+    public function run() : void
     {
         $requestWrapped = new RequestWrapper(
             ServerRequestCreatorFactory::create()->createServerRequestFromGlobals(),
diff --git a/application/Espo/Core/ApplicationRunners/Job.php b/application/Espo/Core/ApplicationRunners/Job.php
index 8b9321c604..c43630a8b4 100644
--- a/application/Espo/Core/ApplicationRunners/Job.php
+++ b/application/Espo/Core/ApplicationRunners/Job.php
@@ -54,7 +54,7 @@ class Job implements ApplicationRunner
         $this->params = $params;
     }
 
-    public function run()
+    public function run() : void
     {
         $this->cronManager->runJobById($this->params->id);
     }
diff --git a/application/Espo/Core/ApplicationRunners/PortalClient.php b/application/Espo/Core/ApplicationRunners/PortalClient.php
index 1d0549badf..bfb20d30fb 100644
--- a/application/Espo/Core/ApplicationRunners/PortalClient.php
+++ b/application/Espo/Core/ApplicationRunners/PortalClient.php
@@ -69,7 +69,7 @@ class PortalClient implements ApplicationRunner
         $this->params = $params ?? (object) [];
     }
 
-    public function run()
+    public function run() : void
     {
         $id = $this->params->id ??
             Url::detectPortalId() ??
diff --git a/application/Espo/Core/ApplicationRunners/Preload.php b/application/Espo/Core/ApplicationRunners/Preload.php
index e8e3a1a8cb..8c9ff7e45a 100644
--- a/application/Espo/Core/ApplicationRunners/Preload.php
+++ b/application/Espo/Core/ApplicationRunners/Preload.php
@@ -44,7 +44,7 @@ class Preload implements ApplicationRunner
 {
     use Cli;
 
-    public function run()
+    public function run() : void
     {
         $preload = new PreloadUtil();
 
diff --git a/application/Espo/Core/ApplicationRunners/Rebuild.php b/application/Espo/Core/ApplicationRunners/Rebuild.php
index 334d56d359..b878adbd47 100644
--- a/application/Espo/Core/ApplicationRunners/Rebuild.php
+++ b/application/Espo/Core/ApplicationRunners/Rebuild.php
@@ -47,7 +47,7 @@ class Rebuild implements ApplicationRunner
         $this->dataManager = $dataManager;
     }
 
-    public function run()
+    public function run() : void
     {
         $this->dataManager->rebuild();
     }
diff --git a/application/Espo/Core/ApplicationRunners/WebSocket.php b/application/Espo/Core/ApplicationRunners/WebSocket.php
index 63b28f2f0a..33856cfcbe 100644
--- a/application/Espo/Core/ApplicationRunners/WebSocket.php
+++ b/application/Espo/Core/ApplicationRunners/WebSocket.php
@@ -85,7 +85,7 @@ class WebSocket implements ApplicationRunner
         }
     }
 
-    public function run()
+    public function run() : void
     {
         $loop = EventLoopFactory::create();
 
diff --git a/application/Espo/Core/Container.php b/application/Espo/Core/Container.php
index af079c670f..e41d06cff1 100644
--- a/application/Espo/Core/Container.php
+++ b/application/Espo/Core/Container.php
@@ -199,7 +199,7 @@ class Container
     /**
      * Set a service object. Must be configured as settable.
      */
-    public function set(string $name, object $object)
+    public function set(string $name, object $object) : void
     {
         if (!$this->configuration->isSettable($name)) {
             throw new Error("Service '{$name}' is not settable.");
@@ -233,7 +233,7 @@ class Container
         return $this->loaderClassNames[$name] ?? $this->configuration->getLoaderClassName($name);
     }
 
-    private function load(string $name)
+    private function load(string $name) : void
     {
         $loadMethodName = 'load' . ucfirst($name);
 
diff --git a/application/Espo/Core/InjectableFactory.php b/application/Espo/Core/InjectableFactory.php
index d426c8d51f..584c4831cb 100644
--- a/application/Espo/Core/InjectableFactory.php
+++ b/application/Espo/Core/InjectableFactory.php
@@ -33,7 +33,6 @@ use Espo\Core\{
     Exceptions\Error,
     Interfaces\Injectable,
     Binding\BindingContainer,
-    Binding\BindingLoader,
     Binding\Binding,
 };
 
@@ -253,8 +252,10 @@ class InjectableFactory
         throw new Error("InjectableFactory: Bad binding.");
     }
 
-    protected function areDependencyClassesMatching(ReflectionClass $paramHintClass, ReflectionClass $returnHintClass) : bool
-    {
+    protected function areDependencyClassesMatching(
+        ReflectionClass $paramHintClass, ReflectionClass $returnHintClass
+    ) : bool {
+
         if ($paramHintClass->getName() === $returnHintClass->getName()) {
             return true;
         }
@@ -292,8 +293,10 @@ class InjectableFactory
         }
     }
 
-    protected function classHasDependencySetter(ReflectionClass $class, string $name, bool $skipInstanceCheck = false) : bool
-    {
+    protected function classHasDependencySetter(
+        ReflectionClass $class, string $name, bool $skipInstanceCheck = false
+    ) : bool {
+
         $methodName = 'set' . ucfirst($name);
 
         if (!$class->hasMethod($methodName) || !$class->getMethod($methodName)->isPublic()) {
diff --git a/application/Espo/Core/Portal/Application.php b/application/Espo/Core/Portal/Application.php
index aa7ec2a356..d250f3a75e 100644
--- a/application/Espo/Core/Portal/Application.php
+++ b/application/Espo/Core/Portal/Application.php
@@ -57,7 +57,7 @@ class Application extends BaseApplication
         $this->initPreloads();
     }
 
-    protected function initContainer()
+    protected function initContainer() : void
     {
         $this->container = (new ContainerBuilder())
             ->withConfigClassName(Config::class)
@@ -66,7 +66,7 @@ class Application extends BaseApplication
             ->build();
     }
 
-    protected function initPortal(?string $portalId)
+    protected function initPortal(?string $portalId) : void
     {
         if (!$portalId) {
             throw new Error("Portal ID was not passed to Portal\Application.");
@@ -95,12 +95,7 @@ class Application extends BaseApplication
         $this->container->setPortal($portal);
     }
 
-    protected function getPortal()
-    {
-        return $this->portal;
-    }
-
-    protected function initPreloads()
+    protected function initPreloads() : void
     {
         parent::initPreloads();
 
diff --git a/application/Espo/Core/Portal/ApplicationRunners/Client.php b/application/Espo/Core/Portal/ApplicationRunners/Client.php
index e975be6ad8..092a835bca 100644
--- a/application/Espo/Core/Portal/ApplicationRunners/Client.php
+++ b/application/Espo/Core/Portal/ApplicationRunners/Client.php
@@ -49,7 +49,7 @@ class Client implements ApplicationRunner
         $this->applicationState = $applicationState;
     }
 
-    public function run()
+    public function run() : void
     {
         $portalId = $this->applicationState->getPortal()->id;