dimaxz / frameworkless

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

Indentation +73 added lines, -73 removed lines

@@ -13,78 +13,78 @@
 class UserList extends Controllers\ModuleController implements Controllers\ModuleInterface

 {

 

-	/**

-	 *

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

-	 */

-	protected $userRepository;

-

-	protected $request;

-

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

-	{

-		$this->userRepository	= $userRepository;

-		$this->request			=  $request;

-	}

-

-	public function process()

-	{

+    /**

+     *

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

+     */

+    protected $userRepository;

+

+    protected $request;

+

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

+    {

+        $this->userRepository	= $userRepository;

+        $this->request			=  $request;

+    }

+

+    public function process()

+    {

 	

-		$this->logger->debug('UserList start');

-

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

-			$this->add();

-		}

-

-		$Users = $this->userRepository->findMany();

-

-		$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("Произошла ошибка при сохранении пользователя");

-		}

-	}

+        $this->logger->debug('UserList start');

+

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

+            $this->add();

+        }

+

+        $Users = $this->userRepository->findMany();

+

+        $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("Произошла ошибка при сохранении пользователя");

+        }

+    }

 }

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

Indentation +1 added lines, -1 removed lines

@@ -16,6 +16,6 @@
 class User extends BaseUser
 {
 
-	use \Frameworkless\ValidatorTrait;
+    use \Frameworkless\ValidatorTrait;
 
 }

app/ValidatorTrait.php

Indentation +12 added lines, -12 removed lines

@@ -15,26 +15,26 @@
  */
 trait ValidatorTrait
 {
-	/**
-	 * Symfony\Component\Validator\Validator\RecursiveValidator
-	 * @var type 
-	 */
-	protected $validator;
+    /**
+     * Symfony\Component\Validator\Validator\RecursiveValidator
+     * @var type 
+     */
+    protected $validator;
 			
     function __construct()
-	{
-		$this->validator = new RecursiveValidator(
+    {
+        $this->validator = new RecursiveValidator(
             new ExecutionContextFactory(new IdentityTranslator()),
             new LazyLoadingMetadataFactory(new StaticMethodLoader()),
             new ConstraintValidatorFactory()
         );
-	}
+    }
 	
-	public function preSave(\Propel\Runtime\Connection\ConnectionInterface $con = null)
-	{
+    public function preSave(\Propel\Runtime\Connection\ConnectionInterface $con = null)
+    {
         if (!$result = $this->validate($this->validator)) {
             throw new ValidationException($this->getValidationFailures(),"Validation error");
         }     		
-		return $result;
-	}	
+        return $result;
+    }	
 }

app/Controllers/IndexController.php

Indentation +29 added lines, -29 removed lines

@@ -7,37 +7,37 @@
 
 class IndexController extends BaseController {
 
-	protected $userListModule;
-
-	/**
-	 * IndexController, constructed by container
-	 *
-	 * @param Twig_Environment $twig
-	 */
-	public function __construct( UserList $userListModule) {
-
-		$this->userListModule = $userListModule;
-	}
-
-	/**
-	 * Return index page (/)
-	 *
-	 * @param array $args
-	 * @return Response
-	 */
-	public function get($args) {
+    protected $userListModule;
+
+    /**
+     * IndexController, constructed by container
+     *
+     * @param Twig_Environment $twig
+     */
+    public function __construct( UserList $userListModule) {
+
+        $this->userListModule = $userListModule;
+    }
+
+    /**
+     * 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,
+        ]);
+    }
 
 }

bootstrap/container.php

Indentation +24 added lines, -24 removed lines

@@ -25,36 +25,36 @@ 
  * set Monolog
  */
 $container->share(Monolog\Logger::class)
-		->withArgument('myLogger')
-		;
+        ->withArgument('myLogger')
+        ;
 
 /**
  * set Propel2 Logger
  */
 Propel\Runtime\Propel::getServiceContainer()->setLogger('defaultLogger', 
-		(new Monolog\Logger('defaultLogger'))
-			->pushHandler(new Monolog\Handler\StreamHandler('php://stderr'))
-		);
+        (new Monolog\Logger('defaultLogger'))
+            ->pushHandler(new Monolog\Handler\StreamHandler('php://stderr'))
+        );
 
 /**
  * set Debug bar
  */
 $container->share(DebugBar\StandardDebugBar::class)
-		->withMethodCall("addCollector",[
-			new DebugBar\Bridge\Twig\TwigCollector(
-					new DebugBar\Bridge\Twig\TraceableTwigEnvironment(
-							$container->get(Twig_Environment::class),
-							new DebugBar\DataCollector\TimeDataCollector
-							)
-					)
-		])
-		->withMethodCall("addCollector",[
-			new DebugBar\Bridge\Propel2Collector(Propel\Runtime\Propel::getConnection())
-		])	
-		->withMethodCall("addCollector",[
-			new \DebugBar\Bridge\MonologCollector($container->get(Monolog\Logger::class))
-		])
-		;
+        ->withMethodCall("addCollector",[
+            new DebugBar\Bridge\Twig\TwigCollector(
+                    new DebugBar\Bridge\Twig\TraceableTwigEnvironment(
+                            $container->get(Twig_Environment::class),
+                            new DebugBar\DataCollector\TimeDataCollector
+                            )
+                    )
+        ])
+        ->withMethodCall("addCollector",[
+            new DebugBar\Bridge\Propel2Collector(Propel\Runtime\Propel::getConnection())
+        ])	
+        ->withMethodCall("addCollector",[
+            new \DebugBar\Bridge\MonologCollector($container->get(Monolog\Logger::class))
+        ])
+        ;
 ;
 
 
@@ -63,12 +63,12 @@ 
  */
 
 $container->inflector(Psr\Log\LoggerAwareInterface::class)
-          ->invokeMethod('setLogger', [$container->get(Monolog\Logger::class)]);
+            ->invokeMethod('setLogger', [$container->get(Monolog\Logger::class)]);
 
 $container->inflector(Frameworkless\Controllers\PageInterface::class)
-          ->invokeMethod('setTwig', [$container->get(Twig_Environment::class)])
-		  ->invokeMethod('setDebugbar', [$container->get(DebugBar\StandardDebugBar::class)])
-		;
+            ->invokeMethod('setTwig', [$container->get(Twig_Environment::class)])
+            ->invokeMethod('setDebugbar', [$container->get(DebugBar\StandardDebugBar::class)])
+        ;
 
 
 App::getInstance()->import("DI", $container);
\ No newline at end of file

bootstrap/common.php

Indentation +40 added lines, -40 removed lines

@@ -3,45 +3,45 @@
 class App
 {
 
-	private $settings = array();
+    private $settings = array();
 	
-	private static $_instance = null;
-
-	private function __construct()
-	{
-		// приватный конструктор ограничивает реализацию getInstance ()
-	}
-
-	protected function __clone()
-	{
-		// ограничивает клонирование объекта
-	}
-
-	static function getModule($name, array $params = [])
-	{
-		$DI = self::getInstance()->load("DI");
-		$debugbar = $DI->get(DebugBar\StandardDebugBar::class);
-		$debugbar['time']->startMeasure($name, 'Load module ' . $name);
-		$result = $DI->get($name)->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()
+    {
+        // ограничивает клонирование объекта
+    }
+
+    static function getModule($name, array $params = [])
+    {
+        $DI = self::getInstance()->load("DI");
+        $debugbar = $DI->get(DebugBar\StandardDebugBar::class);
+        $debugbar['time']->startMeasure($name, 'Load module ' . $name);
+        $result = $DI->get($name)->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];
+    }
 }