@@ -83,7 +83,7 @@ |
||
83 | 83 | if ($this->cacheConfig && $this->cacheConfig == 'cache') { |
84 | 84 | $page = \Request::get('page') !== null ? \Request::get('page') : '1'; |
85 | 85 | $cacheKey = $name.$page.\Session::get('locale').serialize($arguments); |
86 | - return $this->cache->tags([$this->cacheTag])->rememberForever($cacheKey, function () use ($arguments, $name) { |
|
86 | + return $this->cache->tags([$this->cacheTag])->rememberForever($cacheKey, function() use ($arguments, $name) { |
|
87 | 87 | return call_user_func_array([$this->repo, $name], $arguments); |
88 | 88 | }); |
89 | 89 | } elseif ($this->cacheConfig) { |
@@ -5,102 +5,102 @@ |
||
5 | 5 | |
6 | 6 | class CachingDecorator |
7 | 7 | { |
8 | - /** |
|
9 | - * @var string |
|
10 | - */ |
|
11 | - public $repo; |
|
8 | + /** |
|
9 | + * @var string |
|
10 | + */ |
|
11 | + public $repo; |
|
12 | 12 | |
13 | - /** |
|
14 | - * @var Cache |
|
15 | - */ |
|
16 | - protected $cache; |
|
13 | + /** |
|
14 | + * @var Cache |
|
15 | + */ |
|
16 | + protected $cache; |
|
17 | 17 | |
18 | - /** |
|
19 | - * @var string |
|
20 | - */ |
|
21 | - public $modelKey; |
|
18 | + /** |
|
19 | + * @var string |
|
20 | + */ |
|
21 | + public $modelKey; |
|
22 | 22 | |
23 | - /** |
|
24 | - * @var string |
|
25 | - */ |
|
26 | - public $model; |
|
23 | + /** |
|
24 | + * @var string |
|
25 | + */ |
|
26 | + public $model; |
|
27 | 27 | |
28 | - /** |
|
29 | - * @var string |
|
30 | - */ |
|
31 | - public $modelClass; |
|
28 | + /** |
|
29 | + * @var string |
|
30 | + */ |
|
31 | + public $modelClass; |
|
32 | 32 | |
33 | - /** |
|
34 | - * @var mixed |
|
35 | - */ |
|
36 | - public $cacheConfig; |
|
33 | + /** |
|
34 | + * @var mixed |
|
35 | + */ |
|
36 | + public $cacheConfig; |
|
37 | 37 | |
38 | - /** |
|
39 | - * @var string |
|
40 | - */ |
|
41 | - public $cacheTag; |
|
38 | + /** |
|
39 | + * @var string |
|
40 | + */ |
|
41 | + public $cacheTag; |
|
42 | 42 | |
43 | - /** |
|
44 | - * Init new object. |
|
45 | - * |
|
46 | - * @param string $repo |
|
47 | - * @param Cache $cache |
|
48 | - * |
|
49 | - * @return void |
|
50 | - */ |
|
51 | - public function __construct($repo, Cache $cache) |
|
52 | - { |
|
53 | - $this->repo = $repo; |
|
54 | - $this->cache = $cache; |
|
55 | - $this->model = $this->repo->model; |
|
56 | - $this->modelClass = get_class($this->model); |
|
57 | - $repoClass = explode('\\', get_class($this->repo)); |
|
58 | - $repoName = end($repoClass); |
|
59 | - $this->cacheTag = lcfirst(substr($repoName, 0, strpos($repoName, 'Repository'))); |
|
60 | - } |
|
43 | + /** |
|
44 | + * Init new object. |
|
45 | + * |
|
46 | + * @param string $repo |
|
47 | + * @param Cache $cache |
|
48 | + * |
|
49 | + * @return void |
|
50 | + */ |
|
51 | + public function __construct($repo, Cache $cache) |
|
52 | + { |
|
53 | + $this->repo = $repo; |
|
54 | + $this->cache = $cache; |
|
55 | + $this->model = $this->repo->model; |
|
56 | + $this->modelClass = get_class($this->model); |
|
57 | + $repoClass = explode('\\', get_class($this->repo)); |
|
58 | + $repoName = end($repoClass); |
|
59 | + $this->cacheTag = lcfirst(substr($repoName, 0, strpos($repoName, 'Repository'))); |
|
60 | + } |
|
61 | 61 | |
62 | - /** |
|
63 | - * Handle the cache mechanism for the called method |
|
64 | - * based the configurations. |
|
65 | - * |
|
66 | - * @param string $name the called method name |
|
67 | - * @param array $arguments the method arguments |
|
68 | - * @return object |
|
69 | - */ |
|
70 | - public function __call($name, $arguments) |
|
71 | - { |
|
72 | - $this->setCacheConfig($name); |
|
62 | + /** |
|
63 | + * Handle the cache mechanism for the called method |
|
64 | + * based the configurations. |
|
65 | + * |
|
66 | + * @param string $name the called method name |
|
67 | + * @param array $arguments the method arguments |
|
68 | + * @return object |
|
69 | + */ |
|
70 | + public function __call($name, $arguments) |
|
71 | + { |
|
72 | + $this->setCacheConfig($name); |
|
73 | 73 | |
74 | - if ($this->cacheConfig && $this->cacheConfig == 'cache') { |
|
75 | - $page = \Request::get('page') !== null ? \Request::get('page') : '1'; |
|
76 | - $cacheKey = $name.$page.\Session::get('locale').serialize($arguments); |
|
77 | - return $this->cache->tags([$this->cacheTag])->rememberForever($cacheKey, function () use ($arguments, $name) { |
|
78 | - return call_user_func_array([$this->repo, $name], $arguments); |
|
79 | - }); |
|
80 | - } elseif ($this->cacheConfig) { |
|
81 | - $this->cache->tags($this->cacheConfig)->flush(); |
|
82 | - return call_user_func_array([$this->repo, $name], $arguments); |
|
83 | - } |
|
74 | + if ($this->cacheConfig && $this->cacheConfig == 'cache') { |
|
75 | + $page = \Request::get('page') !== null ? \Request::get('page') : '1'; |
|
76 | + $cacheKey = $name.$page.\Session::get('locale').serialize($arguments); |
|
77 | + return $this->cache->tags([$this->cacheTag])->rememberForever($cacheKey, function () use ($arguments, $name) { |
|
78 | + return call_user_func_array([$this->repo, $name], $arguments); |
|
79 | + }); |
|
80 | + } elseif ($this->cacheConfig) { |
|
81 | + $this->cache->tags($this->cacheConfig)->flush(); |
|
82 | + return call_user_func_array([$this->repo, $name], $arguments); |
|
83 | + } |
|
84 | 84 | |
85 | - return call_user_func_array([$this->repo, $name], $arguments); |
|
86 | - } |
|
85 | + return call_user_func_array([$this->repo, $name], $arguments); |
|
86 | + } |
|
87 | 87 | |
88 | - /** |
|
89 | - * Set cache config based on the called method. |
|
90 | - * |
|
91 | - * @param string $name |
|
92 | - * @return void |
|
93 | - */ |
|
94 | - private function setCacheConfig($name) |
|
95 | - { |
|
96 | - $config = \CoreConfig::getConfig(); |
|
97 | - $cacheConfig = Arr::get($config['cacheConfig'], $this->cacheTag, false); |
|
98 | - $this->cacheConfig = false; |
|
88 | + /** |
|
89 | + * Set cache config based on the called method. |
|
90 | + * |
|
91 | + * @param string $name |
|
92 | + * @return void |
|
93 | + */ |
|
94 | + private function setCacheConfig($name) |
|
95 | + { |
|
96 | + $config = \CoreConfig::getConfig(); |
|
97 | + $cacheConfig = Arr::get($config['cacheConfig'], $this->cacheTag, false); |
|
98 | + $this->cacheConfig = false; |
|
99 | 99 | |
100 | - if ($cacheConfig && in_array($name, $cacheConfig['cache'])) { |
|
101 | - $this->cacheConfig = 'cache'; |
|
102 | - } elseif ($cacheConfig && isset($cacheConfig['clear'][$name])) { |
|
103 | - $this->cacheConfig = $cacheConfig['clear'][$name]; |
|
104 | - } |
|
105 | - } |
|
100 | + if ($cacheConfig && in_array($name, $cacheConfig['cache'])) { |
|
101 | + $this->cacheConfig = 'cache'; |
|
102 | + } elseif ($cacheConfig && isset($cacheConfig['clear'][$name])) { |
|
103 | + $this->cacheConfig = $cacheConfig['clear'][$name]; |
|
104 | + } |
|
105 | + } |
|
106 | 106 | } |
@@ -2,28 +2,28 @@ |
||
2 | 2 | |
3 | 3 | return [ |
4 | 4 | |
5 | - /** |
|
6 | - * List of error messages used in core module. |
|
7 | - */ |
|
8 | - 'unAuthorized' => 'من فضلك قم بتسجيل الدخول', |
|
9 | - 'invalidRefreshToken' => 'رمز التحديث غير صالح', |
|
10 | - 'noPermissions' => 'لا توجد صلاحية', |
|
11 | - 'loginFailed' => 'خطأ في البريد لاكتروني او كلمة المرور', |
|
12 | - 'noSocialEmail' => 'لا يمكن الحصول علي تابريد الاكتروني', |
|
13 | - 'userAlreadyRegistered' => 'المستخد مسجل بالفعل.سجل الدخول بالبريد الاكتروني و كلمة السر', |
|
14 | - 'connectionError' => 'خطأ في الاتصال', |
|
15 | - 'redisNotRunning' => 'سيرفير الاشعارات لايعمل', |
|
16 | - 'dbQueryError' => 'خطا في البيانات', |
|
17 | - 'cannotCreateSetting' => 'لا يمكن اضافة اعدادات', |
|
18 | - 'cannotUpdateSettingKey' => 'لا يمكن تعديل اعدادات', |
|
19 | - 'userIsBlocked' => 'لقد تم حظرك', |
|
20 | - 'invalidResetToken' => 'رمز تعديل كلمة المرور خطا', |
|
21 | - 'invalidResetPassword' => 'خطا في نعديل كلمة المرور', |
|
22 | - 'invalidOldPassword' => 'كلمة السر القديمه خطا', |
|
23 | - 'invalidConfirmationCode' => 'لينك التاكيد غير صالح اة مستخدم من قبل', |
|
24 | - 'notFound' => 'ال :replace المطلوب غير موجود', |
|
25 | - 'generalError' => 'حدث خطا ما', |
|
26 | - 'emailNotConfirmed' => 'بريدك الاكتروني غير مفعل', |
|
27 | - 'emailAlreadyConfirmed' => 'البريد الاكتروني مفع بالقعل' |
|
5 | + /** |
|
6 | + * List of error messages used in core module. |
|
7 | + */ |
|
8 | + 'unAuthorized' => 'من فضلك قم بتسجيل الدخول', |
|
9 | + 'invalidRefreshToken' => 'رمز التحديث غير صالح', |
|
10 | + 'noPermissions' => 'لا توجد صلاحية', |
|
11 | + 'loginFailed' => 'خطأ في البريد لاكتروني او كلمة المرور', |
|
12 | + 'noSocialEmail' => 'لا يمكن الحصول علي تابريد الاكتروني', |
|
13 | + 'userAlreadyRegistered' => 'المستخد مسجل بالفعل.سجل الدخول بالبريد الاكتروني و كلمة السر', |
|
14 | + 'connectionError' => 'خطأ في الاتصال', |
|
15 | + 'redisNotRunning' => 'سيرفير الاشعارات لايعمل', |
|
16 | + 'dbQueryError' => 'خطا في البيانات', |
|
17 | + 'cannotCreateSetting' => 'لا يمكن اضافة اعدادات', |
|
18 | + 'cannotUpdateSettingKey' => 'لا يمكن تعديل اعدادات', |
|
19 | + 'userIsBlocked' => 'لقد تم حظرك', |
|
20 | + 'invalidResetToken' => 'رمز تعديل كلمة المرور خطا', |
|
21 | + 'invalidResetPassword' => 'خطا في نعديل كلمة المرور', |
|
22 | + 'invalidOldPassword' => 'كلمة السر القديمه خطا', |
|
23 | + 'invalidConfirmationCode' => 'لينك التاكيد غير صالح اة مستخدم من قبل', |
|
24 | + 'notFound' => 'ال :replace المطلوب غير موجود', |
|
25 | + 'generalError' => 'حدث خطا ما', |
|
26 | + 'emailNotConfirmed' => 'بريدك الاكتروني غير مفعل', |
|
27 | + 'emailAlreadyConfirmed' => 'البريد الاكتروني مفع بالقعل' |
|
28 | 28 | |
29 | 29 | ]; |
@@ -2,28 +2,28 @@ |
||
2 | 2 | |
3 | 3 | return [ |
4 | 4 | |
5 | - /** |
|
6 | - * List of error messages used in core module. |
|
7 | - */ |
|
8 | - 'unAuthorized' => 'Please login before any action', |
|
9 | - 'invalidRefreshToken' => 'Invalid refresh token', |
|
10 | - 'noPermissions' => 'No permissions', |
|
11 | - 'loginFailed' => 'Wrong mail or password', |
|
12 | - 'noSocialEmail' => 'Couldn\'t retrieve email', |
|
13 | - 'userAlreadyRegistered' => 'User already registered. Please login using email and password', |
|
14 | - 'connectionError' => 'Connection error', |
|
15 | - 'redisNotRunning' => 'Your redis notification server is\'t running', |
|
16 | - 'dbQueryError' => 'Please check the given inputes', |
|
17 | - 'cannotCreateSetting' => 'Can\'t create setting', |
|
18 | - 'cannotUpdateSettingKey' => 'Can\'t update setting key', |
|
19 | - 'userIsBlocked' => 'You have been blocked', |
|
20 | - 'invalidResetToken' => 'Reset password token is invalid', |
|
21 | - 'invalidResetPassword' => 'Reset password is invalid', |
|
22 | - 'invalidOldPassword' => 'Old password is invalid', |
|
23 | - 'invalidConfirmationCode' => 'Confirmation link expired or already used', |
|
24 | - 'notFound' => 'The requested :replace not found', |
|
25 | - 'generalError' => 'Something went wrong', |
|
26 | - 'emailNotConfirmed' => 'Your email isn\'t confirmed', |
|
27 | - 'emailAlreadyConfirmed' => 'Your email is already confirmed' |
|
5 | + /** |
|
6 | + * List of error messages used in core module. |
|
7 | + */ |
|
8 | + 'unAuthorized' => 'Please login before any action', |
|
9 | + 'invalidRefreshToken' => 'Invalid refresh token', |
|
10 | + 'noPermissions' => 'No permissions', |
|
11 | + 'loginFailed' => 'Wrong mail or password', |
|
12 | + 'noSocialEmail' => 'Couldn\'t retrieve email', |
|
13 | + 'userAlreadyRegistered' => 'User already registered. Please login using email and password', |
|
14 | + 'connectionError' => 'Connection error', |
|
15 | + 'redisNotRunning' => 'Your redis notification server is\'t running', |
|
16 | + 'dbQueryError' => 'Please check the given inputes', |
|
17 | + 'cannotCreateSetting' => 'Can\'t create setting', |
|
18 | + 'cannotUpdateSettingKey' => 'Can\'t update setting key', |
|
19 | + 'userIsBlocked' => 'You have been blocked', |
|
20 | + 'invalidResetToken' => 'Reset password token is invalid', |
|
21 | + 'invalidResetPassword' => 'Reset password is invalid', |
|
22 | + 'invalidOldPassword' => 'Old password is invalid', |
|
23 | + 'invalidConfirmationCode' => 'Confirmation link expired or already used', |
|
24 | + 'notFound' => 'The requested :replace not found', |
|
25 | + 'generalError' => 'Something went wrong', |
|
26 | + 'emailNotConfirmed' => 'Your email isn\'t confirmed', |
|
27 | + 'emailAlreadyConfirmed' => 'Your email is already confirmed' |
|
28 | 28 | |
29 | 29 | ]; |
@@ -4,8 +4,8 @@ |
||
4 | 4 | |
5 | 5 | class CoreConfig extends Facade |
6 | 6 | { |
7 | - protected static function getFacadeAccessor() |
|
8 | - { |
|
9 | - return 'CoreConfig'; |
|
10 | - } |
|
7 | + protected static function getFacadeAccessor() |
|
8 | + { |
|
9 | + return 'CoreConfig'; |
|
10 | + } |
|
11 | 11 | } |
@@ -4,8 +4,8 @@ |
||
4 | 4 | |
5 | 5 | class Media extends Facade |
6 | 6 | { |
7 | - protected static function getFacadeAccessor() |
|
8 | - { |
|
9 | - return 'Media'; |
|
10 | - } |
|
7 | + protected static function getFacadeAccessor() |
|
8 | + { |
|
9 | + return 'Media'; |
|
10 | + } |
|
11 | 11 | } |
@@ -4,8 +4,8 @@ |
||
4 | 4 | |
5 | 5 | class Core extends Facade |
6 | 6 | { |
7 | - protected static function getFacadeAccessor() |
|
8 | - { |
|
9 | - return 'Core'; |
|
10 | - } |
|
7 | + protected static function getFacadeAccessor() |
|
8 | + { |
|
9 | + return 'Core'; |
|
10 | + } |
|
11 | 11 | } |
@@ -4,8 +4,8 @@ |
||
4 | 4 | |
5 | 5 | class ErrorHandler extends Facade |
6 | 6 | { |
7 | - protected static function getFacadeAccessor() |
|
8 | - { |
|
9 | - return 'ErrorHandler'; |
|
10 | - } |
|
7 | + protected static function getFacadeAccessor() |
|
8 | + { |
|
9 | + return 'ErrorHandler'; |
|
10 | + } |
|
11 | 11 | } |
@@ -4,8 +4,8 @@ |
||
4 | 4 | |
5 | 5 | class ApiConsumer extends Facade |
6 | 6 | { |
7 | - protected static function getFacadeAccessor() |
|
8 | - { |
|
9 | - return 'ApiConsumer'; |
|
10 | - } |
|
7 | + protected static function getFacadeAccessor() |
|
8 | + { |
|
9 | + return 'ApiConsumer'; |
|
10 | + } |
|
11 | 11 | } |
@@ -2,17 +2,17 @@ |
||
2 | 2 | |
3 | 3 | class CoreConfig |
4 | 4 | { |
5 | - public function getConfig() |
|
6 | - { |
|
7 | - return [ |
|
8 | - /** |
|
9 | - * Specify what relations should be used for every model. |
|
10 | - */ |
|
11 | - 'relations' => config('skeleton.relations'), |
|
12 | - /** |
|
13 | - * Specify caching config for each api. |
|
14 | - */ |
|
15 | - 'cacheConfig' => config('skeleton.cache_config'), |
|
16 | - ]; |
|
17 | - } |
|
5 | + public function getConfig() |
|
6 | + { |
|
7 | + return [ |
|
8 | + /** |
|
9 | + * Specify what relations should be used for every model. |
|
10 | + */ |
|
11 | + 'relations' => config('skeleton.relations'), |
|
12 | + /** |
|
13 | + * Specify caching config for each api. |
|
14 | + */ |
|
15 | + 'cacheConfig' => config('skeleton.cache_config'), |
|
16 | + ]; |
|
17 | + } |
|
18 | 18 | } |