@@ -2,7 +2,7 @@ discard block |
||
2 | 2 | |
3 | 3 | return [ |
4 | 4 | |
5 | - /* |
|
5 | + /* |
|
6 | 6 | |-------------------------------------------------------------------------- |
7 | 7 | | Validation Language Lines |
8 | 8 | |-------------------------------------------------------------------------- |
@@ -13,76 +13,76 @@ discard block |
||
13 | 13 | | |
14 | 14 | */ |
15 | 15 | |
16 | - 'accepted' => 'يجب قبول الحقل :attribute', |
|
17 | - 'active_url' => 'الحقل :attribute لا يُمثّل رابطًا صحيحًا', |
|
18 | - 'after' => 'يجب على الحقل :attribute أن يكون تاريخًا لاحقًا للتاريخ :date.', |
|
19 | - 'alpha' => 'يجب أن لا يحتوي الحقل :attribute سوى على حروف', |
|
20 | - 'alpha_dash' => 'يجب أن لا يحتوي الحقل :attribute على حروف، أرقام ومطّات.', |
|
21 | - 'alpha_num' => 'يجب أن يحتوي :attribute على حروفٍ وأرقامٍ فقط', |
|
22 | - 'array' => 'يجب أن يكون الحقل :attribute ًمصفوفة', |
|
23 | - 'before' => 'يجب على الحقل :attribute أن يكون تاريخًا سابقًا للتاريخ :date.', |
|
24 | - 'between' => [ |
|
25 | - 'numeric' => 'يجب أن تكون قيمة :attribute محصورة ما بين :min و :max.', |
|
26 | - 'file' => 'يجب أن يكون حجم الملف :attribute محصورًا ما بين :min و :max كيلوبايت.', |
|
27 | - 'string' => 'يجب أن يكون عدد حروف النّص :attribute محصورًا ما بين :min و :max', |
|
28 | - 'array' => 'يجب أن يحتوي :attribute على عدد من العناصر محصورًا ما بين :min و :max', |
|
29 | - ], |
|
30 | - 'boolean' => 'يجب أن تكون قيمة الحقل :attribute إما true أو false ', |
|
31 | - 'confirmed' => 'حقل التأكيد غير مُطابق للحقل :attribute', |
|
32 | - 'date' => 'الحقل :attribute ليس تاريخًا صحيحًا', |
|
33 | - 'date_format' => 'لا يتوافق الحقل :attribute مع الشكل :format.', |
|
34 | - 'different' => 'يجب أن يكون الحقلان :attribute و :other مُختلفان', |
|
35 | - 'digits' => 'يجب أن يحتوي الحقل :attribute على :digits رقمًا/أرقام', |
|
36 | - 'digits_between' => 'يجب أن يحتوي الحقل :attribute ما بين :min و :max رقمًا/أرقام ', |
|
37 | - 'dimensions' => 'The :attribute has invalid image dimensions.', |
|
38 | - 'distinct' => 'للحقل :attribute قيمة مُكرّرة.', |
|
39 | - 'email' => 'يجب أن يكون :attribute عنوان بريد إلكتروني صحيح البُنية', |
|
40 | - 'exists' => 'الحقل :attribute لاغٍ', |
|
41 | - 'file' => 'The :attribute must be a file.', |
|
42 | - 'filled' => 'الحقل :attribute إجباري', |
|
43 | - 'image' => 'يجب أن يكون الحقل :attribute صورةً', |
|
44 | - 'in' => 'الحقل :attribute لاغٍ', |
|
45 | - 'in_array' => 'الحقل :attribute غير موجود في :other.', |
|
46 | - 'integer' => 'يجب أن يكون الحقل :attribute عددًا صحيحًا', |
|
47 | - 'ip' => 'يجب أن يكون الحقل :attribute عنوان IP ذي بُنية صحيحة', |
|
48 | - 'json' => 'يجب أن يكون الحقل :attribute نصآ من نوع JSON.', |
|
49 | - 'max' => [ |
|
50 | - 'numeric' => 'يجب أن تكون قيمة الحقل :attribute أصغر من :max.', |
|
51 | - 'file' => 'يجب أن يكون حجم الملف :attribute أصغر من :max كيلوبايت', |
|
52 | - 'string' => 'يجب أن لا يتجاوز طول النّص :attribute :max حروفٍ/حرفًا', |
|
53 | - 'array' => 'يجب أن لا يحتوي الحقل :attribute على أكثر من :max عناصر/عنصر.', |
|
54 | - ], |
|
55 | - 'mimes' => 'يجب أن يكون الحقل ملفًا من نوع : :values.', |
|
56 | - 'min' => [ |
|
57 | - 'numeric' => 'يجب أن تكون قيمة الحقل :attribute أكبر من :min.', |
|
58 | - 'file' => 'يجب أن يكون حجم الملف :attribute أكبر من :min كيلوبايت', |
|
59 | - 'string' => 'يجب أن يكون طول النص :attribute أكبر من :min حروفٍ/حرفًا', |
|
60 | - 'array' => 'يجب أن يحتوي الحقل :attribute على الأقل على :min عُنصرًا/عناصر', |
|
61 | - ], |
|
62 | - 'not_in' => 'الحقل :attribute لاغٍ', |
|
63 | - 'numeric' => 'يجب على الحقل :attribute أن يكون رقمًا', |
|
64 | - 'present' => 'The :attribute field must be present.', |
|
65 | - 'regex' => 'صيغة الحقل :attribute .غير صحيحة', |
|
66 | - 'required' => 'الحقل :attribute مطلوب.', |
|
67 | - 'required_if' => 'الحقل :attribute مطلوب في حال ما إذا كان :other يساوي :value.', |
|
68 | - 'required_unless' => 'الحقل :attribute مطلوب في حال ما لم يكن :other يساوي :values.', |
|
69 | - 'required_with' => 'الحقل :attribute إذا توفّر :values.', |
|
70 | - 'required_with_all' => 'الحقل :attribute إذا توفّر :values.', |
|
71 | - 'required_without' => 'الحقل :attribute إذا لم يتوفّر :values.', |
|
72 | - 'required_without_all' => 'الحقل :attribute إذا لم يتوفّر :values.', |
|
73 | - 'same' => 'يجب أن يتطابق الحقل :attribute مع :other', |
|
74 | - 'size' => [ |
|
75 | - 'numeric' => 'يجب أن تكون قيمة :attribute أكبر من :size.', |
|
76 | - 'file' => 'يجب أن يكون حجم الملف :attribute أكبر من :size كيلو بايت.', |
|
77 | - 'string' => 'يجب أن يحتوي النص :attribute عن ما لا يقل عن :size حرفٍ/أحرف.', |
|
78 | - 'array' => 'يجب أن يحتوي الحقل :attribute عن ما لا يقل عن:min عنصرٍ/عناصر', |
|
79 | - ], |
|
80 | - 'string' => 'يجب أن يكون الحقل :attribute نصآ.', |
|
81 | - 'timezone' => 'يجب أن يكون :attribute نطاقًا زمنيًا صحيحًا', |
|
82 | - 'unique' => 'قيمة الحقل :attribute مُستخدمة من قبل', |
|
83 | - 'url' => 'صيغة الرابط :attribute غير صحيحة', |
|
16 | + 'accepted' => 'يجب قبول الحقل :attribute', |
|
17 | + 'active_url' => 'الحقل :attribute لا يُمثّل رابطًا صحيحًا', |
|
18 | + 'after' => 'يجب على الحقل :attribute أن يكون تاريخًا لاحقًا للتاريخ :date.', |
|
19 | + 'alpha' => 'يجب أن لا يحتوي الحقل :attribute سوى على حروف', |
|
20 | + 'alpha_dash' => 'يجب أن لا يحتوي الحقل :attribute على حروف، أرقام ومطّات.', |
|
21 | + 'alpha_num' => 'يجب أن يحتوي :attribute على حروفٍ وأرقامٍ فقط', |
|
22 | + 'array' => 'يجب أن يكون الحقل :attribute ًمصفوفة', |
|
23 | + 'before' => 'يجب على الحقل :attribute أن يكون تاريخًا سابقًا للتاريخ :date.', |
|
24 | + 'between' => [ |
|
25 | + 'numeric' => 'يجب أن تكون قيمة :attribute محصورة ما بين :min و :max.', |
|
26 | + 'file' => 'يجب أن يكون حجم الملف :attribute محصورًا ما بين :min و :max كيلوبايت.', |
|
27 | + 'string' => 'يجب أن يكون عدد حروف النّص :attribute محصورًا ما بين :min و :max', |
|
28 | + 'array' => 'يجب أن يحتوي :attribute على عدد من العناصر محصورًا ما بين :min و :max', |
|
29 | + ], |
|
30 | + 'boolean' => 'يجب أن تكون قيمة الحقل :attribute إما true أو false ', |
|
31 | + 'confirmed' => 'حقل التأكيد غير مُطابق للحقل :attribute', |
|
32 | + 'date' => 'الحقل :attribute ليس تاريخًا صحيحًا', |
|
33 | + 'date_format' => 'لا يتوافق الحقل :attribute مع الشكل :format.', |
|
34 | + 'different' => 'يجب أن يكون الحقلان :attribute و :other مُختلفان', |
|
35 | + 'digits' => 'يجب أن يحتوي الحقل :attribute على :digits رقمًا/أرقام', |
|
36 | + 'digits_between' => 'يجب أن يحتوي الحقل :attribute ما بين :min و :max رقمًا/أرقام ', |
|
37 | + 'dimensions' => 'The :attribute has invalid image dimensions.', |
|
38 | + 'distinct' => 'للحقل :attribute قيمة مُكرّرة.', |
|
39 | + 'email' => 'يجب أن يكون :attribute عنوان بريد إلكتروني صحيح البُنية', |
|
40 | + 'exists' => 'الحقل :attribute لاغٍ', |
|
41 | + 'file' => 'The :attribute must be a file.', |
|
42 | + 'filled' => 'الحقل :attribute إجباري', |
|
43 | + 'image' => 'يجب أن يكون الحقل :attribute صورةً', |
|
44 | + 'in' => 'الحقل :attribute لاغٍ', |
|
45 | + 'in_array' => 'الحقل :attribute غير موجود في :other.', |
|
46 | + 'integer' => 'يجب أن يكون الحقل :attribute عددًا صحيحًا', |
|
47 | + 'ip' => 'يجب أن يكون الحقل :attribute عنوان IP ذي بُنية صحيحة', |
|
48 | + 'json' => 'يجب أن يكون الحقل :attribute نصآ من نوع JSON.', |
|
49 | + 'max' => [ |
|
50 | + 'numeric' => 'يجب أن تكون قيمة الحقل :attribute أصغر من :max.', |
|
51 | + 'file' => 'يجب أن يكون حجم الملف :attribute أصغر من :max كيلوبايت', |
|
52 | + 'string' => 'يجب أن لا يتجاوز طول النّص :attribute :max حروفٍ/حرفًا', |
|
53 | + 'array' => 'يجب أن لا يحتوي الحقل :attribute على أكثر من :max عناصر/عنصر.', |
|
54 | + ], |
|
55 | + 'mimes' => 'يجب أن يكون الحقل ملفًا من نوع : :values.', |
|
56 | + 'min' => [ |
|
57 | + 'numeric' => 'يجب أن تكون قيمة الحقل :attribute أكبر من :min.', |
|
58 | + 'file' => 'يجب أن يكون حجم الملف :attribute أكبر من :min كيلوبايت', |
|
59 | + 'string' => 'يجب أن يكون طول النص :attribute أكبر من :min حروفٍ/حرفًا', |
|
60 | + 'array' => 'يجب أن يحتوي الحقل :attribute على الأقل على :min عُنصرًا/عناصر', |
|
61 | + ], |
|
62 | + 'not_in' => 'الحقل :attribute لاغٍ', |
|
63 | + 'numeric' => 'يجب على الحقل :attribute أن يكون رقمًا', |
|
64 | + 'present' => 'The :attribute field must be present.', |
|
65 | + 'regex' => 'صيغة الحقل :attribute .غير صحيحة', |
|
66 | + 'required' => 'الحقل :attribute مطلوب.', |
|
67 | + 'required_if' => 'الحقل :attribute مطلوب في حال ما إذا كان :other يساوي :value.', |
|
68 | + 'required_unless' => 'الحقل :attribute مطلوب في حال ما لم يكن :other يساوي :values.', |
|
69 | + 'required_with' => 'الحقل :attribute إذا توفّر :values.', |
|
70 | + 'required_with_all' => 'الحقل :attribute إذا توفّر :values.', |
|
71 | + 'required_without' => 'الحقل :attribute إذا لم يتوفّر :values.', |
|
72 | + 'required_without_all' => 'الحقل :attribute إذا لم يتوفّر :values.', |
|
73 | + 'same' => 'يجب أن يتطابق الحقل :attribute مع :other', |
|
74 | + 'size' => [ |
|
75 | + 'numeric' => 'يجب أن تكون قيمة :attribute أكبر من :size.', |
|
76 | + 'file' => 'يجب أن يكون حجم الملف :attribute أكبر من :size كيلو بايت.', |
|
77 | + 'string' => 'يجب أن يحتوي النص :attribute عن ما لا يقل عن :size حرفٍ/أحرف.', |
|
78 | + 'array' => 'يجب أن يحتوي الحقل :attribute عن ما لا يقل عن:min عنصرٍ/عناصر', |
|
79 | + ], |
|
80 | + 'string' => 'يجب أن يكون الحقل :attribute نصآ.', |
|
81 | + 'timezone' => 'يجب أن يكون :attribute نطاقًا زمنيًا صحيحًا', |
|
82 | + 'unique' => 'قيمة الحقل :attribute مُستخدمة من قبل', |
|
83 | + 'url' => 'صيغة الرابط :attribute غير صحيحة', |
|
84 | 84 | |
85 | - /* |
|
85 | + /* |
|
86 | 86 | |-------------------------------------------------------------------------- |
87 | 87 | | Custom Validation Language Lines |
88 | 88 | |-------------------------------------------------------------------------- |
@@ -93,13 +93,13 @@ discard block |
||
93 | 93 | | |
94 | 94 | */ |
95 | 95 | |
96 | - 'custom' => [ |
|
97 | - 'attribute-name' => [ |
|
98 | - 'rule-name' => 'custom-message', |
|
99 | - ], |
|
100 | - ], |
|
96 | + 'custom' => [ |
|
97 | + 'attribute-name' => [ |
|
98 | + 'rule-name' => 'custom-message', |
|
99 | + ], |
|
100 | + ], |
|
101 | 101 | |
102 | - /* |
|
102 | + /* |
|
103 | 103 | |-------------------------------------------------------------------------- |
104 | 104 | | Custom Validation Attributes |
105 | 105 | |-------------------------------------------------------------------------- |
@@ -110,36 +110,36 @@ discard block |
||
110 | 110 | | |
111 | 111 | */ |
112 | 112 | |
113 | - 'attributes' => [ |
|
114 | - 'name' => 'الاسم', |
|
115 | - 'username' => 'اسم المُستخدم', |
|
116 | - 'email' => 'البريد الالكتروني', |
|
117 | - 'first_name' => 'الاسم', |
|
118 | - 'last_name' => 'اسم العائلة', |
|
119 | - 'password' => 'كلمة السر', |
|
120 | - 'password_confirmation' => 'تأكيد كلمة السر', |
|
121 | - 'city' => 'المدينة', |
|
122 | - 'country' => 'الدولة', |
|
123 | - 'address' => 'العنوان', |
|
124 | - 'phone' => 'الهاتف', |
|
125 | - 'mobile' => 'الجوال', |
|
126 | - 'age' => 'العمر', |
|
127 | - 'sex' => 'الجنس', |
|
128 | - 'gender' => 'النوع', |
|
129 | - 'day' => 'اليوم', |
|
130 | - 'month' => 'الشهر', |
|
131 | - 'year' => 'السنة', |
|
132 | - 'hour' => 'ساعة', |
|
133 | - 'minute' => 'دقيقة', |
|
134 | - 'second' => 'ثانية', |
|
135 | - 'title' => 'اللقب', |
|
136 | - 'content' => 'المُحتوى', |
|
137 | - 'description' => 'الوصف', |
|
138 | - 'excerpt' => 'المُلخص', |
|
139 | - 'date' => 'التاريخ', |
|
140 | - 'time' => 'الوقت', |
|
141 | - 'available' => 'مُتاح', |
|
142 | - 'size' => 'الحجم', |
|
143 | - ], |
|
113 | + 'attributes' => [ |
|
114 | + 'name' => 'الاسم', |
|
115 | + 'username' => 'اسم المُستخدم', |
|
116 | + 'email' => 'البريد الالكتروني', |
|
117 | + 'first_name' => 'الاسم', |
|
118 | + 'last_name' => 'اسم العائلة', |
|
119 | + 'password' => 'كلمة السر', |
|
120 | + 'password_confirmation' => 'تأكيد كلمة السر', |
|
121 | + 'city' => 'المدينة', |
|
122 | + 'country' => 'الدولة', |
|
123 | + 'address' => 'العنوان', |
|
124 | + 'phone' => 'الهاتف', |
|
125 | + 'mobile' => 'الجوال', |
|
126 | + 'age' => 'العمر', |
|
127 | + 'sex' => 'الجنس', |
|
128 | + 'gender' => 'النوع', |
|
129 | + 'day' => 'اليوم', |
|
130 | + 'month' => 'الشهر', |
|
131 | + 'year' => 'السنة', |
|
132 | + 'hour' => 'ساعة', |
|
133 | + 'minute' => 'دقيقة', |
|
134 | + 'second' => 'ثانية', |
|
135 | + 'title' => 'اللقب', |
|
136 | + 'content' => 'المُحتوى', |
|
137 | + 'description' => 'الوصف', |
|
138 | + 'excerpt' => 'المُلخص', |
|
139 | + 'date' => 'التاريخ', |
|
140 | + 'time' => 'الوقت', |
|
141 | + 'available' => 'مُتاح', |
|
142 | + 'size' => 'الحجم', |
|
143 | + ], |
|
144 | 144 | |
145 | 145 | ]; |
@@ -2,7 +2,7 @@ discard block |
||
2 | 2 | |
3 | 3 | return [ |
4 | 4 | |
5 | - /* |
|
5 | + /* |
|
6 | 6 | |-------------------------------------------------------------------------- |
7 | 7 | | Pagination Language Lines |
8 | 8 | |-------------------------------------------------------------------------- |
@@ -13,7 +13,7 @@ discard block |
||
13 | 13 | | |
14 | 14 | */ |
15 | 15 | |
16 | - 'previous' => '« السابق', |
|
17 | - 'next' => 'التالي »', |
|
16 | + 'previous' => '« السابق', |
|
17 | + 'next' => 'التالي »', |
|
18 | 18 | |
19 | 19 | ]; |
@@ -2,7 +2,7 @@ discard block |
||
2 | 2 | |
3 | 3 | return [ |
4 | 4 | |
5 | - /* |
|
5 | + /* |
|
6 | 6 | |-------------------------------------------------------------------------- |
7 | 7 | | Authentication Language Lines |
8 | 8 | |-------------------------------------------------------------------------- |
@@ -13,7 +13,7 @@ discard block |
||
13 | 13 | | |
14 | 14 | */ |
15 | 15 | |
16 | - 'failed' => 'بيانات الاعتماد هذه غير متطابقة مع البيانات المسجلة لدينا.', |
|
17 | - 'throttle' => 'عدد كبير جدا من محاولات الدخول. يرجى المحاولة مرة أخرى بعد :seconds ثانية.', |
|
16 | + 'failed' => 'بيانات الاعتماد هذه غير متطابقة مع البيانات المسجلة لدينا.', |
|
17 | + 'throttle' => 'عدد كبير جدا من محاولات الدخول. يرجى المحاولة مرة أخرى بعد :seconds ثانية.', |
|
18 | 18 | |
19 | 19 | ]; |
@@ -2,7 +2,7 @@ discard block |
||
2 | 2 | |
3 | 3 | return [ |
4 | 4 | |
5 | - /* |
|
5 | + /* |
|
6 | 6 | |-------------------------------------------------------------------------- |
7 | 7 | | Password Reminder Language Lines |
8 | 8 | |-------------------------------------------------------------------------- |
@@ -13,10 +13,10 @@ discard block |
||
13 | 13 | | |
14 | 14 | */ |
15 | 15 | |
16 | - 'password' => 'يجب أن لا يقل طول كلمة السر عن ستة أحرف، كما يجب أن تتطابق مع حقل التأكيد', |
|
17 | - 'reset' => 'تمت إعادة تعيين كلمة السر', |
|
18 | - 'sent' => 'تم إرسال تفاصيل استعادة كلمة السر الخاصة بك إلى بريدك الإلكتروني', |
|
19 | - 'token' => '.رمز استعادة كلمة السر الذي أدخلته غير صحيح', |
|
20 | - 'user' => 'لم يتم العثور على أيّ حسابٍ بهذا العنوان الإلكتروني', |
|
16 | + 'password' => 'يجب أن لا يقل طول كلمة السر عن ستة أحرف، كما يجب أن تتطابق مع حقل التأكيد', |
|
17 | + 'reset' => 'تمت إعادة تعيين كلمة السر', |
|
18 | + 'sent' => 'تم إرسال تفاصيل استعادة كلمة السر الخاصة بك إلى بريدك الإلكتروني', |
|
19 | + 'token' => '.رمز استعادة كلمة السر الذي أدخلته غير صحيح', |
|
20 | + 'user' => 'لم يتم العثور على أيّ حسابٍ بهذا العنوان الإلكتروني', |
|
21 | 21 | |
22 | 22 | ]; |
@@ -8,31 +8,31 @@ |
||
8 | 8 | |
9 | 9 | class AuthServiceProvider extends ServiceProvider |
10 | 10 | { |
11 | - /** |
|
12 | - * The policy mappings for the application. |
|
13 | - * |
|
14 | - * @var array |
|
15 | - */ |
|
16 | - protected $policies = [ |
|
17 | - 'App\Model' => 'App\Policies\ModelPolicy', |
|
18 | - ]; |
|
11 | + /** |
|
12 | + * The policy mappings for the application. |
|
13 | + * |
|
14 | + * @var array |
|
15 | + */ |
|
16 | + protected $policies = [ |
|
17 | + 'App\Model' => 'App\Policies\ModelPolicy', |
|
18 | + ]; |
|
19 | 19 | |
20 | - /** |
|
21 | - * Register any authentication / authorization services. |
|
22 | - * |
|
23 | - * @return void |
|
24 | - */ |
|
25 | - public function boot() |
|
26 | - { |
|
27 | - $this->registerPolicies(); |
|
20 | + /** |
|
21 | + * Register any authentication / authorization services. |
|
22 | + * |
|
23 | + * @return void |
|
24 | + */ |
|
25 | + public function boot() |
|
26 | + { |
|
27 | + $this->registerPolicies(); |
|
28 | 28 | |
29 | - Passport::routes(function ($router) { |
|
30 | - $router->forAuthorization(); |
|
31 | - $router->forAccessTokens(); |
|
32 | - $router->forPersonalAccessTokens(); |
|
33 | - $router->forTransientTokens(); |
|
34 | - }); |
|
35 | - Passport::tokensExpireIn(\Carbon\Carbon::now()->addMinutes(10)); |
|
36 | - Passport::refreshTokensExpireIn(\Carbon\Carbon::now()->addDays(10)); |
|
37 | - } |
|
29 | + Passport::routes(function ($router) { |
|
30 | + $router->forAuthorization(); |
|
31 | + $router->forAccessTokens(); |
|
32 | + $router->forPersonalAccessTokens(); |
|
33 | + $router->forTransientTokens(); |
|
34 | + }); |
|
35 | + Passport::tokensExpireIn(\Carbon\Carbon::now()->addMinutes(10)); |
|
36 | + Passport::refreshTokensExpireIn(\Carbon\Carbon::now()->addDays(10)); |
|
37 | + } |
|
38 | 38 | } |
@@ -26,7 +26,7 @@ |
||
26 | 26 | { |
27 | 27 | $this->registerPolicies(); |
28 | 28 | |
29 | - Passport::routes(function ($router) { |
|
29 | + Passport::routes(function($router) { |
|
30 | 30 | $router->forAuthorization(); |
31 | 31 | $router->forAccessTokens(); |
32 | 32 | $router->forPersonalAccessTokens(); |
@@ -7,15 +7,15 @@ |
||
7 | 7 | |
8 | 8 | class BroadcastServiceProvider extends ServiceProvider |
9 | 9 | { |
10 | - /** |
|
11 | - * Bootstrap any application services. |
|
12 | - * |
|
13 | - * @return void |
|
14 | - */ |
|
15 | - public function boot() |
|
16 | - { |
|
17 | - Broadcast::routes(['middleware' => ['auth:api']]); |
|
10 | + /** |
|
11 | + * Bootstrap any application services. |
|
12 | + * |
|
13 | + * @return void |
|
14 | + */ |
|
15 | + public function boot() |
|
16 | + { |
|
17 | + Broadcast::routes(['middleware' => ['auth:api']]); |
|
18 | 18 | |
19 | - require base_path('routes/channels.php'); |
|
20 | - } |
|
19 | + require base_path('routes/channels.php'); |
|
20 | + } |
|
21 | 21 | } |
@@ -12,5 +12,5 @@ |
||
12 | 12 | */ |
13 | 13 | |
14 | 14 | Broadcast::channel('users.{id}', function ($user, $id) { |
15 | - return (int) $user->id === (int) $id; |
|
15 | + return (int) $user->id === (int) $id; |
|
16 | 16 | }); |
@@ -11,6 +11,6 @@ |
||
11 | 11 | | |
12 | 12 | */ |
13 | 13 | |
14 | -Broadcast::channel('users.{id}', function ($user, $id) { |
|
14 | +Broadcast::channel('users.{id}', function($user, $id) { |
|
15 | 15 | return (int) $user->id === (int) $id; |
16 | 16 | }); |
@@ -199,7 +199,7 @@ |
||
199 | 199 | /** |
200 | 200 | * Get the given method body code. |
201 | 201 | * |
202 | - * @param object $reflectionMethod |
|
202 | + * @param \ReflectionMethod $reflectionMethod |
|
203 | 203 | * @return string |
204 | 204 | */ |
205 | 205 | protected function getMethodBody($reflectionMethod) |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | */ |
80 | 80 | protected function getRoutes() |
81 | 81 | { |
82 | - return collect(\Route::getRoutes())->map(function ($route) { |
|
82 | + return collect(\Route::getRoutes())->map(function($route) { |
|
83 | 83 | if (strpos($route->uri(), 'api/') !== false) { |
84 | 84 | return [ |
85 | 85 | 'method' => $route->methods()[0], |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | ]; |
111 | 111 | |
112 | 112 | |
113 | - if (! $skipLoginCheck || ! in_array($method, $skipLoginCheck)) { |
|
113 | + if ( ! $skipLoginCheck || ! in_array($method, $skipLoginCheck)) { |
|
114 | 114 | $route['headers']['Authorization'] = 'Bearer {token}'; |
115 | 115 | } |
116 | 116 | } |
@@ -7,255 +7,255 @@ |
||
7 | 7 | |
8 | 8 | class GenerateDoc extends Command |
9 | 9 | { |
10 | - /** |
|
11 | - * The name and signature of the console command. |
|
12 | - * |
|
13 | - * @var string |
|
14 | - */ |
|
15 | - protected $signature = 'doc:generate'; |
|
10 | + /** |
|
11 | + * The name and signature of the console command. |
|
12 | + * |
|
13 | + * @var string |
|
14 | + */ |
|
15 | + protected $signature = 'doc:generate'; |
|
16 | 16 | |
17 | - /** |
|
18 | - * The console command description. |
|
19 | - * |
|
20 | - * @var string |
|
21 | - */ |
|
22 | - protected $description = 'Generate api documentation'; |
|
17 | + /** |
|
18 | + * The console command description. |
|
19 | + * |
|
20 | + * @var string |
|
21 | + */ |
|
22 | + protected $description = 'Generate api documentation'; |
|
23 | 23 | |
24 | - /** |
|
25 | - * Init new object. |
|
26 | - * |
|
27 | - * @return void |
|
28 | - */ |
|
29 | - public function __construct() |
|
30 | - { |
|
31 | - parent::__construct(); |
|
32 | - } |
|
24 | + /** |
|
25 | + * Init new object. |
|
26 | + * |
|
27 | + * @return void |
|
28 | + */ |
|
29 | + public function __construct() |
|
30 | + { |
|
31 | + parent::__construct(); |
|
32 | + } |
|
33 | 33 | |
34 | - /** |
|
35 | - * Execute the console command. |
|
36 | - * |
|
37 | - * @return mixed |
|
38 | - */ |
|
39 | - public function handle() |
|
40 | - { |
|
41 | - $docData = []; |
|
42 | - $docData['models'] = []; |
|
43 | - $routes = $this->getRoutes(); |
|
44 | - foreach ($routes as $route) { |
|
45 | - if ($route) { |
|
46 | - $actoinArray = explode('@', $route['action']); |
|
47 | - if (Arr::get($actoinArray, 1, false)) { |
|
48 | - $controller = $actoinArray[0]; |
|
49 | - $method = $actoinArray[1]; |
|
50 | - $route['name'] = $method !== 'index' ? $method : 'list'; |
|
34 | + /** |
|
35 | + * Execute the console command. |
|
36 | + * |
|
37 | + * @return mixed |
|
38 | + */ |
|
39 | + public function handle() |
|
40 | + { |
|
41 | + $docData = []; |
|
42 | + $docData['models'] = []; |
|
43 | + $routes = $this->getRoutes(); |
|
44 | + foreach ($routes as $route) { |
|
45 | + if ($route) { |
|
46 | + $actoinArray = explode('@', $route['action']); |
|
47 | + if (Arr::get($actoinArray, 1, false)) { |
|
48 | + $controller = $actoinArray[0]; |
|
49 | + $method = $actoinArray[1]; |
|
50 | + $route['name'] = $method !== 'index' ? $method : 'list'; |
|
51 | 51 | |
52 | - $reflectionClass = new \ReflectionClass($controller); |
|
53 | - $reflectionMethod = $reflectionClass->getMethod($method); |
|
54 | - $classProperties = $reflectionClass->getDefaultProperties(); |
|
55 | - $skipLoginCheck = Arr::get($classProperties, 'skipLoginCheck', false); |
|
56 | - $validationRules = Arr::get($classProperties, 'validationRules', false); |
|
52 | + $reflectionClass = new \ReflectionClass($controller); |
|
53 | + $reflectionMethod = $reflectionClass->getMethod($method); |
|
54 | + $classProperties = $reflectionClass->getDefaultProperties(); |
|
55 | + $skipLoginCheck = Arr::get($classProperties, 'skipLoginCheck', false); |
|
56 | + $validationRules = Arr::get($classProperties, 'validationRules', false); |
|
57 | 57 | |
58 | - dd($classProperties); |
|
59 | - $this->processDocBlock($route, $reflectionMethod); |
|
60 | - $this->getHeaders($route, $method, $skipLoginCheck); |
|
61 | - $this->getPostData($route, $reflectionMethod, $validationRules); |
|
58 | + dd($classProperties); |
|
59 | + $this->processDocBlock($route, $reflectionMethod); |
|
60 | + $this->getHeaders($route, $method, $skipLoginCheck); |
|
61 | + $this->getPostData($route, $reflectionMethod, $validationRules); |
|
62 | 62 | |
63 | - $route['response'] = $this->getResponseObject($classProperties['model'], $route['name'], $route['returnDocBlock']); |
|
63 | + $route['response'] = $this->getResponseObject($classProperties['model'], $route['name'], $route['returnDocBlock']); |
|
64 | 64 | |
65 | - preg_match('/api\/([^#]+)\//iU', $route['uri'], $module); |
|
66 | - $docData['modules'][$module[1]][substr($route['prefix'], strlen('/api/'.$module[1].'/') - 1)][] = $route; |
|
65 | + preg_match('/api\/([^#]+)\//iU', $route['uri'], $module); |
|
66 | + $docData['modules'][$module[1]][substr($route['prefix'], strlen('/api/'.$module[1].'/') - 1)][] = $route; |
|
67 | 67 | |
68 | - $this->getModels($classProperties['model'], $docData); |
|
69 | - } |
|
70 | - } |
|
71 | - } |
|
68 | + $this->getModels($classProperties['model'], $docData); |
|
69 | + } |
|
70 | + } |
|
71 | + } |
|
72 | 72 | |
73 | - $docData['errors'] = $this->getErrors(); |
|
74 | - $docData['reports'] = \Core::reports()->all(); |
|
75 | - \File::put(app_path('Modules/Core/Resources/api.json'), json_encode($docData)); |
|
76 | - } |
|
73 | + $docData['errors'] = $this->getErrors(); |
|
74 | + $docData['reports'] = \Core::reports()->all(); |
|
75 | + \File::put(app_path('Modules/Core/Resources/api.json'), json_encode($docData)); |
|
76 | + } |
|
77 | 77 | |
78 | - /** |
|
79 | - * Get list of all registered routes. |
|
80 | - * |
|
81 | - * @return collection |
|
82 | - */ |
|
83 | - protected function getRoutes() |
|
84 | - { |
|
85 | - return collect(\Route::getRoutes())->map(function ($route) { |
|
86 | - if (strpos($route->uri(), 'api/') !== false) { |
|
87 | - return [ |
|
88 | - 'method' => $route->methods()[0], |
|
89 | - 'uri' => $route->uri(), |
|
90 | - 'action' => $route->getActionName(), |
|
91 | - 'prefix' => $route->getPrefix() |
|
92 | - ]; |
|
93 | - } |
|
94 | - return false; |
|
95 | - })->all(); |
|
96 | - } |
|
78 | + /** |
|
79 | + * Get list of all registered routes. |
|
80 | + * |
|
81 | + * @return collection |
|
82 | + */ |
|
83 | + protected function getRoutes() |
|
84 | + { |
|
85 | + return collect(\Route::getRoutes())->map(function ($route) { |
|
86 | + if (strpos($route->uri(), 'api/') !== false) { |
|
87 | + return [ |
|
88 | + 'method' => $route->methods()[0], |
|
89 | + 'uri' => $route->uri(), |
|
90 | + 'action' => $route->getActionName(), |
|
91 | + 'prefix' => $route->getPrefix() |
|
92 | + ]; |
|
93 | + } |
|
94 | + return false; |
|
95 | + })->all(); |
|
96 | + } |
|
97 | 97 | |
98 | - /** |
|
99 | - * Generate headers for the given route. |
|
100 | - * |
|
101 | - * @param array &$route |
|
102 | - * @param string $method |
|
103 | - * @param array $skipLoginCheck |
|
104 | - * @return void |
|
105 | - */ |
|
106 | - protected function getHeaders(&$route, $method, $skipLoginCheck) |
|
107 | - { |
|
108 | - $route['headers'] = [ |
|
109 | - 'Accept' => 'application/json', |
|
110 | - 'Content-Type' => 'application/json', |
|
111 | - 'locale' => 'The language of the returned data: ar, en or all.', |
|
112 | - 'time-zone' => 'Your locale time zone', |
|
113 | - ]; |
|
98 | + /** |
|
99 | + * Generate headers for the given route. |
|
100 | + * |
|
101 | + * @param array &$route |
|
102 | + * @param string $method |
|
103 | + * @param array $skipLoginCheck |
|
104 | + * @return void |
|
105 | + */ |
|
106 | + protected function getHeaders(&$route, $method, $skipLoginCheck) |
|
107 | + { |
|
108 | + $route['headers'] = [ |
|
109 | + 'Accept' => 'application/json', |
|
110 | + 'Content-Type' => 'application/json', |
|
111 | + 'locale' => 'The language of the returned data: ar, en or all.', |
|
112 | + 'time-zone' => 'Your locale time zone', |
|
113 | + ]; |
|
114 | 114 | |
115 | 115 | |
116 | - if (! $skipLoginCheck || ! in_array($method, $skipLoginCheck)) { |
|
117 | - $route['headers']['Authorization'] = 'Bearer {token}'; |
|
118 | - } |
|
119 | - } |
|
116 | + if (! $skipLoginCheck || ! in_array($method, $skipLoginCheck)) { |
|
117 | + $route['headers']['Authorization'] = 'Bearer {token}'; |
|
118 | + } |
|
119 | + } |
|
120 | 120 | |
121 | - /** |
|
122 | - * Generate description and params for the given route |
|
123 | - * based on the docblock. |
|
124 | - * |
|
125 | - * @param array &$route |
|
126 | - * @param \ReflectionMethod $reflectionMethod |
|
127 | - * @return void |
|
128 | - */ |
|
129 | - protected function processDocBlock(&$route, $reflectionMethod) |
|
130 | - { |
|
131 | - $factory = \phpDocumentor\Reflection\DocBlockFactory::createInstance(); |
|
132 | - $docblock = $factory->create($reflectionMethod->getDocComment()); |
|
133 | - $route['description'] = trim(preg_replace('/\s+/', ' ', $docblock->getSummary())); |
|
134 | - $params = $docblock->getTagsByName('param'); |
|
135 | - $route['returnDocBlock'] = $docblock->getTagsByName('return')[0]->getType()->getFqsen()->getName(); |
|
136 | - foreach ($params as $param) { |
|
137 | - $name = $param->getVariableName(); |
|
138 | - if ($name !== 'request') { |
|
139 | - $route['parametars'][$param->getVariableName()] = $param->getDescription()->render(); |
|
140 | - } |
|
141 | - } |
|
142 | - } |
|
121 | + /** |
|
122 | + * Generate description and params for the given route |
|
123 | + * based on the docblock. |
|
124 | + * |
|
125 | + * @param array &$route |
|
126 | + * @param \ReflectionMethod $reflectionMethod |
|
127 | + * @return void |
|
128 | + */ |
|
129 | + protected function processDocBlock(&$route, $reflectionMethod) |
|
130 | + { |
|
131 | + $factory = \phpDocumentor\Reflection\DocBlockFactory::createInstance(); |
|
132 | + $docblock = $factory->create($reflectionMethod->getDocComment()); |
|
133 | + $route['description'] = trim(preg_replace('/\s+/', ' ', $docblock->getSummary())); |
|
134 | + $params = $docblock->getTagsByName('param'); |
|
135 | + $route['returnDocBlock'] = $docblock->getTagsByName('return')[0]->getType()->getFqsen()->getName(); |
|
136 | + foreach ($params as $param) { |
|
137 | + $name = $param->getVariableName(); |
|
138 | + if ($name !== 'request') { |
|
139 | + $route['parametars'][$param->getVariableName()] = $param->getDescription()->render(); |
|
140 | + } |
|
141 | + } |
|
142 | + } |
|
143 | 143 | |
144 | - /** |
|
145 | - * Generate post body for the given route. |
|
146 | - * |
|
147 | - * @param array &$route |
|
148 | - * @param \ReflectionMethod $reflectionMethod |
|
149 | - * @param array $validationRules |
|
150 | - * @return void |
|
151 | - */ |
|
152 | - protected function getPostData(&$route, $reflectionMethod, $validationRules) |
|
153 | - { |
|
154 | - if ($route['method'] == 'POST') { |
|
155 | - $body = $this->getMethodBody($reflectionMethod); |
|
144 | + /** |
|
145 | + * Generate post body for the given route. |
|
146 | + * |
|
147 | + * @param array &$route |
|
148 | + * @param \ReflectionMethod $reflectionMethod |
|
149 | + * @param array $validationRules |
|
150 | + * @return void |
|
151 | + */ |
|
152 | + protected function getPostData(&$route, $reflectionMethod, $validationRules) |
|
153 | + { |
|
154 | + if ($route['method'] == 'POST') { |
|
155 | + $body = $this->getMethodBody($reflectionMethod); |
|
156 | 156 | |
157 | - preg_match('/\$this->validate\(\$request,([^#]+)\);/iU', $body, $match); |
|
158 | - if (count($match)) { |
|
159 | - if ($match[1] == '$this->validationRules') { |
|
160 | - $route['body'] = $validationRules; |
|
161 | - } else { |
|
162 | - $route['body'] = eval('return '.str_replace(',\'.$request->get(\'id\')', ',{id}\'', $match[1]).';'); |
|
163 | - } |
|
157 | + preg_match('/\$this->validate\(\$request,([^#]+)\);/iU', $body, $match); |
|
158 | + if (count($match)) { |
|
159 | + if ($match[1] == '$this->validationRules') { |
|
160 | + $route['body'] = $validationRules; |
|
161 | + } else { |
|
162 | + $route['body'] = eval('return '.str_replace(',\'.$request->get(\'id\')', ',{id}\'', $match[1]).';'); |
|
163 | + } |
|
164 | 164 | |
165 | - foreach ($route['body'] as &$rule) { |
|
166 | - if (strpos($rule, 'unique')) { |
|
167 | - $rule = substr($rule, 0, strpos($rule, 'unique') + 6); |
|
168 | - } elseif (strpos($rule, 'exists')) { |
|
169 | - $rule = substr($rule, 0, strpos($rule, 'exists') - 1); |
|
170 | - } |
|
171 | - } |
|
172 | - } else { |
|
173 | - $route['body'] = 'conditions'; |
|
174 | - } |
|
175 | - } |
|
176 | - } |
|
165 | + foreach ($route['body'] as &$rule) { |
|
166 | + if (strpos($rule, 'unique')) { |
|
167 | + $rule = substr($rule, 0, strpos($rule, 'unique') + 6); |
|
168 | + } elseif (strpos($rule, 'exists')) { |
|
169 | + $rule = substr($rule, 0, strpos($rule, 'exists') - 1); |
|
170 | + } |
|
171 | + } |
|
172 | + } else { |
|
173 | + $route['body'] = 'conditions'; |
|
174 | + } |
|
175 | + } |
|
176 | + } |
|
177 | 177 | |
178 | - /** |
|
179 | - * Generate application errors. |
|
180 | - * |
|
181 | - * @return array |
|
182 | - */ |
|
183 | - protected function getErrors() |
|
184 | - { |
|
185 | - $errors = []; |
|
186 | - $reflectionClass = new \ReflectionClass('App\Modules\Core\Utl\ErrorHandler'); |
|
187 | - foreach ($reflectionClass->getMethods() as $method) { |
|
188 | - $methodName = $method->name; |
|
189 | - $reflectionMethod = $reflectionClass->getMethod($methodName); |
|
190 | - $body = $this->getMethodBody($reflectionMethod); |
|
178 | + /** |
|
179 | + * Generate application errors. |
|
180 | + * |
|
181 | + * @return array |
|
182 | + */ |
|
183 | + protected function getErrors() |
|
184 | + { |
|
185 | + $errors = []; |
|
186 | + $reflectionClass = new \ReflectionClass('App\Modules\Core\Utl\ErrorHandler'); |
|
187 | + foreach ($reflectionClass->getMethods() as $method) { |
|
188 | + $methodName = $method->name; |
|
189 | + $reflectionMethod = $reflectionClass->getMethod($methodName); |
|
190 | + $body = $this->getMethodBody($reflectionMethod); |
|
191 | 191 | |
192 | - preg_match('/\$error=\[\'status\'=>([^#]+)\,/iU', $body, $match); |
|
192 | + preg_match('/\$error=\[\'status\'=>([^#]+)\,/iU', $body, $match); |
|
193 | 193 | |
194 | - if (count($match)) { |
|
195 | - $errors[$match[1]][] = $methodName; |
|
196 | - } |
|
197 | - } |
|
194 | + if (count($match)) { |
|
195 | + $errors[$match[1]][] = $methodName; |
|
196 | + } |
|
197 | + } |
|
198 | 198 | |
199 | - return $errors; |
|
200 | - } |
|
199 | + return $errors; |
|
200 | + } |
|
201 | 201 | |
202 | - /** |
|
203 | - * Get the given method body code. |
|
204 | - * |
|
205 | - * @param object $reflectionMethod |
|
206 | - * @return string |
|
207 | - */ |
|
208 | - protected function getMethodBody($reflectionMethod) |
|
209 | - { |
|
210 | - $filename = $reflectionMethod->getFileName(); |
|
211 | - $start_line = $reflectionMethod->getStartLine() - 1; |
|
212 | - $end_line = $reflectionMethod->getEndLine(); |
|
213 | - $length = $end_line - $start_line; |
|
214 | - $source = file($filename); |
|
215 | - $body = implode("", array_slice($source, $start_line, $length)); |
|
216 | - $body = trim(preg_replace('/\s+/', '', $body)); |
|
202 | + /** |
|
203 | + * Get the given method body code. |
|
204 | + * |
|
205 | + * @param object $reflectionMethod |
|
206 | + * @return string |
|
207 | + */ |
|
208 | + protected function getMethodBody($reflectionMethod) |
|
209 | + { |
|
210 | + $filename = $reflectionMethod->getFileName(); |
|
211 | + $start_line = $reflectionMethod->getStartLine() - 1; |
|
212 | + $end_line = $reflectionMethod->getEndLine(); |
|
213 | + $length = $end_line - $start_line; |
|
214 | + $source = file($filename); |
|
215 | + $body = implode("", array_slice($source, $start_line, $length)); |
|
216 | + $body = trim(preg_replace('/\s+/', '', $body)); |
|
217 | 217 | |
218 | - return $body; |
|
219 | - } |
|
218 | + return $body; |
|
219 | + } |
|
220 | 220 | |
221 | - /** |
|
222 | - * Get example object of all availble models. |
|
223 | - * |
|
224 | - * @param string $modelName |
|
225 | - * @param array $docData |
|
226 | - * @return string |
|
227 | - */ |
|
228 | - protected function getModels($modelName, &$docData) |
|
229 | - { |
|
230 | - if ($modelName && ! Arr::has($docData['models'], $modelName)) { |
|
231 | - $modelClass = call_user_func_array("\Core::{$modelName}", [])->modelClass; |
|
232 | - $model = factory($modelClass)->make(); |
|
233 | - $modelArr = $model->toArray(); |
|
221 | + /** |
|
222 | + * Get example object of all availble models. |
|
223 | + * |
|
224 | + * @param string $modelName |
|
225 | + * @param array $docData |
|
226 | + * @return string |
|
227 | + */ |
|
228 | + protected function getModels($modelName, &$docData) |
|
229 | + { |
|
230 | + if ($modelName && ! Arr::has($docData['models'], $modelName)) { |
|
231 | + $modelClass = call_user_func_array("\Core::{$modelName}", [])->modelClass; |
|
232 | + $model = factory($modelClass)->make(); |
|
233 | + $modelArr = $model->toArray(); |
|
234 | 234 | |
235 | - if ($model->trans && ! $model->trans->count()) { |
|
236 | - $modelArr['trans'] = [ |
|
237 | - 'en' => factory($modelClass.'Translation')->make()->toArray() |
|
238 | - ]; |
|
239 | - } |
|
235 | + if ($model->trans && ! $model->trans->count()) { |
|
236 | + $modelArr['trans'] = [ |
|
237 | + 'en' => factory($modelClass.'Translation')->make()->toArray() |
|
238 | + ]; |
|
239 | + } |
|
240 | 240 | |
241 | - $docData['models'][$modelName] = json_encode($modelArr, JSON_PRETTY_PRINT); |
|
242 | - } |
|
243 | - } |
|
241 | + $docData['models'][$modelName] = json_encode($modelArr, JSON_PRETTY_PRINT); |
|
242 | + } |
|
243 | + } |
|
244 | 244 | |
245 | - /** |
|
246 | - * Get the route response object type. |
|
247 | - * |
|
248 | - * @param string $modelName |
|
249 | - * @param string $method |
|
250 | - * @param string $returnDocBlock |
|
251 | - * @return array |
|
252 | - */ |
|
253 | - protected function getResponseObject($modelName, $method, $returnDocBlock) |
|
254 | - { |
|
255 | - $config = \CoreConfig::getConfig(); |
|
256 | - $relations = Arr::has($config['relations'], $modelName) ? Arr::has($config['relations'][$modelName], $method) ? $config['relations'][$modelName] : false : false; |
|
257 | - $modelName = call_user_func_array("\Core::{$returnDocBlock}", []) ? $returnDocBlock : $modelName; |
|
245 | + /** |
|
246 | + * Get the route response object type. |
|
247 | + * |
|
248 | + * @param string $modelName |
|
249 | + * @param string $method |
|
250 | + * @param string $returnDocBlock |
|
251 | + * @return array |
|
252 | + */ |
|
253 | + protected function getResponseObject($modelName, $method, $returnDocBlock) |
|
254 | + { |
|
255 | + $config = \CoreConfig::getConfig(); |
|
256 | + $relations = Arr::has($config['relations'], $modelName) ? Arr::has($config['relations'][$modelName], $method) ? $config['relations'][$modelName] : false : false; |
|
257 | + $modelName = call_user_func_array("\Core::{$returnDocBlock}", []) ? $returnDocBlock : $modelName; |
|
258 | 258 | |
259 | - return $relations ? [$modelName => $relations && $relations[$method] ? $relations[$method] : []] : false; |
|
260 | - } |
|
259 | + return $relations ? [$modelName => $relations && $relations[$method] ? $relations[$method] : []] : false; |
|
260 | + } |
|
261 | 261 | } |
@@ -28,10 +28,6 @@ discard block |
||
28 | 28 | } |
29 | 29 | |
30 | 30 | /** |
31 | - * @param string $uri |
|
32 | - * @param array $data |
|
33 | - * @param array $headers |
|
34 | - * @param string $content |
|
35 | 31 | * @return \Illuminate\Http\Response |
36 | 32 | */ |
37 | 33 | public function get() |
@@ -40,10 +36,6 @@ discard block |
||
40 | 36 | } |
41 | 37 | |
42 | 38 | /** |
43 | - * @param string $uri |
|
44 | - * @param array $data |
|
45 | - * @param array $headers |
|
46 | - * @param string $content |
|
47 | 39 | * @return \Illuminate\Http\Response |
48 | 40 | */ |
49 | 41 | public function post() |
@@ -52,10 +44,6 @@ discard block |
||
52 | 44 | } |
53 | 45 | |
54 | 46 | /** |
55 | - * @param string $uri |
|
56 | - * @param array $data |
|
57 | - * @param array $headers |
|
58 | - * @param string $content |
|
59 | 47 | * @return \Illuminate\Http\Response |
60 | 48 | */ |
61 | 49 | public function put() |
@@ -64,10 +52,6 @@ discard block |
||
64 | 52 | } |
65 | 53 | |
66 | 54 | /** |
67 | - * @param string $uri |
|
68 | - * @param array $data |
|
69 | - * @param array $headers |
|
70 | - * @param string $content |
|
71 | 55 | * @return \Illuminate\Http\Response |
72 | 56 | */ |
73 | 57 | public function delete() |
@@ -7,218 +7,218 @@ |
||
7 | 7 | class ApiConsumer |
8 | 8 | { |
9 | 9 | |
10 | - private $app; |
|
11 | - |
|
12 | - private $router; |
|
13 | - |
|
14 | - private $request; |
|
15 | - |
|
16 | - private $disableMiddleware = false; |
|
17 | - |
|
18 | - /** |
|
19 | - * @param \Illuminate\Foundation\Application $app |
|
20 | - * @param \Illuminate\Http\Request $request, |
|
21 | - * @param \Illuminate\Routing\Router $router |
|
22 | - */ |
|
23 | - public function __construct(Application $app, Request $request, LaravelRouter $router) |
|
24 | - { |
|
25 | - $this->app = $app; |
|
26 | - $this->request = $request; |
|
27 | - $this->router = $router; |
|
28 | - } |
|
29 | - |
|
30 | - /** |
|
31 | - * @param string $uri |
|
32 | - * @param array $data |
|
33 | - * @param array $headers |
|
34 | - * @param string $content |
|
35 | - * @return \Illuminate\Http\Response |
|
36 | - */ |
|
37 | - public function get() |
|
38 | - { |
|
39 | - return $this->quickCall('GET', func_get_args()); |
|
40 | - } |
|
41 | - |
|
42 | - /** |
|
43 | - * @param string $uri |
|
44 | - * @param array $data |
|
45 | - * @param array $headers |
|
46 | - * @param string $content |
|
47 | - * @return \Illuminate\Http\Response |
|
48 | - */ |
|
49 | - public function post() |
|
50 | - { |
|
51 | - return $this->quickCall('POST', func_get_args()); |
|
52 | - } |
|
53 | - |
|
54 | - /** |
|
55 | - * @param string $uri |
|
56 | - * @param array $data |
|
57 | - * @param array $headers |
|
58 | - * @param string $content |
|
59 | - * @return \Illuminate\Http\Response |
|
60 | - */ |
|
61 | - public function put() |
|
62 | - { |
|
63 | - return $this->quickCall('PUT', func_get_args()); |
|
64 | - } |
|
65 | - |
|
66 | - /** |
|
67 | - * @param string $uri |
|
68 | - * @param array $data |
|
69 | - * @param array $headers |
|
70 | - * @param string $content |
|
71 | - * @return \Illuminate\Http\Response |
|
72 | - */ |
|
73 | - public function delete() |
|
74 | - { |
|
75 | - return $this->quickCall('DELETE', func_get_args()); |
|
76 | - } |
|
77 | - |
|
78 | - /** |
|
79 | - * @param array $requests An array of requests |
|
80 | - * @return array |
|
81 | - */ |
|
82 | - public function batchRequest(array $requests) |
|
83 | - { |
|
84 | - foreach ($requests as $i => $request) { |
|
85 | - $requests[$i] = call_user_func_array([$this, 'singleRequest'], $request); |
|
86 | - } |
|
87 | - |
|
88 | - return $requests; |
|
89 | - } |
|
90 | - |
|
91 | - /** |
|
92 | - * @param string $method |
|
93 | - * @param array $args |
|
94 | - * @return \Illuminate\Http\Response |
|
95 | - */ |
|
96 | - public function quickCall($method, array $args) |
|
97 | - { |
|
98 | - array_unshift($args, $method); |
|
99 | - return call_user_func_array([$this, "singleRequest"], $args); |
|
100 | - } |
|
101 | - |
|
102 | - /** |
|
103 | - * @param string $method |
|
104 | - * @param string $uri |
|
105 | - * @param array $data |
|
106 | - * @param array $headers |
|
107 | - * @param string $content |
|
108 | - * @return \Illuminate\Http\Response |
|
109 | - */ |
|
110 | - public function singleRequest($method, $uri, array $data = [], array $headers = [], $content = null) |
|
111 | - { |
|
112 | - // Save the current request so we can reset the router back to it |
|
113 | - // after we've completed our internal request. |
|
114 | - $currentRequest = $this->request->instance()->duplicate(); |
|
115 | - |
|
116 | - $headers = $this->overrideHeaders($currentRequest->server->getHeaders(), $headers); |
|
117 | - |
|
118 | - if ($this->disableMiddleware) { |
|
119 | - $this->app->instance('middleware.disable', true); |
|
120 | - } |
|
121 | - |
|
122 | - $response = $this->request($method, $uri, $data, $headers, $content); |
|
123 | - |
|
124 | - if ($this->disableMiddleware) { |
|
125 | - $this->app->instance('middleware.disable', false); |
|
126 | - } |
|
127 | - |
|
128 | - // Once the request has completed we reset the currentRequest of the router |
|
129 | - // to match the original request. |
|
130 | - $this->request->instance()->initialize( |
|
131 | - $currentRequest->query->all(), |
|
132 | - $currentRequest->request->all(), |
|
133 | - $currentRequest->attributes->all(), |
|
134 | - $currentRequest->cookies->all(), |
|
135 | - $currentRequest->files->all(), |
|
136 | - $currentRequest->server->all(), |
|
137 | - $currentRequest->content |
|
138 | - ); |
|
139 | - |
|
140 | - return $response; |
|
141 | - } |
|
142 | - |
|
143 | - private function overrideHeaders(array $default, array $headers) |
|
144 | - { |
|
145 | - $headers = $this->transformHeadersToUppercaseUnderscoreType($headers); |
|
146 | - return array_merge($default, $headers); |
|
147 | - } |
|
148 | - |
|
149 | - public function enableMiddleware() |
|
150 | - { |
|
151 | - $this->disableMiddleware = false; |
|
152 | - } |
|
153 | - |
|
154 | - public function disableMiddleware() |
|
155 | - { |
|
156 | - $this->disableMiddleware = true; |
|
157 | - } |
|
158 | - |
|
159 | - /** |
|
160 | - * @param string $method |
|
161 | - * @param string $uri |
|
162 | - * @param array $data |
|
163 | - * @param array $headers |
|
164 | - * @param string $content |
|
165 | - * @return \Illuminate\Http\Response |
|
166 | - */ |
|
167 | - private function request($method, $uri, array $data = [], array $headers = [], $content = null) |
|
168 | - { |
|
169 | - // Create a new request object for the internal request |
|
170 | - $request = $this->createRequest($method, $uri, $data, $headers, $content); |
|
171 | - |
|
172 | - // Handle the request in the kernel and prepare a response |
|
173 | - $response = $this->router->prepareResponse($request, $this->app->handle($request)); |
|
174 | - |
|
175 | - return $response; |
|
176 | - } |
|
177 | - |
|
178 | - /** |
|
179 | - * @param string $method |
|
180 | - * @param string $uri |
|
181 | - * @param array $data |
|
182 | - * @param array $headers |
|
183 | - * @param string $content |
|
184 | - * @return \Illuminate\Http\Request |
|
185 | - */ |
|
186 | - private function createRequest($method, $uri, array $data = [], array $headers = [], $content = null) |
|
187 | - { |
|
188 | - $server = $this->transformHeadersToServerVariables($headers); |
|
189 | - |
|
190 | - return $this->request->create($uri, $method, $data, [], [], $server, $content); |
|
191 | - } |
|
192 | - |
|
193 | - private function transformHeadersToUppercaseUnderscoreType($headers) |
|
194 | - { |
|
195 | - $transformed = []; |
|
196 | - |
|
197 | - foreach ($headers as $headerType => $headerValue) { |
|
198 | - $headerType = strtoupper(str_replace('-', '_', $headerType)); |
|
199 | - |
|
200 | - $transformed[$headerType] = $headerValue; |
|
201 | - } |
|
202 | - |
|
203 | - return $transformed; |
|
204 | - } |
|
205 | - |
|
206 | - /** |
|
207 | - * https://github.com/symfony/symfony/issues/5074 |
|
208 | - * |
|
209 | - * @param array $headers |
|
210 | - * @return array |
|
211 | - */ |
|
212 | - private function transformHeadersToServerVariables($headers) |
|
213 | - { |
|
214 | - $server = []; |
|
215 | - |
|
216 | - foreach ($headers as $headerType => $headerValue) { |
|
217 | - $headerType = 'HTTP_' . $headerType; |
|
218 | - |
|
219 | - $server[$headerType] = $headerValue; |
|
220 | - } |
|
221 | - |
|
222 | - return $server; |
|
223 | - } |
|
10 | + private $app; |
|
11 | + |
|
12 | + private $router; |
|
13 | + |
|
14 | + private $request; |
|
15 | + |
|
16 | + private $disableMiddleware = false; |
|
17 | + |
|
18 | + /** |
|
19 | + * @param \Illuminate\Foundation\Application $app |
|
20 | + * @param \Illuminate\Http\Request $request, |
|
21 | + * @param \Illuminate\Routing\Router $router |
|
22 | + */ |
|
23 | + public function __construct(Application $app, Request $request, LaravelRouter $router) |
|
24 | + { |
|
25 | + $this->app = $app; |
|
26 | + $this->request = $request; |
|
27 | + $this->router = $router; |
|
28 | + } |
|
29 | + |
|
30 | + /** |
|
31 | + * @param string $uri |
|
32 | + * @param array $data |
|
33 | + * @param array $headers |
|
34 | + * @param string $content |
|
35 | + * @return \Illuminate\Http\Response |
|
36 | + */ |
|
37 | + public function get() |
|
38 | + { |
|
39 | + return $this->quickCall('GET', func_get_args()); |
|
40 | + } |
|
41 | + |
|
42 | + /** |
|
43 | + * @param string $uri |
|
44 | + * @param array $data |
|
45 | + * @param array $headers |
|
46 | + * @param string $content |
|
47 | + * @return \Illuminate\Http\Response |
|
48 | + */ |
|
49 | + public function post() |
|
50 | + { |
|
51 | + return $this->quickCall('POST', func_get_args()); |
|
52 | + } |
|
53 | + |
|
54 | + /** |
|
55 | + * @param string $uri |
|
56 | + * @param array $data |
|
57 | + * @param array $headers |
|
58 | + * @param string $content |
|
59 | + * @return \Illuminate\Http\Response |
|
60 | + */ |
|
61 | + public function put() |
|
62 | + { |
|
63 | + return $this->quickCall('PUT', func_get_args()); |
|
64 | + } |
|
65 | + |
|
66 | + /** |
|
67 | + * @param string $uri |
|
68 | + * @param array $data |
|
69 | + * @param array $headers |
|
70 | + * @param string $content |
|
71 | + * @return \Illuminate\Http\Response |
|
72 | + */ |
|
73 | + public function delete() |
|
74 | + { |
|
75 | + return $this->quickCall('DELETE', func_get_args()); |
|
76 | + } |
|
77 | + |
|
78 | + /** |
|
79 | + * @param array $requests An array of requests |
|
80 | + * @return array |
|
81 | + */ |
|
82 | + public function batchRequest(array $requests) |
|
83 | + { |
|
84 | + foreach ($requests as $i => $request) { |
|
85 | + $requests[$i] = call_user_func_array([$this, 'singleRequest'], $request); |
|
86 | + } |
|
87 | + |
|
88 | + return $requests; |
|
89 | + } |
|
90 | + |
|
91 | + /** |
|
92 | + * @param string $method |
|
93 | + * @param array $args |
|
94 | + * @return \Illuminate\Http\Response |
|
95 | + */ |
|
96 | + public function quickCall($method, array $args) |
|
97 | + { |
|
98 | + array_unshift($args, $method); |
|
99 | + return call_user_func_array([$this, "singleRequest"], $args); |
|
100 | + } |
|
101 | + |
|
102 | + /** |
|
103 | + * @param string $method |
|
104 | + * @param string $uri |
|
105 | + * @param array $data |
|
106 | + * @param array $headers |
|
107 | + * @param string $content |
|
108 | + * @return \Illuminate\Http\Response |
|
109 | + */ |
|
110 | + public function singleRequest($method, $uri, array $data = [], array $headers = [], $content = null) |
|
111 | + { |
|
112 | + // Save the current request so we can reset the router back to it |
|
113 | + // after we've completed our internal request. |
|
114 | + $currentRequest = $this->request->instance()->duplicate(); |
|
115 | + |
|
116 | + $headers = $this->overrideHeaders($currentRequest->server->getHeaders(), $headers); |
|
117 | + |
|
118 | + if ($this->disableMiddleware) { |
|
119 | + $this->app->instance('middleware.disable', true); |
|
120 | + } |
|
121 | + |
|
122 | + $response = $this->request($method, $uri, $data, $headers, $content); |
|
123 | + |
|
124 | + if ($this->disableMiddleware) { |
|
125 | + $this->app->instance('middleware.disable', false); |
|
126 | + } |
|
127 | + |
|
128 | + // Once the request has completed we reset the currentRequest of the router |
|
129 | + // to match the original request. |
|
130 | + $this->request->instance()->initialize( |
|
131 | + $currentRequest->query->all(), |
|
132 | + $currentRequest->request->all(), |
|
133 | + $currentRequest->attributes->all(), |
|
134 | + $currentRequest->cookies->all(), |
|
135 | + $currentRequest->files->all(), |
|
136 | + $currentRequest->server->all(), |
|
137 | + $currentRequest->content |
|
138 | + ); |
|
139 | + |
|
140 | + return $response; |
|
141 | + } |
|
142 | + |
|
143 | + private function overrideHeaders(array $default, array $headers) |
|
144 | + { |
|
145 | + $headers = $this->transformHeadersToUppercaseUnderscoreType($headers); |
|
146 | + return array_merge($default, $headers); |
|
147 | + } |
|
148 | + |
|
149 | + public function enableMiddleware() |
|
150 | + { |
|
151 | + $this->disableMiddleware = false; |
|
152 | + } |
|
153 | + |
|
154 | + public function disableMiddleware() |
|
155 | + { |
|
156 | + $this->disableMiddleware = true; |
|
157 | + } |
|
158 | + |
|
159 | + /** |
|
160 | + * @param string $method |
|
161 | + * @param string $uri |
|
162 | + * @param array $data |
|
163 | + * @param array $headers |
|
164 | + * @param string $content |
|
165 | + * @return \Illuminate\Http\Response |
|
166 | + */ |
|
167 | + private function request($method, $uri, array $data = [], array $headers = [], $content = null) |
|
168 | + { |
|
169 | + // Create a new request object for the internal request |
|
170 | + $request = $this->createRequest($method, $uri, $data, $headers, $content); |
|
171 | + |
|
172 | + // Handle the request in the kernel and prepare a response |
|
173 | + $response = $this->router->prepareResponse($request, $this->app->handle($request)); |
|
174 | + |
|
175 | + return $response; |
|
176 | + } |
|
177 | + |
|
178 | + /** |
|
179 | + * @param string $method |
|
180 | + * @param string $uri |
|
181 | + * @param array $data |
|
182 | + * @param array $headers |
|
183 | + * @param string $content |
|
184 | + * @return \Illuminate\Http\Request |
|
185 | + */ |
|
186 | + private function createRequest($method, $uri, array $data = [], array $headers = [], $content = null) |
|
187 | + { |
|
188 | + $server = $this->transformHeadersToServerVariables($headers); |
|
189 | + |
|
190 | + return $this->request->create($uri, $method, $data, [], [], $server, $content); |
|
191 | + } |
|
192 | + |
|
193 | + private function transformHeadersToUppercaseUnderscoreType($headers) |
|
194 | + { |
|
195 | + $transformed = []; |
|
196 | + |
|
197 | + foreach ($headers as $headerType => $headerValue) { |
|
198 | + $headerType = strtoupper(str_replace('-', '_', $headerType)); |
|
199 | + |
|
200 | + $transformed[$headerType] = $headerValue; |
|
201 | + } |
|
202 | + |
|
203 | + return $transformed; |
|
204 | + } |
|
205 | + |
|
206 | + /** |
|
207 | + * https://github.com/symfony/symfony/issues/5074 |
|
208 | + * |
|
209 | + * @param array $headers |
|
210 | + * @return array |
|
211 | + */ |
|
212 | + private function transformHeadersToServerVariables($headers) |
|
213 | + { |
|
214 | + $server = []; |
|
215 | + |
|
216 | + foreach ($headers as $headerType => $headerValue) { |
|
217 | + $headerType = 'HTTP_' . $headerType; |
|
218 | + |
|
219 | + $server[$headerType] = $headerValue; |
|
220 | + } |
|
221 | + |
|
222 | + return $server; |
|
223 | + } |
|
224 | 224 | } |
@@ -214,7 +214,7 @@ |
||
214 | 214 | $server = []; |
215 | 215 | |
216 | 216 | foreach ($headers as $headerType => $headerValue) { |
217 | - $headerType = 'HTTP_' . $headerType; |
|
217 | + $headerType = 'HTTP_'.$headerType; |
|
218 | 218 | |
219 | 219 | $server[$headerType] = $headerValue; |
220 | 220 | } |