Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions .github/workflows/formatting.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Fix syling

on:
push:
branches:
- master
- "*.x"
paths:
- "**.php"

pull_request:
paths:
- "**.php"

permissions:
contents: write
jobs:
php-cs-fixer:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
with:
ref: ${{ github.head_ref }}

- name: Install dependencies
run: composer install

- name: Execute php-cs-fixer
run: ./vendor/bin/php-cs-fixer fix

- uses: stefanzweifel/git-auto-commit-action@v4
with:
commit_message: Fix styling
45 changes: 15 additions & 30 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -1,39 +1,24 @@
name: PHP Composer
name: "Tests"

on:
push:
branches:
- master
- "*.x"
pull_request:
branches:
- master
- "*.x"

permissions:
contents: read
on: push

jobs:
build:
run:
runs-on: ubuntu-latest

strategy:
matrix:
php-versions: ["8.1", "8.2"]
steps:
- uses: actions/checkout@v3

- name: Validate composer.json and composer.lock
run: composer validate --strict

- name: Cache Composer packages
id: composer-cache
uses: actions/cache@v3
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
path: vendor
key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
restore-keys: |
${{ runner.os }}-php-
php-version: ${{ matrix.php-versions }}

- name: Checkout code
uses: actions/checkout@v3

- name: Install dependencies
run: composer install --prefer-dist --no-progress
run: composer install --prefer-dist --no-progress --no-interaction

- name: Execute Tests
run: vendor/bin/pest
- name: Execute tests
run: ./vendor/bin/pest
143 changes: 143 additions & 0 deletions .php-cs-fixer.dist.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,143 @@
<?php
/*
* This document has been generated with
* https://mlocati.github.io/php-cs-fixer-configurator/#version:3.12.0|configurator
* you can change this configuration by importing this file.
*
* Thank you mlocati! ~ megasteve19
*/
$config = new PhpCsFixer\Config();

return $config
->setRules([
'align_multiline_comment' => true,
'array_syntax' => true,
'blank_line_after_namespace' => true,
'blank_line_after_opening_tag' => true,
'blank_line_before_statement' => ['statements'=>['case', 'for', 'foreach', 'if', 'phpdoc', 'return', 'switch', 'throw', 'try', 'while']],
'braces' => ['position_after_anonymous_constructs'=>'next', 'position_after_control_structures'=>'next'],
'cast_spaces' => true,
'class_attributes_separation' => true,
'class_definition' => true,
'class_reference_name_casing' => true,
'clean_namespace' => true,
'combine_consecutive_issets' => true,
'combine_consecutive_unsets' => true,
'compact_nullable_typehint' => true,
'concat_space' => ['spacing'=>'one'],
'constant_case' => true,
'control_structure_braces' => true,
'control_structure_continuation_position' => ['position'=>'next_line'],
'curly_braces_position' => ['allow_single_line_anonymous_functions'=>false, 'allow_single_line_empty_anonymous_classes'=>false, 'anonymous_classes_opening_brace'=>'next_line_unless_newline_at_signature_end', 'anonymous_functions_opening_brace'=>'same_line', 'control_structures_opening_brace'=>'next_line_unless_newline_at_signature_end', 'functions_opening_brace'=>'next_line_unless_newline_at_signature_end'],
'declare_equal_normalize' => ['space'=>'single'],
'declare_parentheses' => true,
'echo_tag_syntax' => ['format'=>'short'],
'elseif' => true,
'encoding' => true,
'explicit_indirect_variable' => true,
'explicit_string_variable' => true,
'full_opening_tag' => true,
'fully_qualified_strict_types' => true,
'function_declaration' => ['closure_function_spacing'=>'none'],
'function_typehint_space' => true,
'heredoc_indentation' => true,
'include' => true,
'increment_style' => ['style'=>'post'],
'indentation_type' => true,
'lambda_not_used_import' => true,
'line_ending' => true,
'linebreak_after_opening_tag' => true,
'list_syntax' => true,
'lowercase_cast' => true,
'lowercase_keywords' => true,
'lowercase_static_reference' => true,
'magic_constant_casing' => true,
'magic_method_casing' => true,
'method_argument_space' => true,
'method_chaining_indentation' => true,
'multiline_comment_opening_closing' => true,
'multiline_whitespace_before_semicolons' => true,
'native_function_casing' => true,
'native_function_type_declaration_casing' => true,
'new_with_braces' => true,
'no_alias_language_construct_call' => true,
'no_blank_lines_after_class_opening' => true,
'no_blank_lines_after_phpdoc' => true,
'no_closing_tag' => true,
'no_empty_comment' => true,
'no_empty_phpdoc' => true,
'no_empty_statement' => true,
'no_leading_namespace_whitespace' => true,
'no_multiline_whitespace_around_double_arrow' => true,
'no_multiple_statements_per_line' => true,
'no_null_property_initialization' => true,
'no_short_bool_cast' => true,
'no_singleline_whitespace_before_semicolons' => true,
'no_space_around_double_colon' => true,
'no_spaces_after_function_name' => true,
'no_spaces_around_offset' => true,
'no_spaces_inside_parenthesis' => true,
'no_trailing_comma_in_singleline' => true,
'no_trailing_whitespace' => true,
'no_trailing_whitespace_in_comment' => true,
'no_unneeded_import_alias' => true,
'no_unused_imports' => true,
'no_useless_concat_operator' => true,
'no_useless_else' => true,
'no_useless_nullsafe_operator' => true,
'no_useless_return' => true,
'no_whitespace_before_comma_in_array' => true,
'no_whitespace_in_blank_line' => true,
'normalize_index_brace' => true,
'nullable_type_declaration_for_default_null_value' => true,
'object_operator_without_whitespace' => true,
'operator_linebreak' => true,
'ordered_imports' => true,
'phpdoc_align' => ['align'=>'left'],
'phpdoc_indent' => true,
'phpdoc_line_span' => true,
'phpdoc_no_access' => true,
'phpdoc_no_alias_tag' => true,
'phpdoc_order' => true,
'phpdoc_separation' => true,
'phpdoc_single_line_var_spacing' => true,
'phpdoc_summary' => true,
'phpdoc_tag_casing' => true,
'phpdoc_tag_type' => true,
'phpdoc_trim' => true,
'phpdoc_trim_consecutive_blank_line_separation' => true,
'phpdoc_types' => true,
'phpdoc_types_order' => ['null_adjustment'=>'always_last'],
'phpdoc_var_annotation_correct_order' => true,
'phpdoc_var_without_name' => true,
'return_type_declaration' => true,
'semicolon_after_instruction' => true,
'short_scalar_cast' => true,
'simple_to_complex_string_variable' => true,
'simplified_null_return' => 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_spacing' => true,
'single_line_throw' => true,
'single_space_after_construct' => ['constructs'=>['abstract', 'as', 'attribute', 'break', 'case', 'comment', 'echo', 'if', 'implements', 'namespace', 'new', 'private', 'protected', 'public', 'readonly', 'var']],
'space_after_semicolon' => true,
'standardize_increment' => true,
'standardize_not_equals' => true,
'statement_indentation' => true,
'switch_case_space' => true,
'switch_continue_to_break' => true,
'ternary_operator_spaces' => true,
'ternary_to_null_coalescing' => true,
'trailing_comma_in_multiline' => true,
'trim_array_spaces' => true,
'types_spaces' => true,
'unary_operator_spaces' => true,
'whitespace_after_comma_in_array' => ['ensure_single_space'=>false],
])
->setFinder(
PhpCsFixer\Finder::create()
->exclude('vendor')
->in(__DIR__)
);
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@
},
"require-dev": {
"pestphp/pest": "^1.22",
"orchestra/testbench": "^7.19"
"orchestra/testbench": "^7.19",
"friendsofphp/php-cs-fixer": "^3.14"
},
"config": {
"allow-plugins": {
Expand Down
2 changes: 1 addition & 1 deletion src/Blocks/Attaches.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

namespace BumpCore\EditorPhp\Blocks;

use BumpCore\EditorPhp\Block\Block;
use BumpCore\EditorPhp\Block\Data;
use BumpCore\EditorPhp\Block\Field;
use BumpCore\EditorPhp\Block\Block;
use BumpCore\EditorPhp\Helpers;
use Illuminate\Support\Facades\View;

Expand Down
2 changes: 1 addition & 1 deletion src/Blocks/Checklist.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

namespace BumpCore\EditorPhp\Blocks;

use BumpCore\EditorPhp\Block\Block;
use BumpCore\EditorPhp\Block\Data;
use BumpCore\EditorPhp\Block\Field;
use BumpCore\EditorPhp\Block\Block;
use BumpCore\EditorPhp\Helpers;
use Illuminate\Support\Facades\View;

Expand Down
2 changes: 1 addition & 1 deletion src/Blocks/Code.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

namespace BumpCore\EditorPhp\Blocks;

use BumpCore\EditorPhp\Block\Block;
use BumpCore\EditorPhp\Block\Data;
use BumpCore\EditorPhp\Block\Field;
use BumpCore\EditorPhp\Block\Block;
use BumpCore\EditorPhp\Helpers;
use Illuminate\Support\Facades\View;

Expand Down
2 changes: 1 addition & 1 deletion src/Blocks/Delimiter.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

namespace BumpCore\EditorPhp\Blocks;

use BumpCore\EditorPhp\Block\Data;
use BumpCore\EditorPhp\Block\Block;
use BumpCore\EditorPhp\Block\Data;
use BumpCore\EditorPhp\Helpers;
use Illuminate\Support\Facades\View;

Expand Down
2 changes: 1 addition & 1 deletion src/Blocks/Embed.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

namespace BumpCore\EditorPhp\Blocks;

use BumpCore\EditorPhp\Block\Block;
use BumpCore\EditorPhp\Block\Data;
use BumpCore\EditorPhp\Block\Field;
use BumpCore\EditorPhp\Block\Block;
use BumpCore\EditorPhp\Helpers;
use Illuminate\Support\Facades\View;

Expand Down
2 changes: 1 addition & 1 deletion src/Blocks/Header.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

namespace BumpCore\EditorPhp\Blocks;

use BumpCore\EditorPhp\Block\Block;
use BumpCore\EditorPhp\Block\Data;
use BumpCore\EditorPhp\Block\Field;
use BumpCore\EditorPhp\Block\Block;
use BumpCore\EditorPhp\Helpers;
use Illuminate\Support\Facades\View;

Expand Down
2 changes: 1 addition & 1 deletion src/Blocks/Image.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

namespace BumpCore\EditorPhp\Blocks;

use BumpCore\EditorPhp\Block\Block;
use BumpCore\EditorPhp\Block\Data;
use BumpCore\EditorPhp\Block\Field;
use BumpCore\EditorPhp\Block\Block;
use BumpCore\EditorPhp\Helpers;
use Illuminate\Support\Facades\View;

Expand Down
2 changes: 1 addition & 1 deletion src/Blocks/LinkTool.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

namespace BumpCore\EditorPhp\Blocks;

use BumpCore\EditorPhp\Block\Block;
use BumpCore\EditorPhp\Block\Data;
use BumpCore\EditorPhp\Block\Field;
use BumpCore\EditorPhp\Block\Block;
use BumpCore\EditorPhp\Helpers;
use Illuminate\Support\Facades\View;

Expand Down
2 changes: 1 addition & 1 deletion src/Blocks/ListBlock.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

namespace BumpCore\EditorPhp\Blocks;

use BumpCore\EditorPhp\Block\Block;
use BumpCore\EditorPhp\Block\Data;
use BumpCore\EditorPhp\Block\Field;
use BumpCore\EditorPhp\Block\Block;
use BumpCore\EditorPhp\Helpers;
use Illuminate\Support\Facades\View;
use Illuminate\Validation\Rule;
Expand Down
2 changes: 1 addition & 1 deletion src/Blocks/Paragraph.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

namespace BumpCore\EditorPhp\Blocks;

use BumpCore\EditorPhp\Block\Block;
use BumpCore\EditorPhp\Block\Data;
use BumpCore\EditorPhp\Block\Field;
use BumpCore\EditorPhp\Block\Block;
use BumpCore\EditorPhp\Helpers;
use Illuminate\Support\Facades\View;

Expand Down
2 changes: 1 addition & 1 deletion src/Blocks/Personality.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

namespace BumpCore\EditorPhp\Blocks;

use BumpCore\EditorPhp\Block\Block;
use BumpCore\EditorPhp\Block\Data;
use BumpCore\EditorPhp\Block\Field;
use BumpCore\EditorPhp\Block\Block;
use BumpCore\EditorPhp\Helpers;
use Illuminate\Support\Facades\View;

Expand Down
2 changes: 1 addition & 1 deletion src/Blocks/Quote.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

namespace BumpCore\EditorPhp\Blocks;

use BumpCore\EditorPhp\Block\Block;
use BumpCore\EditorPhp\Block\Data;
use BumpCore\EditorPhp\Block\Field;
use BumpCore\EditorPhp\Block\Block;
use BumpCore\EditorPhp\Helpers;
use Illuminate\Support\Facades\View;
use Illuminate\Validation\Rule;
Expand Down
2 changes: 1 addition & 1 deletion src/Blocks/Raw.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

namespace BumpCore\EditorPhp\Blocks;

use BumpCore\EditorPhp\Block\Block;
use BumpCore\EditorPhp\Block\Data;
use BumpCore\EditorPhp\Block\Field;
use BumpCore\EditorPhp\Block\Block;

class Raw extends Block
{
Expand Down
2 changes: 1 addition & 1 deletion src/Blocks/Table.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

namespace BumpCore\EditorPhp\Blocks;

use BumpCore\EditorPhp\Block\Block;
use BumpCore\EditorPhp\Block\Data;
use BumpCore\EditorPhp\Block\Field;
use BumpCore\EditorPhp\Block\Block;
use BumpCore\EditorPhp\Helpers;
use Illuminate\Support\Facades\View;

Expand Down
Loading