@@ -2,62 +2,62 @@ |
||
| 2 | 2 | |
| 3 | 3 | class Media |
| 4 | 4 | { |
| 5 | - /** |
|
| 6 | - * Upload the given image. |
|
| 7 | - * |
|
| 8 | - * @param object $image |
|
| 9 | - * @param string $dir |
|
| 10 | - * @return string |
|
| 11 | - */ |
|
| 12 | - public function uploadImage($image, $dir) |
|
| 13 | - { |
|
| 14 | - $image = \Image::make($image); |
|
| 15 | - return $this->saveImage($image, $dir); |
|
| 16 | - } |
|
| 5 | + /** |
|
| 6 | + * Upload the given image. |
|
| 7 | + * |
|
| 8 | + * @param object $image |
|
| 9 | + * @param string $dir |
|
| 10 | + * @return string |
|
| 11 | + */ |
|
| 12 | + public function uploadImage($image, $dir) |
|
| 13 | + { |
|
| 14 | + $image = \Image::make($image); |
|
| 15 | + return $this->saveImage($image, $dir); |
|
| 16 | + } |
|
| 17 | 17 | |
| 18 | - /** |
|
| 19 | - * Upload the given image. |
|
| 20 | - * |
|
| 21 | - * @param object $image |
|
| 22 | - * @param string $dir |
|
| 23 | - * @return string |
|
| 24 | - */ |
|
| 25 | - public function uploadImageBas64($image, $dir) |
|
| 26 | - { |
|
| 27 | - if (! strlen($image)) { |
|
| 28 | - return null; |
|
| 29 | - } |
|
| 18 | + /** |
|
| 19 | + * Upload the given image. |
|
| 20 | + * |
|
| 21 | + * @param object $image |
|
| 22 | + * @param string $dir |
|
| 23 | + * @return string |
|
| 24 | + */ |
|
| 25 | + public function uploadImageBas64($image, $dir) |
|
| 26 | + { |
|
| 27 | + if (! strlen($image)) { |
|
| 28 | + return null; |
|
| 29 | + } |
|
| 30 | 30 | |
| 31 | - $base = base64_decode(preg_replace('#^data:image/\w+;base64,#i', '', $image)); |
|
| 32 | - $image = \Image::make($base); |
|
| 31 | + $base = base64_decode(preg_replace('#^data:image/\w+;base64,#i', '', $image)); |
|
| 32 | + $image = \Image::make($base); |
|
| 33 | 33 | |
| 34 | - return $this->saveImage($image, $dir); |
|
| 35 | - } |
|
| 34 | + return $this->saveImage($image, $dir); |
|
| 35 | + } |
|
| 36 | 36 | |
| 37 | - /** |
|
| 38 | - * Delete the given image. |
|
| 39 | - * |
|
| 40 | - * @param object $path |
|
| 41 | - * @return void |
|
| 42 | - */ |
|
| 43 | - public function deleteImage($path) |
|
| 44 | - { |
|
| 45 | - \Storage::delete($path); |
|
| 46 | - } |
|
| 37 | + /** |
|
| 38 | + * Delete the given image. |
|
| 39 | + * |
|
| 40 | + * @param object $path |
|
| 41 | + * @return void |
|
| 42 | + */ |
|
| 43 | + public function deleteImage($path) |
|
| 44 | + { |
|
| 45 | + \Storage::delete($path); |
|
| 46 | + } |
|
| 47 | 47 | |
| 48 | - /** |
|
| 49 | - * Save the given image. |
|
| 50 | - * |
|
| 51 | - * @param object $image |
|
| 52 | - * @param string $dir |
|
| 53 | - * @return string |
|
| 54 | - */ |
|
| 55 | - protected function saveImage($image, $dir) |
|
| 56 | - { |
|
| 57 | - $imageName = 'image'.uniqid().time().'.jpg'; |
|
| 58 | - $path = 'public'.DIRECTORY_SEPARATOR.'uploads'.DIRECTORY_SEPARATOR.$dir.DIRECTORY_SEPARATOR.$imageName; |
|
| 59 | - \Storage::put($path, $image->stream()); |
|
| 48 | + /** |
|
| 49 | + * Save the given image. |
|
| 50 | + * |
|
| 51 | + * @param object $image |
|
| 52 | + * @param string $dir |
|
| 53 | + * @return string |
|
| 54 | + */ |
|
| 55 | + protected function saveImage($image, $dir) |
|
| 56 | + { |
|
| 57 | + $imageName = 'image'.uniqid().time().'.jpg'; |
|
| 58 | + $path = 'public'.DIRECTORY_SEPARATOR.'uploads'.DIRECTORY_SEPARATOR.$dir.DIRECTORY_SEPARATOR.$imageName; |
|
| 59 | + \Storage::put($path, $image->stream()); |
|
| 60 | 60 | |
| 61 | - return $path; |
|
| 62 | - } |
|
| 61 | + return $path; |
|
| 62 | + } |
|
| 63 | 63 | } |
@@ -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 | } |
@@ -2,8 +2,8 @@ |
||
| 2 | 2 | |
| 3 | 3 | return [ |
| 4 | 4 | |
| 5 | - /** |
|
| 6 | - * Here goes your notification messages. |
|
| 7 | - */ |
|
| 5 | + /** |
|
| 6 | + * Here goes your notification messages. |
|
| 7 | + */ |
|
| 8 | 8 | |
| 9 | 9 | ]; |
@@ -9,41 +9,41 @@ |
||
| 9 | 9 | |
| 10 | 10 | class ConfirmEmail extends Notification implements ShouldQueue |
| 11 | 11 | { |
| 12 | - use Queueable; |
|
| 12 | + use Queueable; |
|
| 13 | 13 | |
| 14 | - /** |
|
| 15 | - * Init new object. |
|
| 16 | - * |
|
| 17 | - * @return void |
|
| 18 | - */ |
|
| 19 | - public function __construct() |
|
| 20 | - { |
|
| 21 | - // |
|
| 22 | - } |
|
| 14 | + /** |
|
| 15 | + * Init new object. |
|
| 16 | + * |
|
| 17 | + * @return void |
|
| 18 | + */ |
|
| 19 | + public function __construct() |
|
| 20 | + { |
|
| 21 | + // |
|
| 22 | + } |
|
| 23 | 23 | |
| 24 | - /** |
|
| 25 | - * Get the notification's delivery channels. |
|
| 26 | - * |
|
| 27 | - * @param mixed $notifiable |
|
| 28 | - * @return string[] |
|
| 29 | - */ |
|
| 30 | - public function via($notifiable) |
|
| 31 | - { |
|
| 32 | - return ['mail']; |
|
| 33 | - } |
|
| 24 | + /** |
|
| 25 | + * Get the notification's delivery channels. |
|
| 26 | + * |
|
| 27 | + * @param mixed $notifiable |
|
| 28 | + * @return string[] |
|
| 29 | + */ |
|
| 30 | + public function via($notifiable) |
|
| 31 | + { |
|
| 32 | + return ['mail']; |
|
| 33 | + } |
|
| 34 | 34 | |
| 35 | - /** |
|
| 36 | - * Get the mail representation of the notification. |
|
| 37 | - * |
|
| 38 | - * @param mixed $notifiable |
|
| 39 | - * @return \Illuminate\Notifications\Messages\MailMessage |
|
| 40 | - */ |
|
| 41 | - public function toMail($notifiable) |
|
| 42 | - { |
|
| 43 | - return (new MailMessage) |
|
| 44 | - ->subject('Email verification') |
|
| 45 | - ->line('Email verification') |
|
| 46 | - ->line('To validate your email click on the button below') |
|
| 47 | - ->action('Verify your email', config('skeleton.confrim_email_url').'/'.$notifiable->confirmation_code); |
|
| 48 | - } |
|
| 35 | + /** |
|
| 36 | + * Get the mail representation of the notification. |
|
| 37 | + * |
|
| 38 | + * @param mixed $notifiable |
|
| 39 | + * @return \Illuminate\Notifications\Messages\MailMessage |
|
| 40 | + */ |
|
| 41 | + public function toMail($notifiable) |
|
| 42 | + { |
|
| 43 | + return (new MailMessage) |
|
| 44 | + ->subject('Email verification') |
|
| 45 | + ->line('Email verification') |
|
| 46 | + ->line('To validate your email click on the button below') |
|
| 47 | + ->action('Verify your email', config('skeleton.confrim_email_url').'/'.$notifiable->confirmation_code); |
|
| 48 | + } |
|
| 49 | 49 | } |
@@ -9,43 +9,43 @@ |
||
| 9 | 9 | |
| 10 | 10 | class ResetPassword extends Notification implements ShouldQueue |
| 11 | 11 | { |
| 12 | - use Queueable; |
|
| 12 | + use Queueable; |
|
| 13 | 13 | |
| 14 | - protected $token; |
|
| 14 | + protected $token; |
|
| 15 | 15 | |
| 16 | - /** |
|
| 17 | - * Init new object. |
|
| 18 | - * |
|
| 19 | - * @return void |
|
| 20 | - */ |
|
| 21 | - public function __construct($token) |
|
| 22 | - { |
|
| 23 | - $this->token = $token; |
|
| 24 | - } |
|
| 16 | + /** |
|
| 17 | + * Init new object. |
|
| 18 | + * |
|
| 19 | + * @return void |
|
| 20 | + */ |
|
| 21 | + public function __construct($token) |
|
| 22 | + { |
|
| 23 | + $this->token = $token; |
|
| 24 | + } |
|
| 25 | 25 | |
| 26 | - /** |
|
| 27 | - * Get the notification's delivery channels. |
|
| 28 | - * |
|
| 29 | - * @param mixed $notifiable |
|
| 30 | - * @return string[] |
|
| 31 | - */ |
|
| 32 | - public function via($notifiable) |
|
| 33 | - { |
|
| 34 | - return ['mail']; |
|
| 35 | - } |
|
| 26 | + /** |
|
| 27 | + * Get the notification's delivery channels. |
|
| 28 | + * |
|
| 29 | + * @param mixed $notifiable |
|
| 30 | + * @return string[] |
|
| 31 | + */ |
|
| 32 | + public function via($notifiable) |
|
| 33 | + { |
|
| 34 | + return ['mail']; |
|
| 35 | + } |
|
| 36 | 36 | |
| 37 | - /** |
|
| 38 | - * Get the mail representation of the notification. |
|
| 39 | - * |
|
| 40 | - * @param mixed $notifiable |
|
| 41 | - * @return \Illuminate\Notifications\Messages\MailMessage |
|
| 42 | - */ |
|
| 43 | - public function toMail($notifiable) |
|
| 44 | - { |
|
| 45 | - return (new MailMessage) |
|
| 46 | - ->subject('Reset passowrd') |
|
| 47 | - ->line('Reset passowrd') |
|
| 48 | - ->line('To reset your password click on the button below') |
|
| 49 | - ->action('Reset password', config('skeleton.reset_password_url').'/'.$this->token); |
|
| 50 | - } |
|
| 37 | + /** |
|
| 38 | + * Get the mail representation of the notification. |
|
| 39 | + * |
|
| 40 | + * @param mixed $notifiable |
|
| 41 | + * @return \Illuminate\Notifications\Messages\MailMessage |
|
| 42 | + */ |
|
| 43 | + public function toMail($notifiable) |
|
| 44 | + { |
|
| 45 | + return (new MailMessage) |
|
| 46 | + ->subject('Reset passowrd') |
|
| 47 | + ->line('Reset passowrd') |
|
| 48 | + ->line('To reset your password click on the button below') |
|
| 49 | + ->action('Reset password', config('skeleton.reset_password_url').'/'.$this->token); |
|
| 50 | + } |
|
| 51 | 51 | } |
@@ -2,15 +2,15 @@ |
||
| 2 | 2 | |
| 3 | 3 | interface BaseFactoryInterface |
| 4 | 4 | { |
| 5 | - /** |
|
| 6 | - * Construct the repository class name based on |
|
| 7 | - * the method name called, search in the |
|
| 8 | - * given namespaces for the class and |
|
| 9 | - * return an instance. |
|
| 10 | - * |
|
| 11 | - * @param string $name the called method name |
|
| 12 | - * @param array $arguments the method arguments |
|
| 13 | - * @return object |
|
| 14 | - */ |
|
| 15 | - public function __call($name, $arguments); |
|
| 5 | + /** |
|
| 6 | + * Construct the repository class name based on |
|
| 7 | + * the method name called, search in the |
|
| 8 | + * given namespaces for the class and |
|
| 9 | + * return an instance. |
|
| 10 | + * |
|
| 11 | + * @param string $name the called method name |
|
| 12 | + * @param array $arguments the method arguments |
|
| 13 | + * @return object |
|
| 14 | + */ |
|
| 15 | + public function __call($name, $arguments); |
|
| 16 | 16 | } |
@@ -6,14 +6,14 @@ |
||
| 6 | 6 | |
| 7 | 7 | class General extends JsonResource |
| 8 | 8 | { |
| 9 | - /** |
|
| 10 | - * Transform the resource into an array. |
|
| 11 | - * |
|
| 12 | - * @param Request $request |
|
| 13 | - * @return array |
|
| 14 | - */ |
|
| 15 | - public function toArray($request) |
|
| 16 | - { |
|
| 17 | - return ['status' => $this->resource ?? 'success']; |
|
| 18 | - } |
|
| 9 | + /** |
|
| 10 | + * Transform the resource into an array. |
|
| 11 | + * |
|
| 12 | + * @param Request $request |
|
| 13 | + * @return array |
|
| 14 | + */ |
|
| 15 | + public function toArray($request) |
|
| 16 | + { |
|
| 17 | + return ['status' => $this->resource ?? 'success']; |
|
| 18 | + } |
|
| 19 | 19 | } |
@@ -6,27 +6,27 @@ |
||
| 6 | 6 | |
| 7 | 7 | class ModuleServiceProvider extends ServiceProvider |
| 8 | 8 | { |
| 9 | - /** |
|
| 10 | - * Bootstrap the module services. |
|
| 11 | - * |
|
| 12 | - * @return void |
|
| 13 | - */ |
|
| 14 | - public function boot() |
|
| 15 | - { |
|
| 16 | - $this->loadTranslationsFrom(__DIR__.'/../Resources/Lang', 'users'); |
|
| 17 | - $this->loadViewsFrom(__DIR__.'/../Resources/Views', 'users'); |
|
| 9 | + /** |
|
| 10 | + * Bootstrap the module services. |
|
| 11 | + * |
|
| 12 | + * @return void |
|
| 13 | + */ |
|
| 14 | + public function boot() |
|
| 15 | + { |
|
| 16 | + $this->loadTranslationsFrom(__DIR__.'/../Resources/Lang', 'users'); |
|
| 17 | + $this->loadViewsFrom(__DIR__.'/../Resources/Views', 'users'); |
|
| 18 | 18 | |
| 19 | - $this->loadMigrationsFrom(module_path('users', 'Database/Migrations', 'app')); |
|
| 20 | - $this->loadFactoriesFrom(module_path('users', 'Database/Factories', 'app')); |
|
| 21 | - } |
|
| 19 | + $this->loadMigrationsFrom(module_path('users', 'Database/Migrations', 'app')); |
|
| 20 | + $this->loadFactoriesFrom(module_path('users', 'Database/Factories', 'app')); |
|
| 21 | + } |
|
| 22 | 22 | |
| 23 | - /** |
|
| 24 | - * Register the module services. |
|
| 25 | - * |
|
| 26 | - * @return void |
|
| 27 | - */ |
|
| 28 | - public function register() |
|
| 29 | - { |
|
| 30 | - $this->app->register(RouteServiceProvider::class); |
|
| 31 | - } |
|
| 23 | + /** |
|
| 24 | + * Register the module services. |
|
| 25 | + * |
|
| 26 | + * @return void |
|
| 27 | + */ |
|
| 28 | + public function register() |
|
| 29 | + { |
|
| 30 | + $this->app->register(RouteServiceProvider::class); |
|
| 31 | + } |
|
| 32 | 32 | } |
@@ -7,73 +7,73 @@ |
||
| 7 | 7 | |
| 8 | 8 | class RouteServiceProvider extends ServiceProvider |
| 9 | 9 | { |
| 10 | - /** |
|
| 11 | - * This namespace is applied to your controller routes. |
|
| 12 | - * |
|
| 13 | - * In addition, it is set as the URL generator's root namespace. |
|
| 14 | - * |
|
| 15 | - * @var string |
|
| 16 | - */ |
|
| 17 | - protected $namespace = 'App\Modules\Users\Http\Controllers'; |
|
| 10 | + /** |
|
| 11 | + * This namespace is applied to your controller routes. |
|
| 12 | + * |
|
| 13 | + * In addition, it is set as the URL generator's root namespace. |
|
| 14 | + * |
|
| 15 | + * @var string |
|
| 16 | + */ |
|
| 17 | + protected $namespace = 'App\Modules\Users\Http\Controllers'; |
|
| 18 | 18 | |
| 19 | - /** |
|
| 20 | - * Define your route model bindings, pattern filters, etc. |
|
| 21 | - * |
|
| 22 | - * @return void |
|
| 23 | - */ |
|
| 24 | - public function boot() |
|
| 25 | - { |
|
| 26 | - // |
|
| 19 | + /** |
|
| 20 | + * Define your route model bindings, pattern filters, etc. |
|
| 21 | + * |
|
| 22 | + * @return void |
|
| 23 | + */ |
|
| 24 | + public function boot() |
|
| 25 | + { |
|
| 26 | + // |
|
| 27 | 27 | |
| 28 | - parent::boot(); |
|
| 29 | - } |
|
| 28 | + parent::boot(); |
|
| 29 | + } |
|
| 30 | 30 | |
| 31 | - /** |
|
| 32 | - * Define the routes for the module. |
|
| 33 | - * |
|
| 34 | - * @return void |
|
| 35 | - */ |
|
| 36 | - public function map() |
|
| 37 | - { |
|
| 38 | - $this->mapWebRoutes(); |
|
| 31 | + /** |
|
| 32 | + * Define the routes for the module. |
|
| 33 | + * |
|
| 34 | + * @return void |
|
| 35 | + */ |
|
| 36 | + public function map() |
|
| 37 | + { |
|
| 38 | + $this->mapWebRoutes(); |
|
| 39 | 39 | |
| 40 | - $this->mapApiRoutes(); |
|
| 40 | + $this->mapApiRoutes(); |
|
| 41 | 41 | |
| 42 | - // |
|
| 43 | - } |
|
| 42 | + // |
|
| 43 | + } |
|
| 44 | 44 | |
| 45 | - /** |
|
| 46 | - * Define the "web" routes for the module. |
|
| 47 | - * |
|
| 48 | - * These routes all receive session state, CSRF protection, etc. |
|
| 49 | - * |
|
| 50 | - * @return void |
|
| 51 | - */ |
|
| 52 | - protected function mapWebRoutes() |
|
| 53 | - { |
|
| 54 | - Route::group([ |
|
| 55 | - 'middleware' => 'web', |
|
| 56 | - 'namespace' => $this->namespace, |
|
| 57 | - ], function ($router) { |
|
| 58 | - require module_path('users', 'Routes/web.php', 'app'); |
|
| 59 | - }); |
|
| 60 | - } |
|
| 45 | + /** |
|
| 46 | + * Define the "web" routes for the module. |
|
| 47 | + * |
|
| 48 | + * These routes all receive session state, CSRF protection, etc. |
|
| 49 | + * |
|
| 50 | + * @return void |
|
| 51 | + */ |
|
| 52 | + protected function mapWebRoutes() |
|
| 53 | + { |
|
| 54 | + Route::group([ |
|
| 55 | + 'middleware' => 'web', |
|
| 56 | + 'namespace' => $this->namespace, |
|
| 57 | + ], function ($router) { |
|
| 58 | + require module_path('users', 'Routes/web.php', 'app'); |
|
| 59 | + }); |
|
| 60 | + } |
|
| 61 | 61 | |
| 62 | - /** |
|
| 63 | - * Define the "api" routes for the module. |
|
| 64 | - * |
|
| 65 | - * These routes are typically stateless. |
|
| 66 | - * |
|
| 67 | - * @return void |
|
| 68 | - */ |
|
| 69 | - protected function mapApiRoutes() |
|
| 70 | - { |
|
| 71 | - Route::group([ |
|
| 72 | - 'middleware' => 'api', |
|
| 73 | - 'namespace' => $this->namespace, |
|
| 74 | - 'prefix' => 'api', |
|
| 75 | - ], function ($router) { |
|
| 76 | - require module_path('users', 'Routes/api.php', 'app'); |
|
| 77 | - }); |
|
| 78 | - } |
|
| 62 | + /** |
|
| 63 | + * Define the "api" routes for the module. |
|
| 64 | + * |
|
| 65 | + * These routes are typically stateless. |
|
| 66 | + * |
|
| 67 | + * @return void |
|
| 68 | + */ |
|
| 69 | + protected function mapApiRoutes() |
|
| 70 | + { |
|
| 71 | + Route::group([ |
|
| 72 | + 'middleware' => 'api', |
|
| 73 | + 'namespace' => $this->namespace, |
|
| 74 | + 'prefix' => 'api', |
|
| 75 | + ], function ($router) { |
|
| 76 | + require module_path('users', 'Routes/api.php', 'app'); |
|
| 77 | + }); |
|
| 78 | + } |
|
| 79 | 79 | } |