dimaxz / frameworkless

app/Controllers/IndexController.php

Doc Comments +1 added lines, -2 removed lines

@@ -17,7 +17,6 @@ 
 	/**
 	 * IndexController, constructed by container
 	 *
-	 * @param Twig_Environment $twig
 	 */
 	public function __construct( UserList $userListModule) {
 
@@ -28,7 +27,7 @@ 
 	 * Return index page (/)
 	 *
 	 * @param array $args
-	 * @return Response
+	 * @return \Symfony\Component\HttpFoundation\Response
 	 */
 	public function get($args) {
 		return $this->render('pages/index.html.twig', [

Indentation +29 added lines, -29 removed lines

@@ -6,34 +6,34 @@
 
 class IndexController extends BaseController {
 	
-	/**
-	 *
-	 * @var \Models\User\UserRepository $UserRepository
-	 */
-	protected $UserRepository;
-
-	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) {
-		return $this->render('pages/index.html.twig', [
-				"content" => $this->userListModule->process($args),
-		]);
-	}
+    /**
+     *
+     * @var \Models\User\UserRepository $UserRepository
+     */
+    protected $UserRepository;
+
+    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) {
+        return $this->render('pages/index.html.twig', [
+                "content" => $this->userListModule->process($args),
+        ]);
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
 	 *
 	 * @param Twig_Environment $twig
 	 */
-	public function __construct( UserList $userListModule) {
+	public function __construct(UserList $userListModule) {
 
 		$this->userListModule = $userListModule;
 	}

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

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

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

 namespace Core\Modules\UserList;

 

-use Frameworkless\Controllers;

+use Frameworkless\Controllers;
 use Donquixote\Cellbrush\Table\Table;

 

 /**

Indentation +72 added lines, -72 removed lines

@@ -12,76 +12,76 @@
 class UserList extends Controllers\ModuleController implements Controllers\ModuleInterface

 {

 

-	/**

-	 *

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

-	 */

-	protected $userRepository;

-

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

-	{

-		$this->userRepository = $userRepository;

-	}

-

-	public function process($args = [])

-	{

-

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

-

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

-		}

-

-	}

+    /**

+     *

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

+     */

+    protected $userRepository;

+

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

+    {

+        $this->userRepository = $userRepository;

+    }

+

+    public function process($args = [])

+    {

+

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

+

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

+        }

+

+    }

 }

Spacing +4 added lines, -4 removed lines

@@ -34,7 +34,7 @@ 
 

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

 

-		$table	 = Table::create();

+		$table = Table::create();

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

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

 		$table->thead()

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

@@ -69,14 +69,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/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',), ),
+            'validate' => array('rule1' => array('column' => 'email', 'validator' => '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);
         });
     }