@@ -462,9 +462,11 @@ |
||
| 462 | 462 | |
| 463 | 463 | if (! file_exists(config('maileclipse.mailables_dir'))): |
| 464 | 464 | |
| 465 | - return; else: |
|
| 465 | + return; else { |
|
| 466 | + : |
|
| 466 | 467 | |
| 467 | 468 | $allFiles = new RecursiveIteratorIterator(new RecursiveDirectoryIterator(config('maileclipse.mailables_dir'))); |
| 469 | + } |
|
| 468 | 470 | $phpFiles = new RegexIterator($allFiles, '/\.php$/'); |
| 469 | 471 | $i = 0; |
| 470 | 472 | |
@@ -51,8 +51,8 @@ discard block |
||
| 51 | 51 | $template = self::getTemplates() |
| 52 | 52 | ->where('template_slug', $templateSlug)->first(); |
| 53 | 53 | |
| 54 | - if (! is_null($template)) { |
|
| 55 | - self::saveTemplates(self::getTemplates()->reject(function ($value, $key) use ($template) { |
|
| 54 | + if (!is_null($template)) { |
|
| 55 | + self::saveTemplates(self::getTemplates()->reject(function($value, $key) use ($template) { |
|
| 56 | 56 | return $value->template_slug == $template->template_slug; |
| 57 | 57 | })); |
| 58 | 58 | |
@@ -76,8 +76,8 @@ discard block |
||
| 76 | 76 | public static function getTemplatesFile() |
| 77 | 77 | { |
| 78 | 78 | $file = config('maileclipse.mailables_dir').'templates.json'; |
| 79 | - if (! file_exists($file)) { |
|
| 80 | - if (! file_exists(config('maileclipse.mailables_dir'))) { |
|
| 79 | + if (!file_exists($file)) { |
|
| 80 | + if (!file_exists(config('maileclipse.mailables_dir'))) { |
|
| 81 | 81 | mkdir(config('maileclipse.mailables_dir')); |
| 82 | 82 | } |
| 83 | 83 | file_put_contents($file, '[]'); |
@@ -96,8 +96,8 @@ discard block |
||
| 96 | 96 | $template = self::getTemplates() |
| 97 | 97 | ->where('template_slug', $request->templateslug)->first(); |
| 98 | 98 | |
| 99 | - if (! is_null($template)) { |
|
| 100 | - if (! preg_match("/^[a-zA-Z0-9-_\s]+$/", $request->title)) { |
|
| 99 | + if (!is_null($template)) { |
|
| 100 | + if (!preg_match("/^[a-zA-Z0-9-_\s]+$/", $request->title)) { |
|
| 101 | 101 | return response()->json([ |
| 102 | 102 | 'status' => 'failed', |
| 103 | 103 | 'message' => 'Template name not valid', |
@@ -121,7 +121,7 @@ discard block |
||
| 121 | 121 | |
| 122 | 122 | // Update |
| 123 | 123 | // |
| 124 | - $oldForm = self::getTemplates()->reject(function ($value, $key) use ($template) { |
|
| 124 | + $oldForm = self::getTemplates()->reject(function($value, $key) use ($template) { |
|
| 125 | 125 | return $value->template_slug == $template->template_slug; |
| 126 | 126 | }); |
| 127 | 127 | $newForm = array_merge($oldForm->toArray(), [array_merge((array) $template, [ |
@@ -162,7 +162,7 @@ discard block |
||
| 162 | 162 | $template = self::getTemplates() |
| 163 | 163 | ->where('template_slug', $templateSlug)->first(); |
| 164 | 164 | |
| 165 | - if (! is_null($template)) { |
|
| 165 | + if (!is_null($template)) { |
|
| 166 | 166 | $template_view = self::$view_namespace.'::templates.'.$template->template_slug; |
| 167 | 167 | $template_plaintext_view = $template_view.'_plain_text'; |
| 168 | 168 | |
@@ -199,7 +199,7 @@ discard block |
||
| 199 | 199 | |
| 200 | 200 | public static function createTemplate($request) |
| 201 | 201 | { |
| 202 | - if (! preg_match("/^[a-zA-Z0-9-_\s]+$/", $request->template_name)) { |
|
| 202 | + if (!preg_match("/^[a-zA-Z0-9-_\s]+$/", $request->template_name)) { |
|
| 203 | 203 | return response()->json([ |
| 204 | 204 | |
| 205 | 205 | 'status' => 'error', |
@@ -212,7 +212,7 @@ discard block |
||
| 212 | 212 | |
| 213 | 213 | $templatename = Str::camel(preg_replace('/\s+/', '_', $request->template_name)); |
| 214 | 214 | |
| 215 | - if (! view()->exists($view) && ! self::getTemplates()->contains('template_slug', '=', $templatename)) { |
|
| 215 | + if (!view()->exists($view) && !self::getTemplates()->contains('template_slug', '=', $templatename)) { |
|
| 216 | 216 | self::saveTemplates(self::getTemplates() |
| 217 | 217 | ->push([ |
| 218 | 218 | 'template_name' => $request->template_name, |
@@ -225,7 +225,7 @@ discard block |
||
| 225 | 225 | |
| 226 | 226 | $dir = resource_path('views/vendor/'.self::$view_namespace.'/templates'); |
| 227 | 227 | |
| 228 | - if (! \File::isDirectory($dir)) { |
|
| 228 | + if (!\File::isDirectory($dir)) { |
|
| 229 | 229 | \File::makeDirectory($dir, 0755, true); |
| 230 | 230 | } |
| 231 | 231 | |
@@ -349,7 +349,7 @@ discard block |
||
| 349 | 349 | |
| 350 | 350 | $replaced = self::templateComponentReplace($content); |
| 351 | 351 | |
| 352 | - if (! $save) { |
|
| 352 | + if (!$save) { |
|
| 353 | 353 | return $replaced; |
| 354 | 354 | } |
| 355 | 355 | |
@@ -368,7 +368,7 @@ discard block |
||
| 368 | 368 | if ($template) { |
| 369 | 369 | $instance = null; |
| 370 | 370 | } else { |
| 371 | - if (! is_null(self::handleMailableViewDataArgs($namespace))) { |
|
| 371 | + if (!is_null(self::handleMailableViewDataArgs($namespace))) { |
|
| 372 | 372 | $instance = self::handleMailableViewDataArgs($namespace); |
| 373 | 373 | } else { |
| 374 | 374 | $instance = new $namespace; |
@@ -396,8 +396,8 @@ discard block |
||
| 396 | 396 | |
| 397 | 397 | $templateData = collect($mailable->first())->only(['markdown', 'view_path', 'text_view_path', 'text_view', 'view_data', 'data', 'namespace'])->all(); |
| 398 | 398 | |
| 399 | - $templateExists = ! is_null($templateData['view_path']); |
|
| 400 | - $textTemplateExists = ! is_null($templateData['text_view_path']); |
|
| 399 | + $templateExists = !is_null($templateData['view_path']); |
|
| 400 | + $textTemplateExists = !is_null($templateData['text_view_path']); |
|
| 401 | 401 | |
| 402 | 402 | if ($templateExists) { |
| 403 | 403 | $viewPathParams = collect($templateData)->union([ |
@@ -405,8 +405,8 @@ discard block |
||
| 405 | 405 | 'text_template' => $textTemplateExists ? file_get_contents($templateData['text_view_path']) : null, |
| 406 | 406 | 'template' => file_get_contents($templateData['view_path']), |
| 407 | 407 | 'markdowned_template' => self::markdownedTemplate($templateData['view_path']), |
| 408 | - 'template_name' => ! is_null($templateData['markdown']) ? $templateData['markdown'] : $templateData['data']->view, |
|
| 409 | - 'is_markdown' => ! is_null($templateData['markdown']) ? true : false, |
|
| 408 | + 'template_name' => !is_null($templateData['markdown']) ? $templateData['markdown'] : $templateData['data']->view, |
|
| 409 | + 'is_markdown' => !is_null($templateData['markdown']) ? true : false, |
|
| 410 | 410 | // 'text_template' => file_get_contents($templateData['text_view_path']), |
| 411 | 411 | |
| 412 | 412 | ])->all(); |
@@ -421,7 +421,7 @@ discard block |
||
| 421 | 421 | { |
| 422 | 422 | $name = ucwords(Str::camel(preg_replace('/\s+/', '_', $request->input('name')))); |
| 423 | 423 | |
| 424 | - if (! self::getMailable('name', $name)->isEmpty() && ! $request->has('force')) { |
|
| 424 | + if (!self::getMailable('name', $name)->isEmpty() && !$request->has('force')) { |
|
| 425 | 425 | // return redirect()->route('createMailable')->with('error', 'mailable already exists! to overide it enable force option.'); |
| 426 | 426 | // |
| 427 | 427 | return response()->json([ |
@@ -473,7 +473,7 @@ discard block |
||
| 473 | 473 | { |
| 474 | 474 | $fqcns = []; |
| 475 | 475 | |
| 476 | - if (! file_exists(config('maileclipse.mailables_dir'))): |
|
| 476 | + if (!file_exists(config('maileclipse.mailables_dir'))): |
|
| 477 | 477 | |
| 478 | 478 | return; else: |
| 479 | 479 | |
@@ -487,7 +487,7 @@ discard block |
||
| 487 | 487 | $tokens = token_get_all($content); |
| 488 | 488 | $namespace = ''; |
| 489 | 489 | for ($index = 0; isset($tokens[$index]); $index++) { |
| 490 | - if (! isset($tokens[$index][0])) { |
|
| 490 | + if (!isset($tokens[$index][0])) { |
|
| 491 | 491 | continue; |
| 492 | 492 | } |
| 493 | 493 | if (T_NAMESPACE === $tokens[$index][0]) { |
@@ -503,7 +503,7 @@ discard block |
||
| 503 | 503 | |
| 504 | 504 | $mailableClass = $namespace.'\\'.$tokens[$index][1]; |
| 505 | 505 | |
| 506 | - if (! self::mailable_exists($mailableClass)) { |
|
| 506 | + if (!self::mailable_exists($mailableClass)) { |
|
| 507 | 507 | continue; |
| 508 | 508 | } |
| 509 | 509 | |
@@ -515,7 +515,7 @@ discard block |
||
| 515 | 515 | |
| 516 | 516 | $mailable_data = self::buildMailable($mailableClass); |
| 517 | 517 | |
| 518 | - if (! is_null(self::handleMailableViewDataArgs($mailableClass))) { |
|
| 518 | + if (!is_null(self::handleMailableViewDataArgs($mailableClass))) { |
|
| 519 | 519 | $mailable_view_data = self::getMailableViewData(self::handleMailableViewDataArgs($mailableClass), $mailable_data); |
| 520 | 520 | } else { |
| 521 | 521 | $mailable_view_data = self::getMailableViewData(new $mailableClass, $mailable_data); |
@@ -536,16 +536,16 @@ discard block |
||
| 536 | 536 | $fqcns[$i]['view_path'] = null; |
| 537 | 537 | $fqcns[$i]['text_view_path'] = null; |
| 538 | 538 | |
| 539 | - if (! is_null($fqcns[$i]['markdown']) && View::exists($fqcns[$i]['markdown'])) { |
|
| 539 | + if (!is_null($fqcns[$i]['markdown']) && View::exists($fqcns[$i]['markdown'])) { |
|
| 540 | 540 | $fqcns[$i]['view_path'] = View($fqcns[$i]['markdown'])->getPath(); |
| 541 | 541 | } |
| 542 | 542 | |
| 543 | - if (! is_null($fqcns[$i]['data'])) { |
|
| 544 | - if (! is_null($fqcns[$i]['data']->view) && View::exists($fqcns[$i]['data']->view)) { |
|
| 543 | + if (!is_null($fqcns[$i]['data'])) { |
|
| 544 | + if (!is_null($fqcns[$i]['data']->view) && View::exists($fqcns[$i]['data']->view)) { |
|
| 545 | 545 | $fqcns[$i]['view_path'] = View($fqcns[$i]['data']->view)->getPath(); |
| 546 | 546 | } |
| 547 | 547 | |
| 548 | - if (! is_null($fqcns[$i]['data']->textView) && View::exists($fqcns[$i]['data']->textView)) { |
|
| 548 | + if (!is_null($fqcns[$i]['data']->textView) && View::exists($fqcns[$i]['data']->textView)) { |
|
| 549 | 549 | $fqcns[$i]['text_view_path'] = View($fqcns[$i]['data']->textView)->getPath(); |
| 550 | 550 | $fqcns[$i]['text_view'] = $fqcns[$i]['data']->textView; |
| 551 | 551 | } |
@@ -558,10 +558,10 @@ discard block |
||
| 558 | 558 | } |
| 559 | 559 | } |
| 560 | 560 | |
| 561 | - $collection = collect($fqcns)->map(function ($mailable) { |
|
| 561 | + $collection = collect($fqcns)->map(function($mailable) { |
|
| 562 | 562 | return $mailable; |
| 563 | - })->reject(function ($object) { |
|
| 564 | - return ! method_exists($object['namespace'], 'build'); |
|
| 563 | + })->reject(function($object) { |
|
| 564 | + return !method_exists($object['namespace'], 'build'); |
|
| 565 | 565 | }); |
| 566 | 566 | |
| 567 | 567 | // return $collection->all(); |
@@ -585,7 +585,7 @@ discard block |
||
| 585 | 585 | |
| 586 | 586 | $eloquentFactory = app(EloquentFactory::class); |
| 587 | 587 | |
| 588 | - $args = collect($params)->map(function ($param) { |
|
| 588 | + $args = collect($params)->map(function($param) { |
|
| 589 | 589 | if ($param->getType() !== null) { |
| 590 | 590 | if (class_exists($param->getType()->getName())) { |
| 591 | 591 | $parameters = [ |
@@ -631,7 +631,7 @@ discard block |
||
| 631 | 631 | |
| 632 | 632 | $reflector = new ReflectionClass($mailable); |
| 633 | 633 | |
| 634 | - if (! $args->isEmpty()) { |
|
| 634 | + if (!$args->isEmpty()) { |
|
| 635 | 635 | $foo = $reflector->newInstanceArgs($filteredparams); |
| 636 | 636 | |
| 637 | 637 | return $foo; |
@@ -663,17 +663,17 @@ discard block |
||
| 663 | 663 | $reflection = collect($params)->where('name', $arg)->first()->getType(); |
| 664 | 664 | |
| 665 | 665 | if (version_compare(phpversion(), '7.1', '>=')) { |
| 666 | - $type = ! is_null($reflection) |
|
| 666 | + $type = !is_null($reflection) |
|
| 667 | 667 | ? self::TYPES[$reflection->getName()] |
| 668 | 668 | : null; |
| 669 | 669 | } else { |
| 670 | - $type = ! is_null($reflection) |
|
| 670 | + $type = !is_null($reflection) |
|
| 671 | 671 | ? self::TYPES[/** @scrutinizer ignore-deprecated */ $reflection->__toString()] |
| 672 | 672 | : null; |
| 673 | 673 | } |
| 674 | 674 | |
| 675 | 675 | try { |
| 676 | - return ! is_null($type) |
|
| 676 | + return !is_null($type) |
|
| 677 | 677 | ? $type |
| 678 | 678 | : new Mocked($arg, \ReeceM\Mocker\Utils\VarStore::singleton()); |
| 679 | 679 | } catch (\Exception $e) { |
@@ -698,7 +698,7 @@ discard block |
||
| 698 | 698 | |
| 699 | 699 | foreach ($properties as $prop) { |
| 700 | 700 | if ($prop->class == $data->getName() || $prop->class == get_parent_class($data->getName()) && |
| 701 | - get_parent_class($data->getName()) != 'Illuminate\Mail\Mailable' && ! $prop->isStatic()) { |
|
| 701 | + get_parent_class($data->getName()) != 'Illuminate\Mail\Mailable' && !$prop->isStatic()) { |
|
| 702 | 702 | $allProps[] = $prop->name; |
| 703 | 703 | } |
| 704 | 704 | } |
@@ -717,7 +717,7 @@ discard block |
||
| 717 | 717 | |
| 718 | 718 | $mailableData = collect($classProps)->merge($withFuncData); |
| 719 | 719 | |
| 720 | - $data = $mailableData->map(function ($parameter) use ($mailable_data) { |
|
| 720 | + $data = $mailableData->map(function($parameter) use ($mailable_data) { |
|
| 721 | 721 | return [ |
| 722 | 722 | 'key' => $parameter, |
| 723 | 723 | 'value' => property_exists($mailable_data, $parameter) ? $mailable_data->$parameter : null, |
@@ -750,7 +750,7 @@ discard block |
||
| 750 | 750 | |
| 751 | 751 | protected static function mailable_exists($mailable) |
| 752 | 752 | { |
| 753 | - if (! class_exists($mailable)) { |
|
| 753 | + if (!class_exists($mailable)) { |
|
| 754 | 754 | return false; |
| 755 | 755 | } |
| 756 | 756 | |
@@ -775,7 +775,7 @@ discard block |
||
| 775 | 775 | public static function buildMailable($instance, $type = 'call') |
| 776 | 776 | { |
| 777 | 777 | if ($type == 'call') { |
| 778 | - if (! is_null(self::handleMailableViewDataArgs($instance))) { |
|
| 778 | + if (!is_null(self::handleMailableViewDataArgs($instance))) { |
|
| 779 | 779 | return Container::getInstance()->call([self::handleMailableViewDataArgs($instance), 'build']); |
| 780 | 780 | } |
| 781 | 781 | |
@@ -787,17 +787,17 @@ discard block |
||
| 787 | 787 | |
| 788 | 788 | public static function renderPreview($simpleview, $view, $template = false, $instance = null) |
| 789 | 789 | { |
| 790 | - if (! View::exists($view)) { |
|
| 790 | + if (!View::exists($view)) { |
|
| 791 | 791 | return; |
| 792 | 792 | } |
| 793 | 793 | |
| 794 | - if (! $template) { |
|
| 794 | + if (!$template) { |
|
| 795 | 795 | $obj = self::buildMailable($instance); |
| 796 | 796 | $viewData = $obj->viewData; |
| 797 | 797 | $_data = array_merge($instance->buildViewData(), $viewData); |
| 798 | 798 | |
| 799 | 799 | foreach ($_data as $key => $value) { |
| 800 | - if (! is_object($value)) { |
|
| 800 | + if (!is_object($value)) { |
|
| 801 | 801 | $_data[$key] = '<span class="maileclipse-key" title="Variable">'.$key.'</span>'; |
| 802 | 802 | } |
| 803 | 803 | } |
@@ -58,7 +58,7 @@ discard block |
||
| 58 | 58 | { |
| 59 | 59 | $templateData = mailEclipse::getMailableTemplateData($name); |
| 60 | 60 | |
| 61 | - if (! $templateData) { |
|
| 61 | + if (!$templateData) { |
|
| 62 | 62 | return redirect()->route('viewMailable', ['name' => $name]); |
| 63 | 63 | } |
| 64 | 64 | |
@@ -105,7 +105,7 @@ discard block |
||
| 105 | 105 | |
| 106 | 106 | $resource = $mailable->first(); |
| 107 | 107 | |
| 108 | - if (! is_null(mailEclipse::handleMailableViewDataArgs($resource['namespace']))) { |
|
| 108 | + if (!is_null(mailEclipse::handleMailableViewDataArgs($resource['namespace']))) { |
|
| 109 | 109 | // $instance = new $resource['namespace']; |
| 110 | 110 | // |
| 111 | 111 | $instance = mailEclipse::handleMailableViewDataArgs($resource['namespace']); |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | return 'View not found'; |
| 118 | 118 | } |
| 119 | 119 | |
| 120 | - $view = ! is_null($resource['markdown']) ? $resource['markdown'] : $resource['data']->view; |
|
| 120 | + $view = !is_null($resource['markdown']) ? $resource['markdown'] : $resource['data']->view; |
|
| 121 | 121 | |
| 122 | 122 | if (view()->exists($view)) { |
| 123 | 123 | try { |
@@ -2,7 +2,7 @@ discard block |
||
| 2 | 2 | |
| 3 | 3 | Route::get('/', 'MailablesController@toMailablesList'); |
| 4 | 4 | |
| 5 | -Route::group(['prefix' => 'templates'], function () { |
|
| 5 | +Route::group(['prefix' => 'templates'], function() { |
|
| 6 | 6 | Route::get('/', 'TemplatesController@index')->name('templateList'); |
| 7 | 7 | Route::get('new', 'TemplatesController@select')->name('selectNewTemplate'); |
| 8 | 8 | Route::get('new/{type}/{name}/{skeleton}', 'TemplatesController@new')->name('newTemplate'); |
@@ -13,7 +13,7 @@ discard block |
||
| 13 | 13 | Route::post('preview', 'TemplatesController@previewTemplateMarkdownView')->name('previewTemplateMarkdownView'); |
| 14 | 14 | }); |
| 15 | 15 | |
| 16 | -Route::group(['prefix' => 'mailables'], function () { |
|
| 16 | +Route::group(['prefix' => 'mailables'], function() { |
|
| 17 | 17 | Route::get('/', 'MailablesController@index')->name('mailableList'); |
| 18 | 18 | Route::get('view/{name}', 'MailablesController@viewMailable')->name('viewMailable'); |
| 19 | 19 | Route::get('edit/template/{name}', 'MailablesController@editMailable')->name('editMailable'); |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | */ |
| 34 | 34 | private function registerRoutes() |
| 35 | 35 | { |
| 36 | - Route::group($this->routeConfiguration(), function () { |
|
| 36 | + Route::group($this->routeConfiguration(), function() { |
|
| 37 | 37 | $this->loadRoutesFrom(__DIR__.'/Http/routes.php'); |
| 38 | 38 | }); |
| 39 | 39 | } |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | $this->mergeConfigFrom(__DIR__.'/../config/maileclipse.php', 'maileclipse'); |
| 63 | 63 | |
| 64 | 64 | // Register the service the package provides. |
| 65 | - $this->app->singleton('maileclipse', function ($app) { |
|
| 65 | + $this->app->singleton('maileclipse', function($app) { |
|
| 66 | 66 | return new mailEclipse; |
| 67 | 67 | }); |
| 68 | 68 | } |