Merge pull request #132 from Millon15/issue-129 FF

[#129] FF
unitfactoryAlumni · Apr 24, 2019 · 003d867 · 003d867
2 parents 4133338 + 1ce6be2
commit 003d867
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 16 deletions.
diff --git a/config/db.php b/config/db.php
@@ -2,9 +2,9 @@
 
 return [
     'class' => 'yii\db\Connection',
-    'dsn' => 'mysql:host=' . getenv('DB_HOST', 'mysql') . ';port=' . getenv('DB_PORT', '3306') .';dbname=' . getenv('DB_NAME', 'yii2') . ';',
-    'username' => getenv('DB_USERNAME', 'yii2'),
-    'password' => getenv('DB_PASSWORD', 'yii2'),
+    'dsn' => 'mysql:host=' . env('DB_HOST', 'mysql') . ';port=' . env('DB_PORT', '3306') .';dbname=' . env('DB_NAME', 'yii2') . ';',
+    'username' => env('DB_USERNAME', 'yii2'),
+    'password' => env('DB_PASSWORD', 'yii2'),
     'charset' => 'utf8',
     // Schema cache options (for production environment)
     //'enableSchemaCache' => true,

diff --git a/config/web.php b/config/web.php
@@ -28,7 +28,7 @@
     ],
     'components' => [
         'request' => [
-            'cookieValidationKey' => getenv('VD_KEY'),
+            'cookieValidationKey' => env('VD_KEY'),
             'enableCookieValidation' => true,
             'enableCsrfValidation' => true,
             'baseUrl' => '', //убрать frontend/web
@@ -76,8 +76,8 @@
             'clients' => [
                 'auth42' => [
                     'class' => 'app\helpers\Auth42',
-                    'clientId' => getenv('42_API_CI'),
-                    'clientSecret' => getenv('42_API_CS'),
+                    'clientId' => env('42_API_CI'),
+                    'clientSecret' => env('42_API_CS'),
                 ],
             ],
         ],

diff --git a/helpers/RememberUserInfo/RememberHelper.php b/helpers/RememberUserInfo/RememberHelper.php
@@ -35,7 +35,6 @@ abstract protected function remember();
      * __construct - method will done all work children of the class created for
      * @param array $response - .json given from 42 RESTfull API converted to php array
      * @see app\helpers\RememberUserInfo\RememberUserInfo
-     * @throws \Exception - in case of db error
      */
     public function __construct(&$response)
     {
@@ -124,13 +123,13 @@ public static function mergeChildArrByKey(&$arr, $key)
 
     /**
      * findARbyId
-     * @param  array $arrToPutIntoDb
+     * @param  array $id
      * @return mixed|bool
      */
-    protected function findARbyId($arrToPutIntoDb)
+    protected function findARbyId($id)
     {
         foreach ($this->ARcollection as $key => $AR) {
-            if ($AR[$this->idcol] == $arrToPutIntoDb[$this->idcol]) {
+            if ($AR[$this->idcol] == $id) {
                 return $key;
             }
         }
@@ -186,7 +185,6 @@ protected function batchDelete()
 
     /**
      * updateDB
-     * @throws \Exception - in case of db error
      */
     protected function updateDB()
     {
@@ -198,7 +196,6 @@ protected function updateDB()
             $transaction->commit();
         } catch (\Exception $e) {
             $transaction->rollBack();
-            throw $e;
         }
     }
 
@@ -208,7 +205,7 @@ protected function updateDB()
      */
     protected function saveChangesToDB($arrToPutIntoDb)
     {
-        $ARkey = $this->findARbyId($arrToPutIntoDb);
+        $ARkey = $this->findARbyId($arrToPutIntoDb[$this->idcol]);
 
         if ($ARkey === false) {
             $ARtoInsert = new $this->model();

diff --git a/helpers/RememberUserInfo/RememberUser.php b/helpers/RememberUserInfo/RememberUser.php
@@ -24,7 +24,7 @@ protected function init()
      */
     protected function remember()
     {
-        $user = $this->ARcollection[$this->findARbyId($this->ARcollection)];
+        $user = $this->ARcollection[$this->findARbyId($this->xid)];
 
         $this->responseSubset['lastloc'] = date('Y-m-d H:i:s');
         $this->responseSubset['howach'] = count($this->responseSubset['achievements']);

diff --git a/helpers/RememberUserInfo/RememberUserInfo.php b/helpers/RememberUserInfo/RememberUserInfo.php
@@ -14,7 +14,6 @@ class RememberUserInfo
     /**
      * rememberAllToDB
      * @param array $response - .json given from 42 RESTfull API converted to php array
-     * @throws \Exception - in case of db error
      */
     public function __construct($response)
     {

diff --git a/yii b/yii
@@ -14,7 +14,7 @@ require(__DIR__ . '/helpers/helpers.php');
 $dotenv = new \Dotenv\Dotenv(dirname(__DIR__));
 $dotenv->load();
 
-defined('YII_DEBUG') or define('YII_DEBUG', getenv('YII_DEBUG'));
+defined('YII_DEBUG') or define('YII_DEBUG', env('YII_DEBUG'));
 
 // fcgi doesn't have STDIN and STDOUT defined by default
 defined('STDIN') or define('STDIN', fopen('php://stdin', 'r'));