From da89ab981e094a772dc0e2a3a66419b3fd850ff7 Mon Sep 17 00:00:00 2001 From: Wahyu Kristianto Date: Tue, 28 Apr 2020 14:16:58 +0700 Subject: [PATCH 01/19] Create CODE_OF_CONDUCT.md --- CODE_OF_CONDUCT.md | 76 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 CODE_OF_CONDUCT.md diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 0000000..d6a6cd3 --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -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 From d666cccba262ca8e824ec1b220450fcd50d2550f Mon Sep 17 00:00:00 2001 From: Kristories Date: Tue, 11 Jan 2022 19:42:44 +0000 Subject: [PATCH 02/19] Update CHANGELOG --- CHANGELOG.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0588d63..d2a5a27 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,19 +2,35 @@ All notable changes to `laravel-helpers` will be documented in this file. +## 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 From 02e738516f676e08e9441d39c30372f3fdfe623a Mon Sep 17 00:00:00 2001 From: Wahyu Kristianto Date: Sun, 30 Jan 2022 16:24:45 +0700 Subject: [PATCH 03/19] Support Laravel 9 --- .github/workflows/tests.yml | 94 ++++++++++++++++++++----------------- composer.json | 2 +- 2 files changed, 51 insertions(+), 45 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8d579a9..7b4e165 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -1,48 +1,54 @@ -name: "Tests" +name: Tests on: - push: - branches: [develop] - pull_request: - branches: [main] - schedule: - - cron: '0 0 * * *' + push: + branches: + - l9 + pull_request: + branches: + - "*" + schedule: + - cron: '0 0 * * *' 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: ubuntu-latest + timeout-minutes: 15 + env: + COMPOSER_NO_INTERACTION: 1 + + strategy: + fail-fast: false + matrix: + php: [8.1, 8.0, 7.4] + laravel: [9.*, 8.*] + dependency-version: [prefer-lowest, prefer-stable] + include: + - laravel: 9.* + testbench: 7.* + - laravel: 8.* + testbench: ^6.23 + exclude: + - laravel: 9.* + php: 7.4 + + name: PHP ${{ matrix.php }} - Laravel ${{ 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 }} + coverage: none + extensions: mbstring + + - 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: composer test diff --git a/composer.json b/composer.json index 29a905d..1585de8 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ "type": "library", "require": { "php": "^7.4|^8.0", - "illuminate/support": "^6.20.13|7.30.4|^8.22.2" + "illuminate/support": "^6|^7|^8|^9" }, "require-dev": { "phpunit/phpunit": "^9.3", From 8cbf8320a03c7f600a5a048ddbb8241dd0fdbf9d Mon Sep 17 00:00:00 2001 From: Wahyu Kristianto Date: Sun, 30 Jan 2022 16:25:26 +0700 Subject: [PATCH 04/19] On push branch master --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7b4e165..453f6ce 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -3,7 +3,7 @@ name: Tests on: push: branches: - - l9 + - master pull_request: branches: - "*" From db73158a1eeb44238f71a600709ce1b5c13a714d Mon Sep 17 00:00:00 2001 From: Kristories Date: Sun, 30 Jan 2022 09:33:24 +0000 Subject: [PATCH 05/19] Update CHANGELOG --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d2a5a27..33dd563 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,14 @@ All notable changes to `laravel-helpers` will be documented in this file. +## 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 From 6dfd1d3f451e6689a5b3885d2dccd043ed812462 Mon Sep 17 00:00:00 2001 From: Wahyu Kristianto Date: Fri, 4 Mar 2022 17:56:07 +0700 Subject: [PATCH 06/19] Update tests.yml --- .github/workflows/tests.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 453f6ce..d6ac4e9 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -7,8 +7,6 @@ on: pull_request: branches: - "*" - schedule: - - cron: '0 0 * * *' jobs: run-tests: From a9bd501ac1c519f47fd2b877d1e4aade864d0fd1 Mon Sep 17 00:00:00 2001 From: Wahyu Kristianto Date: Fri, 23 Sep 2022 21:34:49 +0700 Subject: [PATCH 07/19] Update .php_cs.dist.php --- .php_cs.dist.php | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.php_cs.dist.php b/.php_cs.dist.php index 7a55888..e56a064 100644 --- a/.php_cs.dist.php +++ b/.php_cs.dist.php @@ -1,21 +1,21 @@ 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, @@ -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, From 37bdc808ed0e73f24f2d1ee6a938902a3c11df77 Mon Sep 17 00:00:00 2001 From: Wahyu Kristianto Date: Fri, 23 Sep 2022 21:35:06 +0700 Subject: [PATCH 08/19] Change brand --- README.md | 2 +- composer.json | 23 ++++++++--------------- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 12823bb..1ab6165 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Helper Generator for Laravel Install via composer ```bash -composer require wearedevtical/laravel-helpers +composer require devtical/laravel-helpers ``` #### Optional diff --git a/composer.json b/composer.json index 1585de8..6b2db5f 100644 --- a/composer.json +++ b/composer.json @@ -1,28 +1,19 @@ { - "name": "wearedevtical/laravel-helpers", + "name": "devtical/laravel-helpers", "description": "Helper Generator for Laravel", - "license": "mit", - "authors": [ - { - "name": "Wahyu Kristianto", - "email": "w.kristories@gmail.com", - "homepage": "https://github.com/kristories" - } - ], - "homepage": "https://github.com/wearedevtical/laravel-helpers", "keywords": [ "laravel", "helper", "generator" ], - "type": "library", + "license": "MIT", "require": { "php": "^7.4|^8.0", "illuminate/support": "^6|^7|^8|^9" }, "require-dev": { - "phpunit/phpunit": "^9.3", - "orchestra/testbench": "^5.20|^6.23", + "phpunit/phpunit": "^9.4", + "orchestra/testbench": "^6.24|^7.0", "friendsofphp/php-cs-fixer": "^3.0" }, "autoload": { @@ -42,9 +33,11 @@ ] } }, + "config": { + "sort-packages": true + }, "scripts": { - "format": "vendor/bin/php-cs-fixer fix --config=.php_cs.dist.php --allow-risky=yes", - "test": "vendor/bin/phpunit" + "format": "vendor/bin/php-cs-fixer fix --config=.php_cs.dist.php --allow-risky=yes" }, "minimum-stability": "dev", "prefer-stable": true From 67d7bc1fee1d554a1179895518fcd7882fcb8d77 Mon Sep 17 00:00:00 2001 From: Kristories Date: Fri, 23 Sep 2022 14:38:14 +0000 Subject: [PATCH 09/19] Update CHANGELOG --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 33dd563..f27f883 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ All notable changes to `laravel-helpers` will be documented in this file. +## 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 From 70d5bdd63199efa2312f1cbcbfcb03111f912a3f Mon Sep 17 00:00:00 2001 From: Wahyu Kristianto Date: Sat, 24 Sep 2022 20:11:45 +0700 Subject: [PATCH 10/19] Update CONTRIBUTING.md --- CONTRIBUTING.md | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a93e16b..eaaa86f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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**! From 9b511ee117a51a030883d0c041099f24d83cfd1d Mon Sep 17 00:00:00 2001 From: Wahyu Kristianto Date: Sun, 6 Nov 2022 12:21:11 +0700 Subject: [PATCH 11/19] Add phpstan & analyse --- composer.json | 6 ++++-- phpstan-baseline.neon | 0 phpstan.neon.dist | 9 +++++++++ tests/HelpersTest.php | 6 +++++- tests/TestCase.php | 4 ++-- 5 files changed, 20 insertions(+), 5 deletions(-) create mode 100644 phpstan-baseline.neon create mode 100644 phpstan.neon.dist diff --git a/composer.json b/composer.json index 6b2db5f..67257ae 100644 --- a/composer.json +++ b/composer.json @@ -12,9 +12,10 @@ "illuminate/support": "^6|^7|^8|^9" }, "require-dev": { - "phpunit/phpunit": "^9.4", + "friendsofphp/php-cs-fixer": "^3.0", "orchestra/testbench": "^6.24|^7.0", - "friendsofphp/php-cs-fixer": "^3.0" + "phpstan/phpstan": "^1.9", + "phpunit/phpunit": "^9.4" }, "autoload": { "psr-4": { @@ -37,6 +38,7 @@ "sort-packages": true }, "scripts": { + "analyse": "vendor/bin/phpstan analyse", "format": "vendor/bin/php-cs-fixer fix --config=.php_cs.dist.php --allow-risky=yes" }, "minimum-stability": "dev", diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon new file mode 100644 index 0000000..e69de29 diff --git a/phpstan.neon.dist b/phpstan.neon.dist new file mode 100644 index 0000000..728d8be --- /dev/null +++ b/phpstan.neon.dist @@ -0,0 +1,9 @@ +includes: + - phpstan-baseline.neon + +parameters: + level: 6 + paths: + - src + - config + - tests \ No newline at end of file diff --git a/tests/HelpersTest.php b/tests/HelpersTest.php index 53ef3f3..a718d71 100644 --- a/tests/HelpersTest.php +++ b/tests/HelpersTest.php @@ -4,7 +4,11 @@ class HelpersTest extends TestCase { - /** @test */ + /** + * Test a console command. + * + * @return void + */ public function test_console_command() { $this->artisan('make:helper', ['name' => 'TestHelper'])->assertExitCode(0); diff --git a/tests/TestCase.php b/tests/TestCase.php index 938bbe4..0d6fb9c 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -10,9 +10,9 @@ abstract class TestCase extends Orchestra /** * @param \Illuminate\Foundation\Application $app * - * @return array + * @return array> */ - protected function getPackageProviders($app): array + protected function getPackageProviders($app) { return [ HelperServiceProvider::class, From b5d9ac19ed0d8e060c5597c55ea4e08263102452 Mon Sep 17 00:00:00 2001 From: Wahyu Kristianto Date: Fri, 11 Nov 2022 00:24:38 +0700 Subject: [PATCH 12/19] Add scripts : format, test, analyse --- composer.json | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 67257ae..475b30d 100644 --- a/composer.json +++ b/composer.json @@ -12,10 +12,10 @@ "illuminate/support": "^6|^7|^8|^9" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^3.0", "orchestra/testbench": "^6.24|^7.0", "phpstan/phpstan": "^1.9", - "phpunit/phpunit": "^9.4" + "laravel/pint": "^1.2", + "pestphp/pest": "^1.22" }, "autoload": { "psr-4": { @@ -35,11 +35,17 @@ } }, "config": { - "sort-packages": true + "preferred-install": "dist", + "sort-packages": true, + "optimize-autoloader": true, + "allow-plugins": { + "pestphp/pest-plugin": true + } }, "scripts": { - "analyse": "vendor/bin/phpstan analyse", - "format": "vendor/bin/php-cs-fixer fix --config=.php_cs.dist.php --allow-risky=yes" + "format": "vendor/bin/pint", + "test": "vendor/bin/pest --colors=always", + "analyse": "vendor/bin/phpstan analyse" }, "minimum-stability": "dev", "prefer-stable": true From e5dbf0f014f4bde876a792eda8c4f5bda29af73a Mon Sep 17 00:00:00 2001 From: Wahyu Kristianto Date: Fri, 11 Nov 2022 00:24:56 +0700 Subject: [PATCH 13/19] Format --- src/Console/Commands/HelperMakeCommand.php | 3 +-- tests/TestCase.php | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Console/Commands/HelperMakeCommand.php b/src/Console/Commands/HelperMakeCommand.php index 98a5e18..5dbfd69 100644 --- a/src/Console/Commands/HelperMakeCommand.php +++ b/src/Console/Commands/HelperMakeCommand.php @@ -40,8 +40,7 @@ protected function getStub() /** * Get the default namespace for the class. * - * @param string $rootNamespace - * + * @param string $rootNamespace * @return string */ protected function getDefaultNamespace($rootNamespace) diff --git a/tests/TestCase.php b/tests/TestCase.php index 0d6fb9c..52430c5 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -8,8 +8,7 @@ abstract class TestCase extends Orchestra { /** - * @param \Illuminate\Foundation\Application $app - * + * @param \Illuminate\Foundation\Application $app * @return array> */ protected function getPackageProviders($app) From c9a5c0466a350940e8c7390a95667328ebb6be3c Mon Sep 17 00:00:00 2001 From: Wahyu Kristianto Date: Fri, 11 Nov 2022 00:29:01 +0700 Subject: [PATCH 14/19] Remove support PHP 7.4 --- .github/workflows/php-cs-fixer.yml | 23 ----------------------- .github/workflows/tests.yml | 5 +---- composer.json | 4 ++-- 3 files changed, 3 insertions(+), 29 deletions(-) delete mode 100644 .github/workflows/php-cs-fixer.yml diff --git a/.github/workflows/php-cs-fixer.yml b/.github/workflows/php-cs-fixer.yml deleted file mode 100644 index 62f6106..0000000 --- a/.github/workflows/php-cs-fixer.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: Check & fix styling - -on: [push] - -jobs: - php-cs-fixer: - runs-on: ubuntu-latest - - steps: - - name: Checkout code - uses: actions/checkout@v2 - with: - ref: ${{ github.head_ref }} - - - name: Run PHP CS Fixer - uses: docker://oskarstark/php-cs-fixer-ga - with: - args: --config=.php_cs.dist.php --allow-risky=yes - - - name: Commit changes - uses: stefanzweifel/git-auto-commit-action@v4 - with: - commit_message: Fix styling diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d6ac4e9..b01c6ba 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -18,7 +18,7 @@ jobs: strategy: fail-fast: false matrix: - php: [8.1, 8.0, 7.4] + php: [8.1, 8.0] laravel: [9.*, 8.*] dependency-version: [prefer-lowest, prefer-stable] include: @@ -26,9 +26,6 @@ jobs: testbench: 7.* - laravel: 8.* testbench: ^6.23 - exclude: - - laravel: 9.* - php: 7.4 name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - ${{ matrix.dependency-version }} diff --git a/composer.json b/composer.json index 475b30d..2d814a6 100644 --- a/composer.json +++ b/composer.json @@ -8,8 +8,8 @@ ], "license": "MIT", "require": { - "php": "^7.4|^8.0", - "illuminate/support": "^6|^7|^8|^9" + "php": "^8.0", + "illuminate/support": "^8|^9" }, "require-dev": { "orchestra/testbench": "^6.24|^7.0", From 96e5f2e4189b255a845032a858e5bc5de2295b41 Mon Sep 17 00:00:00 2001 From: Wahyu Kristianto Date: Fri, 11 Nov 2022 00:33:52 +0700 Subject: [PATCH 15/19] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1ab6165..97a0465 100644 --- a/README.md +++ b/README.md @@ -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. \ No newline at end of file From 8243e4d0fbbf6459ef381ac1af716a0d2c4be5e6 Mon Sep 17 00:00:00 2001 From: Kristories Date: Thu, 10 Nov 2022 17:36:02 +0000 Subject: [PATCH 16/19] Update CHANGELOG --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f27f883..f4dfbab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to `laravel-helpers` will be documented in this file. +## 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` From 2b989d55df27c462f2d27329b922acb92fffaa96 Mon Sep 17 00:00:00 2001 From: Wahyu Kristianto Date: Thu, 12 Jan 2023 21:37:16 +0700 Subject: [PATCH 17/19] Support Laravel 10 --- .github/workflows/tests.yml | 127 ++++++++++++++++++++++++------------ composer.json | 7 +- 2 files changed, 89 insertions(+), 45 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8d579a9..d7b2efe 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -1,48 +1,91 @@ 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 diff --git a/composer.json b/composer.json index 29a905d..f8e425b 100644 --- a/composer.json +++ b/composer.json @@ -17,12 +17,13 @@ ], "type": "library", "require": { - "php": "^7.4|^8.0", - "illuminate/support": "^6.20.13|7.30.4|^8.22.2" + "php": "^7.2|^8.0", + "illuminate/support": "^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0" }, "require-dev": { "phpunit/phpunit": "^9.3", - "orchestra/testbench": "^5.20|^6.23", + "orchestra/testbench": "^4.0 || ^6.0 || ^7.0 || ^8.0", + "phpunit/phpunit": "^8.3 || ^9.0", "friendsofphp/php-cs-fixer": "^3.0" }, "autoload": { From e294abbad5fff00b391fcc9d7be27164b2e34091 Mon Sep 17 00:00:00 2001 From: Kristories Date: Thu, 12 Jan 2023 14:46:18 +0000 Subject: [PATCH 18/19] Update CHANGELOG --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f4dfbab..f2e28cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,14 @@ 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 From 563fd49bbf4df927b0d0d3bd8a42b17c79cec302 Mon Sep 17 00:00:00 2001 From: Wahyu Kristianto Date: Tue, 24 Sep 2024 10:47:47 +0700 Subject: [PATCH 19/19] Laravel 11 --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index c125c3f..165c6a2 100644 --- a/composer.json +++ b/composer.json @@ -9,12 +9,12 @@ "license": "MIT", "require": { "php": "^7.2|^8.0", - "illuminate/support": "^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0" + "illuminate/database": "^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0 || ^11.0", + "illuminate/support": "^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0 || ^11.0" }, "require-dev": { - "phpunit/phpunit": "^9.3", - "orchestra/testbench": "^4.0 || ^6.0 || ^7.0 || ^8.0", - "phpunit/phpunit": "^8.3 || ^9.0", + "orchestra/testbench": "^4.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0", + "phpunit/phpunit": "^8.4 || ^9.0 || ^10.0", "friendsofphp/php-cs-fixer": "^3.0" }, "autoload": {