dimaxz / frameworkless

packages/core/src/Models/Task/Base/Task.php

Spacing +2 added lines, -2 removed lines

@@ -711,7 +711,7 @@ 
             $con = Propel::getServiceContainer()->getWriteConnection(UserTableMap::DATABASE_NAME);
         }
 
-        $con->transaction(function () use ($con) {
+        $con->transaction(function() use ($con) {
             $deleteQuery = ChildUserQuery::create()
                 ->filterByPrimaryKey($this->getPrimaryKey());
             $ret = $this->preDelete($con);
@@ -746,7 +746,7 @@ 
             $con = Propel::getServiceContainer()->getWriteConnection(UserTableMap::DATABASE_NAME);
         }
 
-        return $con->transaction(function () use ($con) {
+        return $con->transaction(function() use ($con) {
             $isInsert = $this->isNew();
             $ret = $this->preSave($con);
             if ($isInsert) {

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

Spacing +7 added lines, -7 removed lines

@@ -23,8 +23,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()

@@ -32,13 +32,13 @@ 
 	

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

 

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

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

 			$this->add();

 		}

 

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

 

-		$table	 = Table::create();

+		$table = Table::create();

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

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

 		$table->thead()

@@ -46,7 +46,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(),

@@ -73,14 +73,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;
     }
 

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

Spacing +6 added lines, -6 removed lines

@@ -739,7 +739,7 @@ 
             $con = Propel::getServiceContainer()->getWriteConnection(UserTableMap::DATABASE_NAME);
         }
 
-        $con->transaction(function () use ($con) {
+        $con->transaction(function() use ($con) {
             $deleteQuery = ChildUserQuery::create()
                 ->filterByPrimaryKey($this->getPrimaryKey());
             $ret = $this->preDelete($con);
@@ -774,7 +774,7 @@ 
             $con = Propel::getServiceContainer()->getWriteConnection(UserTableMap::DATABASE_NAME);
         }
 
-        return $con->transaction(function () use ($con) {
+        return $con->transaction(function() use ($con) {
             $isInsert = $this->isNew();
             $ret = $this->preSave($con);
             if ($isInsert) {
@@ -1384,8 +1384,8 @@ 
      */
     static public function loadValidatorMetadata(ClassMetadata $metadata)
     {
-        $metadata->addPropertyConstraint('email', new Email(array ('message' => 'поле Email не заполнено',)));
-        $metadata->addPropertyConstraint('email', new Unique(array ('message' => 'Email должен быть уникален',)));
+        $metadata->addPropertyConstraint('email', new Email(array('message' => 'поле Email не заполнено',)));
+        $metadata->addPropertyConstraint('email', new Unique(array('message' => 'Email должен быть уникален',)));
     }
 
     /**
@@ -1398,13 +1398,13 @@ 
     public function validate(ValidatorInterface $validator = null)
     {
         if (null === $validator) {
-            if(class_exists('Symfony\\Component\\Validator\\Validator\\LegacyValidator')){
+            if (class_exists('Symfony\\Component\\Validator\\Validator\\LegacyValidator')) {
                 $validator = new LegacyValidator(
                             new ExecutionContextFactory(new DefaultTranslator()),
                             new ClassMetaDataFactory(new StaticMethodLoader()),
                             new ConstraintValidatorFactory()
                 );
-            }else{
+            } else {
                 $validator = new Validator(
                             new ClassMetadataFactory(new StaticMethodLoader()),
                             new ConstraintValidatorFactory(),

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

Spacing +16 added lines, -16 removed lines

@@ -117,12 +117,12 @@ 
      * first dimension keys are the type constants
      * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
      */
-    protected static $fieldNames = array (
-        self::TYPE_PHPNAME       => array('Id', 'Name', 'Email', 'Password', 'RememberToken', 'CreatedAt', 'UpdatedAt', ),
-        self::TYPE_CAMELNAME     => array('id', 'name', 'email', 'password', 'rememberToken', 'createdAt', 'updatedAt', ),
-        self::TYPE_COLNAME       => array(UserTableMap::COL_ID, UserTableMap::COL_NAME, UserTableMap::COL_EMAIL, UserTableMap::COL_PASSWORD, UserTableMap::COL_REMEMBER_TOKEN, UserTableMap::COL_CREATED_AT, UserTableMap::COL_UPDATED_AT, ),
-        self::TYPE_FIELDNAME     => array('id', 'name', 'email', 'password', 'remember_token', 'created_at', 'updated_at', ),
-        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, )
+    protected static $fieldNames = array(
+        self::TYPE_PHPNAME       => array('Id', 'Name', 'Email', 'Password', 'RememberToken', 'CreatedAt', 'UpdatedAt',),
+        self::TYPE_CAMELNAME     => array('id', 'name', 'email', 'password', 'rememberToken', 'createdAt', 'updatedAt',),
+        self::TYPE_COLNAME       => array(UserTableMap::COL_ID, UserTableMap::COL_NAME, UserTableMap::COL_EMAIL, UserTableMap::COL_PASSWORD, UserTableMap::COL_REMEMBER_TOKEN, UserTableMap::COL_CREATED_AT, UserTableMap::COL_UPDATED_AT,),
+        self::TYPE_FIELDNAME     => array('id', 'name', 'email', 'password', 'remember_token', 'created_at', 'updated_at',),
+        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6,)
     );
 
     /**
@@ -131,12 +131,12 @@ 
      * first dimension keys are the type constants
      * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
      */
-    protected static $fieldKeys = array (
-        self::TYPE_PHPNAME       => array('Id' => 0, 'Name' => 1, 'Email' => 2, 'Password' => 3, 'RememberToken' => 4, 'CreatedAt' => 5, 'UpdatedAt' => 6, ),
-        self::TYPE_CAMELNAME     => array('id' => 0, 'name' => 1, 'email' => 2, 'password' => 3, 'rememberToken' => 4, 'createdAt' => 5, 'updatedAt' => 6, ),
-        self::TYPE_COLNAME       => array(UserTableMap::COL_ID => 0, UserTableMap::COL_NAME => 1, UserTableMap::COL_EMAIL => 2, UserTableMap::COL_PASSWORD => 3, UserTableMap::COL_REMEMBER_TOKEN => 4, UserTableMap::COL_CREATED_AT => 5, UserTableMap::COL_UPDATED_AT => 6, ),
-        self::TYPE_FIELDNAME     => array('id' => 0, 'name' => 1, 'email' => 2, 'password' => 3, 'remember_token' => 4, 'created_at' => 5, 'updated_at' => 6, ),
-        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, )
+    protected static $fieldKeys = array(
+        self::TYPE_PHPNAME       => array('Id' => 0, 'Name' => 1, 'Email' => 2, 'Password' => 3, 'RememberToken' => 4, 'CreatedAt' => 5, 'UpdatedAt' => 6,),
+        self::TYPE_CAMELNAME     => array('id' => 0, 'name' => 1, 'email' => 2, 'password' => 3, 'rememberToken' => 4, 'createdAt' => 5, 'updatedAt' => 6,),
+        self::TYPE_COLNAME       => array(UserTableMap::COL_ID => 0, UserTableMap::COL_NAME => 1, UserTableMap::COL_EMAIL => 2, UserTableMap::COL_PASSWORD => 3, UserTableMap::COL_REMEMBER_TOKEN => 4, UserTableMap::COL_CREATED_AT => 5, UserTableMap::COL_UPDATED_AT => 6,),
+        self::TYPE_FIELDNAME     => array('id' => 0, 'name' => 1, 'email' => 2, 'password' => 3, 'remember_token' => 4, 'created_at' => 5, 'updated_at' => 6,),
+        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6,)
     );
 
     /**
@@ -181,7 +181,7 @@ 
     public function getBehaviors()
     {
         return array(
-            'validate' => array('rule1' => array ('column' => 'email','validator' => 'Email','options' => array ('message' => 'поле Email не заполнено',),), 'rule2' => array ('column' => 'email','validator' => 'Unique','options' => array ('message' => 'Email должен быть уникален',),), ),
+            'validate' => array('rule1' => array('column' => 'email', 'validator' => 'Email', 'options' => array('message' => 'поле Email не заполнено',),), 'rule2' => array('column' => 'email', 'validator' => 'Unique', 'options' => array('message' => 'Email должен быть уникален',),),),
         );
     } // getBehaviors()
 
@@ -440,8 +440,8 @@ 
             $criteria = $criteria->buildCriteria(); // build Criteria from User object
         }
 
-        if ($criteria->containsKey(UserTableMap::COL_ID) && $criteria->keyContainsValue(UserTableMap::COL_ID) ) {
-            throw new PropelException('Cannot insert a value for auto-increment primary key ('.UserTableMap::COL_ID.')');
+        if ($criteria->containsKey(UserTableMap::COL_ID) && $criteria->keyContainsValue(UserTableMap::COL_ID)) {
+            throw new PropelException('Cannot insert a value for auto-increment primary key (' . UserTableMap::COL_ID . ')');
         }
 
 
@@ -450,7 +450,7 @@ 
 
         // use transaction because $criteria could contain info
         // for more than one table (I guess, conceivably)
-        return $con->transaction(function () use ($con, $query) {
+        return $con->transaction(function() use ($con, $query) {
             return $query->doInsert($con);
         });
     }

app/ValidatorTrait.php

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

app/Controllers/IndexController.php

Spacing +3 added lines, -3 removed lines

@@ -14,7 +14,7 @@ 
 	 *
 	 * @param Twig_Environment $twig
 	 */
-	public function __construct( UserList $userListModule) {
+	public function __construct(UserList $userListModule) {
 
 		$this->userListModule = $userListModule;
 	}
@@ -27,11 +27,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
 				]);
 		

bootstrap/container.php

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

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 		return self::$_instance;
 	}
 
-	public function import($key,$value)
+	public function import($key, $value)
 	{
 		$this->settings[$key] = $value;
 	}