Merge pull request #12 from ARCANEDEV/develop

Laravel 10 Support + Updating the package
ARCANEDEV · Mar 18, 2024 · 01cdb76 · 01cdb76
2 parents afc9cd7 + 57ca4f2
commit 01cdb76
Show file tree

Hide file tree

Showing 62 changed files with 617 additions and 1,297 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -9,14 +9,14 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.0, 8.1]
+        php: [8.1, 8.2]
         dependency-version: [prefer-lowest, prefer-stable]
 
     name: PHP ${{ matrix.php }} - ${{ matrix.dependency-version }}
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 2
 
@@ -30,19 +30,16 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          extensions: curl, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, iconv
-          tools: composer:v2
+          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, iconv
           coverage: pcov
 
       - name: Install dependencies
         run: composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction
 
       - name: Execute tests
-        run: |
-          mkdir -p build/logs
-          vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover
+        run: composer test:ci
 
-#      - name: Scrutinizer CI
-#        run: |
-#          composer require scrutinizer/ocular --dev
-#          vendor/bin/ocular code-coverage:upload --format=php-clover coverage.clover
+      - name: Scrutinizer CI
+        run: |
+          composer require scrutinizer/ocular --dev
+          vendor/bin/ocular code-coverage:upload --format=php-clover /build/coverage/clover.xml
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,6 @@
-/build/
-/vendor/
+/.phpunit.cache
+/build
+/vendor
 /composer.lock
 /composer.phar
+.phpunit.result.cache
diff --git a/composer.json b/composer.json
@@ -14,12 +14,12 @@
     "type":    "library",
     "license": "MIT",
     "require": {
-        "php": "^8.0",
-        "illuminate/support": "^9.0"
+        "php": "^8.1",
+        "illuminate/support": "^10.0"
     },
     "require-dev": {
         "ext-dom": "*",
-        "phpunit/phpunit": "^9.5.8"
+        "phpunit/phpunit": "^10.0"
     },
     "autoload": {
         "psr-4": {
@@ -32,12 +32,14 @@
         }
     },
     "scripts": {
-        "test": "phpunit",
-        "coverage": "phpunit --coverage-html build/coverage/html"
+        "test": "phpunit --colors=always",
+        "test:dox": "phpunit --testdox --colors=always",
+        "test:cov": "phpunit --coverage-html",
+        "test:ci": "phpunit --coverage-text"
     },
     "extra": {
         "branch-alias": {
-            "dev-develop": "6.x-dev"
+            "dev-develop": "7.x-dev"
         }
     },
     "config": {

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -6,10 +6,10 @@
 >
     <testsuites>
         <testsuite name="Package Test Suite">
-            <directory suffix=".php">./tests</directory>
+            <directory suffix="Test.php">./tests</directory>
         </testsuite>
     </testsuites>
-    <coverage processUncoveredFiles="true">
+    <coverage>
         <include>
             <directory suffix=".php">./src</directory>
         </include>

diff --git a/src/Contracts/Elements/HtmlElement.php b/src/Contracts/Elements/HtmlElement.php
@@ -33,19 +33,14 @@ public function getAttributes();
     /**
      * Set an attribute.
      *
-     * @param  string       $name
-     * @param  string|null  $value
-     *
-     * @return static
+     * @return $this
      */
-    public function attribute(string $name, $value = null);
+    public function attribute(string $name, mixed $value = null): static;
 
     /**
      * Set the attributes.
      *
-     * @param  iterable  $attributes
-     *
-     * @return static
+     * @return $this
      */
-    public function attributes($attributes);
+    public function attributes(iterable $attributes): static;
 }