Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

L11 #8

Merged
merged 27 commits into from
Sep 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
da89ab9
Create CODE_OF_CONDUCT.md
Kristories Apr 28, 2020
4b5adf1
Merge pull request #1 from Kristories/add-code-of-conduct-1
Kristories Apr 28, 2020
ca589a0
Merge pull request #2 from Kristories/develop
Kristories Sep 13, 2020
21ac9b0
Merge branch 'develop'
Kristories Jul 25, 2021
79a8d34
Merge pull request #5 from wearedevtical/develop
Kristories Jan 11, 2022
d666ccc
Update CHANGELOG
Kristories Jan 11, 2022
d406f26
Merge branch 'master' into develop
Kristories Jan 30, 2022
02e7385
Support Laravel 9
Kristories Jan 30, 2022
8cbf832
On push branch master
Kristories Jan 30, 2022
af2a3c3
Merge pull request #6 from wearedevtical/laravel-9
Kristories Jan 30, 2022
db73158
Update CHANGELOG
Kristories Jan 30, 2022
6dfd1d3
Update tests.yml
Kristories Mar 4, 2022
a9bd501
Update .php_cs.dist.php
Kristories Sep 23, 2022
37bdc80
Change brand
Kristories Sep 23, 2022
67d7bc1
Update CHANGELOG
Kristories Sep 23, 2022
70d5bdd
Update CONTRIBUTING.md
Kristories Sep 24, 2022
9b511ee
Add phpstan & analyse
Kristories Nov 6, 2022
b5d9ac1
Add scripts : format, test, analyse
Kristories Nov 10, 2022
e5dbf0f
Format
Kristories Nov 10, 2022
c9a5c04
Remove support PHP 7.4
Kristories Nov 10, 2022
96e5f2e
Update README.md
Kristories Nov 10, 2022
8243e4d
Update CHANGELOG
Kristories Nov 10, 2022
2b989d5
Support Laravel 10
Kristories Jan 12, 2023
86a9386
Merge branch 'develop'
Kristories Jan 12, 2023
4fc9873
Merge pull request #7 from Kristories/develop
Kristories Jan 12, 2023
e294abb
Update CHANGELOG
Kristories Jan 12, 2023
563fd49
Laravel 11
Kristories Sep 24, 2024
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
23 changes: 0 additions & 23 deletions .github/workflows/php-cs-fixer.yml

This file was deleted.

129 changes: 86 additions & 43 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -1,48 +1,91 @@
name: "Tests"
name: Tests

on:
push:
branches: [develop]
push:
branches:
- "**"
pull_request:
branches: [main]
schedule:
- cron: '0 0 * * *'
branches: [main]

jobs:
run-tests:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
php: [7.4, 8.0, 8.1]
laravel: [8.*]
dependency-version: [prefer-lowest, prefer-stable]
include:
- laravel: 8.*
testbench: ^6.23

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

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

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick
coverage: none

- name: Setup Problem Matches
run: |
echo "::add-matcher::${{ runner.tool_cache }}/php.json"
echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"

- name: Install dependencies
run: |
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest

- name: Execute tests
run: vendor/bin/phpunit
run-tests:
runs-on: ${{ matrix.os }}

strategy:
matrix:
php: [7.2, 7.3, 7.4, '8.0', 8.1, 8.2]
laravel: [6.*, 7.*, 8.*, 9.*, 10.*]
os: [ubuntu-latest]
include:
- laravel: 10.*
testbench: 8.*
- laravel: 9.*
testbench: 7.*
- laravel: 8.*
testbench: 6.*
- laravel: 7.*
testbench: 5.*
- laravel: 6.*
testbench: 4.*

exclude:
- laravel: 6.*
php: 7.1
- laravel: 6.*
php: 8.1
- laravel: 6.*
php: 8.2
- laravel: 7.*
php: 7.1
- laravel: 7.*
php: 8.1
- laravel: 7.*
php: 8.2
- laravel: 8.*
php: 7.1
- laravel: 8.*
php: 7.2
- laravel: 8.*
php: 8.2
- laravel: 9.*
php: 7.1
- laravel: 9.*
php: 7.2
- laravel: 9.*
php: 7.3
- laravel: 9.*
php: 7.4
- laravel: 10.*
php: 7.1
- laravel: 10.*
php: 7.2
- laravel: 10.*
php: 7.3
- laravel: 10.*
php: 7.4
- laravel: 10.*
php: '8.0'

name: PHP ${{ matrix.php }} / Laravel ${{ matrix.laravel }}

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

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
extension: mbstring
coverage: none

- name: Install dependencies
run: |
composer require "illuminate/contracts:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
composer install --prefer-dist --no-interaction --no-suggest

- name: Installed dependencies
run: composer show -D

- name: Execute tests
run: vendor/bin/phpunit --exclude-group skipped
15 changes: 10 additions & 5 deletions .php_cs.dist.php
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
<?php

$finder = PhpCsFixer\Finder::create()
$finder = Symfony\Component\Finder\Finder::create()
->in([
__DIR__ . '/src',
__DIR__ . '/tests',
__DIR__ . '/src'
])
->name('*.php')
->notName('*.blade.php')
->ignoreDotFiles(true)
->ignoreVCS(true);

return (new PhpCsFixer\Config())
->setRules([
'@PSR12' => true,
'@PSR2' => true,
'array_syntax' => ['syntax' => 'short'],
'ordered_imports' => ['sort_algorithm' => 'alpha'],
'no_unused_imports' => true,
'not_operator_with_successor_space' => false,
'not_operator_with_successor_space' => true,
'trailing_comma_in_multiline' => true,
'phpdoc_scalar' => true,
'unary_operator_spaces' => true,
Expand All @@ -25,6 +25,11 @@
],
'phpdoc_single_line_var_spacing' => true,
'phpdoc_var_without_name' => true,
'class_attributes_separation' => [
'elements' => [
'method' => 'one',
],
],
'method_argument_space' => [
'on_multiline' => 'ensure_fully_multiline',
'keep_multiple_spaces_after_comma' => true,
Expand Down
42 changes: 42 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,61 @@

All notable changes to `laravel-helpers` will be documented in this file.

## v1.3.1 - 2023-01-12

### What's Changed

- Support Laravel 10 by @Kristories in https://github.com/devtical/laravel-helpers/pull/7

**Full Changelog**: https://github.com/devtical/laravel-helpers/compare/v1.3.0...v1.3.1

## v1.3.0 - 2022-11-10

**Full Changelog**: https://github.com/devtical/laravel-helpers/compare/v1.2.1...v1.3.0

## v1.2.1 - 2022-09-23

`composer require devtical/laravel-helpers`

**Full Changelog**: https://github.com/devtical/laravel-helpers/compare/v1.2.0...v1.2.1

## v1.2.0 - 2022-01-30

## What's Changed

- Add support for Laravel 9

**Full Changelog**: https://github.com/wearedevtical/laravel-helpers/compare/v1.1.1...v1.2.0

## v1.1.1 - 2022-01-11

## What's Changed

- Apply fixes from StyleCI by @Kristories in https://github.com/wearedevtical/laravel-helpers/pull/4
- Setup test, phpcs, and actions by @Kristories in https://github.com/wearedevtical/laravel-helpers/pull/5

**Full Changelog**: https://github.com/wearedevtical/laravel-helpers/compare/v1.1.0...v1.1.1

## Version 1.1.0

### Changed

- Transfer owner
- Improve tests

## Version 1.0.3

### Added

- Support Laravel 8

## Version 1.0.2

### Added

- Code of Conduct
- Support Laravel 7

## Version 1.0.0

- Initial release
76 changes: 76 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
# Contributor Covenant Code of Conduct

## Our Pledge

In the interest of fostering an open and welcoming environment, we as
contributors and maintainers pledge to making participation in our project and
our community a harassment-free experience for everyone, regardless of age, body
size, disability, ethnicity, sex characteristics, gender identity and expression,
level of experience, education, socio-economic status, nationality, personal
appearance, race, religion, or sexual identity and orientation.

## Our Standards

Examples of behavior that contributes to creating a positive environment
include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or
advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic
address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting

## Our Responsibilities

Project maintainers are responsible for clarifying the standards of acceptable
behavior and are expected to take appropriate and fair corrective action in
response to any instances of unacceptable behavior.

Project maintainers have the right and responsibility to remove, edit, or
reject comments, commits, code, wiki edits, issues, and other contributions
that are not aligned to this Code of Conduct, or to ban temporarily or
permanently any contributor for other behaviors that they deem inappropriate,
threatening, offensive, or harmful.

## Scope

This Code of Conduct applies both within project spaces and in public spaces
when an individual is representing the project or its community. Examples of
representing a project or community include using an official project e-mail
address, posting via an official social media account, or acting as an appointed
representative at an online or offline event. Representation of a project may be
further defined and clarified by project maintainers.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the project team at w.kristories@gmail.com. All
complaints will be reviewed and investigated and will result in a response that
is deemed necessary and appropriate to the circumstances. The project team is
obligated to maintain confidentiality with regard to the reporter of an incident.
Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good
faith may face temporary or permanent repercussions as determined by other
members of the project's leadership.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html

[homepage]: https://www.contributor-covenant.org

For answers to common questions about this code of conduct, see
https://www.contributor-covenant.org/faq
10 changes: 2 additions & 8 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,15 @@

Contributions are welcome and will be fully credited.

Contributions are accepted via Pull Requests on [Github](https://github.com/wearedevtical/laravel-quran).
Contributions are accepted via Pull Requests on Github.

## Pull Requests

- **[PSR-2 Coding Standard](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md)** - The easiest way to apply the conventions is to install [PHP Code Sniffer](http://pear.php.net/package/PHP_CodeSniffer).
- **[PSR-2 Coding Standard](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md)**.
- **Add tests!** - Your patch won't be accepted if it doesn't have tests.
- **Document any change in behaviour** - Make sure the `README.md` and any other relevant documentation are kept up-to-date.
- **Consider our release cycle** - We try to follow [SemVer v2.0.0](http://semver.org/). Randomly breaking public APIs is not an option.
- **One pull request per feature** - If you want to do more than one thing, send multiple pull requests.
- **Send coherent history** - Make sure each individual commit in your pull request is meaningful. If you had to make multiple intermediate commits while developing, please [squash them](http://www.git-scm.com/book/en/v2/Git-Tools-Rewriting-History#Changing-Multiple-Commit-Messages) before submitting.

## Running Tests

``` bash
$ phpunit
```

**Happy coding**!
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Helper Generator for Laravel

Install via composer
```bash
composer require wearedevtical/laravel-helpers
composer require devtical/laravel-helpers
```

#### Optional
Expand Down Expand Up @@ -44,4 +44,4 @@ If you discover any security related issues, please email author instead of usin

## License

The MIT License (MIT). Please see the [license file](LICENSE.md) for more information.
The MIT License (MIT). Please see the [license file](LICENSE.md) for more information.
Loading
Loading