Updates

Author: GrahamCampbell

.github/CODE_OF_CONDUCT.md

@@ -2,75 +2,131 @@
 
 ## 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.
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, caste, color, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
 
 ## Our Standards
 
-Examples of behavior that contributes to creating a positive environment
-include:
+Examples of behavior that contributes to a positive environment for our
+community 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
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
 
-Examples of unacceptable behavior by participants include:
+Examples of unacceptable behavior include:
 
-* The use of sexualized language or imagery and unwelcome sexual attention or
- advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or 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
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
 * Other conduct which could reasonably be considered inappropriate in a
- professional setting
+  professional setting
 
-## Our Responsibilities
+## Enforcement 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.
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
 
-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.
+Community leaders 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, and will communicate reasons for moderation
+decisions when appropriate.
 
 ## 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.
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
 
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at [email protected]. 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.
+reported to the community leaders responsible for enforcement at
+[email protected].
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
 
-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.
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
 
 ## 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
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.1, available at
+[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
 
-[homepage]: https://www.contributor-covenant.org
+Community Impact Guidelines were inspired by
+[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
 
-For answers to common questions about this code of conduct, see
-https://www.contributor-covenant.org/faq
+For answers to common questions about this code of conduct, see the FAQ at
+[https://www.contributor-covenant.org/faq][FAQ]. Translations are available
+at [https://www.contributor-covenant.org/translations][translations].
+
+[homepage]: https://www.contributor-covenant.org
+[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
+[Mozilla CoC]: https://github.com/mozilla/diversity
+[FAQ]: https://www.contributor-covenant.org/faq
+[translations]: https://www.contributor-covenant.org/translations

.github/CONTRIBUTING.md

@@ -2,16 +2,16 @@
 
 Contributions are **welcome** and will be fully **credited**.
 
-We accept contributions via pull requests on Github. Please review these guidelines before continuing.
+We accept contributions via pull requests on GitHub. Please review these guidelines before continuing.
 
 ## Guidelines
 
-* Please follow the [PSR-2 Coding Style Guide](https://www.php-fig.org/psr/psr-2/), enforced by [StyleCI](https://styleci.io/).
+* Please follow the [PSR-12 Coding Style Guide](https://www.php-fig.org/psr/psr-12/), enforced by [StyleCI](https://styleci.io/).
 * Ensure that the current tests pass, and if you've added something new, add the tests where relevant.
-* Send a coherent commit history, making sure each individual commit in your pull request is meaningful.
+* Send a coherent commit history, making sure each commit in your pull request is meaningful.
 * You may need to [rebase](https://git-scm.com/book/en/v2/Git-Branching-Rebasing) to avoid merge conflicts.
-* If you are changing or adding to the behaviour or public api, you may need to update the docs.
-* Please remember that we follow [SemVer](https://semver.org/).
+* If you are changing or adding to the behaviour or public API, you may need to update the docs.
+* Please remember that we follow [Semantic Versioning](https://semver.org/).
 
 ## Running Tests
 
@@ -27,5 +27,5 @@ Then run [PHPUnit](https://phpunit.de/):
 $ vendor/bin/phpunit
 ```
 
-* The tests will be automatically run by [Travis CI](https://travis-ci.org/) against pull requests.
-* We also have [StyleCI](https://styleci.io/) setup to automatically fix any code style issues.
+* The tests will be automatically run by [GitHub Actions](https://github.com/features/actions) against pull requests.
+* We also have [StyleCI](https://styleci.io/) set up to automatically fix any code style issues.

.github/SECURITY.md

@@ -3,12 +3,12 @@
 ## Supported Versions
 
 After each new major release, the previous release will be supported for no
-less than 6 months, unless explictly stated otherwise. This may mean that there
-are multiple supported versions at any given time.
+less than 12 months, unless explictly stated otherwise. This may mean that
+there are multiple supported versions at any given time.
 
 ## Reporting a Vulnerability
 
 If you discover a security vulnerability within this package, please send an
-email to Graham Campbell at graham@alt-three.com. All security vulnerabilities
-will be promptly addressed. Please do not disclose security-related issues
-publicly until a fix has been announced.
+email to security@tidelift.com. All security vulnerabilities will be promptly
+addressed. Please do not disclose security-related issues publicly until a fix
+has been announced.

.github/workflows/tests.yml

@@ -11,11 +11,13 @@ jobs:
 
     strategy:
       matrix:
-        php: ['7.2', '7.3', '7.4', '8.0']
+        php: ['7.2', '7.3', '7.4', '8.0', '8.1']
         laravel: ['7', '8']
         exclude:
           - php: '7.2'
             laravel: '8'
+          - php: '8.1'
+            laravel: '7'
 
     steps:
       - name: Checkout Code
@@ -47,21 +49,12 @@ jobs:
           command: composer require "laravel/framework:8.*" --no-update --no-interaction
         if: "matrix.laravel == '8'"
 
-      - name: Install PHP 7 Dependencies
+      - name: Install PHP Dependencies
         uses: nick-invision/retry@v1
         with:
           timeout_minutes: 5
           max_attempts: 5
           command: composer update --no-interaction --no-progress
-        if: "matrix.php < 8"
-
-      - name: Install PHP 8 Dependencies
-        uses: nick-invision/retry@v1
-        with:
-          timeout_minutes: 5
-          max_attempts: 5
-          command: composer update --no-interaction --no-progress --ignore-platform-req=php
-        if: "matrix.php >= 8"
 
       - name: Execute PHPUnit
         run: vendor/bin/phpunit

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2021 Graham Campbell <[email protected]>
+Copyright (c) 2014-2021 Graham Campbell <[email protected]>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -5,10 +5,6 @@ Laravel Exceptions was created by, and is maintained by [Graham Campbell](https:
 
 ![Banner](https://user-images.githubusercontent.com/2829600/71477346-60993680-27e1-11ea-881f-01ac5caaa169.png)
 
-<p align="center">
-<a href="https://xscode.com/grahamcampbell/Laravel-Exceptions"><img src="https://xscode.com/assets/promo-banner.svg" alt="Promo Banner"></img></a>
-</p>
-
 <p align="center">
 <a href="https://github.com/GrahamCampbell/Laravel-Exceptions/actions?query=workflow%3ATests"><img src="https://img.shields.io/github/workflow/status/GrahamCampbell/Laravel-Exceptions/Tests?label=Tests&style=flat-square" alt="Build Status"></img></a>
 <a href="https://github.styleci.io/repos/26882182"><img src="https://github.styleci.io/repos/26882182/shield" alt="StyleCI Status"></img></a>
@@ -20,7 +16,7 @@ Laravel Exceptions was created by, and is maintained by [Graham Campbell](https:
 
 ## Installation
 
-Laravel Exceptions requires [PHP](https://php.net) 7.2-8.0. This particular version supports Laravel 7-8.
+Laravel Exceptions requires [PHP](https://php.net) 7.2-8.1. This particular version supports Laravel 7-8.
 
 | Exceptions | L5.1               | L5.2               | L5.3               | L5.4               | L5.5               | L5.6               | L5.7               | L5.8               | L6                 | L7                 | L8                 |
 |------------|--------------------|--------------------|--------------------|--------------------|--------------------|--------------------|--------------------|--------------------|--------------------|--------------------|--------------------|
@@ -96,7 +92,7 @@ There is currently no usage documentation for Laravel Exceptions, but we are ope
 
 ## Security
 
-If you discover a security vulnerability within this package, please send an email to Graham Campbell at graham@alt-three.com. All security vulnerabilities will be promptly addressed. You may view our full security policy [here](https://github.com/GrahamCampbell/Laravel-Exceptions/security/policy).
+If you discover a security vulnerability within this package, please send an email to security@tidelift.com. All security vulnerabilities will be promptly addressed. You may view our full security policy [here](https://github.com/GrahamCampbell/Laravel-Exceptions/security/policy).
 
 
 ## License

composer.json

@@ -6,7 +6,8 @@
     "authors": [
         {
             "name": "Graham Campbell",
-            "email": "[email protected]"
+            "email": "[email protected]",
+            "homepage": "https://github.com/GrahamCampbell"
         }
     ],
     "require": {

config/exceptions.php

@@ -5,7 +5,7 @@
 /*
  * This file is part of Laravel Exceptions.
  *
- * (c) Graham Campbell <[email protected]>
+ * (c) Graham Campbell <[email protected]>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

src/Displayer/AbstractJsonDisplayer.php

@@ -5,7 +5,7 @@
 /*
  * This file is part of Laravel Exceptions.
  *
- * (c) Graham Campbell <[email protected]>
+ * (c) Graham Campbell <[email protected]>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -22,7 +22,7 @@
  *
  * @internal
  *
- * @author Graham Campbell <[email protected]>
+ * @author Graham Campbell <[email protected]>
  */
 abstract class AbstractJsonDisplayer implements DisplayerInterface
 {

src/Displayer/DebugDisplayer.php

@@ -5,7 +5,7 @@
 /*
  * This file is part of Laravel Exceptions.
  *
- * (c) Graham Campbell <[email protected]>
+ * (c) Graham Campbell <[email protected]>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -21,7 +21,7 @@
 /**
  * This is the debug displayer class.
  *
- * @author Graham Campbell <[email protected]>
+ * @author Graham Campbell <[email protected]>
  */
 final class DebugDisplayer implements DisplayerInterface
 {

src/Displayer/DisplayerInterface.php

@@ -5,7 +5,7 @@
 /*
  * This file is part of Laravel Exceptions.
  *
- * (c) Graham Campbell <[email protected]>
+ * (c) Graham Campbell <[email protected]>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -18,7 +18,7 @@
 /**
  * This is the displayer interface.
  *
- * @author Graham Campbell <[email protected]>
+ * @author Graham Campbell <[email protected]>
  */
 interface DisplayerInterface
 {

src/Displayer/HtmlDisplayer.php

@@ -5,7 +5,7 @@
 /*
  * This file is part of Laravel Exceptions.
  *
- * (c) Graham Campbell <[email protected]>
+ * (c) Graham Campbell <[email protected]>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -20,7 +20,7 @@
 /**
  * This is the html displayer class.
  *
- * @author Graham Campbell <[email protected]>
+ * @author Graham Campbell <[email protected]>
  */
 final class HtmlDisplayer implements DisplayerInterface
 {