mirror of
https://github.com/archtechx/virtualcolumn.git
synced 2025-12-12 17:04:04 +00:00
wip
This commit is contained in:
parent
c5e70e832c
commit
6dc8467473
5 changed files with 223 additions and 35 deletions
50
.github/workflows/ci.yml
vendored
50
.github/workflows/ci.yml
vendored
|
|
@ -4,44 +4,42 @@ on: [push, pull_request]
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
test:
|
test:
|
||||||
runs-on: ${{ matrix.os }}
|
runs-on: ubuntu-latest
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: true
|
fail-fast: true
|
||||||
matrix:
|
matrix:
|
||||||
os: [ubuntu-latest, windows-latest]
|
laravel: [6, 7, 8, 9]
|
||||||
php: [7.3, 7.4]
|
|
||||||
laravel: [6.*, 7.*, 8.*]
|
|
||||||
dependency-version: [prefer-lowest, prefer-stable]
|
|
||||||
include:
|
|
||||||
- laravel: 8.*
|
|
||||||
testbench: 6.*
|
|
||||||
- laravel: 7.*
|
|
||||||
testbench: 5.*
|
|
||||||
- laravel: 6.*
|
|
||||||
testbench: 4.*
|
|
||||||
|
|
||||||
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
|
|
||||||
|
name: Tests (PHPUnit) - L${{ matrix.laravel }}
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v2
|
||||||
|
|
||||||
- name: Cache dependencies
|
|
||||||
uses: actions/cache@v1
|
|
||||||
with:
|
|
||||||
path: ~/.composer/cache/files
|
|
||||||
key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
|
|
||||||
|
|
||||||
- name: Setup PHP
|
- name: Setup PHP
|
||||||
uses: shivammathur/setup-php@v2
|
uses: shivammathur/setup-php@v2
|
||||||
with:
|
with:
|
||||||
php-version: ${{ matrix.php }}
|
php-version: '8.0'
|
||||||
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick
|
|
||||||
coverage: none
|
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: |
|
run: composer require "laravel/framework:^${{matrix.laravel}}.0"
|
||||||
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
|
- name: Run tests
|
||||||
composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest
|
|
||||||
- name: Execute tests
|
|
||||||
run: vendor/bin/phpunit
|
run: vendor/bin/phpunit
|
||||||
|
|
||||||
|
php-cs-fixer:
|
||||||
|
name: Code style (php-cs-fixer)
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v2
|
||||||
|
- name: Install php-cs-fixer
|
||||||
|
run: composer global require friendsofphp/php-cs-fixer
|
||||||
|
- name: Run php-cs-fixer
|
||||||
|
run: $HOME/.composer/vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.php
|
||||||
|
- name: Commit changes from php-cs-fixer
|
||||||
|
uses: EndBug/add-and-commit@v5
|
||||||
|
with:
|
||||||
|
author_name: Samuel Štancl
|
||||||
|
author_email: samuel.stancl@gmail.com
|
||||||
|
message: Fix code style (php-cs-fixer)
|
||||||
|
|
|
||||||
2
.gitignore
vendored
2
.gitignore
vendored
|
|
@ -1,2 +1,4 @@
|
||||||
/vendor/
|
/vendor/
|
||||||
composer.lock
|
composer.lock
|
||||||
|
.phpunit.result.cache
|
||||||
|
.php-cs-fixer.cache
|
||||||
|
|
|
||||||
141
.php-cs-fixer.php
Normal file
141
.php-cs-fixer.php
Normal file
|
|
@ -0,0 +1,141 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
use PhpCsFixer\Config;
|
||||||
|
use PhpCsFixer\Finder;
|
||||||
|
|
||||||
|
$rules = [
|
||||||
|
'array_syntax' => ['syntax' => 'short'],
|
||||||
|
'binary_operator_spaces' => [
|
||||||
|
'default' => 'single_space',
|
||||||
|
'operators' => [
|
||||||
|
'=>' => null,
|
||||||
|
'|' => 'no_space',
|
||||||
|
],
|
||||||
|
],
|
||||||
|
'blank_line_after_namespace' => true,
|
||||||
|
'blank_line_after_opening_tag' => true,
|
||||||
|
'no_superfluous_phpdoc_tags' => true,
|
||||||
|
'blank_line_before_statement' => [
|
||||||
|
'statements' => ['return'],
|
||||||
|
],
|
||||||
|
'braces' => true,
|
||||||
|
'cast_spaces' => true,
|
||||||
|
'class_definition' => true,
|
||||||
|
'concat_space' => [
|
||||||
|
'spacing' => 'one',
|
||||||
|
],
|
||||||
|
'declare_equal_normalize' => true,
|
||||||
|
'elseif' => true,
|
||||||
|
'encoding' => true,
|
||||||
|
'full_opening_tag' => true,
|
||||||
|
'declare_strict_types' => 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,
|
||||||
|
'constant_case' => 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' => ['sort_algorithm' => 'alpha'],
|
||||||
|
'phpdoc_indent' => true,
|
||||||
|
'general_phpdoc_tag_rename' => 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' => false,
|
||||||
|
'phpdoc_trim' => true,
|
||||||
|
'phpdoc_types' => true,
|
||||||
|
'phpdoc_var_without_name' => true,
|
||||||
|
'psr_autoloading' => true,
|
||||||
|
'self_accessor' => true,
|
||||||
|
'short_scalar_cast' => true,
|
||||||
|
'simplified_null_return' => false, // disabled by Shift
|
||||||
|
'single_blank_line_at_eof' => true,
|
||||||
|
'single_blank_line_before_namespace' => true,
|
||||||
|
'single_class_element_per_statement' => true,
|
||||||
|
'single_import_per_statement' => false,
|
||||||
|
'single_line_after_imports' => true,
|
||||||
|
'no_unused_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' => true,
|
||||||
|
'trim_array_spaces' => true,
|
||||||
|
'unary_operator_spaces' => true,
|
||||||
|
'whitespace_after_comma_in_array' => true,
|
||||||
|
];
|
||||||
|
|
||||||
|
$project_path = getcwd();
|
||||||
|
$finder = Finder::create()
|
||||||
|
->in([
|
||||||
|
$project_path . '/src',
|
||||||
|
])
|
||||||
|
->name('*.php')
|
||||||
|
->notName('*.blade.php')
|
||||||
|
->ignoreDotFiles(true)
|
||||||
|
->ignoreVCS(true);
|
||||||
|
|
||||||
|
return (new Config())
|
||||||
|
->setFinder($finder)
|
||||||
|
->setRules($rules)
|
||||||
|
->setRiskyAllowed(true)
|
||||||
|
->setUsingCache(true);
|
||||||
47
check
Executable file
47
check
Executable file
|
|
@ -0,0 +1,47 @@
|
||||||
|
#!/bin/bash
|
||||||
|
set -e
|
||||||
|
|
||||||
|
offer_run() {
|
||||||
|
read -p "For more output, run $1. Run it now (Y/n)? " run
|
||||||
|
|
||||||
|
case ${run:0:1} in
|
||||||
|
n|N )
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
* )
|
||||||
|
$1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
|
||||||
|
if (php-cs-fixer fix --dry-run --config=.php-cs-fixer.php > /dev/null 2>/dev/null); then
|
||||||
|
echo '✅ php-cs-fixer OK'
|
||||||
|
else
|
||||||
|
read -p "⚠️ php-cs-fixer found issues. Fix (Y/n)? " fix
|
||||||
|
case ${fix:0:1} in
|
||||||
|
n|N )
|
||||||
|
echo '❌ php-cs-fixer FAIL'
|
||||||
|
offer_run 'php-cs-fixer fix --config=.php-cs-fixer.php'
|
||||||
|
;;
|
||||||
|
* )
|
||||||
|
if (php-cs-fixer fix --config=.php-cs-fixer.php > /dev/null 2>/dev/null); then
|
||||||
|
echo '✅ php-cs-fixer OK'
|
||||||
|
else
|
||||||
|
echo '❌ php-cs-fixer FAIL'
|
||||||
|
offer_run 'php-cs-fixer fix --config=.php-cs-fixer.php'
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
|
||||||
|
if (./vendor/bin/phpunit > /dev/null 2>/dev/null); then
|
||||||
|
echo '✅ PHPUnit OK'
|
||||||
|
else
|
||||||
|
echo '❌ PHPUnit FAIL'
|
||||||
|
offer_run './vendor/bin/phpunit'
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo '=================='
|
||||||
|
echo '✅ Everything OK'
|
||||||
|
|
@ -19,11 +19,11 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"illuminate/support": "^6.0|^7.11|^8.0|dev-master",
|
"illuminate/support": "^6.0|^7.11|^8.0|^9.0",
|
||||||
"illuminate/database": "^6.0|^7.11|^8.0|dev-master"
|
"illuminate/database": "^6.0|^7.11|^8.0|^9.0"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"orchestra/testbench": "^4.0|^5.2|^6.0"
|
"orchestra/testbench": "^4.0|^5.2|^6.0|^7.0"
|
||||||
},
|
},
|
||||||
"minimum-stability": "dev",
|
"minimum-stability": "dev",
|
||||||
"prefer-stable": true
|
"prefer-stable": true
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue