Updates for Laravel 9.x and 10.x. PHP 8.0 and above. (#3)

Author: jbrooksuk

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+github:
+  - cachethq
+  - jbrooksuk

.github/workflows/fix-code-styling.yml

@@ -0,0 +1,10 @@
+name: "Fix Code Styling"
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  lint:
+    uses: laravel/.github/.github/workflows/coding-standards.yml@main

.github/workflows/run-tests.yml

@@ -0,0 +1,40 @@
+name: run-tests
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: true
+      matrix:
+        os: [ubuntu-latest]
+        php: [8.2, 8.1]
+        laravel: [10.*]
+        stability: [prefer-lowest, prefer-stable]
+        include:
+          - laravel: 10.*
+            testbench: 8.*
+            pest: ^2.13
+            pest_laravel: ^2.0
+
+    name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - 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, fileinfo
+          coverage: none
+
+      - name: Install dependencies
+        run: |
+          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "pestphp/pest:${{ matrix.pest }}" "pestphp/pest-plugin-laravel:${{ matrix.pest_laravel }}" --no-interaction --no-update
+          composer update --${{ matrix.stability }} --prefer-dist --no-interaction
+
+      - name: Execute tests
+        run: composer test

.github/workflows/update-changelog.yml

@@ -0,0 +1,28 @@
+name: "Update Changelog"
+
+on:
+  release:
+    types: [released]
+
+jobs:
+  update:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          ref: main
+
+      - name: Update Changelog
+        uses: stefanzweifel/changelog-updater-action@v1
+        with:
+          latest-version: ${{ github.event.release.name }}
+          release-notes: ${{ github.event.release.body }}
+
+      - name: Commit updated CHANGELOG
+        uses: stefanzweifel/[email protected]
+        with:
+          branch: main
+          commit_message: Update CHANGELOG
+          file_pattern: CHANGELOG.md

.travis.yml

@@ -2,27 +2,24 @@
 
 A badge generator for Laravel 5 and 6.
 
-
 ## Installation
 
-This version requires [PHP](https://php.net) 7.1 - 7.3, and supports Laravel 5.5 and above.
+This version requires [PHP](https://php.net) 8.0 and 8.1, and supports Laravel 8.0 and above.
 
 To get the latest version, simply require the project using [Composer](https://getcomposer.org):
 
 ```bash
 $ composer require cachethq/badger
 ```
 
-Once installed, if you are not using automatic package discovery, then you need to register the `CachetHQ\Badger\BadgerServiceProvider` service provider in your `config/app.php`.
-
+Once installed, if you are not using automatic package discovery, then you need to register the `Cachet\Badger\BadgerServiceProvider` service provider in your `config/app.php`.
 
 ## Examples
 
-
 Get started immediately:
 
 ```php
-// Using the facade
+// Using the Facade
 Badger::generate('license', 'MIT', 'blue', 'plastic')
 
 // Dependency injection example
@@ -32,7 +29,6 @@ $badger->generate('license', 'MIT', '#ff69b4', 'plastic')
 ![License Blue MIT](https://cdn.rawgit.com/CachetHQ/Badger/master/tests/stubs/license-MIT-blue-plastic.svg)
 ![License Custom MIT](https://cdn.rawgit.com/CachetHQ/Badger/master/tests/stubs/license-MIT-custom-plastic.svg)
 
-
 ## Usage
 
 The generate method takes four parameters:
@@ -60,12 +56,10 @@ And finally the fourth parameter is the badge type. This determines the style of
 - `plastic`
 - `social` (without links)
 
-
 ## Security
 
 If you discover a security vulnerability within this package, please e-mail us at [email protected]. All security vulnerabilities will be promptly addressed.
 
-
 ## License
 
 Cachet Badger is licensed under [The MIT License (MIT)](LICENSE).

README.md

@@ -1,44 +1,54 @@
 {
     "name": "cachethq/badger",
-    "description": "A Badge Generator For Laravel 5 and 6.",
+    "description": "A badge generator for Laravel.",
     "keywords": ["badger", "badge", "shield", "svg", "Badger", "Cachet", "CachetHQ"],
     "license": "MIT",
+    "support": {
+        "issues": "https://github.com/cachethq/badger/issues",
+        "source": "https://github.com/cachethq/badger"
+    },
     "authors": [
         {
-            "name": "Cachet",
-            "email": "[email protected]"
+            "name": "James Brooks",
+            "email": "[email protected]"
         }
     ],
     "require": {
-        "php": "^7.1.3",
-        "illuminate/contracts": "^5.5|^6.0",
-        "illuminate/support": "^5.5|^6.0"
+        "php": "^8.0",
+        "illuminate/contracts": "^8.0|^9.0|^10.0",
+        "illuminate/support": "^8.0|^9.0|^10.0"
     },
     "require-dev": {
-        "graham-campbell/analyzer": "^2.1",
-        "graham-campbell/testbench": "^5.1",
-        "phpunit/phpunit": "^6.5|^7.0|^8.0"
+        "orchestra/testbench": "^8.8",
+        "pestphp/pest": "^2.13",
+        "pestphp/pest-plugin-laravel": "^2.2"
     },
     "autoload": {
         "psr-4": {
-            "CachetHQ\\Badger\\": "src/"
+            "Cachet\\Badger\\": "src/"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "CachetHQ\\Tests\\Badger\\": "tests/"
+            "Cachet\\Tests\\Badger\\": "tests/"
         }
     },
     "config": {
-        "preferred-install": "dist"
+        "sort-packages": true,
+        "allow-plugins": {
+            "pestphp/pest-plugin": true
+        }
+    },
+    "scripts": {
+        "test": "vendor/bin/pest"
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.0-dev"
+            "dev-master": "3.0-dev"
         },
         "laravel": {
             "providers": [
-                "CachetHQ\\Badger\\BadgerServiceProvider"
+                "Cachet\\Badger\\BadgerServiceProvider"
             ]
         }
     },

composer.json

@@ -1,28 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         beStrictAboutTestsThatDoNotTestAnything="true"
-         beStrictAboutOutputDuringTests="true"
-         bootstrap="vendor/autoload.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         failOnRisky="true"
-         failOnWarning="true"
-         processIsolation="false"
-         stopOnError="false"
-         stopOnFailure="false"
-         verbose="true"
->
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.3/phpunit.xsd" bootstrap="vendor/autoload.php" colors="true">
     <testsuites>
         <testsuite name="Badger Test Suite">
             <directory suffix="Test.php">./tests</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
+    <coverage/>
+    <source>
+        <include>
             <directory suffix=".php">./src</directory>
-        </whitelist>
-    </filter>
+        </include>
+    </source>
 </phpunit>