From fd1b79a823d3c382d833f006c781cde48e15e1b7 Mon Sep 17 00:00:00 2001 From: ARCANEDEV Date: Sat, 24 Oct 2020 10:41:25 +0100 Subject: [PATCH 1/2] Preparing the develop branch --- .github/workflows/run-tests.yml | 2 +- composer.json | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 6846dd0..6287847 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -22,7 +22,7 @@ jobs: uses: actions/cache@v2 with: path: ~/.composer/cache/files - key: dependencies-laravel-8.x-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }} + key: dependencies-laravel-9.x-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }} - name: Setup PHP uses: shivammathur/setup-php@v2 diff --git a/composer.json b/composer.json index be2098f..d0d70c7 100644 --- a/composer.json +++ b/composer.json @@ -15,11 +15,11 @@ "license": "MIT", "require": { "php": "^7.3|^8.0", - "arcanedev/support": "^8.0" + "arcanedev/support": "^9.0" }, "require-dev": { "mockery/mockery": "^1.4.2", - "orchestra/testbench": "^6.4", + "orchestra/testbench": "^7.0", "phpunit/phpunit": "^9.3.3" }, "autoload": { @@ -37,6 +37,9 @@ "test:dox": "phpunit --testdox" }, "extra": { + "branch-alias": { + "dev-develop": "9.x-dev" + }, "laravel": { "providers": [ "Arcanedev\\LaravelNotes\\LaravelNotesServiceProvider" From 412528f9cf3621e96c429beeafd145d83c145942 Mon Sep 17 00:00:00 2001 From: ARCANEDEV Date: Sun, 6 Mar 2022 19:49:55 +0100 Subject: [PATCH 2/2] Adding Laravel 9 support --- .github/workflows/run-tests.yml | 12 +++++++----- .scrutinizer.yml | 2 +- LICENSE.md | 2 +- README.md | 4 ++-- _docs/0-Home.md | 18 ------------------ _docs/1-Installation-and-Setup.md | 3 +++ composer.json | 10 ++++++---- .../2016_10_00_000001_create_notes_table.php | 4 ++-- 8 files changed, 22 insertions(+), 33 deletions(-) delete mode 100644 _docs/0-Home.md diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 6287847..949cd6b 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -9,7 +9,7 @@ jobs: strategy: fail-fast: true matrix: - php: [7.3, 7.4, 8.0] + php: [8.0, 8.1] dependency-version: [prefer-lowest, prefer-stable] name: PHP ${{ matrix.php }} - ${{ matrix.dependency-version }} @@ -17,20 +17,22 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v2 + with: + fetch-depth: 2 - name: Cache dependencies uses: actions/cache@v2 with: path: ~/.composer/cache/files - key: dependencies-laravel-9.x-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }} + key: dependencies-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }} - name: Setup PHP uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php }} extensions: curl, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, iconv - coverage: xdebug tools: composer:v2 + coverage: pcov - name: Install dependencies run: composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction @@ -42,5 +44,5 @@ jobs: - name: Scrutinizer CI run: | - wget https://scrutinizer-ci.com/ocular.phar - php ocular.phar code-coverage:upload --format=php-clover coverage.clover + composer require scrutinizer/ocular --dev -W + vendor/bin/ocular code-coverage:upload --format=php-clover coverage.clover diff --git a/.scrutinizer.yml b/.scrutinizer.yml index a34f2cb..5dc7cd4 100644 --- a/.scrutinizer.yml +++ b/.scrutinizer.yml @@ -23,7 +23,7 @@ checks: tools: external_code_coverage: timeout: 600 - runs: 6 + runs: 4 php_code_sniffer: enabled: true config: diff --git a/LICENSE.md b/LICENSE.md index b9ccf02..23f7f3f 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2016-2020 | ARCANEDEV - Laravel Notes +Copyright (c) ARCANEDEV - Laravel Notes Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index dc42d4e..4f74ecd 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ This Laravel Notes will allow you to add a notes system into your Laravel projec * Easy setup & configuration. * Well documented & IDE Friendly. * Well tested with maximum code quality. - * Laravel `5.1` to `8.x` are supported. + * Laravel `5.1` to `9.x` are supported. * Made with :heart: & :coffee:. ## Table of contents @@ -42,7 +42,7 @@ If you discover any security related issues, please email arcanedev.maroc@gmail. - [ARCANEDEV][link-author] - [All Contributors][link-contributors] -[badge_laravel]: https://img.shields.io/badge/For%20Laravel-5.1%20to%208.x-orange.svg?style=flat-square +[badge_laravel]: https://img.shields.io/badge/For%20Laravel-5.1%20to%209.x-orange.svg?style=flat-square [badge_license]: https://img.shields.io/packagist/l/arcanedev/laravel-notes.svg?style=flat-square [badge_build]: https://img.shields.io/github/workflow/status/ARCANEDEV/LaravelNotes/run-tests?style=flat-square [badge_coverage]: https://img.shields.io/scrutinizer/coverage/g/ARCANEDEV/LaravelNotes.svg?style=flat-square diff --git a/_docs/0-Home.md b/_docs/0-Home.md deleted file mode 100644 index d1d714d..0000000 --- a/_docs/0-Home.md +++ /dev/null @@ -1,18 +0,0 @@ -# Laravel Notes - -This Laravel Notes will allow you to add a notes system into your Laravel project. - -### Features - - * A very flexible notes system. - * Easy setup & configuration. - * Well documented & IDE Friendly. - * Well tested with maximum code quality. - * Laravel `5.1` to `8.x` are supported. - * Made with :heart: & :coffee:. - -## Table of contents - - 1. [Installation and Setup](1-Installation-and-Setup.md) - 2. [Configuration](2-Configuration.md) - 3. [Usage](3-Usage.md) diff --git a/_docs/1-Installation-and-Setup.md b/_docs/1-Installation-and-Setup.md index ffc0325..acf5b06 100644 --- a/_docs/1-Installation-and-Setup.md +++ b/_docs/1-Installation-and-Setup.md @@ -10,6 +10,7 @@ | Laravel | Laravel Notes | |:-----------------------------|:-----------------------------------------| +| ![Laravel v9.x][laravel_9_x] | ![Laravel Notes v9.x][laravel_notes_9_x] | | ![Laravel v8.x][laravel_8_x] | ![Laravel Notes v8.x][laravel_notes_8_x] | | ![Laravel v7.x][laravel_7_x] | ![Laravel Notes v7.x][laravel_notes_7_x] | | ![Laravel v6.x][laravel_6_x] | ![Laravel Notes v6.x][laravel_notes_6_x] | @@ -22,6 +23,7 @@ | ![Laravel v5.2][laravel_5_2] | ![Laravel Notes v0.x][laravel_notes_0_x] | | ![Laravel v5.1][laravel_5_1] | ![Laravel Notes v0.x][laravel_notes_0_x] | +[laravel_9_x]: https://img.shields.io/badge/version-9.x-blue.svg?style=flat-square "Laravel v9.x" [laravel_8_x]: https://img.shields.io/badge/version-8.x-blue.svg?style=flat-square "Laravel v8.x" [laravel_7_x]: https://img.shields.io/badge/version-7.x-blue.svg?style=flat-square "Laravel v7.x" [laravel_6_x]: https://img.shields.io/badge/version-6.x-blue.svg?style=flat-square "Laravel v6.x" @@ -34,6 +36,7 @@ [laravel_5_2]: https://img.shields.io/badge/version-5.2-blue.svg?style=flat-square "Laravel v5.2" [laravel_5_1]: https://img.shields.io/badge/version-5.1-blue.svg?style=flat-square "Laravel v5.1" +[laravel_notes_9_x]: https://img.shields.io/badge/version-9.x-blue.svg?style=flat-square "LaravelNotes v9.x" [laravel_notes_8_x]: https://img.shields.io/badge/version-8.x-blue.svg?style=flat-square "LaravelNotes v8.x" [laravel_notes_7_x]: https://img.shields.io/badge/version-7.x-blue.svg?style=flat-square "LaravelNotes v7.x" [laravel_notes_6_x]: https://img.shields.io/badge/version-6.x-blue.svg?style=flat-square "LaravelNotes v6.x" diff --git a/composer.json b/composer.json index d0d70c7..2232277 100644 --- a/composer.json +++ b/composer.json @@ -14,13 +14,15 @@ "type": "library", "license": "MIT", "require": { - "php": "^7.3|^8.0", + "php": "^8.0", "arcanedev/support": "^9.0" }, "require-dev": { - "mockery/mockery": "^1.4.2", - "orchestra/testbench": "^7.0", - "phpunit/phpunit": "^9.3.3" + "fakerphp/faker": "^1.9.1", + "mockery/mockery": "^1.4.4", + "laravel/framework": "^9.0", + "orchestra/testbench-core": "^7.0", + "phpunit/phpunit": "^9.5.10" }, "autoload": { "psr-4": { diff --git a/database/migrations/2016_10_00_000001_create_notes_table.php b/database/migrations/2016_10_00_000001_create_notes_table.php index ce32e1b..c219147 100644 --- a/database/migrations/2016_10_00_000001_create_notes_table.php +++ b/database/migrations/2016_10_00_000001_create_notes_table.php @@ -12,7 +12,7 @@ * * @see \Arcanedev\LaravelNotes\Models\Note */ -class CreateNotesTable extends Migration +return new class extends Migration { /* ----------------------------------------------------------------- | Constructor @@ -52,4 +52,4 @@ public function up(): void ->onDelete('cascade'); }); } -} +};