diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index abe2e14..5b8e007 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.2, 7.3, 7.4] + php: [7.3, 7.4] dependency-version: [prefer-lowest, prefer-stable] name: PHP ${{ matrix.php }} - ${{ matrix.dependency-version }} @@ -22,7 +22,7 @@ jobs: uses: actions/cache@v2 with: path: ~/.composer/cache/files - key: dependencies-laravel-7-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }} + key: dependencies-laravel-8-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }} - name: Setup PHP uses: shivammathur/setup-php@v2 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/README.md b/README.md index 5665707..359f885 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ This package is inspired/based on [illuminate/html](https://github.com/illuminat * Easy setup & configuration. * Well documented & IDE Friendly. * Well tested with maximum code quality. - * Laravel `5.1` to `7.x` are supported. + * Laravel `5.1` to `8.x` are supported. * Made with :heart: & :coffee:. ## Table of contents @@ -46,7 +46,7 @@ If you discover any security related issues, please email arcanedev.maroc@gmail. - [LaravelCollective](https://github.com/LaravelCollective/html) - [All Contributors][link-contributors] -[badge_laravel]: https://img.shields.io/badge/Laravel-5.1%20to%207.x-orange.svg?style=flat-square +[badge_laravel]: https://img.shields.io/badge/Laravel-5.1%20to%208.x-orange.svg?style=flat-square [badge_license]: https://img.shields.io/packagist/l/arcanedev/laravel-html.svg?style=flat-square [badge_build]: https://img.shields.io/github/workflow/status/ARCANEDEV/LaravelHtml/run-tests?style=flat-square [badge_coverage]: https://img.shields.io/scrutinizer/coverage/g/ARCANEDEV/LaravelHtml.svg?style=flat-square diff --git a/composer.json b/composer.json index 7540ef3..1a53df9 100644 --- a/composer.json +++ b/composer.json @@ -14,15 +14,15 @@ "type": "library", "license": "MIT", "require": { - "php": "^7.2.5", - "arcanedev/php-html": "^4.0", - "arcanedev/support": "^7.0" + "php": "^7.3", + "arcanedev/php-html": "^5.0", + "arcanedev/support": "^8.0" }, "require-dev": { - "ext-dom": "*", - "orchestra/testbench": "^5.0", - "mockery/mockery": "^1.3.1", - "phpunit/phpunit": "^8.5|^9.0" + "ext-dom": "*", + "orchestra/testbench": "^6.0", + "mockery/mockery": "^1.3.1", + "phpunit/phpunit": "^9.3" }, "autoload": { "psr-4": { @@ -35,13 +35,23 @@ "Arcanedev\\LaravelHtml\\Tests\\": "tests/" } }, + "scripts": { + "test": "phpunit", + "coverage": "phpunit --coverage-html build/coverage/html" + }, "extra": { + "branch-alias": { + "dev-develop": "8.x-dev" + }, "laravel": { "providers": [ "Arcanedev\\LaravelHtml\\HtmlServiceProvider" ] } }, + "config": { + "sort-packages": true + }, "minimum-stability": "dev", "prefer-stable": true } diff --git a/phpunit.xml.dist b/phpunit.xml.dist index bad1c88..10fb66d 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,30 +1,25 @@ - +> - ./tests/ + ./tests - - - ./src/ - - + + + ./src + + + + + + + - - - - - diff --git a/src/AbstractBuilder.php b/src/AbstractBuilder.php index 988dcf4..1cfae08 100644 --- a/src/AbstractBuilder.php +++ b/src/AbstractBuilder.php @@ -11,7 +11,6 @@ /** * Class AbstractBuilder * - * @package Arcanedev\LaravelHtml * @author ARCANEDEV */ abstract class AbstractBuilder diff --git a/src/Contracts/FormBuilder.php b/src/Contracts/FormBuilder.php index 80885e9..470acd2 100644 --- a/src/Contracts/FormBuilder.php +++ b/src/Contracts/FormBuilder.php @@ -11,7 +11,6 @@ /** * Interface FormBuilder * - * @package Arcanedev\LaravelHtml\Contracts * @author ARCANEDEV */ interface FormBuilder diff --git a/src/Contracts/HtmlBuilder.php b/src/Contracts/HtmlBuilder.php index 73b75c8..615839f 100644 --- a/src/Contracts/HtmlBuilder.php +++ b/src/Contracts/HtmlBuilder.php @@ -9,7 +9,6 @@ /** * Interface HtmlBuilder * - * @package Arcanedev\LaravelHtml\Contracts * @author ARCANEDEV */ interface HtmlBuilder diff --git a/src/FormBuilder.php b/src/FormBuilder.php index 66a5316..8cebad2 100644 --- a/src/FormBuilder.php +++ b/src/FormBuilder.php @@ -14,7 +14,6 @@ /** * Class FormBuilder * - * @package Arcanedev\LaravelHtml * @author ARCANEDEV */ class FormBuilder extends AbstractBuilder implements FormBuilderContract diff --git a/src/Helpers/Obfuscater.php b/src/Helpers/Obfuscater.php index 2b1358e..d4e2a4f 100644 --- a/src/Helpers/Obfuscater.php +++ b/src/Helpers/Obfuscater.php @@ -7,7 +7,6 @@ /** * Class Obfuscater * - * @package Arcanedev\LaravelHtml\Helpers * @author ARCANEDEV */ class Obfuscater diff --git a/src/HtmlBuilder.php b/src/HtmlBuilder.php index bbc2131..7bdadea 100644 --- a/src/HtmlBuilder.php +++ b/src/HtmlBuilder.php @@ -14,7 +14,6 @@ /** * Class HtmlBuilder * - * @package Arcanedev\LaravelHtml * @author ARCANEDEV */ class HtmlBuilder extends AbstractBuilder implements HtmlBuilderContract diff --git a/src/HtmlServiceProvider.php b/src/HtmlServiceProvider.php index ff144b3..2d52bd7 100644 --- a/src/HtmlServiceProvider.php +++ b/src/HtmlServiceProvider.php @@ -4,14 +4,14 @@ namespace Arcanedev\LaravelHtml; -use Arcanedev\LaravelHtml\Contracts\{FormBuilder as FormBuilderContract, HtmlBuilder as HtmlBuilderContract}; +use Arcanedev\LaravelHtml\Contracts\FormBuilder as FormBuilderContract; +use Arcanedev\LaravelHtml\Contracts\HtmlBuilder as HtmlBuilderContract; use Arcanedev\Support\Providers\ServiceProvider; use Illuminate\Contracts\Support\DeferrableProvider; /** * Class HtmlServiceProvider * - * @package Arcanedev\LaravelHtml * @author ARCANEDEV */ class HtmlServiceProvider extends ServiceProvider implements DeferrableProvider diff --git a/src/Traits/Componentable.php b/src/Traits/Componentable.php index dd2c409..dd7e6d3 100644 --- a/src/Traits/Componentable.php +++ b/src/Traits/Componentable.php @@ -5,13 +5,11 @@ namespace Arcanedev\LaravelHtml\Traits; use BadMethodCallException; -use Illuminate\Support\Arr; -use Illuminate\Support\HtmlString; +use Illuminate\Support\{Arr, HtmlString}; /** - * Class Componentable + * Trait Componentable * - * @package Arcanedev\LaravelHtml\Traits * @author ARCANEDEV */ trait Componentable diff --git a/src/Traits/FormAccessible.php b/src/Traits/FormAccessible.php index bdba065..b25f2d3 100644 --- a/src/Traits/FormAccessible.php +++ b/src/Traits/FormAccessible.php @@ -9,9 +9,8 @@ use ReflectionMethod; /** - * Class FormAccessible + * Trait FormAccessible * - * @package Arcanedev\LaravelHtml\Traits * @author ARCANEDEV */ trait FormAccessible diff --git a/tests/Concerns/AssertsHtmlStrings.php b/tests/Concerns/AssertsHtmlStrings.php index e87381f..b31030b 100644 --- a/tests/Concerns/AssertsHtmlStrings.php +++ b/tests/Concerns/AssertsHtmlStrings.php @@ -1,11 +1,14 @@ - */ trait AssertsHtmlStrings diff --git a/tests/FormBuilderTest.php b/tests/FormBuilderTest.php index da9aab4..cfac111 100644 --- a/tests/FormBuilderTest.php +++ b/tests/FormBuilderTest.php @@ -17,7 +17,6 @@ /** * Class FormBuilderTest * - * @package Arcanedev\LaravelHtml\Tests\Builders * @author ARCANEDEV */ class FormBuilderTest extends TestCase diff --git a/tests/HtmlBuilderTest.php b/tests/HtmlBuilderTest.php index 3d37e20..53e2649 100644 --- a/tests/HtmlBuilderTest.php +++ b/tests/HtmlBuilderTest.php @@ -9,7 +9,6 @@ /** * Class HtmlBuilderTest * - * @package Arcanedev\LaravelHtml\Tests\Builders * @author ARCANEDEV */ class HtmlBuilderTest extends TestCase diff --git a/tests/HtmlServiceProviderTest.php b/tests/HtmlServiceProviderTest.php index 645d941..e746fa5 100644 --- a/tests/HtmlServiceProviderTest.php +++ b/tests/HtmlServiceProviderTest.php @@ -10,7 +10,6 @@ /** * Class HtmlServiceProviderTest * - * @package Arcanedev\LaravelHtml\Tests * @author ARCANEDEV */ class HtmlServiceProviderTest extends TestCase diff --git a/tests/Stubs/DummyController.php b/tests/Stubs/DummyController.php index 5aefcde..8bf92eb 100644 --- a/tests/Stubs/DummyController.php +++ b/tests/Stubs/DummyController.php @@ -9,7 +9,6 @@ /** * Class DummyController * - * @package Arcanedev\LaravelHtml\Tests\Stubs * @author ARCANEDEV */ class DummyController extends Controller diff --git a/tests/Stubs/FormBuilderModelStub.php b/tests/Stubs/FormBuilderModelStub.php index a8330ef..33292f3 100644 --- a/tests/Stubs/FormBuilderModelStub.php +++ b/tests/Stubs/FormBuilderModelStub.php @@ -7,7 +7,6 @@ /** * Class FormBuilderModelStub * - * @package Arcanedev\LaravelHtml\Tests\Stubs * @author ARCANEDEV */ class FormBuilderModelStub diff --git a/tests/Stubs/ModelThatDoesntUseForms.php b/tests/Stubs/ModelThatDoesntUseForms.php index 8f33aa7..3f9b4ee 100644 --- a/tests/Stubs/ModelThatDoesntUseForms.php +++ b/tests/Stubs/ModelThatDoesntUseForms.php @@ -9,7 +9,6 @@ /** * Class ModelThatDoesntUseForms * - * @package Arcanedev\LaravelHtml\Tests\Stubs * @author ARCANEDEV */ class ModelThatDoesntUseForms extends Model diff --git a/tests/Stubs/ModelThatUsesForms.php b/tests/Stubs/ModelThatUsesForms.php index 41babb2..13e570a 100644 --- a/tests/Stubs/ModelThatUsesForms.php +++ b/tests/Stubs/ModelThatUsesForms.php @@ -11,7 +11,6 @@ /** * Class ModelThatUsesForms * - * @package Arcanedev\LaravelHtml\Tests\Stubs * @author ARCANEDEV */ class ModelThatUsesForms extends Model diff --git a/tests/TestCase.php b/tests/TestCase.php index 20c7fcb..4b04849 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -15,7 +15,6 @@ /** * Class TestCase * - * @package Arcanedev\LaravelHtml\Tests * @author ARCANEDEV */ abstract class TestCase extends BaseTestCase diff --git a/tests/Traits/FormAccessible.php b/tests/Traits/FormAccessible.php index c808a11..cc127b5 100644 --- a/tests/Traits/FormAccessible.php +++ b/tests/Traits/FormAccessible.php @@ -4,7 +4,6 @@ namespace Arcanedev\LaravelHtml\Tests\Traits; -use Arcanedev\LaravelHtml\FormBuilder; use Arcanedev\LaravelHtml\Tests\Stubs\{ModelThatDoesntUseForms, ModelThatUsesForms}; use Arcanedev\LaravelHtml\Tests\TestCase; use Carbon\Carbon; @@ -13,7 +12,6 @@ /** * Class FormAccessible * - * @package Arcanedev\LaravelHtml\Tests\Traits * @author ARCANEDEV */ class FormAccessible extends TestCase