Skip to content

Commit

Permalink
5.x Refactor (#46)
Browse files Browse the repository at this point in the history
* Refactored many things in the Source Code...
* Implemented a new OVHConfiguration class for better data referencing.
* Refactored OVHServiceProvider and OVHSwiftAdapter to properly use the new OVHConfiguration object.
* Refactored SetTempUrlKey command to simplify its readability.
* Adjusted Tests to comply with the new OVHConfiguration object.
* Overall Code cleanup.
* Comments FTW!

* Added reference for Custom Domain Names

* Added config support for default `deleteAfter` param.
- Simplified OVHConfiguration object. Use public properties.

* Moved from StyleCI to PHP-CS-Fixer

* Updated Github Actions for new Version Contraints
Also, updated composer version requirements

* Properly detect composer cache directory for CI cache
* Fixed PHP-CS-Fixer not working on PHP 7.4 (Requires >= v2.16.1)
  • Loading branch information
iksaku committed May 6, 2020
1 parent b45c76d commit c88acf2
Show file tree
Hide file tree
Showing 15 changed files with 812 additions and 334 deletions.
33 changes: 15 additions & 18 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,34 +1,28 @@
name: CI laravel-ovh
on: [push]
on: [push, pull_request]
jobs:
test:
runs-on: ubuntu-latest
strategy:
fail-fast: true
matrix:
php: [7.2, 7.3, 7.4]
illuminate: [5.4.*, 5.5.*, 5.6.*, 5.7.*, 5.8.*, 6.*, 7.*]
php: [7.4]
illuminate: [5.8.*, 6.*, 7.*]
dependency-version: [prefer-lowest, prefer-stable]
exclude:
- illuminate: 5.7.*
php: 7.4
- illuminate: 5.6.*
php: 7.4
- illuminate: 5.5.*
php: 7.4
- illuminate: 5.4.*
php: 7.4

name: P${{ matrix.php }} - L${{ matrix.illuminate }}
name: P${{ matrix.php }} - L${{ matrix.illuminate }} - ${{ matrix.dependency-version }}

steps:
- name: Checkout code
uses: actions/checkout@v1

- name: Cache dependencies
- name: Detect Composer Cache Directory
id: composer-cache
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
- name: Setup Composer Cache
uses: actions/cache@v1
with:
path: ~/.composer/cache/files
path: ${{ steps.composer-cache.outputs.dir }}
key: dependencies-illuminate-${{ matrix.illuminate }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}

- name: Setup PHP
Expand All @@ -37,10 +31,13 @@ jobs:
php-version: ${{ matrix.php }}
coverage: none

- name: Install dependencies
- name: Install Composer Packages
run: |
composer require "illuminate/support:${{ matrix.illuminate }}" --no-interaction --no-update
composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest
- name: Execute tests (Unit and Feature tests) via PHPUnit
run: vendor/bin/phpunit
- name: Execute PHP Linter
run: composer test:lint

- name: Execute PHPUnit Tests
run: composer test:unit
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@ laravel-ovh.sublime-project
laravel-ovh.sublime-workspace
composer.lock
.idea/
cghooks.lock
.php_cs.cache
125 changes: 125 additions & 0 deletions .php_cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,125 @@
<?php

use PhpCsFixer\Config;
use PhpCsFixer\Finder;

$rules = [
'binary_operator_spaces' => [
'operators' => ['=>' => null]
],
'blank_line_after_namespace' => true,
'blank_line_after_opening_tag' => true,
'blank_line_before_statement' => true,
'braces' => true,
'cast_spaces' => true,
'class_definition' => true,
'concat_space' => true,
'declare_equal_normalize' => true,
'elseif' => true,
'encoding' => true,
'full_opening_tag' => true,
'function_declaration' => true,
'function_typehint_space' => true,
'single_line_comment_style' => [
'comment_types' => ['hash']
],
'heredoc_to_nowdoc' => true,
'include' => true,
'indentation_type' => true,
'linebreak_after_opening_tag' => true,
'lowercase_cast' => true,
'lowercase_constants' => true,
'lowercase_keywords' => true,
'magic_constant_casing' => true,
'method_argument_space' => true,
'class_attributes_separation' => true,
'visibility_required' => true,
'native_function_casing' => true,
'no_alias_functions' => true,
'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_extra_blank_lines' => true,
'no_leading_import_slash' => true,
'no_leading_namespace_whitespace' => true,
'no_multiline_whitespace_around_double_arrow' => true,
'multiline_whitespace_before_semicolons' => true,
'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' => false,
'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,
'increment_style' => ['style' => 'post'],
'no_mixed_echo_print' => true,
'psr4' => true,
'self_accessor' => true,
'array_syntax' => ['syntax' => 'short'],
'short_scalar_cast' => true,
'simplified_null_return' => false,
'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_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,
'line_ending' => true,
'whitespace_after_comma_in_array' => true,
'lowercase_static_reference' => true, // added from Symfony
'magic_method_casing' => true, // added from Symfony
'fully_qualified_strict_types' => true, // added,
'no_unused_imports' => true,
];

$finder = Finder::create()
->notPath('bootstrap')
->notPath('storage')
->notPath('vendor')
->in(getcwd())
->name('*.php')
->notName('*.blade.php')
->notName('index.php')
->notName('server.php')
->notName('_ide_helper.php')
->ignoreDotFiles(true)
->ignoreVCS(true);

return Config::create()
->setFinder($finder)
->setRules($rules)
->setRiskyAllowed(true)
->setUsingCache(true);
4 changes: 0 additions & 4 deletions .styleci.yml

This file was deleted.

0 comments on commit c88acf2

Please sign in to comment.