dimaxz / frameworkless

packages/core/src/Models/User/UserRepository.php

Indentation +5 added lines, -5 removed lines

@@ -36,11 +36,11 @@
 
     public function findMany(array $conditions = [], $limit = false)
     {
-		$Users = UserQuery::create()
-				->_if($limit)
-					->limit($limit)
-				->_endif()
-				->findByArray($conditions);
+        $Users = UserQuery::create()
+                ->_if($limit)
+                    ->limit($limit)
+                ->_endif()
+                ->findByArray($conditions);
         return $Users;    
     }
 

packages/core/src/Modules/UserList/UserList.php

Indentation +78 added lines, -78 removed lines

@@ -13,82 +13,82 @@
 class UserList extends Controllers\ModuleController

 {

 

-	/**

-	 * UserRepository 

-	 * @var \Core\Models\User\UserRepository 

-	 */

-	protected $userRepository;

-

-	/**

-	 * Request

-	 * @var Symfony\Component\HttpFoundation\Request 

-	 */

-	protected $request;

-

-	protected $limit = 5;

-

-	function __construct(\Core\Models\User\UserRepository $userRepository, Request $request)

-	{

-		$this->userRepository	 = $userRepository;

-		$this->request			 = $request;

-	}

-

-	public function process()

-	{

-

-		if ($this->request->query->get('fn') == 'add') {

-			$this->add();

-		}

-

-		$Users = $this->userRepository->findMany([],$this->limit);

-

-		$table	 = Table::create();

-		$table->addColNames([0, 1, 2]);

-		$table->addClass('table table-striped');

-		$table->thead()

-				->addRowName('head row')

-				->th('head row', 0, 'Id')

-				->th('head row', 1, 'Имя')

-				->th('head row', 2, 'Email');

-		$i		 = 0;

-		foreach ($Users as $User) {

-			$table->addRow($i)->tdMultiple([

-				$User->getId(),

-				$User->getName(),

-				$User->getEmail()]);

-			$i++;

-		}

-

-		return $this->render('default', [

-					'table' => $table->render()

-		]);

-	}

-

-	protected function add()

-	{

-

-		try {

-

-			$User = $this->userRepository->build();

-			$User->setEmail('tedt@mail.ru');

-

-			if (!$this->userRepository->save($User)) {

-				throw new Exception('User not save');

-			} else {

-				$this->logger->info("Пользователь успешно сохранен!");

-			}

-		} catch(\Frameworkless\Exceptions\ValidationException $ex) {

-

-			foreach ($ex->getFailures() as $failure) {

-				$this->logger->error("Property " . $failure->getPropertyPath() . ": " . $failure->getMessage() . "\n");

-			}

-

-			$this->logger->info("Произошла ошибка при сохранении пользователя");

-		} catch(\Exception $ex) {

-

-			$this->logger->error("system error:" . $ex->getMessage());

-

-			$this->logger->info("Произошла ошибка при сохранении пользователя");

-		}

-	}

+    /**

+     * UserRepository 

+     * @var \Core\Models\User\UserRepository 

+     */

+    protected $userRepository;

+

+    /**

+     * Request

+     * @var Symfony\Component\HttpFoundation\Request 

+     */

+    protected $request;

+

+    protected $limit = 5;

+

+    function __construct(\Core\Models\User\UserRepository $userRepository, Request $request)

+    {

+        $this->userRepository	 = $userRepository;

+        $this->request			 = $request;

+    }

+

+    public function process()

+    {

+

+        if ($this->request->query->get('fn') == 'add') {

+            $this->add();

+        }

+

+        $Users = $this->userRepository->findMany([],$this->limit);

+

+        $table	 = Table::create();

+        $table->addColNames([0, 1, 2]);

+        $table->addClass('table table-striped');

+        $table->thead()

+                ->addRowName('head row')

+                ->th('head row', 0, 'Id')

+                ->th('head row', 1, 'Имя')

+                ->th('head row', 2, 'Email');

+        $i		 = 0;

+        foreach ($Users as $User) {

+            $table->addRow($i)->tdMultiple([

+                $User->getId(),

+                $User->getName(),

+                $User->getEmail()]);

+            $i++;

+        }

+

+        return $this->render('default', [

+                    'table' => $table->render()

+        ]);

+    }

+

+    protected function add()

+    {

+

+        try {

+

+            $User = $this->userRepository->build();

+            $User->setEmail('tedt@mail.ru');

+

+            if (!$this->userRepository->save($User)) {

+                throw new Exception('User not save');

+            } else {

+                $this->logger->info("Пользователь успешно сохранен!");

+            }

+        } catch(\Frameworkless\Exceptions\ValidationException $ex) {

+

+            foreach ($ex->getFailures() as $failure) {

+                $this->logger->error("Property " . $failure->getPropertyPath() . ": " . $failure->getMessage() . "\n");

+            }

+

+            $this->logger->info("Произошла ошибка при сохранении пользователя");

+        } catch(\Exception $ex) {

+

+            $this->logger->error("system error:" . $ex->getMessage());

+

+            $this->logger->info("Произошла ошибка при сохранении пользователя");

+        }

+    }

 }

Spacing +7 added lines, -7 removed lines

@@ -29,8 +29,8 @@ 
 

 	function __construct(\Core\Models\User\UserRepository $userRepository, Request $request)

 	{

-		$this->userRepository	 = $userRepository;

-		$this->request			 = $request;

+		$this->userRepository = $userRepository;

+		$this->request = $request;

 	}

 

 	public function process()

@@ -40,9 +40,9 @@ 
 			$this->add();

 		}

 

-		$Users = $this->userRepository->findMany([],$this->limit);

+		$Users = $this->userRepository->findMany([], $this->limit);

 

-		$table	 = Table::create();

+		$table = Table::create();

 		$table->addColNames([0, 1, 2]);

 		$table->addClass('table table-striped');

 		$table->thead()

@@ -50,7 +50,7 @@ 
 				->th('head row', 0, 'Id')

 				->th('head row', 1, 'Имя')

 				->th('head row', 2, 'Email');

-		$i		 = 0;

+		$i = 0;

 		foreach ($Users as $User) {

 			$table->addRow($i)->tdMultiple([

 				$User->getId(),

@@ -77,14 +77,14 @@ 
 			} else {

 				$this->logger->info("Пользователь успешно сохранен!");

 			}

-		} catch(\Frameworkless\Exceptions\ValidationException $ex) {

+		} catch (\Frameworkless\Exceptions\ValidationException $ex) {

 

 			foreach ($ex->getFailures() as $failure) {

 				$this->logger->error("Property " . $failure->getPropertyPath() . ": " . $failure->getMessage() . "\n");

 			}

 

 			$this->logger->info("Произошла ошибка при сохранении пользователя");

-		} catch(\Exception $ex) {

+		} catch (\Exception $ex) {

 

 			$this->logger->error("system error:" . $ex->getMessage());

 

bootstrap/common.php

Indentation +48 added lines, -48 removed lines

@@ -3,53 +3,53 @@
 class App
 {
 
-	private $settings = array();
+    private $settings = array();
 	
-	private static $_instance = null;
-
-	private function __construct()
-	{
-		// приватный конструктор ограничивает реализацию getInstance ()
-	}
-
-	protected function __clone()
-	{
-		// ограничивает клонирование объекта
-	}
-
-	/**
-	 * Вызов модуля
-	 * @param type $name
-	 * @param array $params
-	 * @return string
-	 */
-	static function getModule($name, array $params = [])
-	{
-		$DI			 = self::getInstance()->load("DI");
-		$debugbar	 = $DI->get(DebugBar\StandardDebugBar::class);
-		$debugbar['messages']->debug(sprintf('App::getModule %s, with params %s' , $name, json_encode($params) ));
-		$debugbar['time']->startMeasure($name, 'Load module ' . $name);
-		$module		 = $DI->get($name);
-		$result		 = $module->setParams($params)->process();
-		$debugbar['time']->stopMeasure($name);
-		return $result;
-	}
-
-	static public function getInstance()
-	{
-		if (is_null(self::$_instance)) {
-			self::$_instance = new self();
-		}
-		return self::$_instance;
-	}
-
-	public function import($key,$value)
-	{
-		$this->settings[$key] = $value;
-	}
-
-	public function load($key)
-	{
-		return $this->settings[$key];
-	}
+    private static $_instance = null;
+
+    private function __construct()
+    {
+        // приватный конструктор ограничивает реализацию getInstance ()
+    }
+
+    protected function __clone()
+    {
+        // ограничивает клонирование объекта
+    }
+
+    /**
+     * Вызов модуля
+     * @param type $name
+     * @param array $params
+     * @return string
+     */
+    static function getModule($name, array $params = [])
+    {
+        $DI			 = self::getInstance()->load("DI");
+        $debugbar	 = $DI->get(DebugBar\StandardDebugBar::class);
+        $debugbar['messages']->debug(sprintf('App::getModule %s, with params %s' , $name, json_encode($params) ));
+        $debugbar['time']->startMeasure($name, 'Load module ' . $name);
+        $module		 = $DI->get($name);
+        $result		 = $module->setParams($params)->process();
+        $debugbar['time']->stopMeasure($name);
+        return $result;
+    }
+
+    static public function getInstance()
+    {
+        if (is_null(self::$_instance)) {
+            self::$_instance = new self();
+        }
+        return self::$_instance;
+    }
+
+    public function import($key,$value)
+    {
+        $this->settings[$key] = $value;
+    }
+
+    public function load($key)
+    {
+        return $this->settings[$key];
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -25,9 +25,9 @@ 
 	 */
 	static function getModule($name, array $params = [])
 	{
-		$DI			 = self::getInstance()->load("DI");
-		$debugbar	 = $DI->get(DebugBar\StandardDebugBar::class);
-		$debugbar['messages']->debug(sprintf('App::getModule %s, with params %s' , $name, json_encode($params) ));
+		$DI = self::getInstance()->load("DI");
+		$debugbar = $DI->get(DebugBar\StandardDebugBar::class);
+		$debugbar['messages']->debug(sprintf('App::getModule %s, with params %s', $name, json_encode($params)));
 		$debugbar['time']->startMeasure($name, 'Load module ' . $name);
 		$module		 = $DI->get($name);
 		$result		 = $module->setParams($params)->process();
@@ -43,7 +43,7 @@ 
 		return self::$_instance;
 	}
 
-	public function import($key,$value)
+	public function import($key, $value)
 	{
 		$this->settings[$key] = $value;
 	}

app/ModuleInterface.php

Indentation +2 added lines, -2 removed lines

@@ -8,7 +8,7 @@
  */

 interface ModuleInterface {

 	

-	public function process();

+    public function process();

 	

-	public function setParams(array $params = []);

+    public function setParams(array $params = []);

 }

app/Controllers/ModuleController.php

Indentation +22 added lines, -22 removed lines

@@ -9,35 +9,35 @@
  */

 abstract class ModuleController extends BaseController implements \Frameworkless\ModuleInterface{

 	

-	protected function render($view, array $data = array()) {

+    protected function render($view, array $data = array()) {

 

-		$ref = new \ReflectionClass($this);

+        $ref = new \ReflectionClass($this);

 		

-		$tpl = (new \SplFileInfo($ref->getFileName()))->getPath() . DIRECTORY_SEPARATOR .'tpl';

+        $tpl = (new \SplFileInfo($ref->getFileName()))->getPath() . DIRECTORY_SEPARATOR .'tpl';

 		

-		$twig = new \Twig_Environment(new \Twig_Loader_Filesystem($tpl));

+        $twig = new \Twig_Environment(new \Twig_Loader_Filesystem($tpl));

 

-		return $twig->render($view . '.twig',$data);

-	}

+        return $twig->render($view . '.twig',$data);

+    }

 	

-	abstract public function process();

+    abstract public function process();

 

-	/**

-	 * set module params

-	 * @param array $params

-	 * @return $this

-	 * @throws \Exception

-	 */

-	public function setParams(array $params = array())

-	{

+    /**

+     * set module params

+     * @param array $params

+     * @return $this

+     * @throws \Exception

+     */

+    public function setParams(array $params = array())

+    {

 		

-		foreach($params as $param => $value){

-			if((new \ReflectionClass($this))->hasProperty($param)===false)

-				throw new \Exception(sprintf("param '%s' not found in module '%s'",$param,self::class));

+        foreach($params as $param => $value){

+            if((new \ReflectionClass($this))->hasProperty($param)===false)

+                throw new \Exception(sprintf("param '%s' not found in module '%s'",$param,self::class));

 			

-			$this->{$param} = $value;

-		}

-		return $this;

-	}

+            $this->{$param} = $value;

+        }

+        return $this;

+    }

 

 }

Spacing +6 added lines, -6 removed lines

@@ -7,17 +7,17 @@ 
  *

  * @author d.lanec

  */

-abstract class ModuleController extends BaseController implements \Frameworkless\ModuleInterface{

+abstract class ModuleController extends BaseController implements \Frameworkless\ModuleInterface {

 	

 	protected function render($view, array $data = array()) {

 

 		$ref = new \ReflectionClass($this);

 		

-		$tpl = (new \SplFileInfo($ref->getFileName()))->getPath() . DIRECTORY_SEPARATOR .'tpl';

+		$tpl = (new \SplFileInfo($ref->getFileName()))->getPath() . DIRECTORY_SEPARATOR . 'tpl';

 		

 		$twig = new \Twig_Environment(new \Twig_Loader_Filesystem($tpl));

 

-		return $twig->render($view . '.twig',$data);

+		return $twig->render($view . '.twig', $data);

 	}

 	

 	abstract public function process();

@@ -31,9 +31,9 @@ 
 	public function setParams(array $params = array())

 	{

 		

-		foreach($params as $param => $value){

-			if((new \ReflectionClass($this))->hasProperty($param)===false)

-				throw new \Exception(sprintf("param '%s' not found in module '%s'",$param,self::class));

+		foreach ($params as $param => $value) {

+			if ((new \ReflectionClass($this))->hasProperty($param) === false)

+				throw new \Exception(sprintf("param '%s' not found in module '%s'", $param, self::class));

 			

 			$this->{$param} = $value;

 		}

Braces +3 added lines, -2 removed lines

@@ -32,8 +32,9 @@
 	{

 		

 		foreach($params as $param => $value){

-			if((new \ReflectionClass($this))->hasProperty($param)===false)

-				throw new \Exception(sprintf("param '%s' not found in module '%s'",$param,self::class));

+			if((new \ReflectionClass($this))->hasProperty($param)===false) {
+							throw new \Exception(sprintf("param '%s' not found in module '%s'",$param,self::class));
+			}
 			

 			$this->{$param} = $value;

 		}

app/Controllers/IndexController.php

Indentation +17 added lines, -17 removed lines

@@ -8,25 +8,25 @@
 class IndexController extends BaseController {
 
 
-	/**
-	 * Return index page (/)
-	 *
-	 * @param array $args
-	 * @return Response
-	 */
-	public function get($args) {
+    /**
+     * Return index page (/)
+     *
+     * @param array $args
+     * @return Response
+     */
+    public function get($args) {
 		
-		$result = \App::getModule(UserList::class,[
-					"limit" => 2
-				]);
+        $result = \App::getModule(UserList::class,[
+                    "limit" => 2
+                ]);
 		
-		$result .= \App::getModule(UserList::class,[
-					"limit" => 1
-				]);
+        $result .= \App::getModule(UserList::class,[
+                    "limit" => 1
+                ]);
 		
-		return $this->render('pages/index.html.twig', [
-				"content" => $result,
-		]);
-	}
+        return $this->render('pages/index.html.twig', [
+                "content" => $result,
+        ]);
+    }
 
 }

Spacing +2 added lines, -2 removed lines

@@ -16,11 +16,11 @@
 	 */
 	public function get($args) {
 		
-		$result = \App::getModule(UserList::class,[
+		$result = \App::getModule(UserList::class, [
 					"limit" => 2
 				]);
 		
-		$result .= \App::getModule(UserList::class,[
+		$result .= \App::getModule(UserList::class, [
 					"limit" => 1
 				]);