Completed
Push — master ( eae558...21a71a )
by Afshin
01:55
created
core/Services/AuthService.php 2 patches
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
         return isset($_SESSION['user']['user_id']);
26 26
     }
27 27
 
28
-    public function attempt(string $loginField,string $password)
28
+    public function attempt(string $loginField, string $password)
29 29
     {
30 30
         $user = UserDataAccess::getUserLoginField($loginField);
31 31
         if (!$user) {
@@ -35,17 +35,17 @@  discard block
 block discarded – undo
35 35
             ];
36 36
         }
37 37
         $setting = Config::get('settings.auth');
38
-        if($setting['2step']){
38
+        if ($setting['2step']) {
39 39
             $this->twoStepAuth();
40
-        }else{
41
-            if ($this->checkPass($password,$user->password)) {
40
+        }else {
41
+            if ($this->checkPass($password, $user->password)) {
42 42
                 $_SESSION['user']['user_id'] = $user->id;
43 43
                 $_SESSION['user']['mobile'] = $user->mobile;
44 44
                 return [
45 45
                     'type'=>'success',
46 46
                     'message'=> 'Logined',
47 47
                 ];
48
-            }else{
48
+            }else {
49 49
                 return [
50 50
                     'type'=>'error',
51 51
                     'message'=> 'password mismatch',
@@ -60,9 +60,9 @@  discard block
 block discarded – undo
60 60
 
61 61
 
62 62
 
63
-    public function checkPass($password,$database_pass)
63
+    public function checkPass($password, $database_pass)
64 64
     {
65
-        if($database_pass == $password){
65
+        if ($database_pass == $password) {
66 66
             return true;
67 67
         }
68 68
         return false;
Please login to merge, or discard this patch.
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
         $setting = Config::get('settings.auth');
38 38
         if($setting['2step']){
39 39
             $this->twoStepAuth();
40
-        }else{
40
+        } else{
41 41
             if ($this->checkPass($password,$user->password)) {
42 42
                 $_SESSION['user']['user_id'] = $user->id;
43 43
                 $_SESSION['user']['mobile'] = $user->mobile;
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
                     'type'=>'success',
46 46
                     'message'=> 'Logined',
47 47
                 ];
48
-            }else{
48
+            } else{
49 49
                 return [
50 50
                     'type'=>'error',
51 51
                     'message'=> 'password mismatch',
Please login to merge, or discard this patch.
migrations/20171130091220_Add_Password_To_Users_Table_Migration.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
12 12
     {
13 13
         Capsule::schema()->table('users', function($table)
14 14
         {
15
-            $table->string('password',128);
15
+            $table->string('password', 128);
16 16
         });
17 17
     }
18 18
 
Please login to merge, or discard this patch.
bootstrap/dependencies.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@  discard block
 block discarded – undo
6 6
 /* database connection */
7 7
 
8 8
 
9
-$container['db'] = function ($container) {
9
+$container['db'] = function($container) {
10 10
     $db = $container['settings']['db'];
11 11
     $pdo = new PDO("mysql:host=" . $db['host'] . ";dbname=" . $db['database'],
12 12
         $db['username'], $db['password']);
@@ -18,19 +18,19 @@  discard block
 block discarded – undo
18 18
 //
19 19
 
20 20
 
21
-$container['generalErrorHandler'] = function ($container) {
21
+$container['generalErrorHandler'] = function($container) {
22 22
     return new \Core\Handlers\GeneralErrorHandler($container);
23 23
 };
24 24
 
25 25
 
26 26
 
27 27
 // Service factory for the ORM
28
-$container['validator'] = function () {
28
+$container['validator'] = function() {
29 29
     return new App\Validation\Validator();
30 30
 };
31 31
 
32 32
 
33
-$container['eloquent'] = function ($container) {
33
+$container['eloquent'] = function($container) {
34 34
     $capsule = new \Illuminate\Database\Capsule\Manager;
35 35
     $capsule->addConnection($container['settings']['db']);
36 36
     $capsule->setAsGlobal();
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
 
49 49
 
50 50
 // monolog
51
-$container['logger'] = function ($c) {
51
+$container['logger'] = function($c) {
52 52
     $settings = $c->get('settings')['logger'];
53 53
     $logger = new Monolog\Logger($settings['name']);
54 54
     $logger->pushProcessor(new Monolog\Processor\UidProcessor());
@@ -57,8 +57,8 @@  discard block
 block discarded – undo
57 57
 };
58 58
 
59 59
 // not found handler
60
-$container['notFoundHandler'] = function ($container) {
61
-    return function (\Slim\Http\Request $request, \Slim\Http\Response $response) use ($container) {
60
+$container['notFoundHandler'] = function($container) {
61
+    return function(\Slim\Http\Request $request, \Slim\Http\Response $response) use ($container) {
62 62
         return $container['view']->render($response->withStatus(404), '404');
63 63
     };
64 64
 };
@@ -68,13 +68,13 @@  discard block
 block discarded – undo
68 68
 $translator = new \Core\Translator\Translator($container);
69 69
 $translator->init();
70 70
 
71
-$container['translator'] = function () use ($translator) {
71
+$container['translator'] = function() use ($translator) {
72 72
     return $translator;
73 73
 };
74 74
 
75 75
 
76 76
 // Register provider
77
-$container['flash'] = function () {
77
+$container['flash'] = function() {
78 78
     return new \Slim\Flash\Messages();
79 79
 };
80 80
 
@@ -82,14 +82,14 @@  discard block
 block discarded – undo
82 82
 
83 83
 
84 84
 // Register Blade View helper
85
-$container['view'] = function ($container) {
85
+$container['view'] = function($container) {
86 86
 
87 87
     $messages = $container->flash->getMessages();
88 88
 
89 89
     $viewSettings = $container['settings']['view'];
90 90
 
91 91
     return new \Slim\Views\Blade(
92
-        [$viewSettings['blade_template_path'].$viewSettings['template']],
92
+        [$viewSettings['blade_template_path'] . $viewSettings['template']],
93 93
         $viewSettings['blade_cache_path'],
94 94
         null,
95 95
         [
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
         ]
100 100
     );
101 101
 };
102
-$app->getContainer()['view']->getRenderer()->getCompiler()->directive('helloWorld', function(){
102
+$app->getContainer()['view']->getRenderer()->getCompiler()->directive('helloWorld', function() {
103 103
 
104 104
     return "<?php echo 'Hello Directive'; ?>";
105 105
 });
@@ -112,14 +112,14 @@  discard block
 block discarded – undo
112 112
 
113 113
 
114 114
 /*Dynamic containers in services*/
115
-$dir = scandir(__APP_ROOT__.'/core/Services/');
115
+$dir = scandir(__APP_ROOT__ . '/core/Services/');
116 116
 $ex_folders = array('..', '.');
117
-$filesInServices =  array_diff($dir,$ex_folders);
117
+$filesInServices = array_diff($dir, $ex_folders);
118 118
 
119
-foreach($filesInServices as $service){
120
-    $content = preg_replace('/.php/','',$service);
121
-    $container[$content] = function () use ($content){
122
-        $class =  '\\Core\\Services\\'.$content ;
119
+foreach ($filesInServices as $service) {
120
+    $content = preg_replace('/.php/', '', $service);
121
+    $container[$content] = function() use ($content){
122
+        $class = '\\Core\\Services\\' . $content;
123 123
         return new $class();
124 124
     };
125 125
 }
Please login to merge, or discard this patch.
core/Functions/general_helpers.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -5,5 +5,5 @@
 block discarded – undo
5 5
     $dir = scandir($path);
6 6
     $ex_folders = array('..', '.');
7 7
 
8
-    return array_diff($dir,$ex_folders);
8
+    return array_diff($dir, $ex_folders);
9 9
 }
Please login to merge, or discard this patch.
core/Helpers/Url.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -19,9 +19,9 @@
 block discarded – undo
19 19
     {
20 20
         $this->container = $container;
21 21
     }
22
-    public function get( $name, $params = array() )
22
+    public function get($name, $params = array())
23 23
     {
24
-            $route = $this->container->get('router')->pathFor($name,$params);
24
+            $route = $this->container->get('router')->pathFor($name, $params);
25 25
 
26 26
 
27 27
             return $route;
Please login to merge, or discard this patch.
bootstrap/app.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -1,33 +1,33 @@
 block discarded – undo
1 1
 <?php
2
-define('__APP_ROOT__',__DIR__ . '/../') ;
2
+define('__APP_ROOT__', __DIR__ . '/../');
3 3
 
4
-require  __APP_ROOT__.'bootstrap/bootstrap.php';
5
-require __APP_ROOT__.'vendor/autoload.php';
6
-require __APP_ROOT__.'config/settings.php';
4
+require  __APP_ROOT__ . 'bootstrap/bootstrap.php';
5
+require __APP_ROOT__ . 'vendor/autoload.php';
6
+require __APP_ROOT__ . 'config/settings.php';
7 7
 
8
-require  __APP_ROOT__.'core/Functions/general_helpers.php';
8
+require  __APP_ROOT__ . 'core/Functions/general_helpers.php';
9 9
 
10 10
 
11 11
 $app = new \Core\App($config);
12 12
 
13 13
 use SlimFacades\Facade;
14 14
 // get container app
15
-require __APP_ROOT__.'bootstrap/dependencies.php';
15
+require __APP_ROOT__ . 'bootstrap/dependencies.php';
16 16
 
17
-require  __APP_ROOT__.'bootstrap/routes.php';
18
-require  __APP_ROOT__.'core/Functions/helpers.php';
17
+require  __APP_ROOT__ . 'bootstrap/routes.php';
18
+require  __APP_ROOT__ . 'core/Functions/helpers.php';
19 19
 
20
-if(php_sapi_name() != 'cli') {
20
+if (php_sapi_name() != 'cli') {
21 21
     $settings['tracy']['path'] = '';
22
-    if($app->getContainer() instanceof Psr\Container\ContainerInterface){
22
+    if ($app->getContainer() instanceof Psr\Container\ContainerInterface) {
23 23
         $settings = $app->getContainer()->settings;
24
-        if($settings['debug'] == true){
24
+        if ($settings['debug'] == true) {
25 25
             Tracy\Debugger::enable(Tracy\Debugger::DEVELOPMENT, $settings['tracy']['path']);
26 26
         }
27 27
         Facade::setFacadeApplication($app);
28 28
     }
29 29
 
30
-    require  __APP_ROOT__.'bootstrap/middlewares.php';
30
+    require  __APP_ROOT__ . 'bootstrap/middlewares.php';
31 31
 
32 32
     $app->run();
33 33
 
Please login to merge, or discard this patch.
core/Functions/helpers.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -2,16 +2,16 @@
 block discarded – undo
2 2
 
3 3
 
4 4
 
5
-function url(string $name ,array $params)
5
+function url(string $name, array $params)
6 6
 {
7 7
     $url = new \Core\Helpers\Url($GLOBALS['container']);
8
-    return $url->get($name , $params);
8
+    return $url->get($name, $params);
9 9
 }
10 10
 
11 11
 // translate
12 12
 
13 13
 
14
-function trans($key , $replace = []){
14
+function trans($key, $replace = []) {
15 15
     $container = $GLOBALS['container'];
16
-    return $container->translator->trans($key,$replace);
16
+    return $container->translator->trans($key, $replace);
17 17
 }
18 18
\ No newline at end of file
Please login to merge, or discard this patch.