-
-
Notifications
You must be signed in to change notification settings - Fork 721
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #787 from spatie/v4
V4
- Loading branch information
Showing
59 changed files
with
2,677 additions
and
633 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,37 +1,30 @@ | ||
| <?php | ||
|
|
||
| $finder = Symfony\Component\Finder\Finder::create() | ||
| $finder = \PhpCsFixer\Finder::create() | ||
| ->notPath('bootstrap/*') | ||
| ->notPath('storage/*') | ||
| ->notPath('resources/view/mail/*') | ||
| ->in([ | ||
| __DIR__ . '/src', | ||
| __DIR__ . '/tests', | ||
| __DIR__.'/src', | ||
| __DIR__.'/tests', | ||
| ]) | ||
| ->name('*.php') | ||
| ->notName('*.blade.php') | ||
| ->ignoreDotFiles(true) | ||
| ->ignoreVCS(true); | ||
|
|
||
| return PhpCsFixer\Config::create() | ||
| ->setRules([ | ||
| return \PhpCsFixer\Config::create() | ||
| ->setRules(array_merge(require '.php_cs.laravel', [ | ||
| '@PSR2' => true, | ||
| 'array_syntax' => ['syntax' => 'short'], | ||
| 'ordered_imports' => ['sortAlgorithm' => 'alpha'], | ||
| '@PSR12' => true, | ||
| 'no_unused_imports' => true, | ||
| 'not_operator_with_successor_space' => true, | ||
| 'trailing_comma_in_multiline_array' => true, | ||
| 'phpdoc_scalar' => true, | ||
| 'unary_operator_spaces' => true, | ||
| 'binary_operator_spaces' => true, | ||
| 'blank_line_before_statement' => [ | ||
| 'statements' => ['break', 'continue', 'declare', 'return', 'throw', 'try'], | ||
| ], | ||
| 'phpdoc_single_line_var_spacing' => true, | ||
| 'phpdoc_var_without_name' => true, | ||
| 'method_argument_space' => [ | ||
| 'on_multiline' => 'ensure_fully_multiline', | ||
| 'keep_multiple_spaces_after_comma' => true, | ||
| ] | ||
| ]) | ||
| 'phpdoc_to_comment' => false, | ||
| 'phpdoc_order' => true, | ||
| 'phpdoc_separation' => true, | ||
| 'simplified_null_return' => false, | ||
| ])) | ||
| ->setLineEnding("\n") | ||
| ->setIndent(str_repeat(' ', 4)) | ||
| ->setUsingCache(false) | ||
| ->setRiskyAllowed(true) | ||
| ->setFinder($finder); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,126 @@ | ||
| <?php | ||
|
|
||
| /** | ||
| * @link https://gist.github.com/laravel-shift/cab527923ed2a109dda047b97d53c200 | ||
| */ | ||
|
|
||
| return [ | ||
| 'array_syntax' => ['syntax' => 'short'], | ||
| 'binary_operator_spaces' => [ | ||
| 'default' => 'single_space', | ||
| 'operators' => ['=>' => null] | ||
| ], | ||
| 'blank_line_after_namespace' => true, | ||
| 'blank_line_after_opening_tag' => true, | ||
| 'blank_line_before_statement' => [ | ||
| 'statements' => ['return'] | ||
| ], | ||
| 'braces' => true, | ||
| 'cast_spaces' => true, | ||
| 'class_attributes_separation' => [ | ||
| 'elements' => ['method'] | ||
| ], | ||
| 'class_definition' => true, | ||
| 'concat_space' => [ | ||
| 'spacing' => 'none' | ||
| ], | ||
| 'declare_equal_normalize' => true, | ||
| 'elseif' => true, | ||
| 'encoding' => true, | ||
| 'full_opening_tag' => true, | ||
| 'fully_qualified_strict_types' => true, // added by Shift | ||
| 'function_declaration' => true, | ||
| 'function_typehint_space' => true, | ||
| 'heredoc_to_nowdoc' => true, | ||
| 'include' => true, | ||
| 'increment_style' => ['style' => 'post'], | ||
| 'indentation_type' => true, | ||
| 'linebreak_after_opening_tag' => true, | ||
| 'line_ending' => true, | ||
| 'lowercase_cast' => true, | ||
| 'lowercase_constants' => true, | ||
| 'lowercase_keywords' => true, | ||
| 'lowercase_static_reference' => true, // added from Symfony | ||
| 'magic_method_casing' => true, // added from Symfony | ||
| 'magic_constant_casing' => true, | ||
| 'method_argument_space' => true, | ||
| 'native_function_casing' => true, | ||
| 'no_alias_functions' => true, | ||
| 'no_extra_blank_lines' => [ | ||
| 'tokens' => [ | ||
| 'extra', | ||
| 'throw', | ||
| 'use', | ||
| 'use_trait', | ||
| ] | ||
| ], | ||
| 'no_blank_lines_after_class_opening' => true, | ||
| 'no_blank_lines_after_phpdoc' => true, | ||
| 'no_closing_tag' => true, | ||
| 'no_empty_phpdoc' => true, | ||
| 'no_empty_statement' => true, | ||
| 'no_leading_import_slash' => true, | ||
| 'no_leading_namespace_whitespace' => true, | ||
| 'no_mixed_echo_print' => [ | ||
| 'use' => 'echo' | ||
| ], | ||
| 'no_multiline_whitespace_around_double_arrow' => true, | ||
| 'multiline_whitespace_before_semicolons' => [ | ||
| 'strategy' => 'no_multi_line' | ||
| ], | ||
| 'no_short_bool_cast' => true, | ||
| 'no_singleline_whitespace_before_semicolons' => true, | ||
| 'no_spaces_after_function_name' => true, | ||
| 'no_spaces_around_offset' => true, | ||
| 'no_spaces_inside_parenthesis' => true, | ||
| 'no_trailing_comma_in_list_call' => true, | ||
| 'no_trailing_comma_in_singleline_array' => true, | ||
| 'no_trailing_whitespace' => true, | ||
| 'no_trailing_whitespace_in_comment' => true, | ||
| 'no_unneeded_control_parentheses' => true, | ||
| 'no_unreachable_default_argument_value' => true, | ||
| 'no_useless_return' => true, | ||
| 'no_whitespace_before_comma_in_array' => true, | ||
| 'no_whitespace_in_blank_line' => true, | ||
| 'normalize_index_brace' => true, | ||
| 'not_operator_with_successor_space' => true, | ||
| 'object_operator_without_whitespace' => true, | ||
| 'ordered_imports' => ['sortAlgorithm' => 'alpha'], | ||
| 'phpdoc_indent' => true, | ||
| 'phpdoc_inline_tag' => true, | ||
| 'phpdoc_no_access' => true, | ||
| 'phpdoc_no_package' => true, | ||
| 'phpdoc_no_useless_inheritdoc' => true, | ||
| 'phpdoc_scalar' => true, | ||
| 'phpdoc_single_line_var_spacing' => true, | ||
| 'phpdoc_summary' => true, | ||
| 'phpdoc_to_comment' => true, | ||
| 'phpdoc_trim' => true, | ||
| 'phpdoc_types' => true, | ||
| 'phpdoc_var_without_name' => true, | ||
| 'psr4' => true, | ||
| 'self_accessor' => true, | ||
| 'short_scalar_cast' => true, | ||
| 'simplified_null_return' => true, | ||
| 'single_blank_line_at_eof' => true, | ||
| 'single_blank_line_before_namespace' => true, | ||
| 'single_class_element_per_statement' => true, | ||
| 'single_import_per_statement' => true, | ||
| 'single_line_after_imports' => true, | ||
| 'single_line_comment_style' => [ | ||
| 'comment_types' => ['hash'] | ||
| ], | ||
| 'single_quote' => true, | ||
| 'space_after_semicolon' => true, | ||
| 'standardize_not_equals' => true, | ||
| 'switch_case_semicolon_to_colon' => true, | ||
| 'switch_case_space' => true, | ||
| 'ternary_operator_spaces' => true, | ||
| 'trailing_comma_in_multiline_array' => true, | ||
| 'trim_array_spaces' => true, | ||
| 'unary_operator_spaces' => true, | ||
| 'visibility_required' => [ | ||
| 'elements' => ['method', 'property'] | ||
| ], | ||
| 'whitespace_after_comma_in_array' => true, | ||
| ]; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
22 changes: 22 additions & 0 deletions
22
database/migrations/AddBatchUuidColumnToActivityLogTable.php.stub
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| <?php | ||
|
|
||
| use Illuminate\Support\Facades\Schema; | ||
| use Illuminate\Database\Schema\Blueprint; | ||
| use Illuminate\Database\Migrations\Migration; | ||
|
|
||
| class AddBatchUuidColumnToActivityLogTable extends Migration | ||
| { | ||
| public function up() | ||
| { | ||
| Schema::connection(config('activitylog.database_connection'))->table(config('activitylog.table_name'), function (Blueprint $table) { | ||
| $table->uuid('batch_uuid')->nullable()->after('properties'); | ||
| }); | ||
| } | ||
|
|
||
| public function down() | ||
| { | ||
| Schema::connection(config('activitylog.database_connection'))->table(config('activitylog.table_name'), function (Blueprint $table) { | ||
| $table->dropColumn('batch_uuid'); | ||
| }); | ||
| } | ||
| } |
22 changes: 22 additions & 0 deletions
22
database/migrations/AddEventColumnToActivityLogTable.php.stub
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| <?php | ||
|
|
||
| use Illuminate\Support\Facades\Schema; | ||
| use Illuminate\Database\Schema\Blueprint; | ||
| use Illuminate\Database\Migrations\Migration; | ||
|
|
||
| class AddEventColumnToActivityLogTable extends Migration | ||
| { | ||
| public function up() | ||
| { | ||
| Schema::connection(config('activitylog.database_connection'))->table(config('activitylog.table_name'), function (Blueprint $table) { | ||
| $table->string('event')->nullable()->after('subject_type'); | ||
| }); | ||
| } | ||
|
|
||
| public function down() | ||
| { | ||
| Schema::connection(config('activitylog.database_connection'))->table(config('activitylog.table_name'), function (Blueprint $table) { | ||
| $table->dropColumn('event'); | ||
| }); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.