Skip to content

Commit 6dc8467

Browse files
abrardev99abrardev99
committed
wip
1 parent c5e70e8 commit 6dc8467

File tree

5 files changed

+227
-39
lines changed

5 files changed

+227
-39
lines changed

‎.github/workflows/ci.yml

+34-36
Original file line numberDiff line numberDiff line change
@@ -4,44 +4,42 @@ on: [push, pull_request]
44

55
jobs:
66
test:
7-
runs-on: ${{ matrix.os }}
7+
runs-on: ubuntu-latest
88
strategy:
99
fail-fast: true
1010
matrix:
11-
os: [ubuntu-latest, windows-latest]
12-
php: [7.3, 7.4]
13-
laravel: [6.*, 7.*, 8.*]
14-
dependency-version: [prefer-lowest, prefer-stable]
15-
include:
16-
- laravel: 8.*
17-
testbench: 6.*
18-
- laravel: 7.*
19-
testbench: 5.*
20-
- laravel: 6.*
21-
testbench: 4.*
22-
23-
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
11+
laravel: [6, 7, 8, 9]
12+
13+
14+
name: Tests (PHPUnit) - L${{ matrix.laravel }}
15+
16+
steps:
17+
- name: Checkout code
18+
uses: actions/checkout@v2
19+
20+
- name: Setup PHP
21+
uses: shivammathur/setup-php@v2
22+
with:
23+
php-version: '8.0'
24+
25+
- name: Install dependencies
26+
run: composer require "laravel/framework:^${{matrix.laravel}}.0"
27+
- name: Run tests
28+
run: vendor/bin/phpunit
29+
30+
php-cs-fixer:
31+
name: Code style (php-cs-fixer)
32+
runs-on: ubuntu-latest
2433

2534
steps:
26-
- name: Checkout code
27-
uses: actions/checkout@v2
28-
29-
- name: Cache dependencies
30-
uses: actions/cache@v1
31-
with:
32-
path: ~/.composer/cache/files
33-
key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
34-
35-
- name: Setup PHP
36-
uses: shivammathur/setup-php@v2
37-
with:
38-
php-version: ${{ matrix.php }}
39-
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick
40-
coverage: none
41-
42-
- name: Install dependencies
43-
run: |
44-
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
45-
composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest
46-
- name: Execute tests
47-
run: vendor/bin/phpunit
35+
- uses: actions/checkout@v2
36+
- name: Install php-cs-fixer
37+
run: composer global require friendsofphp/php-cs-fixer
38+
- name: Run php-cs-fixer
39+
run: $HOME/.composer/vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.php
40+
- name: Commit changes from php-cs-fixer
41+
uses: EndBug/add-and-commit@v5
42+
with:
43+
author_name: Samuel Štancl
44+
author_email: [email protected]
45+
message: Fix code style (php-cs-fixer)

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
/vendor/
22
composer.lock
3+
.phpunit.result.cache
4+
.php-cs-fixer.cache

‎.php-cs-fixer.php

+141
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,141 @@
1+
<?php
2+
3+
use PhpCsFixer\Config;
4+
use PhpCsFixer\Finder;
5+
6+
$rules = [
7+
'array_syntax' => ['syntax' => 'short'],
8+
'binary_operator_spaces' => [
9+
'default' => 'single_space',
10+
'operators' => [
11+
'=>' => null,
12+
'|' => 'no_space',
13+
],
14+
],
15+
'blank_line_after_namespace' => true,
16+
'blank_line_after_opening_tag' => true,
17+
'no_superfluous_phpdoc_tags' => true,
18+
'blank_line_before_statement' => [
19+
'statements' => ['return'],
20+
],
21+
'braces' => true,
22+
'cast_spaces' => true,
23+
'class_definition' => true,
24+
'concat_space' => [
25+
'spacing' => 'one',
26+
],
27+
'declare_equal_normalize' => true,
28+
'elseif' => true,
29+
'encoding' => true,
30+
'full_opening_tag' => true,
31+
'declare_strict_types' => true,
32+
'fully_qualified_strict_types' => true, // added by Shift
33+
'function_declaration' => true,
34+
'function_typehint_space' => true,
35+
'heredoc_to_nowdoc' => true,
36+
'include' => true,
37+
'increment_style' => ['style' => 'post'],
38+
'indentation_type' => true,
39+
'linebreak_after_opening_tag' => true,
40+
'line_ending' => true,
41+
'lowercase_cast' => true,
42+
'constant_case' => true,
43+
'lowercase_keywords' => true,
44+
'lowercase_static_reference' => true, // added from Symfony
45+
'magic_method_casing' => true, // added from Symfony
46+
'magic_constant_casing' => true,
47+
'method_argument_space' => true,
48+
'native_function_casing' => true,
49+
'no_alias_functions' => true,
50+
'no_extra_blank_lines' => [
51+
'tokens' => [
52+
'extra',
53+
'throw',
54+
'use',
55+
'use_trait',
56+
],
57+
],
58+
'no_blank_lines_after_class_opening' => true,
59+
'no_blank_lines_after_phpdoc' => true,
60+
'no_closing_tag' => true,
61+
'no_empty_phpdoc' => true,
62+
'no_empty_statement' => true,
63+
'no_leading_import_slash' => true,
64+
'no_leading_namespace_whitespace' => true,
65+
'no_mixed_echo_print' => [
66+
'use' => 'echo',
67+
],
68+
'no_multiline_whitespace_around_double_arrow' => true,
69+
'multiline_whitespace_before_semicolons' => [
70+
'strategy' => 'no_multi_line',
71+
],
72+
'no_short_bool_cast' => true,
73+
'no_singleline_whitespace_before_semicolons' => true,
74+
'no_spaces_after_function_name' => true,
75+
'no_spaces_around_offset' => true,
76+
'no_spaces_inside_parenthesis' => true,
77+
'no_trailing_comma_in_list_call' => true,
78+
'no_trailing_comma_in_singleline_array' => true,
79+
'no_trailing_whitespace' => true,
80+
'no_trailing_whitespace_in_comment' => true,
81+
'no_unneeded_control_parentheses' => true,
82+
'no_unreachable_default_argument_value' => true,
83+
'no_useless_return' => true,
84+
'no_whitespace_before_comma_in_array' => true,
85+
'no_whitespace_in_blank_line' => true,
86+
'normalize_index_brace' => true,
87+
'not_operator_with_successor_space' => true,
88+
'object_operator_without_whitespace' => true,
89+
'ordered_imports' => ['sort_algorithm' => 'alpha'],
90+
'phpdoc_indent' => true,
91+
'general_phpdoc_tag_rename' => true,
92+
'phpdoc_no_access' => true,
93+
'phpdoc_no_package' => true,
94+
'phpdoc_no_useless_inheritdoc' => true,
95+
'phpdoc_scalar' => true,
96+
'phpdoc_single_line_var_spacing' => true,
97+
'phpdoc_summary' => true,
98+
'phpdoc_to_comment' => false,
99+
'phpdoc_trim' => true,
100+
'phpdoc_types' => true,
101+
'phpdoc_var_without_name' => true,
102+
'psr_autoloading' => true,
103+
'self_accessor' => true,
104+
'short_scalar_cast' => true,
105+
'simplified_null_return' => false, // disabled by Shift
106+
'single_blank_line_at_eof' => true,
107+
'single_blank_line_before_namespace' => true,
108+
'single_class_element_per_statement' => true,
109+
'single_import_per_statement' => false,
110+
'single_line_after_imports' => true,
111+
'no_unused_imports' => true,
112+
'single_line_comment_style' => [
113+
'comment_types' => ['hash'],
114+
],
115+
'single_quote' => true,
116+
'space_after_semicolon' => true,
117+
'standardize_not_equals' => true,
118+
'switch_case_semicolon_to_colon' => true,
119+
'switch_case_space' => true,
120+
'ternary_operator_spaces' => true,
121+
'trailing_comma_in_multiline' => true,
122+
'trim_array_spaces' => true,
123+
'unary_operator_spaces' => true,
124+
'whitespace_after_comma_in_array' => true,
125+
];
126+
127+
$project_path = getcwd();
128+
$finder = Finder::create()
129+
->in([
130+
$project_path . '/src',
131+
])
132+
->name('*.php')
133+
->notName('*.blade.php')
134+
->ignoreDotFiles(true)
135+
->ignoreVCS(true);
136+
137+
return (new Config())
138+
->setFinder($finder)
139+
->setRules($rules)
140+
->setRiskyAllowed(true)
141+
->setUsingCache(true);

‎check

+47
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
#!/bin/bash
2+
set -e
3+
4+
offer_run() {
5+
read -p "For more output, run $1. Run it now (Y/n)? " run
6+
7+
case ${run:0:1} in
8+
n|N )
9+
exit 1
10+
;;
11+
* )
12+
$1
13+
;;
14+
esac
15+
16+
exit 1
17+
}
18+
19+
if (php-cs-fixer fix --dry-run --config=.php-cs-fixer.php > /dev/null 2>/dev/null); then
20+
echo '✅ php-cs-fixer OK'
21+
else
22+
read -p "⚠️ php-cs-fixer found issues. Fix (Y/n)? " fix
23+
case ${fix:0:1} in
24+
n|N )
25+
echo '❌ php-cs-fixer FAIL'
26+
offer_run 'php-cs-fixer fix --config=.php-cs-fixer.php'
27+
;;
28+
* )
29+
if (php-cs-fixer fix --config=.php-cs-fixer.php > /dev/null 2>/dev/null); then
30+
echo '✅ php-cs-fixer OK'
31+
else
32+
echo '❌ php-cs-fixer FAIL'
33+
offer_run 'php-cs-fixer fix --config=.php-cs-fixer.php'
34+
fi
35+
;;
36+
esac
37+
fi
38+
39+
if (./vendor/bin/phpunit > /dev/null 2>/dev/null); then
40+
echo '✅ PHPUnit OK'
41+
else
42+
echo '❌ PHPUnit FAIL'
43+
offer_run './vendor/bin/phpunit'
44+
fi
45+
46+
echo '=================='
47+
echo '✅ Everything OK'

‎composer.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
}
2020
},
2121
"require": {
22-
"illuminate/support": "^6.0|^7.11|^8.0|dev-master",
23-
"illuminate/database": "^6.0|^7.11|^8.0|dev-master"
22+
"illuminate/support": "^6.0|^7.11|^8.0|^9.0",
23+
"illuminate/database": "^6.0|^7.11|^8.0|^9.0"
2424
},
2525
"require-dev": {
26-
"orchestra/testbench": "^4.0|^5.2|^6.0"
26+
"orchestra/testbench": "^4.0|^5.2|^6.0|^7.0"
2727
},
2828
"minimum-stability": "dev",
2929
"prefer-stable": true

0 commit comments

Comments
 (0)