Merge branch 'master' into master

.editorconfig

@@ -0,0 +1,10 @@
+; This file is for unifying the coding style for different editors and IDEs.
+; More information at https://editorconfig.org
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true

.github/workflows/awesomebot.yml

@@ -3,16 +3,24 @@ on:
   push:
     branches:
       - master
+      
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
-    - name: Set up Ruby 2.6
-      uses: actions/setup-ruby@v1
+    - uses: actions/checkout@v4
+    - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.6.x
+        ruby-version: '2.7'
+        
     - name: Install Awesome Bot
       run: gem install awesome_bot
+      
     - name: Run Awesome Bot
-      run: awesome_bot README.md --white-list igor.io,symfony,toranproxy.com,vagrantup.com,3v4l.org,voicesoftheelephpant.com,drupal.org
+      run: awesome_bot README.md --request-delay 1 --allow-dupe --white-list igor.io,symfony,toranproxy.com,vagrantup.com,3v4l.org,voicesoftheelephpant.com,drupal.org,oreilly.com,youtube.com,lumen.laravel.com
+    
+    - uses: actions/upload-artifact@v4
+      if: failure()
+      with:
+        name: ab-results
+        path: ab-results-README.md-filtered.json

.travis.yml

@@ -1,9 +0,0 @@
-language: ruby
-rvm:
-  - 2.2
-before_script:
-  - gem install awesome_bot
-script:
-  - awesome_bot README.md --white-list igor.io,symfony,toranproxy.com,vagrantup.com,3v4l.org,voicesoftheelephpant.com,drupal.org
-notifications:
-  email: false

CODE-OF-CONDUCT.md

@@ -35,7 +35,7 @@ This Code of Conduct applies both within project spaces and in public spaces
 when an individual is representing the project or its community.
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting a project maintainer at awesome-php@josediazgonzalez.com. All
+reported by contacting a project maintainer at ziadoz@gmail.com. All
 complaints will be reviewed and investigated and will result in a response that
 is deemed necessary and appropriate to the circumstances. Maintainers are
 obligated to maintain confidentiality with regard to the reporter of an

COLLABORATING.md

@@ -13,9 +13,10 @@ If you provide feedback on a suggested project please be friendly and constructi
 ## Reviewing
 Please work through the following checklist when reviewing a project: 
 
-- Tag pull requests with the most relevant label(s).
-- Validate URLs work correctly and don't point to anything malicious.
 - Ensure suggestions adhere to [CONTRIBUTING](https://github.com/ziadoz/awesome-php/blob/master/CONTRIBUTING.md).
+- Validate URLs work correctly and don't point to anything malicious.
+- Two approvals per pull request is preferred, but not required.
+- Simple pull requests fixing typos, formatting and broken links can be merged with a single approval.
 
 ## Enhancements
 If you have an idea on how to improve the project, please open a ticket for discussion using the `Enhancement` label. Please don’t make any broad or sweeping changes without consulting other collaborators first and reaching a consensus.
@@ -23,4 +24,4 @@ If you have an idea on how to improve the project, please open a ticket for disc
 ## Join
 If you want to help out please send an email to my Github username [at] gmail [dot] com with the subject “Awesome PHP Collaborator and a link to your Github account and I’ll get back to you as soon as I can (I'm notoriously slow, sorry).
 
-Thank you for taking the time to help out with Awesome PHP, your help is appreciated!
+Thank you for taking the time to help out with Awesome PHP, your help is appreciated!

CONTRIBUTING.md

@@ -1,26 +1,33 @@
 # Contribution Guidelines
-Unfortunately, not every library, tool or framework can be considered for inclusion. The aim of Awesome PHP is to be a concise list of noteworthy and interesting software written in modern PHP. Therefore, suggested software should:
+Awesome PHP aims to be a concise list of the best packages, frameworks, tools, and software the PHP ecosystem has to offer. Unfortunately, this means not everything can or should be included. The suggested software should ideally be one of the following:
 
-1. Be widely recommended regardless of personal opinion
-2. Well known or discussed within the PHP community
-3. Be unique in its approach or function
-4. Fill a niche gap in the market
+* Widely known or recognised within the PHP community
+* Established and mature
+* Unique in its approach
+* Fulfill a niche gap in the market
 
-Self-promotion is frowned upon, so please consider seriously whether your project meets the criteria before opening a pull request, otherwise it may be closed without being reviewed.
+Where applicable, preference will be given to software that:
+
+* Targets supported versions of PHP
+* Can be installed using Composer
+* Is PSR compliant
+* Semantically versioned
+* Thoroughly tested
+* Actively maintained
+* Well documented in English
 
 Also, please ensure your pull request adheres to the following guidelines:
 
-* Software that is PHP 7.0+, Composer-installable, PSR compliant, semantically versioned, unit tested, actively maintained and well documented in English is preferred.
-* Please search previous suggestions before making a new one, as yours may be a duplicate.
-* Enter a meaningful pull request description.
-* Please make an individual commit for each suggestion in a separate pull request.
-* Put a link to each library in your pull request ticket so it's easier to review.
-* Use the following format for libraries: \[LIBRARY\]\(LINK\) - DESCRIPTION.
-* Prefix duplicate library names with their vendor or namespace followed by a space: Foo\Bar would be Foo Bar.
-* New categories, or improvements to the existing categorisation, are always welcome.
-* Please keep descriptions short, simple and unbiased. No buzzwords or marketing jargon.
-* End all descriptions with a full stop/period.
-* Check your spelling and grammar.
-* Make sure your text editor is set to remove trailing whitespace.
+* Your suggestion will be closed if it has been previously rejected or is a duplicate
+* Write a meaningful pull request description that includes a link to the project
+* Adheres to the following Markdown format: `[LIBRARY](LINK) - DESCRIPTION.`
+* Your description is short, clear, unbiased, and doesn't contain any jargon
+* The description ends with a full stop/period and no trailing whitespace
+* You've checked your spelling and grammar
+* Your entry is added alphabetically to the category
+* If your entry has the same name as another, it should be prefixed with the vendor (e.g., `Foo\Bar` becomes `Foo Bar`)
+* Feel free to suggest new categories or organisational improvements
+
+Please make sure your suggestion meets all the criteria before submitting a pull request, or it may be closed without review.
 
 Thank you for your suggestions!