dimaxz / frameworkless

app/Exceptions/ValidationException.php

Indentation +8 added lines, -8 removed lines

@@ -9,17 +9,17 @@
  */
 class ValidationException extends \Exception {
 
-	private $failures;
+    private $failures;
 
-	public function __construct($failures, $message = "", $code = 0, $previous = null) {
+    public function __construct($failures, $message = "", $code = 0, $previous = null) {
 		
-		parent::__construct($message, $code, $previous);
+        parent::__construct($message, $code, $previous);
 		
-		$this->failures = $failures;
-	}
+        $this->failures = $failures;
+    }
 
-	function getFailures() {
-		return $this->failures;
-	}
+    function getFailures() {
+        return $this->failures;
+    }
 
 }

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

Unused Use Statements +2 added lines, -2 removed lines

@@ -1,8 +1,8 @@
 <?php

 namespace Core\Modules\UserList;

 

-use Frameworkless\Controllers;

-use Donquixote\Cellbrush\Table\Table;

+use Frameworkless\Controllers;
+use Donquixote\Cellbrush\Table\Table;
 use Symfony\Component\HttpFoundation\Request;

 

 /**

Indentation +80 added lines, -80 removed lines

@@ -13,84 +13,84 @@
 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,3]);

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

-		$table->thead()

-				->addRowName('head row')

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

-				->th('head row', 1, 'Регистрация')

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

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

-		$i		 = 0;

-		foreach ($Users as $User) {

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

-				$User->getId(),

-				$User->getCreatedAt("d.m.Y"),

-				$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,3]);

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

+        $table->thead()

+                ->addRowName('head row')

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

+                ->th('head row', 1, 'Регистрация')

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

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

+        $i		 = 0;

+        foreach ($Users as $User) {

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

+                $User->getId(),

+                $User->getCreatedAt("d.m.Y"),

+                $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 +8 added lines, -8 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,10 +40,10 @@ 
 			$this->add();

 		}

 

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

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

 

-		$table	 = Table::create();

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

+		$table = Table::create();

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

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

 		$table->thead()

 				->addRowName('head row')

@@ -51,7 +51,7 @@ 
 				->th('head row', 1, 'Регистрация')

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

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

-		$i		 = 0;

+		$i = 0;

 		foreach ($Users as $User) {

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

 				$User->getId(),

@@ -79,14 +79,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());

 

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

Spacing +2 added lines, -2 removed lines

@@ -28,7 +28,7 @@ 
     public function findById($id)
     {
         if (!$User = UserQuery::create()->findPk($id)) {
-            throw new \InvalidArgumentException(sprintf('User with ID %d does not exist',$id));
+            throw new \InvalidArgumentException(sprintf('User with ID %d does not exist', $id));
         }
 
         return $User;
@@ -59,7 +59,7 @@ 
      * 
      * @return \Core\Models\User\User $User
      */
-    public function build(){
+    public function build() {
         return new User;
     }
 

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/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;
+    }	
 }

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 	public function preSave(\Propel\Runtime\Connection\ConnectionInterface $con = null)
 	{
         if (!$result = $this->validate($this->validator)) {
-            throw new ValidationException($this->getValidationFailures(),"Validation error");
+            throw new ValidationException($this->getValidationFailures(), "Validation error");
         }     		
 		return $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

Spacing +4 added lines, -4 removed lines

@@ -13,7 +13,7 @@ 
 /**
  * set Request
  */
-$container->add(Request::class,Request::createFromGlobals());
+$container->add(Request::class, Request::createFromGlobals());
 
 /**
  * set Twig
@@ -40,7 +40,7 @@ 
  * set Debug bar
  */
 $container->share(DebugBar\StandardDebugBar::class)
-		->withMethodCall("addCollector",[
+		->withMethodCall("addCollector", [
 			new DebugBar\Bridge\Twig\TwigCollector(
 					new DebugBar\Bridge\Twig\TraceableTwigEnvironment(
 							$container->get(Twig_Environment::class),
@@ -48,10 +48,10 @@ 
 							)
 					)
 		])
-		->withMethodCall("addCollector",[
+		->withMethodCall("addCollector", [
 			new DebugBar\Bridge\Propel2Collector(Propel\Runtime\Propel::getConnection())
 		])	
-		->withMethodCall("addCollector",[
+		->withMethodCall("addCollector", [
 			new \DebugBar\Bridge\MonologCollector($container->get(Monolog\Logger::class))
 		])
 		;

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/Console/Commands/InstallCommand.php

Unused Use Statements -3 removed lines

@@ -4,10 +4,7 @@
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Input\StringInput;
 use Symfony\Component\Console\Input\ArrayInput;
-use Symfony\Component\Process\Process;
-use Symfony\Component\Process\Exception\ProcessFailedException;
 
 /**
  * Description of HelloWorldCommand

Indentation +13 added lines, -13 removed lines

@@ -25,21 +25,21 @@
     protected function execute(InputInterface $input, OutputInterface $output)
     { 
 		
-		$command	 = $this->getApplication()->find('config:convert');
-		$returnCode	 = $command->run(new ArrayInput([
-				'command'	 => 'config:convert'
-		]), $output);
+        $command	 = $this->getApplication()->find('config:convert');
+        $returnCode	 = $command->run(new ArrayInput([
+                'command'	 => 'config:convert'
+        ]), $output);
 		
-		$command	 = $this->getApplication()->find('packages:install');
-		$returnCode	 = $command->run(new ArrayInput([
-				'command'	 => 'packages:install'
-		]), $output);
+        $command	 = $this->getApplication()->find('packages:install');
+        $returnCode	 = $command->run(new ArrayInput([
+                'command'	 => 'packages:install'
+        ]), $output);
 
-		$command	 = $this->getApplication()->find('migration:migrate');
-		$returnCode	 = $command->run(new ArrayInput([
-				'command'	 => 'migration:migrate'
-		]), $output);		
+        $command	 = $this->getApplication()->find('migration:migrate');
+        $returnCode	 = $command->run(new ArrayInput([
+                'command'	 => 'migration:migrate'
+        ]), $output);		
 
-		$output->writeln("install completed!");
+        $output->writeln("install completed!");
     }
 }

Spacing +6 added lines, -6 removed lines

@@ -25,18 +25,18 @@
     protected function execute(InputInterface $input, OutputInterface $output)
     { 
 		
-		$command	 = $this->getApplication()->find('config:convert');
-		$returnCode	 = $command->run(new ArrayInput([
+		$command = $this->getApplication()->find('config:convert');
+		$returnCode = $command->run(new ArrayInput([
 				'command'	 => 'config:convert'
 		]), $output);
 		
-		$command	 = $this->getApplication()->find('packages:install');
-		$returnCode	 = $command->run(new ArrayInput([
+		$command = $this->getApplication()->find('packages:install');
+		$returnCode = $command->run(new ArrayInput([
 				'command'	 => 'packages:install'
 		]), $output);
 
-		$command	 = $this->getApplication()->find('migration:migrate');
-		$returnCode	 = $command->run(new ArrayInput([
+		$command = $this->getApplication()->find('migration:migrate');
+		$returnCode = $command->run(new ArrayInput([
 				'command'	 => 'migration:migrate'
 		]), $output);